More TODO elaboration.
Even more TODO elaboration.