Pulled in changes from dumbClient

Lots of debug couts - remember to comment out or delete them!