Some more changes to Tasks.
Testing required tomorrow.