Finished v1 of Client class