Just tweaking models.
Models working. Still need tweaking to conform to API.
Merge pull request #4 from rgschneider/robert-feature

Robert feature
Merge pull request #3 from rgschneider/models

Models
fixed merge confilcts