Checkpoint before I check with the users.
A bunch of new models and adjustments to existing ones.
Merge pull request #28 from wil-langford/new_models

Merging myself so I can get the migration done this afternoon.