First draft of events restructure