blah
Refactoring into model classes