Maybe always pass client in with a default Client.new