Update TODO

Added additional todo and thoughts.