Changes to data model.
Additions to App core classes. Work in progress.