Event refactor

Just a thought...

(note: this depends on #145)