Implement task IDs (may just be a temporary fix)