Started writing client wrapper
More changes