Revert "Revert "More work on new tasks""

This reverts commit c5f1d802db38fcda5125e71b0afa525408085d25.