- moved stuff to the model away from the implementations and vica versa