WIP: no more static EventHandler