Scheduler completed for now. Tests for Scheduler also

Have a good night merging this :)