Add TODO and text matching, plus FULL_ANALYSIS opt