Another refactor for feature matching.
Pass around strings not BofMatch structs
Find second level matches as well