Finish part 1 of assignment