started working on client stuff
Merge remote-tracking branch 'origin/master'
some more client side methods added