Finished the Client Portion to the new API