Added TODO and updated documentation.