First commit of completed assignment 2