Completed assignment except part 3.2