Finished refactoring crappy client.cs code.
Implemented client options.