WIP: main task API changes
WIP: fallout