Separated model from the presentation layer, ready to work on Week 8 enhancements