Made some changes and added a non-working Part 2 and Rachel's working Part 1