Adding client library, untested.