Improoved Scheduler and Task
merge
removed IScheduler
merge?
merge, finally?