Added TODO.
Added conditional debug output