Start events and stuff, change some other stuff
Fix mergeconflict