Added Todo.
Improved reporting.