add more of the regex implementation