mixins and refactor
Merge pull request #8 from pbrodie/f-add-models

mixins and refactor