Event refactor

Just a thought...

(note: this depends on #145)
It can't - its used by Base.