Refactored to model

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | yes
| Deprecations? | no
| Tests pass?   | ?
| Fixed tickets | 
| License       | MIT
| Doc PR        | TODO

replace #49 with additional commits
/cc @dantleech