Refactoring IV - Working task controller