More work on websockets