diff --git a/.eslintignore b/.eslintignore
index 53c37a166..a4865e1f6 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1 +1,2 @@
-dist
\ No newline at end of file
+dist
+client/lib
diff --git a/client/coral-embed-stream/public/samplearticle.html b/client/coral-embed-stream/public/samplearticle.html
index 64c3fd0f8..454cb249c 100644
--- a/client/coral-embed-stream/public/samplearticle.html
+++ b/client/coral-embed-stream/public/samplearticle.html
@@ -7,7 +7,7 @@
     <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut lobortis sollicitudin eros a ornare. Curabitur dignissim vestibulum massa non rhoncus. Cras laoreet ante vel nunc hendrerit, ac imperdiet neque egestas. Suspendisse aliquet iaculis fermentum. Pellentesque interdum nec elit sed tincidunt. Donec volutpat, tellus posuere laoreet consequat, mi lacus laoreet massa, sed vehicula mauris velit non lectus. Integer non enim nec neque congue faucibus porttitor sit amet dui.</p>
 <p>Nunc pharetra orci id diam feugiat, vitae rutrum magna efficitur. Morbi porttitor blandit lorem, et facilisis tellus luctus at. Morbi tincidunt eget nisl id placerat. Nullam consectetur quam vel mauris lacinia, non consectetur est faucibus. Duis cursus auctor nulla nec sagittis. Aenean sem erat, ultrices a hendrerit consectetur, accumsan non lorem. Integer ac neque sed magna sodales vulputate at quis neque. Praesent eget ornare lacus. Donec ultricies, dolor eget commodo faucibus, arcu velit ullamcorper tellus, in cursus tellus elit sed urna. Suspendisse in consequat magna. Duis vel ullamcorper tortor, vel cursus libero. Proin et nisi luctus ligula faucibus luctus. Morbi pulvinar, justo ac feugiat elementum, libero tellus congue justo, pharetra ultrices felis felis id leo. Integer mattis quam tempus libero porta, ac pretium ligula elementum.</p>
 <div id='coralStreamEmbed'></div>
-<script type='text/javascript' src='https://pym.nprapps.org/pym.v1.min.js'></script>
+<script type='text/javascript' src='/client/js/lib/pym.v1.min.js'></script>
 <script>
 var pymParent = new pym.Parent('coralStreamEmbed', 'index.html', {title: 'comments'});
 pymParent.onMessage('height', function(height) {document.querySelector('#coralStreamEmbed iframe').height = height + 'px'})</script>
diff --git a/client/coral-embed-stream/src/CommentStream.js b/client/coral-embed-stream/src/CommentStream.js
index be40ecff6..95a6f63f3 100644
--- a/client/coral-embed-stream/src/CommentStream.js
+++ b/client/coral-embed-stream/src/CommentStream.js
@@ -78,13 +78,32 @@ class CommentStream extends Component {
   componentDidMount () {
     // Set up messaging between embedded Iframe an parent component
     // Using recommended Pym init code which violates .eslint standards
-    const pym = new Pym.Child({polling: 100});
+    this.pym = new Pym.Child({polling: 100});
 
-    if (/https?\:\/\/([^?]+)/.test(pym.parentUrl)) {
-      this.props.getStream(pym.parentUrl);
-    } else {
-      this.props.getStream(window.location);
-    }
+    const path = this.pym.parentUrl.split('#')[0];
+
+    this.props.getStream(path || window.location);
+    this.path = path;
+
+    this.pym.sendMessage('childReady');
+
+    this.pym.onMessage('DOMContentLoaded', hash => {
+      // the comment ids can start with numbers, which is invalid for DOM id attributes
+      const commentId = hash.replace('#', 'c_');
+      let count = 0;
+      const interval = setInterval(() => {
+        if (document.getElementById(commentId)) {
+          window.clearInterval(interval);
+          this.pym.scrollParentToChildEl(commentId);
+        }
+
+        if (++count > 100) { // ~10 seconds
+          // give up waiting for the comments to load.
+          // it would be weird for the page to jump after that long.
+          window.clearInterval(interval);
+        }
+      }, 100);
+    });
   }
 
   render () {
@@ -109,11 +128,11 @@ class CommentStream extends Component {
     const {actions, users, comments} = this.props.items;
     const {loggedIn, user, showSignInDialog} = this.props.auth;
     const {activeTab} = this.state;
+
     return <div className={showSignInDialog ? 'expandForSignin' : ''}>
       {
         rootItem
-        ? <div>
-
+        ? <div className="commentStream">
           <TabBar onChange={this.changeTab} activeTab={activeTab}>
             <Tab><Count id={rootItemId} items={this.props.items}/></Tab>
             <Tab>Settings</Tab>
@@ -141,7 +160,7 @@ class CommentStream extends Component {
             {
               rootItem.comments && rootItem.comments.map((commentId) => {
                 const comment = comments[commentId];
-                return <div className="comment" key={commentId}>
+                return <div className="comment" key={commentId} id={`c_${commentId}`}>
                   <hr aria-hidden={true}/>
                   <AuthorName author={users[comment.author_id]}/>
                   <PubDate created_at={comment.created_at}/>
@@ -172,8 +191,8 @@ class CommentStream extends Component {
                       updateItem={this.props.updateItem}
                       currentUser={this.props.auth.user}/>
                       <PermalinkButton
-                        comment_id={commentId}
-                        asset_id={comment.asset_id}/>
+                        commentId={commentId}
+                        articleURL={this.path}/>
                   </div>
                     <ReplyBox
                       addNotification={this.props.addNotification}
@@ -189,7 +208,7 @@ class CommentStream extends Component {
                       comment.children &&
                       comment.children.map((replyId) => {
                         let reply = this.props.items.comments[replyId];
-                        return <div className="reply" key={replyId}>
+                        return <div className="reply" key={replyId} id={`c_${replyId}`}>
                           <hr aria-hidden={true}/>
                           <AuthorName author={users[reply.author_id]}/>
                           <PubDate created_at={reply.created_at}/>
@@ -220,8 +239,8 @@ class CommentStream extends Component {
                                 updateItem={this.props.updateItem}
                                 currentUser={this.props.auth.user}/>
                                 <PermalinkButton
-                                  comment_id={reply.parent_id}
-                                  asset_id={rootItemId}
+                                  commentId={reply.parent_id}
+                                  articleURL={this.path}
                                   />
                             </div>
                             <ReplyBox
diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 2da0c09c4..12bdfacae 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -71,6 +71,11 @@ hr {
   display: none;
 }
 
+.commentStream {
+  /* prevent absolutely positioned final permalink popover from being clipped */
+  padding-bottom: 50px;
+}
+
 /* Comment Box Styles */
 .coral-plugin-commentbox-container {
   display: flex;
@@ -106,6 +111,7 @@ hr {
 /* Comment styles */
 .comment {
   margin-bottom: 10px;
+  position: relative;
 }
 
 .coral-plugin-commentcontent-text {
@@ -139,9 +145,8 @@ hr {
   width: 50%;
 }
 
-.commentActionsLeft .material-icons,.commentActionsRight .material-icons,
-.replyActionsLeft .material-icons, .replyActionsRight .material-icons {
-  font-size: 12px;
+.material-icons {
+  font-size: 12px !important;
   margin-left: 3px;
   vertical-align: middle;
 }
@@ -158,3 +163,33 @@ hr {
   color: #CCC;
   display: inline-block;
 }
+
+.coral-plugin-permalinks-container {
+  /*position: relative;*/
+  z-index: 2;
+}
+
+.coral-plugin-permalinks-popover {
+  display: none;
+  background-color: white;
+  border: 1px solid black;
+  width: calc(100% - 15px);
+  position: absolute;
+  top: 70px;
+  right: 0;
+  padding: 5px;
+}
+
+.coral-plugin-permalinks-popover.active {
+  display: block;
+}
+
+.coral-plugin-permalinks-copy-field {
+  display: block;
+  width: calc(100% - 5px);
+}
+
+.coral-plugin-permalinks-copied-text {
+  float: right;
+  margin: 8px;
+}
diff --git a/client/coral-plugin-permalinks/PermalinkButton.js b/client/coral-plugin-permalinks/PermalinkButton.js
index 2372e2035..782e709d7 100644
--- a/client/coral-plugin-permalinks/PermalinkButton.js
+++ b/client/coral-plugin-permalinks/PermalinkButton.js
@@ -9,8 +9,8 @@ const lang = new I18n(translations);
 class PermalinkButton extends React.Component {
 
   static propTypes = {
-    asset_id: PropTypes.string.isRequired,
-    comment_id: PropTypes.string.isRequired
+    articleURL: PropTypes.string.isRequired,
+    commentId: PropTypes.string.isRequired
   }
 
   constructor (props) {
@@ -43,29 +43,27 @@ class PermalinkButton extends React.Component {
   }
 
   render () {
-    const publisherUrl = `${location.protocol}//${location.host}/`;
-
     return (
-      <div className={`${name}-container`} style={styles}>
+      <div className={`${name}-container`}>
         <button onClick={this.toggle} className={`${name}-button`}>
           <i className={`${name}-icon material-icons`} aria-hidden={true}>link</i>
           {lang.t('permalink.permalink')}
         </button>
         <div
-          style={styles.popover(this.state.popoverOpen)}
-          className={`${name}-popover`}>
+          className={`${name}-popover ${this.state.popoverOpen ? 'active' : ''}`}>
           <input
+            className={`${name}-copy-field`}
             type='text'
             ref={input => this.permalinkInput = input}
-            value={`${publisherUrl}${this.props.asset_id}#${this.props.comment_id}`}
+            value={`${this.props.articleURL}#${this.props.commentId}`}
             onChange={() => {}} />
           <button className={`${name}-copy-button`} onClick={this.copyPermalink}>Copy</button>
           {
-            this.state.copySuccessful ? <p>copied to clipboard</p> : null
+            this.state.copySuccessful ? <p className={`${name}-copied-text`}>copied to clipboard</p> : null
           }
           {
             this.state.copyFailure
-            ? <p>copying to clipboard not supported in this browser. Use Cmd + C.</p>
+            ? <p className={`${name}-copied-error`}>copying to clipboard not supported in this browser. Use Cmd + C.</p>
             : null
           }
         </div>
@@ -75,20 +73,3 @@ class PermalinkButton extends React.Component {
 }
 
 export default onClickOutside(PermalinkButton);
-
-const styles = {
-  position: 'relative',
-
-  popover: active => {
-    return {
-      display: active ? 'block' : 'none',
-      backgroundColor: 'white',
-      border: '1px solid black',
-      minWidth: 400,
-      position: 'absolute',
-      top: 30,
-      right: 0,
-      padding: 5
-    };
-  }
-};
diff --git a/client/coral-sign-in/components/ForgotContent.js b/client/coral-sign-in/components/ForgotContent.js
index bc06ae5f1..f76ebe45d 100644
--- a/client/coral-sign-in/components/ForgotContent.js
+++ b/client/coral-sign-in/components/ForgotContent.js
@@ -44,7 +44,7 @@ class ForgotContent extends React.Component {
           }
           {
             passwordRequestFailure
-            ? <p className={styles.attention}>{passwordRequestFailure}</p>
+            ? <p className={styles.passwordRequestFailure}>{passwordRequestFailure}</p>
             : null
           }
         </form>
diff --git a/client/coral-sign-in/components/styles.css b/client/coral-sign-in/components/styles.css
index 1561f557b..e645885ce 100644
--- a/client/coral-sign-in/components/styles.css
+++ b/client/coral-sign-in/components/styles.css
@@ -138,5 +138,6 @@ input.error{
 
 .passwordRequestFailure {
     border: 1px solid orange;
-    background-color: 1px solid coral
+    background-color: 1px solid coral;
+    padding: 10px;
 }
diff --git a/client/lib/pym.v1.min.js b/client/lib/pym.v1.min.js
new file mode 100644
index 000000000..7aa54058d
--- /dev/null
+++ b/client/lib/pym.v1.min.js
@@ -0,0 +1,2 @@
+/*! pym.js - v1.1.2 - 2016-10-25 */
+!function(a){"function"==typeof define&&define.amd?define(a):"undefined"!=typeof module&&module.exports?module.exports=a():window.pym=a.call(this)}(function(){var a="xPYMx",b={},c=function(a){var b=new RegExp("[\\?&]"+a.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]")+"=([^&#]*)"),c=b.exec(location.search);return null===c?"":decodeURIComponent(c[1].replace(/\+/g," "))},d=function(a,b){if("*"===b.xdomain||a.origin.match(new RegExp(b.xdomain+"$")))return!0},e=function(b,c,d){var e=["pym",b,c,d];return e.join(a)},f=function(b){var c=["pym",b,"(\\S+)","(.*)"];return new RegExp("^"+c.join(a)+"$")},g=function(){for(var a=b.autoInitInstances.length,c=a-1;c>=0;c--){var d=b.autoInitInstances[c];d.el.getElementsByTagName("iframe").length&&d.el.getElementsByTagName("iframe")[0].contentWindow||b.autoInitInstances.splice(c,1)}};return b.autoInitInstances=[],b.autoInit=function(){var a=document.querySelectorAll("[data-pym-src]:not([data-pym-auto-initialized])"),c=a.length;g();for(var d=0;d<c;++d){var e=a[d];e.setAttribute("data-pym-auto-initialized",""),""===e.id&&(e.id="pym-"+d);var f=e.getAttribute("data-pym-src"),h={xdomain:"string",title:"string",name:"string",id:"string",sandbox:"string",allowfullscreen:"boolean"},i={};for(var j in h)if(null!==e.getAttribute("data-pym-"+j))switch(h[j]){case"boolean":i[j]=!("false"===e.getAttribute("data-pym-"+j));break;case"string":i[j]=e.getAttribute("data-pym-"+j);break;default:console.err("unrecognized attribute type")}var k=new b.Parent(e.id,f,i);b.autoInitInstances.push(k)}return b.autoInitInstances},b.Parent=function(a,b,c){this.id=a,this.url=b,this.el=document.getElementById(a),this.iframe=null,this.settings={xdomain:"*"},this.messageRegex=f(this.id),this.messageHandlers={},c=c||{},this._constructIframe=function(){var a=this.el.offsetWidth.toString();this.iframe=document.createElement("iframe");var b="",c=this.url.indexOf("#");for(c>-1&&(b=this.url.substring(c,this.url.length),this.url=this.url.substring(0,c)),this.url.indexOf("?")<0?this.url+="?":this.url+="&",this.iframe.src=this.url+"initialWidth="+a+"&childId="+this.id+"&parentTitle="+encodeURIComponent(document.title)+"&parentUrl="+encodeURIComponent(window.location.href)+b,this.iframe.setAttribute("width","100%"),this.iframe.setAttribute("scrolling","no"),this.iframe.setAttribute("marginheight","0"),this.iframe.setAttribute("frameborder","0"),this.settings.title&&this.iframe.setAttribute("title",this.settings.title),void 0!==this.settings.allowfullscreen&&this.settings.allowfullscreen!==!1&&this.iframe.setAttribute("allowfullscreen",""),void 0!==this.settings.sandbox&&"string"==typeof this.settings.sandbox&&this.iframe.setAttribute("sandbox",this.settings.sandbox),this.settings.id&&(document.getElementById(this.settings.id)||this.iframe.setAttribute("id",this.settings.id)),this.settings.name&&this.iframe.setAttribute("name",this.settings.name);this.el.firstChild;)this.el.removeChild(this.el.firstChild);this.el.appendChild(this.iframe),window.addEventListener("resize",this._onResize)},this._onResize=function(){this.sendWidth()}.bind(this),this._fire=function(a,b){if(a in this.messageHandlers)for(var c=0;c<this.messageHandlers[a].length;c++)this.messageHandlers[a][c].call(this,b)},this.remove=function(){window.removeEventListener("message",this._processMessage),window.removeEventListener("resize",this._onResize),this.el.removeChild(this.iframe),g()},this._processMessage=function(a){if(d(a,this.settings)&&"string"==typeof a.data){var b=a.data.match(this.messageRegex);if(!b||3!==b.length)return!1;var c=b[1],e=b[2];this._fire(c,e)}}.bind(this),this._onHeightMessage=function(a){var b=parseInt(a);this.iframe.setAttribute("height",b+"px")},this._onNavigateToMessage=function(a){document.location.href=a},this._onScrollToChildPosMessage=function(a){var b=document.getElementById(this.id).getBoundingClientRect().top+window.pageYOffset,c=b+parseInt(a);window.scrollTo(0,c)},this.onMessage=function(a,b){a in this.messageHandlers||(this.messageHandlers[a]=[]),this.messageHandlers[a].push(b)},this.sendMessage=function(a,b){this.el.getElementsByTagName("iframe").length&&(this.el.getElementsByTagName("iframe")[0].contentWindow?this.el.getElementsByTagName("iframe")[0].contentWindow.postMessage(e(this.id,a,b),"*"):this.remove())},this.sendWidth=function(){var a=this.el.offsetWidth.toString();this.sendMessage("width",a)};for(var h in c)this.settings[h]=c[h];return this.onMessage("height",this._onHeightMessage),this.onMessage("navigateTo",this._onNavigateToMessage),this.onMessage("scrollToChildPos",this._onScrollToChildPosMessage),window.addEventListener("message",this._processMessage,!1),this._constructIframe(),this},b.Child=function(b){this.parentWidth=null,this.id=null,this.parentTitle=null,this.parentUrl=null,this.settings={renderCallback:null,xdomain:"*",polling:0},this.timerId=null,this.messageRegex=null,this.messageHandlers={},b=b||{},this.onMessage=function(a,b){a in this.messageHandlers||(this.messageHandlers[a]=[]),this.messageHandlers[a].push(b)},this._fire=function(a,b){if(a in this.messageHandlers)for(var c=0;c<this.messageHandlers[a].length;c++)this.messageHandlers[a][c].call(this,b)},this._processMessage=function(a){if(d(a,this.settings)&&"string"==typeof a.data){var b=a.data.match(this.messageRegex);if(b&&3===b.length){var c=b[1],e=b[2];this._fire(c,e)}}}.bind(this),this._onWidthMessage=function(a){var b=parseInt(a);b!==this.parentWidth&&(this.parentWidth=b,this.settings.renderCallback&&this.settings.renderCallback(b),this.sendHeight())},this.sendMessage=function(a,b){window.parent.postMessage(e(this.id,a,b),"*")},this.sendHeight=function(){var a=document.getElementsByTagName("body")[0].offsetHeight.toString();return this.sendMessage("height",a),a}.bind(this),this.scrollParentTo=function(a){this.sendMessage("navigateTo","#"+a)},this.navigateParentTo=function(a){this.sendMessage("navigateTo",a)},this.scrollParentToChildEl=function(a){var b=document.getElementById(a).getBoundingClientRect().top+window.pageYOffset;this.scrollParentToChildPos(b)},this.scrollParentToChildPos=function(a){this.sendMessage("scrollToChildPos",a.toString())},this._markWhetherEmbedded=function(a){var b,c=document.getElementsByTagName("html")[0],d=c.className;try{b=window.self!==window.top?"embedded":"not-embedded"}catch(a){b="embedded"}d.indexOf(b)<0&&(c.className=d?d+" "+b:b,a&&a(b))},this.remove=function(){window.removeEventListener("message",this._processMessage),this.timerId&&clearInterval(this.timerId)},this.id=c("childId")||b.id,this.messageRegex=new RegExp("^pym"+a+this.id+a+"(\\S+)"+a+"(.*)$");var f=parseInt(c("initialWidth"));this.parentUrl=c("parentUrl"),this.parentTitle=c("parentTitle"),this.onMessage("width",this._onWidthMessage);for(var g in b)this.settings[g]=b[g];return window.addEventListener("message",this._processMessage,!1),this.settings.renderCallback&&this.settings.renderCallback(f),this.sendHeight(),this.settings.polling&&(this.timerId=window.setInterval(this.sendHeight,this.settings.polling)),this._markWhetherEmbedded(b.onMarkedEmbeddedStatus),this},b.autoInit(),b});
\ No newline at end of file
diff --git a/mongoose.js b/mongoose.js
index 0121a203d..25d1cf65a 100644
--- a/mongoose.js
+++ b/mongoose.js
@@ -1,11 +1,7 @@
 const mongoose = require('mongoose');
 const debug = require('debug')('talk:db');
 const enabled = require('debug').enabled;
-let url = process.env.TALK_MONGO_URL || 'mongodb://localhost';
-
-if (process.env.NODE_ENV === 'test') {
-  url = 'mongodb://localhost/coral-test';
-}
+const url = process.env.TALK_MONGO_URL || (process.env.NODE_ENV === 'test' ? 'mongodb://localhost/test' : 'mongodb://localhost/talk');
 
 // Use native promises
 mongoose.Promise = global.Promise;
diff --git a/routes/index.js b/routes/index.js
index a875d5127..9ab0dff14 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -6,11 +6,17 @@ router.use('/admin', require('./admin'));
 router.use('/embed', require('./embed'));
 
 router.get('/', (req, res) => {
-  res.render('article', {title: 'Coral Talk'});
+  return res.render('article', {
+    title: 'Coral Talk',
+    basePath: '/client/embed/stream'
+  });
 });
 
 router.get('/assets/:asset_title', (req, res) => {
-  res.render('article', {title: req.params.asset_title.split('-').join(' ')});
+  return res.render('article', {
+    title: req.params.asset_title.split('-').join(' '),
+    basePath: '/client/embed/stream'
+  });
 });
 
 module.exports = router;
diff --git a/views/article.ejs b/views/article.ejs
index 71db59593..6fd420f82 100644
--- a/views/article.ejs
+++ b/views/article.ejs
@@ -32,13 +32,25 @@
     <div id='coralStreamEmbed'></div>
   </main>
 
-  <!--- Script --->
-  <script type='text/javascript' src='https://pym.nprapps.org/pym.v1.min.js'></script>
-  <script>
-    var pymParent = new pym.Parent('coralStreamEmbed', '/embed/stream', {title: 'Talk Comments'});
-    pymParent.onMessage('height', function(height) {
-      document.querySelector('#coralStreamEmbed iframe').height = height + 'px';
-    });
-  </script>
+<script type='text/javascript' src='<%= basePath %>/pym.v1.min.js'></script>
+<script>
+  var ready = false;
+  var pymParent = new pym.Parent('coralStreamEmbed', '/embed/stream', {title: 'Talk Comments'});
+  pymParent.onMessage('height', function(height) {document.querySelector('#coralStreamEmbed iframe').height = height + 'px'})
+  pymParent.onMessage('childReady', function () {
+    var interval = setInterval(function () {
+      if (ready) {
+        window.clearInterval(interval);
+        pymParent.sendMessage('DOMContentLoaded', window.location.hash);
+      }
+    }, 100);
+  });
+
+  // wait till images and other iframes are loaded before scrolling the page.
+  // or do we want to be more aggressive and scroll when we hit DOM ready?
+  document.addEventListener('DOMContentLoaded', function () {
+    ready = true;
+  });
+</script>
   </body>
 </html>
diff --git a/views/embed-stream.ejs b/views/embed-stream.ejs
index e1ddb17e7..a05b699f1 100644
--- a/views/embed-stream.ejs
+++ b/views/embed-stream.ejs
@@ -19,14 +19,26 @@
   </head>
   <body>
     <div id='coralStreamEmbed'></div>
-
-    <!--- Script --->
-    <script type='text/javascript' src='https://pym.nprapps.org/pym.v1.min.js'></script>
+    <script type='text/javascript' src='<%= basePath %>/pym.v1.min.js'></script>
     <script>
-      var pymParent = new pym.Parent('coralStreamEmbed', '/embed/stream', {title: 'Talk Comments'});
-      pymParent.onMessage('height', function(height) {
-        document.querySelector('#coralStreamEmbed iframe').height = height + 'px';
-      });
+    var ready = false;
+    var pymParent = new pym.Parent('coralStreamEmbed', '/embed/stream', {title: 'Talk Comments'});
+    pymParent.onMessage('height', function(height) {document.querySelector('#coralStreamEmbed iframe').height = height + 'px'});
+    pymParent.onMessage('childReady', function () {
+      var interval = setInterval(function () {
+        if (ready) {
+          window.clearInterval(interval);
+          pymParent.sendMessage('DOMContentLoaded', window.location.hash);
+        }
+      }, 100);
+    });
+
+    // wait till images and other iframes are loaded before scrolling the page.
+    // or do we want to be more aggressive and scroll when we hit DOM ready?
+    document.addEventListener('DOMContentLoaded', function (e) {
+      ready = true;
+    });
+
     </script>
   </body>
 </html>
diff --git a/webpack.config.dev.js b/webpack.config.dev.js
index 571c31625..913ee35da 100644
--- a/webpack.config.dev.js
+++ b/webpack.config.dev.js
@@ -74,10 +74,16 @@ module.exports = {
     ]
   },
   plugins: [
-    new Copy(buildEmbeds.map(embed => ({
-      from: path.join(__dirname, 'client', `coral-embed-${embed}`, 'style'),
-      to: path.join(__dirname, 'dist', 'embed', embed)
-    }))),
+    new Copy([
+      ...buildEmbeds.map(embed => ({
+        from: path.join(__dirname, 'client', `coral-embed-${embed}`, 'style'),
+        to: path.join(__dirname, 'dist', 'embed', embed)
+      })),
+      {
+        from: path.join(__dirname, 'client', 'lib'),
+        to: path.join(__dirname, 'dist', 'embed', 'stream')
+      }
+    ]),
     autoprefixer,
     precss,
     new webpack.ProvidePlugin({