Still working on the scheduler