WIP: Continued implementing new scheduler