[WIP] Refactor to pull controller and model out of view