Added TODO
Improved 'walk' interface.