Add a TODO comment and improved log output.