* Switch the client to new futures * No need for compat in the client * Fix client tests * Address review