changes to the model to reflect the new direction of the UI
Merged
Merge pull request #22 from austintrose/sbl-dev

Further changes to model to reflect our new UI direction.