Removed TODO - which I don't intend to change.

  Because I'm not seeing a real gain.
  Added roadmap.