Updated models to match client and added new models
Further model enhancements
Merge pull request #15 from petekrull/develop

+ models now match the schema for the client