Try tgreisser's feedback, reduce model boilerplate
Merge pull request #2 from elliotf/taking_tgriesser_feedback

Try tgreisser's feedback, reduce model boilerplate