Re-organized TODO thoughts.