Completion of Assignement 2