Wip/testenh

This is on top of wip/events.

Fixes #88