created proper websocket handlers, TODO: why are websockets just closing? :(
resolved conflicts