Done with project 2

time to refactor!