Start task refactor