Project 2 Final Code

Final changes for Project 2.