Cleaned up and commented the code, need to and the TDD options next