First draft of the new event system