Started adding some more ToDos for the event refactor