Finish assignment 2