Completed assignment 2 =)