diff --git a/src/Linkifier.ts b/src/Linkifier.ts
index 6eaf82cd..64be3947 100644
--- a/src/Linkifier.ts
+++ b/src/Linkifier.ts
@@ -5,8 +5,6 @@
  */
 const TIME_BEFORE_LINKIFY = 200;
 
-const badUrlRegex = /https?:\/\/(\/[\/\\w\.-]*)*/;
-
 const protocolClause = '(https?:\\/\\/)';
 const domainCharacterSet = '[\\da-z\\.-]+';
 const negatedDomainCharacterSet = '[^\\da-z\\.-]+';
@@ -49,8 +47,10 @@ export class Linkifier {
     this._rowTimeoutIds[rowIndex] = setTimeout(this._linkifyRow.bind(this, rowIndex), TIME_BEFORE_LINKIFY);
   }
 
+  // TODO: Support local links
   public attachWebLinkHandler(handler: LinkHandler): void {
     this._webLinkHandler = handler;
+    // TODO: Refresh links if a handler is attached?
   }
 
   /**
@@ -60,24 +60,135 @@ export class Linkifier {
   private _linkifyRow(rowIndex: number): void {
     const rowHtml = this._rows[rowIndex].innerHTML;
     const uri = this._findLinkMatch(rowHtml);
-    if (uri) {
-      const link = '<a href="' + uri + '">' + uri + '</a>';
-      const newHtml = rowHtml.replace(uri, link);
-      this._rows[rowIndex].innerHTML = newHtml;
-      console.log(this._rows[rowIndex].innerHTML);
+    if (!uri) {
+      return;
+    }
+
+    // Iterate over nodes as we want to consider text nodes
+    const nodes = this._rows[rowIndex].childNodes;
+    for (let i = 0; i < nodes.length; i++) {
+      const node = nodes[i];
+      const searchIndex = node.textContent.indexOf(uri);
+      if (searchIndex >= 0) {
+        if (node.childNodes.length > 0) {
+          // This row has already been linkified
+          return;
+        }
+
+        console.log('found uri: ' + uri);
+        const linkElement = this._createAnchorElement(uri);
+        // TODO: Check if childNodes check is needed
+        if (node.textContent.trim().length === uri.length) {
+          // Matches entire string
+          console.log('match entire string');
+          if (node.nodeType === Node.TEXT_NODE) {
+            console.log('text node');
+            this._replaceNode(node, linkElement);
+          } else {
+            console.log('element');
+            const element = (<HTMLElement>node);
+            element.innerHTML = '';
+            element.appendChild(linkElement);
+          }
+        } else {
+          // Matches part of string
+          console.log('part of string');
+          this._replaceNodeSubstringWithNode(node, linkElement, uri, searchIndex);
+        }
+      }
+      // Continue searching in case multiple URIs exist on a single
+      // const link = '<a href="' + uri + '">' + uri + '</a>';
+      // const newHtml = rowHtml.replace(uri, link);
+      // this._rows[rowIndex].innerHTML = newHtml;
     }
   }
 
   /**
    * Finds a link match in a piece of HTML.
    * @param {string} html The HTML to search.
-   * @return The matching URI or null if not found.
+   * @return {string} The matching URI or null if not found.
    */
-  private _findLinkMatch(html): string {
+  private _findLinkMatch(html: string): string {
     const match = html.match(strictUrlRegex);
     if (!match || match.length === 0) {
       return null;
     }
     return match[1];
   }
+
+  /**
+   * Creates a link anchor element.
+   * @param {string} uri The uri of the link.
+   * @return {HTMLAnchorElement} The link.
+   */
+  private _createAnchorElement(uri: string): HTMLAnchorElement {
+    const element = document.createElement('a');
+    element.textContent = uri;
+    // Force link on another tab so work is not lost
+    element.target = '_blank';
+    if (this._webLinkHandler) {
+      element.href = '#';
+      element.addEventListener('click', () => this._webLinkHandler(uri));
+    } else {
+      element.href = uri;
+    }
+    return element;
+  }
+
+  /**
+   * Replace a node with 1 or more other nodes.
+   * @param {Node} oldNode The node to replace.
+   * @param {Node[]} newNodes The new nodes to insert in order.
+   */
+  private _replaceNode(oldNode: Node, ...newNodes: Node[]): void {
+    const parent = oldNode.parentNode;
+    for (let i = 0; i < newNodes.length; i++) {
+      parent.insertBefore(newNodes[i], oldNode);
+    }
+    parent.removeChild(oldNode);
+  }
+
+  /**
+   * Replace a substring within a node with a new node.
+   * @param {Node} targetNode The target node.
+   * @param {Node} newNode The new node to insert.
+   * @param {string} substring The substring to replace.
+   * @param {number} substringIndex The index of the substring within the string.
+   */
+  private _replaceNodeSubstringWithNode(targetNode: Node, newNode: Node, substring: string, substringIndex: number): void {
+    let node = targetNode;
+    if (node.nodeType !== Node.TEXT_NODE) {
+      node = node.childNodes[0];
+    }
+    // The targetNode will be either a text node or a <span>. The targetNode is
+    // assumed to have no children. In either case, the targetNode's text node
+    // must be split into 2 text nodes surrounding the newNode.
+    if (node.childNodes.length === 0 && node.nodeType !== Node.TEXT_NODE) {
+      throw new Error('targetNode must be a text node or only contain a single text node');
+    }
+
+    const fullText = node.textContent;
+
+    if (substringIndex === 0) {
+      // Replace with <newNode><textnode>
+      console.log('Replace with <newNode><textnode>');
+      const rightText = fullText.substring(substring.length);
+      const rightTextNode = document.createTextNode(rightText);
+      this._replaceNode(node, newNode, rightTextNode);
+    } else if (substringIndex === targetNode.textContent.length - substring.length) {
+      // Replace with <textnode><newNode>
+      console.log('Replace with <textnode><newNode>');
+      const leftText = fullText.substring(0, substringIndex);
+      const leftTextNode = document.createTextNode(leftText);
+      this._replaceNode(node, leftTextNode, newNode);
+    } else {
+      // Replace with <textnode><newNode><textnode>
+      console.log('Replace with <textnode><newNode><textnode>');
+      const leftText = fullText.substring(0, substringIndex);
+      const leftTextNode = document.createTextNode(leftText);
+      const rightText = fullText.substring(substringIndex + substring.length);
+      const rightTextNode = document.createTextNode(rightText);
+      this._replaceNode(node, leftTextNode, newNode, rightTextNode);
+    }
+  }
 }