New stuff finally pt 2 part 1