More changes to client.

Not feeling well enough to parse out details.
more work in the Client