Finished functionality for scheduler
Merged