Super refactor! Using EventScheduler to run everything!