client stuff
Merge pull request #4 from acmacalister/master

client stuff