fixing things up to make sure it still deploys, events still randomly overlap