Move Model Logic into the Model