Beginnings of task refactoring