Done migrating to SocketWrapper class