finished controller integration of model refactor