Abstract out the regex catchers, so they can be used other places.
Add inline parsing of URLs to links.  Add titles, and data-attributes for later parsing and additions.