Almost done with assignment 2