merged in a pre-working websocket demo