Added TODO and changed ChangeLog accordingly.