Getting ready for dependency swap from obelisk to _client.