Simplify the client.
Fix up the options handling.
Blat the tests.