removed model to demonstrate messy controller
refactored controller and view by moving clunky code to model
resolved merge conflict