Continued work on websockets