Better task list in build

Rebased.