Finish with main implementation of client