Started to modify to use websocket server instead..