Large batch of changes
Merge pull request #144 from findsorguk/updateModels

Large batch of changes