Van Arsdell changes
Merge pull request #134 from findsorguk/updateModels

Van Arsdell changes