Changed the socket service to be all message driven