Lots of model changes
Merge pull request #137 from findsorguk/updateModels

Lots of model changes