fixup! fixup! fixup! fixup! WIP: WS integration

3 jobs for feature/ws-included in 1 minute and 41 seconds (queued for 7 seconds)