working on restructure of streams in websocket implementation
cleaned up to beginning state