Ignore cancelled events
Major refactor