Project 2 Code refactored, complete.