refactored client api
Merge branch 'master' of github.com:TyOverby/grb