Added TODO to refactor the threading of tasks