Sync back work on model-constructor

Build from models and some fixes in the JSON serialize/deserialize

This release won't build the demo because the implicit create of resources has been removed to accommodate the JSON serialization and constructors

Working on a builder object to make the demo buildable from this version