moved a bit into the tasks controller