Make TODO reflective of reality