Fix only-one-match problem, spot flaw in regex approach...
Add simple matcher
Add basic wildcard matcher
Wireup wildcard matcher (no replaement handling)