Added TODOs.

EA-35