Refactoring how the events get kicked off.