Revert "Revert "Redesigned (and renamed) a big chunk of the task stuff. Still not finished!""

This reverts commit 1398d5ae520c51465a4962f282f56448372a21d2.