Refactor to use new data model approach
Get basic edit and show pages working