Added all of the client library stuff