blah finished stuff with client

blah
Merge remote-tracking branch 'origin/master'