Changes to the DataModel to sync w/ database

Database has been changed in a different branch.  This is confusing,
sorry.
Update UI with Datamodel changes