[WIP] Add ws event new

targets #358