Adding some TODO comments on the event dispatcher