Added TODOs.
See issue #597