Removes lots of TODOs
Better search.  Fuzzy searching