Client w/o testing code

Enjoy!