Middle of implementing model.
Merge pull request #1 from jesserosato/master

Update