Started work on general event collapsing