Intemediate commit: Moving to task based