Improving TaskController - incomplete