Got the majority of part 2 done.

Some of it is commented out for now.