Added task and scheduler, will move to new one soon