Finished the Abstracted Client Framework