Switch to Regex

Prior to this commit we failed lint.
This might be the best of both worlds