Regex

Making this into a pull request so it will be easier to review.