Moving code
Finishing part 2 of assignment