Move Event logic to actually catch them