Finish client (untested at this point)