Begin refactoring stuff into the cell to keep view and model separate