Finished Scheduler implementation

(I think...)