Pushed client class

Imported client class from the old repo and updated one or two points
(renamed, etc.).