diff --git a/client/coral-admin/src/components/Comment.js b/client/coral-admin/src/components/Comment.js
index a57ee65dd..1bfeec4b2 100644
--- a/client/coral-admin/src/components/Comment.js
+++ b/client/coral-admin/src/components/Comment.js
@@ -60,7 +60,7 @@ const getActionButton = (action, i, props) => {
     return null;
   }
   if (action === 'ban') {
-    const showBanUserDialog = true;
+    const showBanUserDialog = false;
     return (
       // <Button
       //   {...props.author.get('status') === 'banned' ? 'disabled' : 'raised'}
diff --git a/client/coral-embed-stream/src/CommentStream.js b/client/coral-embed-stream/src/CommentStream.js
index 3f94f879a..ec5df1908 100644
--- a/client/coral-embed-stream/src/CommentStream.js
+++ b/client/coral-embed-stream/src/CommentStream.js
@@ -28,7 +28,7 @@ import SuspendedAccount from '../../coral-framework/components/SuspendedAccount'
 
 const {addItem, updateItem, postItem, getStream, postAction, deleteAction, appendItemArray} = itemActions;
 const {addNotification, clearNotification} = notificationActions;
-const {logout} = authActions;
+const {logout, showSignInDialog} = authActions;
 
 class CommentStream extends Component {
 
@@ -131,15 +131,30 @@ class CommentStream extends Component {
                         addNotification={this.props.addNotification}
                         id={commentId}
                         like={actions[comment.like]}
+                        showSignInDialog={this.props.showSignInDialog}
                         postAction={this.props.postAction}
                         deleteAction={this.props.deleteAction}
                         addItem={this.props.addItem}
                         updateItem={this.props.updateItem}
                         currentUser={this.props.auth.user}
                         banned={banned}/>
-                  </div>
-                  <div className="commentActionsRight">
-                    <FlagButton
+                    </div>
+                    <div className="commentActionsRight">
+                      <FlagButton
+                        addNotification={this.props.addNotification}
+                        id={commentId}
+                        flag={actions[comment.flag]}
+                        postAction={this.props.postAction}
+                        deleteAction={this.props.deleteAction}
+                        addItem={this.props.addItem}
+                        showSignInDialog={this.props.showSignInDialog}
+                        updateItem={this.props.updateItem}
+                        currentUser={this.props.auth.user}/>
+                      <PermalinkButton
+                        commentId={commentId}
+                        articleURL={this.path}/>
+                    </div>
+                    <ReplyBox
                       addNotification={this.props.addNotification}
                       id={commentId}
                       flag={actions[comment.flag]}
@@ -147,33 +162,58 @@ class CommentStream extends Component {
                       deleteAction={this.props.deleteAction}
                       addItem={this.props.addItem}
                       updateItem={this.props.updateItem}
-                      currentUser={this.props.auth.user}
-                      banned={banned}/>
-                    <PermalinkButton
-                      commentId={commentId}
-                      articleURL={this.path}/>
-                  </div>
-                  <ReplyBox
-                    addNotification={this.props.addNotification}
-                    postItem={this.props.postItem}
-                    appendItemArray={this.props.appendItemArray}
-                    updateItem={this.props.updateItem}
-                    id={rootItemId}
-                    author={user}
-                    parent_id={commentId}
-                    premod={this.props.config.moderation}
-                    showReply={comment.showReply}/>
-                  {
-                    comment.children &&
-                    comment.children.map((replyId) => {
-                      let reply = this.props.items.comments[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}/>
-                        <Content body={reply.body}/>
-                        <div className="replyActionsLeft">
-                          <ReplyButton
+                      id={rootItemId}
+                      author={user}
+                      parent_id={commentId}
+                      premod={this.props.config.moderation}
+                      showReply={comment.showReply}/>
+                    {
+                      comment.children &&
+                      comment.children.map((replyId) => {
+                        let reply = this.props.items.comments[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}/>
+                          <Content body={reply.body}/>
+                          <div className="replyActionsLeft">
+                            <ReplyButton
+                              updateItem={this.props.updateItem}
+                              id={replyId}
+                              showReply={reply.showReply}/>
+                            <LikeButton
+                              addNotification={this.props.addNotification}
+                              id={replyId}
+                              like={this.props.items.actions[reply.like]}
+                              postAction={this.props.postAction}
+                              deleteAction={this.props.deleteAction}
+                              addItem={this.props.addItem}
+                              showSignInDialog={this.props.showSignInDialog}
+                              updateItem={this.props.updateItem}
+                              currentUser={this.props.auth.user}
+                              banned={banned}/>
+                          </div>
+                          <div className="replyActionsRight">
+                            <FlagButton
+                              addNotification={this.props.addNotification}
+                              id={replyId}
+                              flag={this.props.items.actions[reply.flag]}
+                              postAction={this.props.postAction}
+                              showSignInDialog={this.props.showSignInDialog}
+                              deleteAction={this.props.deleteAction}
+                              addItem={this.props.addItem}
+                              updateItem={this.props.updateItem}
+                              currentUser={this.props.auth.user}
+                              banned={banned}/>
+                            <PermalinkButton
+                              commentId={reply.parent_id}
+                              articleURL={this.path}
+                            />
+                          </div>
+                          <ReplyBox
+                            addNotification={this.props.addNotification}
+                            postItem={this.props.postItem}
+                            appendItemArray={this.props.appendItemArray}
                             updateItem={this.props.updateItem}
                             id={replyId}
                             showReply={reply.showReply}/>
@@ -185,36 +225,10 @@ class CommentStream extends Component {
                             deleteAction={this.props.deleteAction}
                             addItem={this.props.addItem}
                             updateItem={this.props.updateItem}
-                            currentUser={this.props.auth.user}/>
-                        </div>
-                        <div className="replyActionsRight">
-                          <FlagButton
-                            addNotification={this.props.addNotification}
-                            id={replyId}
-                            flag={this.props.items.actions[reply.flag]}
-                            postAction={this.props.postAction}
-                            deleteAction={this.props.deleteAction}
-                            addItem={this.props.addItem}
-                            updateItem={this.props.updateItem}
-                            currentUser={this.props.auth.user}/>
-                          <PermalinkButton
-                            commentId={reply.parent_id}
-                            articleURL={this.path}
-                          />
-                        </div>
-                        <ReplyBox
-                          addNotification={this.props.addNotification}
-                          postItem={this.props.postItem}
-                          appendItemArray={this.props.appendItemArray}
-                          updateItem={this.props.updateItem}
-                          id={rootItemId}
-                          author={user}
-                          parent_id={commentId}
-                          child_id={replyId}
-                          premod={this.props.config.moderation}
-                          showReply={reply.showReply}/>
-                      </div>;
-                    })
+                            currentUser={this.props.auth.user}
+                            banned={banned}/>
+                        </div>;
+                      })
                   }
                 </div>;
               })
@@ -256,6 +270,7 @@ const mapDispatchToProps = (dispatch) => ({
   getStream: (rootId) => dispatch(getStream(rootId)),
   addNotification: (type, text) => dispatch(addNotification(type, text)),
   clearNotification: () => dispatch(clearNotification()),
+  showSignInDialog: () => dispatch(showSignInDialog()),
   postAction: (item, action, user, itemType) => dispatch(postAction(item, action, user, itemType)),
   deleteAction: (item, action, user, itemType) => dispatch(deleteAction(item, action, user, itemType)),
   appendItemArray: (item, property, value, addToFront, itemType) => dispatch(appendItemArray(item, property, value, addToFront, itemType)),
diff --git a/client/coral-embed-stream/src/CommentStream.js-base b/client/coral-embed-stream/src/CommentStream.js-base
new file mode 100644
index 000000000..26142a311
--- /dev/null
+++ b/client/coral-embed-stream/src/CommentStream.js-base
@@ -0,0 +1,263 @@
+import React, {Component, PropTypes} from 'react';
+import Pym from 'pym.js';
+import {connect} from 'react-redux';
+
+import {
+  itemActions,
+  Notification,
+  notificationActions,
+  authActions,
+} from '../../coral-framework';
+
+import CommentBox from '../../coral-plugin-commentbox/CommentBox';
+import InfoBox from '../../coral-plugin-infobox/InfoBox';
+import Content from '../../coral-plugin-commentcontent/CommentContent';
+import PubDate from '../../coral-plugin-pubdate/PubDate';
+import Count from '../../coral-plugin-comment-count/CommentCount';
+import AuthorName from '../../coral-plugin-author-name/AuthorName';
+import {ReplyBox, ReplyButton} from '../../coral-plugin-replies';
+import FlagButton from '../../coral-plugin-flags/FlagButton';
+import LikeButton from '../../coral-plugin-likes/LikeButton';
+import PermalinkButton from '../../coral-plugin-permalinks/PermalinkButton';
+import SignInContainer from '../../coral-sign-in/containers/SignInContainer';
+import UserBox from '../../coral-sign-in/components/UserBox';
+import {TabBar, Tab, TabContent, Spinner} from '../../coral-ui';
+import SettingsContainer from '../../coral-settings/containers/SettingsContainer';
+import RestrictedContent from '../../coral-framework/components/RestrictedContent';
+import SuspendedAccount from '../../coral-framework/components/SuspendedAccount';
+
+const {addItem, updateItem, postItem, getStream, postAction, deleteAction, appendItemArray} = itemActions;
+const {addNotification, clearNotification} = notificationActions;
+const {logout} = authActions;
+
+class CommentStream extends Component {
+
+  constructor (props) {
+    super(props);
+
+    this.state = {
+      activeTab: 0
+    };
+
+    this.changeTab = this.changeTab.bind(this);
+  }
+
+  changeTab (tab) {
+    this.setState({
+      activeTab: tab
+    });
+  }
+
+  static propTypes = {
+    items: PropTypes.object.isRequired,
+    addItem: PropTypes.func.isRequired,
+    updateItem: PropTypes.func.isRequired
+  }
+
+  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});
+
+    if (/https?\:\/\/([^?]+)/.test(pym.parentUrl)) {
+      this.props.getStream(pym.parentUrl);
+    } else {
+      this.props.getStream(window.location);
+    }
+  }
+
+  render () {
+    if (Object.keys(this.props.items).length === 0) {
+      // Loading mock asset
+      this.props.postItem({
+        comments: [],
+        url: 'http://coralproject.net'
+      }, 'asset', 'assetTest');
+    }
+
+    // TODO: Replace teststream id with id from params
+
+    const rootItemId = this.props.items.assets && Object.keys(this.props.items.assets)[0];
+    const rootItem = this.props.items.assets && this.props.items.assets[rootItemId];
+    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 className="commentStream">
+          <TabBar onChange={this.changeTab} activeTab={activeTab}>
+            <Tab><Count id={rootItemId} items={this.props.items}/></Tab>
+            <Tab>Settings</Tab>
+          </TabBar>
+          {loggedIn && <UserBox user={user} logout={this.props.logout} />}
+          {/* Add to the restricted param a boolean if the user is suspended*/}
+          <RestrictedContent restricted={false} restrictedComp={<SuspendedAccount />}>
+            <TabContent show={activeTab === 0}>
+              <div id="commentBox">
+                <InfoBox
+                  content={this.props.config.infoBoxContent}
+                  enable={this.props.config.infoBoxEnable}
+                />
+                <CommentBox
+                  addNotification={this.props.addNotification}
+                  postItem={this.props.postItem}
+                  appendItemArray={this.props.appendItemArray}
+                  updateItem={this.props.updateItem}
+                  id={rootItemId}
+                  premod={this.props.config.moderation}
+                  reply={false}
+                  author={user}
+                />
+                {!loggedIn && <SignInContainer />}
+              </div>
+              {
+                rootItem.comments && rootItem.comments.map((commentId) => {
+                  const comment = comments[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}/>
+                    <Content body={comment.body}/>
+                    <div className="commentActionsLeft">
+                      <ReplyButton
+                        updateItem={this.props.updateItem}
+                        id={commentId}
+                        showReply={comment.showReply}/>
+                      <LikeButton
+                        addNotification={this.props.addNotification}
+                        id={commentId}
+                        like={actions[comment.like]}
+                        postAction={this.props.postAction}
+                        deleteAction={this.props.deleteAction}
+                        addItem={this.props.addItem}
+                        updateItem={this.props.updateItem}
+                        currentUser={this.props.auth.user}/>
+                    </div>
+                    <div className="commentActionsRight">
+                      <FlagButton
+                        addNotification={this.props.addNotification}
+                        id={commentId}
+                        flag={actions[comment.flag]}
+                        postAction={this.props.postAction}
+                        deleteAction={this.props.deleteAction}
+                        addItem={this.props.addItem}
+                        updateItem={this.props.updateItem}
+                        currentUser={this.props.auth.user}/>
+                      <PermalinkButton
+                        commentId={commentId}
+                        articleURL={this.path}/>
+                    </div>
+                    <ReplyBox
+                      addNotification={this.props.addNotification}
+                      postItem={this.props.postItem}
+                      appendItemArray={this.props.appendItemArray}
+                      updateItem={this.props.updateItem}
+                      id={rootItemId}
+                      author={user}
+                      parent_id={commentId}
+                      premod={this.props.config.moderation}
+                      showReply={comment.showReply}/>
+                    {
+                      comment.children &&
+                      comment.children.map((replyId) => {
+                        let reply = this.props.items.comments[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}/>
+                          <Content body={reply.body}/>
+                          <div className="replyActionsLeft">
+                            <ReplyButton
+                              updateItem={this.props.updateItem}
+                              id={replyId}
+                              showReply={reply.showReply}/>
+                            <LikeButton
+                              addNotification={this.props.addNotification}
+                              id={replyId}
+                              like={this.props.items.actions[reply.like]}
+                              postAction={this.props.postAction}
+                              deleteAction={this.props.deleteAction}
+                              addItem={this.props.addItem}
+                              updateItem={this.props.updateItem}
+                              currentUser={this.props.auth.user}/>
+                          </div>
+                          <div className="replyActionsRight">
+                            <FlagButton
+                              addNotification={this.props.addNotification}
+                              id={replyId}
+                              flag={this.props.items.actions[reply.flag]}
+                              postAction={this.props.postAction}
+                              deleteAction={this.props.deleteAction}
+                              addItem={this.props.addItem}
+                              updateItem={this.props.updateItem}
+                              currentUser={this.props.auth.user}/>
+                            <PermalinkButton
+                              commentId={reply.parent_id}
+                              articleURL={this.path}
+                            />
+                          </div>
+                          <ReplyBox
+                            addNotification={this.props.addNotification}
+                            postItem={this.props.postItem}
+                            appendItemArray={this.props.appendItemArray}
+                            updateItem={this.props.updateItem}
+                            id={rootItemId}
+                            author={user}
+                            parent_id={commentId}
+                            child_id={replyId}
+                            premod={this.props.config.moderation}
+                            showReply={reply.showReply}/>
+                        </div>;
+                      })
+                    }
+                  </div>;
+                })
+              }
+            </TabContent>
+            <TabContent show={activeTab === 1}>
+              <SettingsContainer
+                loggedIn={loggedIn}
+                userData={this.props.userData}
+                showSignInDialog={this.props.handleSignInDialog}
+              />
+              {!loggedIn && <SignInContainer noButton/>}
+            </TabContent>
+          </RestrictedContent>
+          <Notification
+            notifLength={4500}
+            clearNotification={this.props.clearNotification}
+            notification={this.props.notification}
+          />
+        </div>
+          :
+          <Spinner/>
+      }
+    </div>;
+  }
+}
+
+const mapStateToProps = state => ({
+  config: state.config.toJS(),
+  items: state.items.toJS(),
+  notification: state.notification.toJS(),
+  auth: state.auth.toJS(),
+  userData: state.user.toJS()
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  addItem: (item, itemType) => dispatch(addItem(item, itemType)),
+  updateItem: (id, property, value, itemType) => dispatch(updateItem(id, property, value, itemType)),
+  postItem: (data, type, id) => dispatch(postItem(data, type, id)),
+  getStream: (rootId) => dispatch(getStream(rootId)),
+  addNotification: (type, text) => dispatch(addNotification(type, text)),
+  clearNotification: () => dispatch(clearNotification()),
+  postAction: (item, action, user, itemType) => dispatch(postAction(item, action, user, itemType)),
+  deleteAction: (item, action, user, itemType) => dispatch(deleteAction(item, action, user, itemType)),
+  appendItemArray: (item, property, value, addToFront, itemType) => dispatch(appendItemArray(item, property, value, addToFront, itemType)),
+  handleSignInDialog: () => dispatch(authActions.showSignInDialog()),
+  logout: () => dispatch(logout()),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(CommentStream);
diff --git a/client/coral-embed-stream/src/CommentStream.js-ours b/client/coral-embed-stream/src/CommentStream.js-ours
new file mode 100644
index 000000000..3f94f879a
--- /dev/null
+++ b/client/coral-embed-stream/src/CommentStream.js-ours
@@ -0,0 +1,266 @@
+import React, {Component, PropTypes} from 'react';
+import Pym from 'pym.js';
+import {connect} from 'react-redux';
+
+import {
+  itemActions,
+  Notification,
+  notificationActions,
+  authActions,
+} from '../../coral-framework';
+
+import CommentBox from '../../coral-plugin-commentbox/CommentBox';
+import InfoBox from '../../coral-plugin-infobox/InfoBox';
+import Content from '../../coral-plugin-commentcontent/CommentContent';
+import PubDate from '../../coral-plugin-pubdate/PubDate';
+import Count from '../../coral-plugin-comment-count/CommentCount';
+import AuthorName from '../../coral-plugin-author-name/AuthorName';
+import {ReplyBox, ReplyButton} from '../../coral-plugin-replies';
+import FlagButton from '../../coral-plugin-flags/FlagButton';
+import LikeButton from '../../coral-plugin-likes/LikeButton';
+import PermalinkButton from '../../coral-plugin-permalinks/PermalinkButton';
+import SignInContainer from '../../coral-sign-in/containers/SignInContainer';
+import UserBox from '../../coral-sign-in/components/UserBox';
+import {TabBar, Tab, TabContent, Spinner} from '../../coral-ui';
+import SettingsContainer from '../../coral-settings/containers/SettingsContainer';
+import RestrictedContent from '../../coral-framework/components/RestrictedContent';
+import SuspendedAccount from '../../coral-framework/components/SuspendedAccount';
+
+const {addItem, updateItem, postItem, getStream, postAction, deleteAction, appendItemArray} = itemActions;
+const {addNotification, clearNotification} = notificationActions;
+const {logout} = authActions;
+
+class CommentStream extends Component {
+
+  constructor (props) {
+    super(props);
+
+    this.state = {
+      activeTab: 0
+    };
+
+    this.changeTab = this.changeTab.bind(this);
+  }
+
+  changeTab (tab) {
+    this.setState({
+      activeTab: tab
+    });
+  }
+
+  static propTypes = {
+    items: PropTypes.object.isRequired,
+    addItem: PropTypes.func.isRequired,
+    updateItem: PropTypes.func.isRequired
+  }
+
+  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});
+
+    if (/https?\:\/\/([^?]+)/.test(pym.parentUrl)) {
+      this.props.getStream(pym.parentUrl);
+    } else {
+      this.props.getStream(window.location);
+    }
+  }
+
+  render () {
+    if (Object.keys(this.props.items).length === 0) {
+      // Loading mock asset
+      this.props.postItem({
+        comments: [],
+        url: 'http://coralproject.net'
+      }, 'asset', 'assetTest');
+    }
+
+    // TODO: Replace teststream id with id from params
+
+    const rootItemId = this.props.items.assets && Object.keys(this.props.items.assets)[0];
+    const rootItem = this.props.items.assets && this.props.items.assets[rootItemId];
+    const {actions, users, comments} = this.props.items;
+    const {loggedIn, user, showSignInDialog} = this.props.auth;
+    const {activeTab} = this.state;
+    const banned = (this.props.userData.status === 'banned');
+
+    return <div className={showSignInDialog ? 'expandForSignin' : ''}>
+      {
+        rootItem
+          ? <div className="commentStream">
+          <TabBar onChange={this.changeTab} activeTab={activeTab}>
+            <Tab><Count id={rootItemId} items={this.props.items}/></Tab>
+            <Tab>Settings</Tab>
+          </TabBar>
+          {loggedIn && <UserBox user={user} logout={this.props.logout} />}
+          <TabContent show={activeTab === 0}>
+            <div id="commentBox">
+              <InfoBox
+                content={this.props.config.infoBoxContent}
+                enable={this.props.config.infoBoxEnable}
+              />
+              <RestrictedContent restricted={banned} restrictedComp={<SuspendedAccount />}>
+                <CommentBox
+                  addNotification={this.props.addNotification}
+                  postItem={this.props.postItem}
+                  appendItemArray={this.props.appendItemArray}
+                  updateItem={this.props.updateItem}
+                  id={rootItemId}
+                  premod={this.props.config.moderation}
+                  reply={false}
+                  author={user}
+                />
+              </RestrictedContent>
+              {!loggedIn && <SignInContainer />}
+            </div>
+            {
+              rootItem.comments && rootItem.comments.map((commentId) => {
+                const comment = comments[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}/>
+                  <Content body={comment.body}/>
+                  <div className="commentActionsLeft">
+                      <ReplyButton
+                        updateItem={this.props.updateItem}
+                        id={commentId}
+                        showReply={comment.showReply}
+                        banned={banned}/>
+                      <LikeButton
+                        addNotification={this.props.addNotification}
+                        id={commentId}
+                        like={actions[comment.like]}
+                        postAction={this.props.postAction}
+                        deleteAction={this.props.deleteAction}
+                        addItem={this.props.addItem}
+                        updateItem={this.props.updateItem}
+                        currentUser={this.props.auth.user}
+                        banned={banned}/>
+                  </div>
+                  <div className="commentActionsRight">
+                    <FlagButton
+                      addNotification={this.props.addNotification}
+                      id={commentId}
+                      flag={actions[comment.flag]}
+                      postAction={this.props.postAction}
+                      deleteAction={this.props.deleteAction}
+                      addItem={this.props.addItem}
+                      updateItem={this.props.updateItem}
+                      currentUser={this.props.auth.user}
+                      banned={banned}/>
+                    <PermalinkButton
+                      commentId={commentId}
+                      articleURL={this.path}/>
+                  </div>
+                  <ReplyBox
+                    addNotification={this.props.addNotification}
+                    postItem={this.props.postItem}
+                    appendItemArray={this.props.appendItemArray}
+                    updateItem={this.props.updateItem}
+                    id={rootItemId}
+                    author={user}
+                    parent_id={commentId}
+                    premod={this.props.config.moderation}
+                    showReply={comment.showReply}/>
+                  {
+                    comment.children &&
+                    comment.children.map((replyId) => {
+                      let reply = this.props.items.comments[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}/>
+                        <Content body={reply.body}/>
+                        <div className="replyActionsLeft">
+                          <ReplyButton
+                            updateItem={this.props.updateItem}
+                            id={replyId}
+                            showReply={reply.showReply}/>
+                          <LikeButton
+                            addNotification={this.props.addNotification}
+                            id={replyId}
+                            like={this.props.items.actions[reply.like]}
+                            postAction={this.props.postAction}
+                            deleteAction={this.props.deleteAction}
+                            addItem={this.props.addItem}
+                            updateItem={this.props.updateItem}
+                            currentUser={this.props.auth.user}/>
+                        </div>
+                        <div className="replyActionsRight">
+                          <FlagButton
+                            addNotification={this.props.addNotification}
+                            id={replyId}
+                            flag={this.props.items.actions[reply.flag]}
+                            postAction={this.props.postAction}
+                            deleteAction={this.props.deleteAction}
+                            addItem={this.props.addItem}
+                            updateItem={this.props.updateItem}
+                            currentUser={this.props.auth.user}/>
+                          <PermalinkButton
+                            commentId={reply.parent_id}
+                            articleURL={this.path}
+                          />
+                        </div>
+                        <ReplyBox
+                          addNotification={this.props.addNotification}
+                          postItem={this.props.postItem}
+                          appendItemArray={this.props.appendItemArray}
+                          updateItem={this.props.updateItem}
+                          id={rootItemId}
+                          author={user}
+                          parent_id={commentId}
+                          child_id={replyId}
+                          premod={this.props.config.moderation}
+                          showReply={reply.showReply}/>
+                      </div>;
+                    })
+                  }
+                </div>;
+              })
+            }
+          </TabContent>
+          <TabContent show={activeTab === 1}>
+              <SettingsContainer
+                loggedIn={loggedIn}
+                userData={this.props.userData}
+                showSignInDialog={this.props.handleSignInDialog}
+              />
+              {!loggedIn && <SignInContainer noButton/>}
+            </TabContent>
+          <Notification
+            notifLength={4500}
+            clearNotification={this.props.clearNotification}
+            notification={this.props.notification}
+          />
+        </div>
+          :
+          <Spinner/>
+      }
+    </div>;
+  }
+}
+
+const mapStateToProps = state => ({
+  config: state.config.toJS(),
+  items: state.items.toJS(),
+  notification: state.notification.toJS(),
+  auth: state.auth.toJS(),
+  userData: state.user.toJS()
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  addItem: (item, itemType) => dispatch(addItem(item, itemType)),
+  updateItem: (id, property, value, itemType) => dispatch(updateItem(id, property, value, itemType)),
+  postItem: (data, type, id) => dispatch(postItem(data, type, id)),
+  getStream: (rootId) => dispatch(getStream(rootId)),
+  addNotification: (type, text) => dispatch(addNotification(type, text)),
+  clearNotification: () => dispatch(clearNotification()),
+  postAction: (item, action, user, itemType) => dispatch(postAction(item, action, user, itemType)),
+  deleteAction: (item, action, user, itemType) => dispatch(deleteAction(item, action, user, itemType)),
+  appendItemArray: (item, property, value, addToFront, itemType) => dispatch(appendItemArray(item, property, value, addToFront, itemType)),
+  handleSignInDialog: () => dispatch(authActions.showSignInDialog()),
+  logout: () => dispatch(logout()),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(CommentStream);
diff --git a/client/coral-embed-stream/src/CommentStream.js-theirs b/client/coral-embed-stream/src/CommentStream.js-theirs
new file mode 100644
index 000000000..40ad72a41
--- /dev/null
+++ b/client/coral-embed-stream/src/CommentStream.js-theirs
@@ -0,0 +1,268 @@
+import React, {Component, PropTypes} from 'react';
+import Pym from 'pym.js';
+import {connect} from 'react-redux';
+
+import {
+  itemActions,
+  Notification,
+  notificationActions,
+  authActions,
+} from '../../coral-framework';
+
+import CommentBox from '../../coral-plugin-commentbox/CommentBox';
+import InfoBox from '../../coral-plugin-infobox/InfoBox';
+import Content from '../../coral-plugin-commentcontent/CommentContent';
+import PubDate from '../../coral-plugin-pubdate/PubDate';
+import Count from '../../coral-plugin-comment-count/CommentCount';
+import AuthorName from '../../coral-plugin-author-name/AuthorName';
+import {ReplyBox, ReplyButton} from '../../coral-plugin-replies';
+import FlagButton from '../../coral-plugin-flags/FlagButton';
+import LikeButton from '../../coral-plugin-likes/LikeButton';
+import PermalinkButton from '../../coral-plugin-permalinks/PermalinkButton';
+import SignInContainer from '../../coral-sign-in/containers/SignInContainer';
+import UserBox from '../../coral-sign-in/components/UserBox';
+import {TabBar, Tab, TabContent, Spinner} from '../../coral-ui';
+import SettingsContainer from '../../coral-settings/containers/SettingsContainer';
+import RestrictedContent from '../../coral-framework/components/RestrictedContent';
+import SuspendedAccount from '../../coral-framework/components/SuspendedAccount';
+
+const {addItem, updateItem, postItem, getStream, postAction, deleteAction, appendItemArray} = itemActions;
+const {addNotification, clearNotification} = notificationActions;
+const {logout, showSignInDialog} = authActions;
+
+class CommentStream extends Component {
+
+  constructor (props) {
+    super(props);
+
+    this.state = {
+      activeTab: 0
+    };
+
+    this.changeTab = this.changeTab.bind(this);
+  }
+
+  changeTab (tab) {
+    this.setState({
+      activeTab: tab
+    });
+  }
+
+  static propTypes = {
+    items: PropTypes.object.isRequired,
+    addItem: PropTypes.func.isRequired,
+    updateItem: PropTypes.func.isRequired
+  }
+
+  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});
+
+    if (/https?\:\/\/([^?]+)/.test(pym.parentUrl)) {
+      this.props.getStream(pym.parentUrl);
+    } else {
+      this.props.getStream(window.location);
+    }
+  }
+
+  render () {
+    if (Object.keys(this.props.items).length === 0) {
+      // Loading mock asset
+      this.props.postItem({
+        comments: [],
+        url: 'http://coralproject.net'
+      }, 'asset', 'assetTest');
+    }
+
+    // TODO: Replace teststream id with id from params
+
+    const rootItemId = this.props.items.assets && Object.keys(this.props.items.assets)[0];
+    const rootItem = this.props.items.assets && this.props.items.assets[rootItemId];
+    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 className="commentStream">
+          <TabBar onChange={this.changeTab} activeTab={activeTab}>
+            <Tab><Count id={rootItemId} items={this.props.items}/></Tab>
+            <Tab>Settings</Tab>
+          </TabBar>
+          {loggedIn && <UserBox user={user} logout={this.props.logout} />}
+          {/* Add to the restricted param a boolean if the user is suspended*/}
+          <RestrictedContent restricted={false} restrictedComp={<SuspendedAccount />}>
+            <TabContent show={activeTab === 0}>
+              <div id="commentBox">
+                <InfoBox
+                  content={this.props.config.infoBoxContent}
+                  enable={this.props.config.infoBoxEnable}
+                />
+                <CommentBox
+                  addNotification={this.props.addNotification}
+                  postItem={this.props.postItem}
+                  appendItemArray={this.props.appendItemArray}
+                  updateItem={this.props.updateItem}
+                  id={rootItemId}
+                  premod={this.props.config.moderation}
+                  reply={false}
+                  author={user}
+                />
+                {!loggedIn && <SignInContainer />}
+              </div>
+              {
+                rootItem.comments && rootItem.comments.map((commentId) => {
+                  const comment = comments[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}/>
+                    <Content body={comment.body}/>
+                    <div className="commentActionsLeft">
+                      <ReplyButton
+                        updateItem={this.props.updateItem}
+                        id={commentId}
+                        showReply={comment.showReply}/>
+                      <LikeButton
+                        addNotification={this.props.addNotification}
+                        id={commentId}
+                        like={actions[comment.like]}
+                        showSignInDialog={this.props.showSignInDialog}
+                        postAction={this.props.postAction}
+                        deleteAction={this.props.deleteAction}
+                        addItem={this.props.addItem}
+                        updateItem={this.props.updateItem}
+                        currentUser={this.props.auth.user}/>
+                    </div>
+                    <div className="commentActionsRight">
+                      <FlagButton
+                        addNotification={this.props.addNotification}
+                        id={commentId}
+                        flag={actions[comment.flag]}
+                        postAction={this.props.postAction}
+                        deleteAction={this.props.deleteAction}
+                        addItem={this.props.addItem}
+                        showSignInDialog={this.props.showSignInDialog}
+                        updateItem={this.props.updateItem}
+                        currentUser={this.props.auth.user}/>
+                      <PermalinkButton
+                        commentId={commentId}
+                        articleURL={this.path}/>
+                    </div>
+                    <ReplyBox
+                      addNotification={this.props.addNotification}
+                      postItem={this.props.postItem}
+                      appendItemArray={this.props.appendItemArray}
+                      updateItem={this.props.updateItem}
+                      id={rootItemId}
+                      author={user}
+                      parent_id={commentId}
+                      premod={this.props.config.moderation}
+                      showReply={comment.showReply}/>
+                    {
+                      comment.children &&
+                      comment.children.map((replyId) => {
+                        let reply = this.props.items.comments[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}/>
+                          <Content body={reply.body}/>
+                          <div className="replyActionsLeft">
+                            <ReplyButton
+                              updateItem={this.props.updateItem}
+                              id={replyId}
+                              showReply={reply.showReply}/>
+                            <LikeButton
+                              addNotification={this.props.addNotification}
+                              id={replyId}
+                              like={this.props.items.actions[reply.like]}
+                              postAction={this.props.postAction}
+                              deleteAction={this.props.deleteAction}
+                              addItem={this.props.addItem}
+                              showSignInDialog={this.props.showSignInDialog}
+                              updateItem={this.props.updateItem}
+                              currentUser={this.props.auth.user}/>
+                          </div>
+                          <div className="replyActionsRight">
+                            <FlagButton
+                              addNotification={this.props.addNotification}
+                              id={replyId}
+                              flag={this.props.items.actions[reply.flag]}
+                              postAction={this.props.postAction}
+                              showSignInDialog={this.props.showSignInDialog}
+                              deleteAction={this.props.deleteAction}
+                              addItem={this.props.addItem}
+                              updateItem={this.props.updateItem}
+                              currentUser={this.props.auth.user}/>
+                            <PermalinkButton
+                              commentId={reply.parent_id}
+                              articleURL={this.path}
+                            />
+                          </div>
+                          <ReplyBox
+                            addNotification={this.props.addNotification}
+                            postItem={this.props.postItem}
+                            appendItemArray={this.props.appendItemArray}
+                            updateItem={this.props.updateItem}
+                            id={rootItemId}
+                            author={user}
+                            parent_id={commentId}
+                            child_id={replyId}
+                            premod={this.props.config.moderation}
+                            showReply={reply.showReply}/>
+                        </div>;
+                      })
+                    }
+                  </div>;
+                })
+              }
+            </TabContent>
+            <TabContent show={activeTab === 1}>
+              <SettingsContainer
+                loggedIn={loggedIn}
+                userData={this.props.userData}
+                showSignInDialog={this.props.handleSignInDialog}
+              />
+              {!loggedIn && <SignInContainer noButton/>}
+            </TabContent>
+          </RestrictedContent>
+          <Notification
+            notifLength={4500}
+            clearNotification={this.props.clearNotification}
+            notification={this.props.notification}
+          />
+        </div>
+          :
+          <Spinner/>
+      }
+    </div>;
+  }
+}
+
+const mapStateToProps = state => ({
+  config: state.config.toJS(),
+  items: state.items.toJS(),
+  notification: state.notification.toJS(),
+  auth: state.auth.toJS(),
+  userData: state.user.toJS()
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  addItem: (item, itemType) => dispatch(addItem(item, itemType)),
+  updateItem: (id, property, value, itemType) => dispatch(updateItem(id, property, value, itemType)),
+  postItem: (data, type, id) => dispatch(postItem(data, type, id)),
+  getStream: (rootId) => dispatch(getStream(rootId)),
+  addNotification: (type, text) => dispatch(addNotification(type, text)),
+  clearNotification: () => dispatch(clearNotification()),
+  showSignInDialog: () => dispatch(showSignInDialog()),
+  postAction: (item, action, user, itemType) => dispatch(postAction(item, action, user, itemType)),
+  deleteAction: (item, action, user, itemType) => dispatch(deleteAction(item, action, user, itemType)),
+  appendItemArray: (item, property, value, addToFront, itemType) => dispatch(appendItemArray(item, property, value, addToFront, itemType)),
+  handleSignInDialog: () => dispatch(authActions.showSignInDialog()),
+  logout: () => dispatch(logout()),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(CommentStream);
diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index b6fe672cc..21e40ce98 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -56,12 +56,14 @@ hr {
 
 /* Info Box Styles */
 .coral-plugin-infobox-info {
-  position: fixed;
   top: 0;
   border: 0;
   background: rgb(105,105,105);
   color: white;
-  border-radius: 2px;
+  width: 100%;
+  text-align: center;
+  padding: 10px;
+  margin-bottom: 10px;
   font-weight: bold;
   display: block;
 }
diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index daf7569c8..0e8ec1245 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -4,10 +4,11 @@ import translations from './translations.json';
 
 const name = 'coral-plugin-flags';
 
-const FlagButton = ({flag, id, postAction, deleteAction, addItem, updateItem, addNotification, currentUser, banned}) => {
+const FlagButton = ({flag, id, postAction, deleteAction, addItem, showSignInDialog, updateItem, addNotification, currentUser, banned}) => {
   const flagged = flag && flag.current_user;
   const onFlagClick = () => {
     if (!currentUser) {
+      showSignInDialog();
       return;
     }
     if (banned) {
diff --git a/client/coral-plugin-likes/LikeButton.js b/client/coral-plugin-likes/LikeButton.js
index 4f20d0804..14f7fabd6 100644
--- a/client/coral-plugin-likes/LikeButton.js
+++ b/client/coral-plugin-likes/LikeButton.js
@@ -4,10 +4,11 @@ import translations from './translations.json';
 
 const name = 'coral-plugin-flags';
 
-const LikeButton = ({like, id, postAction, deleteAction, addItem, updateItem, currentUser, banned}) => {
+const LikeButton = ({like, id, postAction, deleteAction, addItem, showSignInDialog, updateItem, currentUser, banned}) => {
   const liked = like && like.current_user;
   const onLikeClick = () => {
     if (!currentUser) {
+      showSignInDialog();
       return;
     }
     if (banned) {
diff --git a/models/setting.js b/models/setting.js
index e23f654a7..bf5ac290a 100644
--- a/models/setting.js
+++ b/models/setting.js
@@ -38,12 +38,11 @@ SettingSchema.statics.getSettings = function () {
 };
 
 /**
- * Gets the moderation settings and sends it back
+ * Gets the settings visible to the public
  * @return {Promise} moderation the settings for how to moderate comments
  */
-SettingSchema.statics.getModerationSetting = function () {
-  console.log('Getting moderation setting');
-  return this.findOne({id: '1'}).select('moderation');
+SettingSchema.statics.getPublicSettings = function () {
+  return this.findOne({id: '1'}).select('moderation infoBoxEnable infoBoxContent');
 };
 
 /**
@@ -51,7 +50,7 @@ SettingSchema.statics.getModerationSetting = function () {
  * @return {Promise} content the content of the info Box
  */
 SettingSchema.statics.getInfoBoxSetting = function () {
-  return this.findOne({id: '1'}).select('infoBoxEnable', 'infoBoxContent');
+  return this.findOne({id: '1'}).select('infoBoxEnable infoBoxContent');
 };
 
 /**
diff --git a/routes/api/queue/index.js b/routes/api/queue/index.js
index 448149387..b38d1b763 100644
--- a/routes/api/queue/index.js
+++ b/routes/api/queue/index.js
@@ -16,7 +16,7 @@ const router = express.Router();
 // Pre-moderation:  New comments are shown in the moderator queues immediately.
 // Post-moderation: New comments do not appear in moderation queues unless they are flagged by other users.
 router.get('/comments/pending', (req, res, next) => {
-  Setting.getModerationSetting().then(({moderation}) =>
+  Setting.getPublicSettings().then(({moderation}) =>
     Comment.moderationQueue(moderation))
   .then((comments) => {
     return Promise.all([
diff --git a/routes/api/stream/index.js b/routes/api/stream/index.js
index ce8871ab8..4e8373999 100644
--- a/routes/api/stream/index.js
+++ b/routes/api/stream/index.js
@@ -26,8 +26,8 @@ router.get('/', (req, res, next) => {
         return asset;
       }),
 
-    // Get the moderation setting from the settings.
-    Setting.getModerationSetting()
+    // Get the public settings.
+    Setting.getPublicSettings()
   ])
   .then(([asset, settings]) => {
 
diff --git a/tests/models/setting.js b/tests/models/setting.js
index 08a47d7a1..186a65245 100644
--- a/tests/models/setting.js
+++ b/tests/models/setting.js
@@ -4,7 +4,9 @@ const expect = require('chai').expect;
 describe('Setting: model', () => {
 
   beforeEach(() => {
-    const defaults = {id: 1};
+    const defaults = {
+      id: 1
+    };
     return Setting.update({id: '1'}, {$setOnInsert: defaults}, {upsert: true});
   });
 
@@ -35,10 +37,13 @@ describe('Setting: model', () => {
     });
   });
 
-  describe('#getModerationSetting', () => {
+  describe('#getPublicSettings', () => {
     it('should return the moderation settings', () => {
-      return Setting.getModerationSetting().then(({moderation}) => {
+      return Setting.getPublicSettings().then(({moderation, infoBoxEnable, infoBoxContent, wordlist}) => {
         expect(moderation).not.to.be.null;
+        expect(infoBoxEnable).not.to.be.null;
+        expect(infoBoxContent).not.to.be.null;
+        expect(wordlist).to.be.undefined;
       });
     });
   });