Changed some stuff
Event up and running
resolved merge conflicts