New models

I've added several new models and updated existing models and (some) views to work with the new models.

This pull request is to provide the capability to migrate the existing production database to the new structure.