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