Planning to move connection handler functionality to client handler