merging in the model from the develop branch
making the properties monolithic