Update to-do list; simplify find_matching_set
Refactor/Simplify find_matching_set