Part 1 and 2 of assignment complete