Beginning of implementation of client API