Start rewrite
Speed up regexes