Final Commit for Project 2 (barring small stuff)