SocketConnection refactor....