Finished the base client, started on writing unit tests