Continue to re-work task loading logic.