Event refactor

Just a thought...

(note: this depends on #145)
I wear my shame proudly. :wink: