Began change of socket abstraction for non-blocking operation and to clear out Client class. (Two tests are not working, yet.)