Second attempt at fixing regex. This time, use match and access the match by name, rather then findall