Refactored some code into a new presentation class so that I can get some tests on it