Now honoring Regex match groups

@DavidLGoldberg This will need to be tested as discussed.