Refactor clients.  Add date test.
Merge