Module 2 is finished, need to refactor module 2 before moving on to module 3