A little re-org of the tasks.