Add client objects and dry the code
Start converting tests to rspec