Refactoring of model structure and differentiation
Updates to messages
Work to update tests and states to new model format