wip - fix thread safety issue with TaskTracker, tests still failing