Events were hard. Lot of refactoring ahead ...