Started work on client library