changes to core, finishing towards websocket client