More work on events
Revert "More work on events"

This reverts commit ebb93fe23ae2ca1d1bd7d82e18f68d6584ff085c.
More work on events
Revert "Revert "More work on events""

This reverts commit 6c44673c20b677d32221ef7421396622292a26f1.