Added TODO.
Additional diagnostics.