Fixing new regex. Was getting 2 groups

This still hits everything _and_ gives it back correctly!