Quest to clear out TODO list continues