Begin refactor to pull controller and model out of view