Changed code to be more modular and OOP. Finished test cases for model.resume