Completing Assignment 2