started moving logic into the models for testing
Merge pull request #26 from MiguelABarbosa/mike

started moving logic into the models for testing