still cutting down on model and views