get rid of model logic