Refactor to get all the messaing out of models, return just bool or int