Start adding websocket support for client