Consolidate to one TODO list