Some work on new regex parser