Stephen

Refactor the controller, model, and view