Programming assignment 2 DONE