Work on new EventHandler stack