Updated TODO
Sorted TODO and planned versions