Add another TODO.

Add another TODO- ondemand loading of extra information.