Events v2

Overhaul with addressable events.