More work on the TaskFactory and the Task class.