Work in progress commit - getting basic navigation and data model on their feet