Assignment 2 completion