Merging in websocket code.