Started part 2

Some of part 2 is complete, still needs a lot of work