Problem 1 Solved.
Finished Problem 2.
Rearranged to allow us to not clobber each other's work.