Continue to re-factor task management