Add TODO. Organize thoughts.