Restructured the match-sorting pipeline to be simpler (bug caused by overly-complex sort method). String-matching now seems to work. About to add more detailed RegEx options.