Changed the Regex to pull out groupings instead of whole matches.