Started part 2 on final project