Event refactor

Just a thought...

(note: this depends on #145)
And then I see this line. Nevermind... :smiley: