Event redesign.
Event redesign take two.
Merge branch 'event-redesign' into anarchy