Continued work on websockets, still not done