Finish Part 1 10-12
Fix merge conflicts