Revert "Events and Actions"

This reverts commit 4bf2840b66ffad7eb02f683e0d56faf3b9f4ca17.
Revert "Revert "Events and Actions""

This reverts commit 3292e76b1827ce8815d8e7e7ce9b4458b6f951b4.