Finished new scheduler (Untested)