Added websockets messaging
Merged websocket code