Work in progress: task and config updates
Work in progress: more task and config updates