Use ClientModel wherever possible
Merge pull request #246 from patriot1burke/master

Use ClientModel wherever possible