Added TODO. Question about code.