WINDUP-109: Major refactor of Model classes and general cleanup
Merge pull request #122 from lincolnthree/WINDUP-109

WINDUP-109: Major refactor of Model classes and general cleanup