Moved shit to the model