Added regex plumbing & regexes from dev branch ready for parser.