diff --git a/app.js b/app.js
index c04e0cb4a..c2601ad5a 100644
--- a/app.js
+++ b/app.js
@@ -94,6 +94,11 @@ if (app.get('env') !== 'production') {
     endpointURL: '/api/v1/graph/ql'
   }));
 
+  // GraphQL documention.
+  app.get('/admin/docs', (req, res) => {
+    res.render('admin/docs');
+  });
+
 }
 
 //==============================================================================
diff --git a/client/coral-admin/src/actions/moderation.js b/client/coral-admin/src/actions/moderation.js
index 7d34a14ed..b332b9086 100644
--- a/client/coral-admin/src/actions/moderation.js
+++ b/client/coral-admin/src/actions/moderation.js
@@ -5,10 +5,5 @@ export const toggleModal = open => ({type: actions.TOGGLE_MODAL, open});
 export const singleView = () => ({type: actions.SINGLE_VIEW});
 
 // Ban User Dialog
-export const showBanUserDialog = (userId, userName, commentId) => {
-  return {type: actions.SHOW_BANUSER_DIALOG, userId, userName, commentId};
-};
-
-export const hideBanUserDialog = (showDialog) => {
-  return {type: actions.HIDE_BANUSER_DIALOG, showDialog};
-};
+export const showBanUserDialog = (user, commentId) => ({type: actions.SHOW_BANUSER_DIALOG, user, commentId});
+export const hideBanUserDialog = (showDialog) => ({type: actions.HIDE_BANUSER_DIALOG, showDialog});
diff --git a/client/coral-admin/src/components/ActionButton.js b/client/coral-admin/src/components/ActionButton.js
index 09abdd266..0415b2529 100644
--- a/client/coral-admin/src/components/ActionButton.js
+++ b/client/coral-admin/src/components/ActionButton.js
@@ -1,44 +1,23 @@
 import React from 'react';
 import styles from './ModerationList.css';
-import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from '../translations.json';
-import {FabButton, Button, Icon} from 'coral-ui';
+import BanUserButton from './BanUserButton';
+import {FabButton} from 'coral-ui';
+import {menuActionsMap} from '../containers/ModerationQueue/helpers/moderationQueueActionsMap';
 
-const ActionButton = ({type, user}) => {
-  const menuOptionsMap = {
-    'reject': {status: 'REJECTED', icon: 'close', key: 'r'},
-    'approve': {status: 'ACCEPTED', icon: 'done', key: 't'},
-    'flag': {status: 'FLAGGED', icon: 'flag', filter: 'Untouched'},
-    'ban': {status: 'BANNED', icon: 'not interested'}
-  };
-
-  if (type === 'ban') {
-    return (
-      <div className={styles.ban}>
-        <Button
-          className={`ban ${styles.banButton}`}
-          cStyle='darkGrey'
-          disabled={user.status === 'BANNED' ? 'disabled' : ''}
-          onClick={() => {}}
-          raised>
-          <Icon name='not_interested' className={styles.banIcon} />
-          {lang.t('comment.ban_user')}
-        </Button>
-      </div>
-    );
+const ActionButton = ({type = '', user, ...props}) => {
+  if (type === 'BAN') {
+    return <BanUserButton user={user} onClick={() => props.showBanUserDialog(props.user, props.id)} />;
   }
 
   return (
     <FabButton
-      className={`${type} ${styles.actionButton}`}
-      cStyle={type}
-      icon={menuOptionsMap[type].icon}
+      className={`${type.toLowerCase()} ${styles.actionButton}`}
+      cStyle={type.toLowerCase()}
+      icon={menuActionsMap[type].icon}
       onClick={() => {}}
     />
   );
-
 };
 
 export default ActionButton;
 
-const lang = new I18n(translations);
diff --git a/client/coral-admin/src/components/BanUserButton.css b/client/coral-admin/src/components/BanUserButton.css
new file mode 100644
index 000000000..79b805c30
--- /dev/null
+++ b/client/coral-admin/src/components/BanUserButton.css
@@ -0,0 +1,10 @@
+.banButton {
+  width: 114px;
+  letter-spacing: 1px;
+
+  i {
+    vertical-align: middle;
+    margin-right: 10px;
+    font-size: 14px;
+  }
+}
diff --git a/client/coral-admin/src/components/BanUserButton.js b/client/coral-admin/src/components/BanUserButton.js
new file mode 100644
index 000000000..191164ca5
--- /dev/null
+++ b/client/coral-admin/src/components/BanUserButton.js
@@ -0,0 +1,26 @@
+import React, {PropTypes} from 'react';
+import {Button, Icon} from 'coral-ui';
+import styles from './BanUserButton.css';
+
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from 'coral-admin/src/translations.json';
+const lang = new I18n(translations);
+
+const BanUserButton = ({user, ...props}) => (
+  <div className={styles.ban}>
+    <Button cStyle='darkGrey'
+      className={`ban ${styles.banButton}`}
+      disabled={user.status === 'BANNED' ? 'disabled' : ''}
+      onClick={props.onClick}
+      raised>
+      <Icon name='not_interested' />
+      {lang.t('comment.ban_user')}
+    </Button>
+  </div>
+);
+
+BanUserButton.propTypes = {
+  onClick: PropTypes.func.isRequired
+};
+
+export default BanUserButton;
diff --git a/client/coral-admin/src/components/BanUserDialog.js b/client/coral-admin/src/components/BanUserDialog.js
index 0ad149fbe..b23d8f9d1 100644
--- a/client/coral-admin/src/components/BanUserDialog.js
+++ b/client/coral-admin/src/components/BanUserDialog.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {PropTypes} from 'react';
 import {Dialog} from 'coral-ui';
 import styles from './BanUserDialog.css';
 
@@ -8,34 +8,28 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../translations';
 const lang = new I18n(translations);
 
-const BanUserDialog = ({open, handleClose, onClickBanUser, user = {}}) => (
+const BanUserDialog = ({open, handleClose, handleBanUser, user}) => (
   <Dialog
     className={styles.dialog}
     id="banuserDialog"
     open={open}
-    onClose={() => handleClose()}
-    onCancel={() => handleClose()}
+    onClose={handleClose}
+    onCancel={handleClose}
     title={lang.t('bandialog.ban_user')}>
     <span className={styles.close} onClick={handleClose}>×</span>
     <div>
       <div className={styles.header}>
-        <h2>
-          {lang.t('bandialog.ban_user')}
-        </h2>
+        <h2>{lang.t('bandialog.ban_user')}</h2>
       </div>
       <div className={styles.separator}>
-        <h3>
-          {lang.t('bandialog.are_you_sure', user.userName)}
-        </h3>
-        <i>
-          {lang.t('bandialog.note')}
-        </i>
+        <h3>{lang.t('bandialog.are_you_sure', user.name)}</h3>
+        <i>{lang.t('bandialog.note')}</i>
       </div>
       <div className={styles.buttons}>
-        <Button cStyle="cancel" className={styles.cancel} onClick={() => handleClose()} raised>
+        <Button cStyle="cancel" className={styles.cancel} onClick={handleClose} raised>
           {lang.t('bandialog.cancel')}
         </Button>
-        <Button cStyle="black" className={styles.ban} onClick={() => onClickBanUser('BANNED', user.userId, user.commentId)} raised>
+        <Button cStyle="black" className={styles.ban} onClick={() => handleBanUser({userId: user.id})} raised>
           {lang.t('bandialog.yes_ban_user')}
         </Button>
       </div>
@@ -43,4 +37,10 @@ const BanUserDialog = ({open, handleClose, onClickBanUser, user = {}}) => (
   </Dialog>
 );
 
+BanUserDialog.propTypes = {
+  handleBanUser: PropTypes.func.isRequired,
+  handleClose: PropTypes.func.isRequired,
+  user: PropTypes.object.isRequired,
+};
+
 export default BanUserDialog;
diff --git a/client/coral-admin/src/components/User.js b/client/coral-admin/src/components/User.js
index 54de0375e..5743b141e 100644
--- a/client/coral-admin/src/components/User.js
+++ b/client/coral-admin/src/components/User.js
@@ -25,9 +25,8 @@ const User = props => {
             {props.modActions.map(
               (action, i) =>
               <ActionButton
-                option={action}
+                type={action.toUpperCase()}
                 key={i}
-                type='USERS'
                 user={user}
                 menuOptionsMap={props.menuOptionsMap}
                 onClickAction={props.onClickAction}
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index 6b0ec8827..36836ea0d 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -5,12 +5,14 @@ import key from 'keymaster';
 import isEqual from 'lodash/isEqual';
 
 import {modQueueQuery} from '../../graphql/queries';
+import {banUser} from '../../graphql/mutations';
 
 import {fetchSettings} from 'actions/settings';
 import {updateAssets} from 'actions/assets';
-import {setActiveTab, toggleModal, singleView} from 'actions/moderation';
+import {setActiveTab, toggleModal, singleView, showBanUserDialog, hideBanUserDialog} from 'actions/moderation';
 
 import {Spinner} from 'coral-ui';
+import BanUserDialog from '../../components/BanUserDialog';
 import ModerationQueue from './ModerationQueue';
 import ModerationMenu from './components/ModerationMenu';
 import ModerationHeader from './components/ModerationHeader';
@@ -42,7 +44,7 @@ class ModerationContainer extends Component {
   }
 
   render () {
-    const {data, moderation, settings, assets} = this.props;
+    const {data, moderation, settings, assets, ...props} = this.props;
     const providedAssetId = this.props.params.id;
     let asset;
 
@@ -59,11 +61,12 @@ class ModerationContainer extends Component {
     }
 
     const enablePremodTab = !!data.premod.length;
+    console.log(props.banUser);
     return (
       <div>
         <ModerationHeader asset={asset} />
         <ModerationMenu
-          onTabClick={this.props.onTabClick}
+          onTabClick={props.onTabClick}
           enablePremodTab={enablePremodTab}
           {...moderation} />
         <ModerationQueue
@@ -71,6 +74,13 @@ class ModerationContainer extends Component {
           activeTab={moderation.activeTab}
           enablePremodTab={enablePremodTab}
           suspectWords={settings.wordlist.suspect}
+          showBanUserDialog={props.showBanUserDialog}
+        />
+        <BanUserDialog
+          open={moderation.banDialog}
+          user={moderation.user}
+          handleClose={props.hideBanUserDialog}
+          handleBanUser={props.banUser}
         />
       </div>
     );
@@ -89,10 +99,13 @@ const mapDispatchToProps = dispatch => ({
   onClose: () => dispatch(toggleModal(false)),
   singleView: () => dispatch(singleView()),
   updateAssets: assets => dispatch(updateAssets(assets)),
-  fetchSettings: () => dispatch(fetchSettings())
+  fetchSettings: () => dispatch(fetchSettings()),
+  showBanUserDialog: (user, commentId) => dispatch(showBanUserDialog(user, commentId)),
+  hideBanUserDialog: () => dispatch(hideBanUserDialog(false)),
 });
 
 export default compose(
   connect(mapStateToProps, mapDispatchToProps),
-  modQueueQuery
+  modQueueQuery,
+  banUser
 )(ModerationContainer);
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainerOld.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainerOld.js
deleted file mode 100644
index 50e45124d..000000000
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainerOld.js
+++ /dev/null
@@ -1,132 +0,0 @@
-import React from 'react';
-import key from 'keymaster';
-import {connect} from 'react-redux';
-import {compose} from 'react-apollo';
-
-import {modQueueQuery} from '../../graphql/queries';
-
-import {
-  updateStatus,
-  showBanUserDialog,
-  hideBanUserDialog,
-  fetchPremodQueue,
-  fetchRejectedQueue,
-  fetchFlaggedQueue,
-  fetchModerationQueueComments,
-} from 'actions/comments';
-
-import {fetchSettings} from 'actions/settings';
-import {userStatusUpdate, sendNotificationEmail} from 'actions/users';
-import {setActiveTab, toggleModal, singleView} from 'actions/moderation';
-
-import ModerationQueue from './ModerationQueue';
-
-class ModerationContainer extends React.Component {
-
-  componentWillMount() {
-    const {toggleModal, singleView} = this.props;
-
-    this.props.fetchModerationQueueComments();
-    this.props.fetchSettings();
-
-    key('s', () => singleView());
-    key('shift+/', () => toggleModal(true));
-    key('esc', () => toggleModal(false));
-  }
-
-  componentWillUnmount() {
-    key.unbind('s');
-    key.unbind('shift+/');
-    key.unbind('esc');
-  }
-
-  onTabClick = (activeTab) => {
-    const {setActiveTab} = this.props;
-    setActiveTab(activeTab);
-
-    if (activeTab === 'premod') {
-      this.props.fetchPremodQueue();
-    } else if (activeTab === 'rejected') {
-      this.props.fetchRejectedQueue();
-    } else if (activeTab === 'flagged') {
-      this.props.fetchFlaggedQueue();
-    } else {
-      this.props.fetchModerationQueueComments();
-    }
-  }
-
-  onClose = () => {
-    const {toggleModal} = this.props;
-    toggleModal(false);
-  }
-
-  render () {
-    const {comments, actions, settings, moderation} = this.props;
-
-    // Remove all this filters
-    const premodIds = comments.ids.filter(id => comments.byId[id].status === 'PREMOD');
-    const rejectedIds = comments.ids.filter(id => comments.byId[id].status === 'REJECTED');
-    const flaggedIds = comments.ids.filter(id =>
-      comments.byId[id].flagged === true &&
-      comments.byId[id].status !== 'REJECTED' &&
-      comments.byId[id].status !== 'ACCEPTED'
-    );
-    const userActionIds = actions.ids.filter(id => actions.byId[id].item_type === 'USERS');
-
-    // show the Pre-Mod tab if premod is enabled globally OR there are pre-mod comments in the db.
-    let enablePremodTab = (settings.settings && settings.settings.moderation === 'PRE') || premodIds.length;
-
-    return (
-      <ModerationQueue
-        enablePremodTab={enablePremodTab}
-        onTabClick={this.onTabClick}
-        onClose={this.onClose}
-        premodIds={premodIds}
-        userActionIds={userActionIds}
-        rejectedIds={rejectedIds}
-        flaggedIds={flaggedIds}
-        {...this.props}
-        {...moderation}
-      />
-    );
-  }
-}
-
-ModerationContainer.contextTypes = {
-  router: React.PropTypes.func.isRequired
-};
-
-const mapStateToProps = state => ({
-  moderation: state.moderation.toJS(),
-  comments: state.comments.toJS(),
-  settings: state.settings.toJS(),
-  users: state.users.toJS(),
-  actions: state.actions.toJS()
-});
-
-const mapDispatchToProps = dispatch => ({
-  setActiveTab: tab => dispatch(setActiveTab(tab)),
-  toggleModal: open => dispatch(toggleModal(open)),
-  singleView: () => dispatch(singleView()),
-
-  fetchSettings: () => dispatch(fetchSettings()),
-  fetchModerationQueueComments: () => dispatch(fetchModerationQueueComments()),
-  fetchPremodQueue: () => dispatch(fetchPremodQueue()),
-  fetchRejectedQueue: () => dispatch(fetchRejectedQueue()),
-  fetchFlaggedQueue: () => dispatch(fetchFlaggedQueue()),
-  showBanUserDialog: (userId, userName, commentId) => dispatch(showBanUserDialog(userId, userName, commentId)),
-  hideBanUserDialog: () => dispatch(hideBanUserDialog(false)),
-  userStatusUpdate: (status, userId, commentId) => dispatch(userStatusUpdate(status, userId, commentId)).then(() => {
-    dispatch(fetchModerationQueueComments());
-  }),
-  suspendUser: (userId, subject, text) => dispatch(userStatusUpdate('suspended', userId))
-    .then(() => dispatch(sendNotificationEmail(userId, subject, text)))
-    .then(() => dispatch(fetchModerationQueueComments()))
-  ,
-  updateStatus: (action, comment) => dispatch(updateStatus(action, comment))
-});
-
-export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
-  modQueueQuery
-)(ModerationContainer);
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.css b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.css
deleted file mode 100644
index 84ee8b923..000000000
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.css
+++ /dev/null
@@ -1,53 +0,0 @@
-@custom-media --big-viewport (min-width: 780px);
-
-.listContainer {
-  max-width: 860px;
-  margin: 0 auto;
-}
-
-.tabBar {
-  background: #262626;
-  z-index: 5;
-}
-
-.tab {
-  flex: 1;
-  color: white;
-  text-transform: capitalize;
-  font-weight: 500;
-  font-size: 15px;
-  letter-spacing: 1px;
-  transition: border-bottom 200ms;
-}
-
-.active {
-  color: white;
-  box-sizing: border-box;
-  border-bottom: solid 5px #F36451;
-}
-
-.active > span {
-  color: white;
-}
-
-.active:after {
-  background: transparent !important;
-}
-
-.showShortcuts {
-  position: absolute;
-  right: 130px;
-  display: flex;
-  align-items: center;
-  font-size: 13px;
-
-  span {
-    margin-left: 7px;
-  }
-}
-
-@media (--big-viewport) {
-  .tab {
-    flex: none;
-  }
-}
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index 47d3d6745..41f0f80bd 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -1,24 +1,20 @@
 import React, {PropTypes} from 'react';
 
 import Comment from './components/Comment';
-
-const actionsMap = {
-  premod: ['reject', 'approve', 'ban']
-};
+import {actionsMap} from './helpers/moderationQueueActionsMap';
 
 const ModerationQueue = props => {
-  console.log(props);
   return (
     <div>
       <ul>
       {
         props.data[props.activeTab].map((comment, i) => {
-          console.log(props.asset);
           return <Comment
             key={i}
             index={i}
             suspectWords={props.suspectWords}
-            actionsMap={actionsMap}
+            actions={actionsMap[comment.status]}
+            showBanUserDialog={props.showBanUserDialog}
             {...comment}
           />;
         })
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueueOld.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueueOld.js
deleted file mode 100644
index 09b02daed..000000000
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueueOld.js
+++ /dev/null
@@ -1,212 +0,0 @@
-import React, {PropTypes} from 'react';
-import styles from './ModerationQueue.css';
-
-import ModerationKeysModal from 'components/ModerationKeysModal';
-import ModerationList from 'components/ModerationList';
-import BanUserDialog from 'components/BanUserDialog';
-
-import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from '../../translations.json';
-
-const lang = new I18n(translations);
-
-const ModerationQueue = (props) => (
-  <div>
-    <div className='mdl-tabs'>
-      <div className={`mdl-tabs__tab-bar ${styles.tabBar}`}>
-        <a href='#all'
-           onClick={(e) => {
-             e.preventDefault();
-             props.onTabClick('all');
-           }}
-           className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'all' ? styles.active : ''}`}
-        >
-          {lang.t('modqueue.all')}
-        </a>
-        {
-          props.enablePremodTab
-          ? <a href='#premod'
-             onClick={(e) => {
-               e.preventDefault();
-               props.onTabClick('premod');
-             }}
-             className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'premod' ? styles.active : ''}`}>
-            {lang.t('modqueue.premod')}
-          </a>
-          : null
-        }
-        <a href='#account'
-          onClick={(e) => {
-            e.preventDefault();
-            props.onTabClick('account');
-          }}
-         className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'account' ? styles.active : ''}`}>
-         {lang.t('modqueue.account')}
-       </a>
-        <a href='#rejected'
-           onClick={(e) => {
-             e.preventDefault();
-             props.onTabClick('rejected');
-           }}
-           className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'rejected' ? styles.active : ''}`}
-        >
-          {lang.t('modqueue.rejected')}
-        </a>
-        <a href='#flagged'
-           onClick={(e) => {
-             e.preventDefault();
-             props.onTabClick('flagged');
-           }}
-           className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'flagged' ? styles.active : ''}`}
-        >
-          {lang.t('modqueue.flagged')}
-        </a>
-      </div>
-      <div className={`mdl-tabs__panel is-active ${styles.listContainer}`} id='all'>
-        {
-          props.activeTab === 'all' &&
-          <div>
-            <ModerationList
-              suspectWords={props.settings.settings.wordlist.suspect}
-              isActive={props.activeTab === 'all'}
-              singleView={props.singleView}
-              commentIds={[...props.premodIds, ...props.flaggedIds]}
-              comments={props.comments.byId}
-              users={props.users.byId}
-              actionIds={props.userActionIds}
-              actions={props.actions.byId}
-              userStatusUpdate={props.userStatusUpdate}
-              suspendUser={props.suspendUser}
-              updateCommentStatus={props.updateStatus}
-              onClickShowBanDialog={props.showBanUserDialog}
-              modActions={['reject', 'approve', 'ban']}
-              loading={props.comments.loading}/>
-            <BanUserDialog
-              open={props.comments.showBanUserDialog}
-              handleClose={props.hideBanUserDialog}
-              onClickBanUser={props.userStatusUpdate}
-              user={props.comments.banUser}
-            />
-          </div>
-        }
-      </div>
-      {
-        props.enablePremodTab
-        ? <div className={`mdl-tabs__panel is-active ${styles.listContainer}`} id='premod'>
-          {
-            props.activeTab === 'premod' &&
-            <div>
-              <ModerationList
-                suspectWords={props.settings.settings.wordlist.suspect}
-                isActive={props.activeTab === 'premod'}
-                singleView={props.singleView}
-                commentIds={props.premodIds}
-                comments={props.comments.byId}
-                users={props.users.byId}
-                actions={props.actions.byId}
-                userStatusUpdate={props.userStatusUpdate}
-                suspendUser={props.suspendUser}
-                updateCommentStatus={props.updateStatus}
-                onClickShowBanDialog={props.showBanUserDialog}
-                modActions={['reject', 'approve', 'ban']}
-                loading={props.comments.loading}/>
-              <BanUserDialog
-                open={props.comments.showBanUserDialog}
-                handleClose={props.hideBanUserDialog}
-                onClickBanUser={props.userStatusUpdate}
-                user={props.comments.banUser}
-              />
-            </div>
-          }
-        </div>
-        : null
-      }
-
-      <div className={`mdl-tabs__panel ${styles.listContainer}`} id='account'>
-        {
-          props.activeTab === 'account' &&
-          <div>
-            <ModerationList
-              suspectWords={props.settings.settings.wordlist.suspect}
-              isActive={props.activeTab === 'account'}
-              singleView={props.singleView}
-              users={props.users.byId}
-              actionIds={props.userActionIds}
-              actions={props.actions.byId}
-              userStatusUpdate={props.userStatusUpdate}
-              suspendUser={props.suspendUser}
-              updateCommentStatus={props.updateStatus}
-              onClickShowBanDialog={props.showBanUserDialog}
-              modActions={['reject', 'approve', 'ban']}
-              loading={props.comments.loading}/>
-            <BanUserDialog
-              open={props.comments.showBanUserDialog}
-              handleClose={props.hideBanUserDialog}
-              onClickBanUser={props.userStatusUpdate}
-              user={props.comments.banUser}
-            />
-          </div>
-        }
-      </div>
-      <div className={`mdl-tabs__panel ${styles.listContainer}`} id='flagged'>
-      {
-        props.activeTab === 'flagged' &&
-        <div>
-          <ModerationList
-            suspectWords={props.settings.settings.wordlist.suspect}
-            isActive={props.activeTab === 'flagged'}
-            singleView={props.singleView}
-            commentIds={props.flaggedIds}
-            userStatusUpdate={props.userStatusUpdate}
-            suspendUser={props.suspendUser}
-            comments={props.comments.byId}
-            users={props.users.byId}
-            updateCommentStatus={props.updateStatus}
-            modActions={['reject', 'approve']}
-            loading={props.comments.loading}/>
-          <BanUserDialog
-            open={props.comments.showBanUserDialog}
-            handleClose={props.hideBanUserDialog}
-            onClickBanUser={props.userStatusUpdate}
-            user={props.comments.banUser}
-          />
-        </div>
-        }
-       </div>
-       <div className={`mdl-tabs__panel ${styles.listContainer}`} id='rejected'>
-       {
-         props.activeTab === 'rejected' &&
-         <div>
-           <ModerationList
-             suspectWords={props.settings.settings.wordlist.suspect}
-             isActive={props.activeTab === 'rejected'}
-             singleView={props.singleView}
-             commentIds={props.rejectedIds}
-             userStatusUpdate={props.userStatusUpdate}
-             suspendUser={props.suspendUser}
-             comments={props.comments.byId}
-             users={props.users.byId}
-             updateCommentStatus={props.updateStatus}
-             modActions={['approve']}
-             loading={props.comments.loading}
-           />
-           <BanUserDialog
-             open={props.comments.showBanUserDialog}
-             handleClose={props.hideBanUserDialog}
-             onClickBanUser={props.userStatusUpdate}
-             user={props.comments.banUser}
-           />
-         </div>
-       }
-       </div>
-
-      <ModerationKeysModal open={props.modalOpen} onClose={props.closeModal} />
-    </div>
-  </div>
-);
-
-ModerationQueue.propTypes = {
-  enablePremodTab: PropTypes.bool.isRequired
-};
-
-export default ModerationQueue;
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index 48f8839a4..7467aa677 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -5,16 +5,17 @@ import Highlighter from 'react-highlight-words';
 import {Link} from 'react-router';
 
 import styles from './styles.css';
-
 import {Icon} from 'coral-ui';
-
 import ActionButton from '../../../components/ActionButton';
+const linkify = new Linkify();
+const lang = new I18n(translations);
 
 import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from '../../../translations.json';
+import translations from 'coral-admin/src/translations.json';
 
 const Comment = props => {
   const links = linkify.getMatches(props.body);
+
   return (
     <li tabIndex={props.index}
         className={`mdl-card mdl-shadow--2dp ${styles.Comment} ${styles.listItem} ${props.isActive && !props.hideActive ? styles.activeItem : ''}`}>
@@ -28,11 +29,13 @@ const Comment = props => {
         </div>
         <div className={styles.sideActions}>
           {links ? <span className={styles.hasLinks}><Icon name='error_outline'/> Contains Link</span> : null}
-          <div className={`actions ${styles.actions}`}>
-            <ActionButton type="reject" user={props.user} />
-            <ActionButton type="approve" user={props.user} />
-            <ActionButton type="ban" user={props.user} />
-          </div>
+           <div className={`actions ${styles.actions}`}>
+             {props.actions.map((action, i) =>
+               <ActionButton type={action} user={props.user} key={i}
+                 showBanUserDialog={() => props.showBanUserDialog(props.user, props.id)}
+               />
+             )}
+           </div>
           {props.user.banned === 'banned' ?
             <span className={styles.banned}>
               <Icon name='error_outline'/>
@@ -42,9 +45,9 @@ const Comment = props => {
         </div>
       </div>
 
-       <div className={styles.moderateArticle}>
-         {props.asset.title} <Link to={`/admin/moderate/${props.asset.id}`}>Moderate Article</Link>
-       </div>
+     <div className={styles.moderateArticle}>
+       {props.asset.title} <Link to={`/admin/moderate/${props.asset.id}`}>Moderate Article</Link>
+     </div>
 
       <div className={styles.itemBody}>
         <p className={styles.body}>
@@ -53,9 +56,11 @@ const Comment = props => {
           </Linkify>
         </p>
       </div>
+
       {/* <span className={styles.context}>*/}
        {/* <a>View context</a>*/}
      {/* </span>*/}
+
     </li>
   );
 };
@@ -65,9 +70,6 @@ const linkStyles = {
   padding: '1px 2px'
 };
 
-const linkify = new Linkify();
-const lang = new I18n(translations);
-
 Comment.propTypes = {
   user: PropTypes.object.isRequired,
   asset: PropTypes.object.isRequired
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
index 803f62ecd..51605c443 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
@@ -1,7 +1,7 @@
 import React, {PropTypes} from 'react';
-import styles from '../ModerationQueue.css';
+import styles from './styles.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from '../../../translations.json';
+import translations from 'coral-admin/src/translations.json';
 
 const lang = new I18n(translations);
 
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index f87efec24..3290b6e1f 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -1,3 +1,57 @@
+@custom-media --big-viewport (min-width: 780px);
+
+.listContainer {
+  max-width: 860px;
+  margin: 0 auto;
+}
+
+.tabBar {
+  background: #262626;
+  z-index: 5;
+}
+
+.tab {
+  flex: 1;
+  color: white;
+  text-transform: capitalize;
+  font-weight: 500;
+  font-size: 15px;
+  letter-spacing: 1px;
+  transition: border-bottom 200ms;
+}
+
+.active {
+  color: white;
+  box-sizing: border-box;
+  border-bottom: solid 5px #F36451;
+}
+
+.active > span {
+  color: white;
+}
+
+.active:after {
+  background: transparent !important;
+}
+
+.showShortcuts {
+  position: absolute;
+  right: 130px;
+  display: flex;
+  align-items: center;
+  font-size: 13px;
+
+span {
+  margin-left: 7px;
+}
+}
+
+@media (--big-viewport) {
+  .tab {
+    flex: none;
+  }
+}
+
 .notFound {
   position: relative;
   margin: 20px auto;
@@ -238,18 +292,6 @@
   margin-top: 5px;
 }
 
-.banButton {
-  width: 114px;
-  letter-spacing: 1px;
-
-  i {
-    vertical-align: middle;
-    margin-right: 10px;
-    font-size: 14px;
-  }
-}
-
-
 .Comment {
   .moderateArticle {
     padding: 10px 0px;
@@ -270,3 +312,5 @@
     }
   }
 }
+
+
diff --git a/client/coral-admin/src/containers/ModerationQueue/helpers/moderationQueueActionsMap.js b/client/coral-admin/src/containers/ModerationQueue/helpers/moderationQueueActionsMap.js
new file mode 100644
index 000000000..0da93e898
--- /dev/null
+++ b/client/coral-admin/src/containers/ModerationQueue/helpers/moderationQueueActionsMap.js
@@ -0,0 +1,13 @@
+export const actionsMap = {
+  PREMOD: ['REJECT', 'APPROVE', 'BAN'],
+  FLAGGED: ['REJECT', 'APPROVE'],
+  REJECTED: ['APPROVE']
+};
+
+export const menuActionsMap = {
+  'REJECT': {status: 'REJECTED', icon: 'close', key: 'r'},
+  'APPROVE': {status: 'ACCEPTED', icon: 'done', key: 't'},
+  'FLAGGED': {status: 'FLAGGED', icon: 'flag', filter: 'Untouched'},
+  'BAN': {status: 'BANNED', icon: 'not interested'},
+  '': {icon: 'done'}
+};
diff --git a/client/coral-admin/src/graphql/fragments/commentView.graphql b/client/coral-admin/src/graphql/fragments/commentView.graphql
index ced2f89fc..c31e67fb1 100644
--- a/client/coral-admin/src/graphql/fragments/commentView.graphql
+++ b/client/coral-admin/src/graphql/fragments/commentView.graphql
@@ -12,12 +12,4 @@ fragment commentView on Comment {
       id
       title
     }
-    actions {
-        type: action_type
-        count
-        current: current_user {
-            id
-            created_at
-        }
-    }
 }
diff --git a/client/coral-admin/src/graphql/mutations/index.js b/client/coral-admin/src/graphql/mutations/index.js
index 3c6b8923c..372f87e56 100644
--- a/client/coral-admin/src/graphql/mutations/index.js
+++ b/client/coral-admin/src/graphql/mutations/index.js
@@ -1,2 +1,16 @@
 // acceptComment
 // rejectComment
+import {graphql} from 'react-apollo';
+import SET_USER_STATUS from './setUserStatus.graphql';
+
+export const banUser = graphql(SET_USER_STATUS, {
+  props: ({mutate}) => ({
+    banUser: ({userId}) => {
+      return mutate({
+        variables: {
+          userId,
+          status: 'BANNED'
+        }
+      });
+    }}),
+});
diff --git a/client/coral-admin/src/graphql/mutations/setUserStatus.graphql b/client/coral-admin/src/graphql/mutations/setUserStatus.graphql
new file mode 100644
index 000000000..0ebaf54fd
--- /dev/null
+++ b/client/coral-admin/src/graphql/mutations/setUserStatus.graphql
@@ -0,0 +1,3 @@
+mutation setUserStatus($userId: ID!, $status: USER_STATUS!) {
+  setUserStatus(id: $userId, status: $status)
+}
diff --git a/client/coral-admin/src/reducers/moderation.js b/client/coral-admin/src/reducers/moderation.js
index 3f04abfc6..3131f6096 100644
--- a/client/coral-admin/src/reducers/moderation.js
+++ b/client/coral-admin/src/reducers/moderation.js
@@ -4,11 +4,24 @@ import * as actions from '../constants/moderation';
 const initialState = Map({
   activeTab: 'all',
   singleView: false,
-  modalOpen: false
+  modalOpen: false,
+  user: Map({}),
+  commentId: null,
+  banDialog: false
 });
 
 export default function moderation (state = initialState, action) {
   switch (action.type) {
+  case actions.HIDE_BANUSER_DIALOG:
+    return state
+      .set('banDialog', false);
+  case actions.SHOW_BANUSER_DIALOG:
+    return state
+      .merge({
+        user: Map(action.user),
+        commentId: action.commentId,
+        banDialog: true
+      });
   case actions.SET_ACTIVE_TAB:
     return state
       .set('activeTab', action.activeTab);
diff --git a/client/coral-docs/src/index.js b/client/coral-docs/src/index.js
new file mode 100644
index 000000000..5d8c49d9d
--- /dev/null
+++ b/client/coral-docs/src/index.js
@@ -0,0 +1,8 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import {GraphQLDocs} from 'graphql-docs';
+
+import fetcher from './services/fetcher';
+
+// Render the application into the DOM
+ReactDOM.render(<GraphQLDocs fetcher={fetcher} />, document.querySelector('#root'));
diff --git a/client/coral-docs/src/services/fetcher.js b/client/coral-docs/src/services/fetcher.js
new file mode 100644
index 000000000..e4d6f091d
--- /dev/null
+++ b/client/coral-docs/src/services/fetcher.js
@@ -0,0 +1,10 @@
+export default function fetcher(query) {
+  return fetch(`${window.location.host}/api/v1/graph/ql`, {
+    method: 'POST',
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({query}),
+  }).then((res) => res.json());
+}
diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index c0c0d57d1..3bf787a9c 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -10,6 +10,8 @@ import React, {PropTypes} from 'react';
 import PermalinkButton from 'coral-plugin-permalinks/PermalinkButton';
 
 import AuthorName from 'coral-plugin-author-name/AuthorName';
+
+import TagLabel from 'coral-plugin-tag-label/TagLabel';
 import Content from 'coral-plugin-commentcontent/CommentContent';
 import PubDate from 'coral-plugin-pubdate/PubDate';
 import {ReplyBox, ReplyButton} from 'coral-plugin-replies';
@@ -18,7 +20,9 @@ import LikeButton from 'coral-plugin-likes/LikeButton';
 
 import styles from './Comment.css';
 
-const getAction = (type, comment) => comment.actions.filter((a) => a.type === type)[0];
+const getActionSummary = (type, comment) => comment.action_summaries
+  .filter((a) => a.__typename === type)[0];
+const isStaff = (tags) => !tags.every((t) => t.name !== 'STAFF') ;
 
 class Comment extends React.Component {
 
@@ -35,7 +39,8 @@ class Comment extends React.Component {
     setActiveReplyBox: PropTypes.func.isRequired,
     refetch: PropTypes.func.isRequired,
     showSignInDialog: PropTypes.func.isRequired,
-    postAction: PropTypes.func.isRequired,
+    postFlag: PropTypes.func.isRequired,
+    postLike: PropTypes.func.isRequired,
     deleteAction: PropTypes.func.isRequired,
     parentId: PropTypes.string,
     addNotification: PropTypes.func.isRequired,
@@ -51,15 +56,19 @@ class Comment extends React.Component {
     }),
     comment: PropTypes.shape({
       depth: PropTypes.number,
-      actions: PropTypes.array.isRequired,
+      action_summaries: PropTypes.array.isRequired,
       body: PropTypes.string.isRequired,
       id: PropTypes.string.isRequired,
+      tags: PropTypes.arrayOf(
+        PropTypes.shape({
+          name: PropTypes.string
+        })
+      ),
       replies: PropTypes.arrayOf(
         PropTypes.shape({
           body: PropTypes.string.isRequired,
           id: PropTypes.string.isRequired
-        })
-      ),
+        })),
       user: PropTypes.shape({
         id: PropTypes.string.isRequired,
         name: PropTypes.string.isRequired
@@ -78,14 +87,15 @@ class Comment extends React.Component {
       refetch,
       addNotification,
       showSignInDialog,
-      postAction,
+      postLike,
+      postFlag,
       setActiveReplyBox,
       activeReplyBox,
       deleteAction
     } = this.props;
 
-    const like = getAction('LIKE', comment);
-    const flag = getAction('FLAG', comment);
+    const like = getActionSummary('LikeActionSummary', comment);
+    const flag = getActionSummary('FlagActionSummary', comment);
 
     return (
       <div
@@ -95,13 +105,16 @@ class Comment extends React.Component {
         <hr aria-hidden={true} />
         <AuthorName
           author={comment.user}/>
+        { isStaff(comment.tags)
+          ? <TagLabel isStaff={true}/>
+          : null }
         <PubDate created_at={comment.created_at} />
         <Content body={comment.body} />
           <div className="commentActionsLeft">
               <LikeButton
                 like={like}
                 id={comment.id}
-                postAction={postAction}
+                postLike={postLike}
                 deleteAction={deleteAction}
                 showSignInDialog={showSignInDialog}
                 currentUser={currentUser} />
@@ -117,7 +130,7 @@ class Comment extends React.Component {
             flag={flag}
             id={comment.id}
             author_id={comment.user.id}
-            postAction={postAction}
+            postFlag={postFlag}
             deleteAction={deleteAction}
             showSignInDialog={showSignInDialog}
             currentUser={currentUser} />
@@ -150,7 +163,8 @@ class Comment extends React.Component {
               depth={depth + 1}
               asset={asset}
               currentUser={currentUser}
-              postAction={postAction}
+              postLike={postLike}
+              postFlag={postFlag}
               deleteAction={deleteAction}
               showSignInDialog={showSignInDialog}
               reactKey={reply.id}
@@ -158,7 +172,6 @@ class Comment extends React.Component {
               comment={reply} />;
           })
         }
-
       </div>
     );
   }
diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index 2def22ce8..236e677e8 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -10,7 +10,7 @@ const {addNotification, clearNotification} = notificationActions;
 const {fetchAssetSuccess} = assetActions;
 
 import {queryStream} from 'coral-framework/graphql/queries';
-import {postComment, postAction, deleteAction} from 'coral-framework/graphql/mutations';
+import {postComment, postFlag, postLike, deleteAction} from 'coral-framework/graphql/mutations';
 import {editName} from 'coral-framework/actions/user';
 import {Notification, notificationActions, authActions, assetActions, pym} from 'coral-framework';
 
@@ -92,7 +92,7 @@ class Embed extends Component {
       minHeight: document.body.scrollHeight + 200
     } : {};
 
-    if (loading) {
+    if (loading || !asset) {
       return <Spinner />;
     }
 
@@ -148,7 +148,8 @@ class Embed extends Component {
               postItem={this.props.postItem}
               asset={asset}
               currentUser={user}
-              postAction={this.props.postAction}
+              postLike={this.props.postLike}
+              postFlag={this.props.postFlag}
               deleteAction={this.props.deleteAction}
               showSignInDialog={this.props.showSignInDialog}
               comments={asset.comments} />
@@ -211,7 +212,8 @@ const mapDispatchToProps = dispatch => ({
 export default compose(
   connect(mapStateToProps, mapDispatchToProps),
   postComment,
-  postAction,
+  postFlag,
+  postLike,
   deleteAction,
   queryStream
 )(Embed);
diff --git a/client/coral-embed-stream/src/Stream.js b/client/coral-embed-stream/src/Stream.js
index 65743e6c7..53b54d4ba 100644
--- a/client/coral-embed-stream/src/Stream.js
+++ b/client/coral-embed-stream/src/Stream.js
@@ -37,7 +37,8 @@ class Stream extends React.Component {
       asset,
       postItem,
       addNotification,
-      postAction,
+      postFlag,
+      postLike,
       deleteAction,
       showSignInDialog,
       refetch
@@ -56,7 +57,8 @@ class Stream extends React.Component {
               postItem={postItem}
               asset={asset}
               currentUser={currentUser}
-              postAction={postAction}
+              postLike={postLike}
+              postFlag={postFlag}
               deleteAction={deleteAction}
               showSignInDialog={showSignInDialog}
               key={comment.id}
diff --git a/client/coral-framework/graphql/fragments/actionSummaryView.graphql b/client/coral-framework/graphql/fragments/actionSummaryView.graphql
new file mode 100644
index 000000000..4ac232bf6
--- /dev/null
+++ b/client/coral-framework/graphql/fragments/actionSummaryView.graphql
@@ -0,0 +1,8 @@
+fragment actionSummaryView on ActionSummary {
+  __typename
+  count
+  current_user {
+    id
+    created_at
+  }
+}
diff --git a/client/coral-framework/graphql/fragments/commentView.graphql b/client/coral-framework/graphql/fragments/commentView.graphql
index 29f9b3bfe..123ce9a09 100644
--- a/client/coral-framework/graphql/fragments/commentView.graphql
+++ b/client/coral-framework/graphql/fragments/commentView.graphql
@@ -1,18 +1,18 @@
+#import "../fragments/actionSummaryView.graphql"
+
 fragment commentView on Comment {
     id
     body
     created_at
     status
+    tags {
+      name
+    }
     user {
         id
         name: displayName
     }
-    actions {
-        type: action_type
-        count
-        current: current_user {
-            id
-            created_at
-        }
+    action_summaries {
+      ...actionSummaryView
     }
 }
diff --git a/client/coral-framework/graphql/mutations/deleteAction.graphql b/client/coral-framework/graphql/mutations/deleteAction.graphql
index bfce8cf6a..f8adf371c 100644
--- a/client/coral-framework/graphql/mutations/deleteAction.graphql
+++ b/client/coral-framework/graphql/mutations/deleteAction.graphql
@@ -1,3 +1,7 @@
 mutation deleteAction ($id: ID!) {
-    deleteAction(id:$id)
+    deleteAction(id:$id) {
+      errors {
+        translation_key
+      }
+    }
 }
diff --git a/client/coral-framework/graphql/mutations/index.js b/client/coral-framework/graphql/mutations/index.js
index b97e5ff22..40ca0a7a3 100644
--- a/client/coral-framework/graphql/mutations/index.js
+++ b/client/coral-framework/graphql/mutations/index.js
@@ -1,6 +1,7 @@
 import {graphql} from 'react-apollo';
 import POST_COMMENT from './postComment.graphql';
-import POST_ACTION from './postAction.graphql';
+import POST_FLAG from './postFlag.graphql';
+import POST_LIKE from './postLike.graphql';
 import DELETE_ACTION from './deleteAction.graphql';
 
 import commentView from '../fragments/commentView.graphql';
@@ -21,12 +22,23 @@ export const postComment = graphql(POST_COMMENT, {
     }}),
 });
 
-export const postAction = graphql(POST_ACTION, {
+export const postLike = graphql(POST_LIKE, {
   props: ({mutate}) => ({
-    postAction: (action) => {
+    postLike: (like) => {
       return mutate({
         variables: {
-          action
+          like
+        }
+      });
+    }}),
+});
+
+export const postFlag = graphql(POST_FLAG, {
+  props: ({mutate}) => ({
+    postFlag: (flag) => {
+      return mutate({
+        variables: {
+          flag
         }
       });
     }}),
diff --git a/client/coral-framework/graphql/mutations/postAction.graphql b/client/coral-framework/graphql/mutations/postAction.graphql
deleted file mode 100644
index fff737fa8..000000000
--- a/client/coral-framework/graphql/mutations/postAction.graphql
+++ /dev/null
@@ -1,5 +0,0 @@
-mutation CreateAction ($action: CreateActionInput!) {
-    createAction(action:$action) {
-        id
-    }
-}
diff --git a/client/coral-framework/graphql/mutations/postComment.graphql b/client/coral-framework/graphql/mutations/postComment.graphql
index 499871766..6ce46eaa8 100644
--- a/client/coral-framework/graphql/mutations/postComment.graphql
+++ b/client/coral-framework/graphql/mutations/postComment.graphql
@@ -2,6 +2,11 @@
 
 mutation CreateComment ($asset_id: ID!, $parent_id: ID, $body: String!) {
     createComment(asset_id:$asset_id, parent_id:$parent_id, body:$body) {
-        ...commentView
+        comment {
+          ...commentView
+        }
+        errors {
+          translation_key
+        }
     }
 }
diff --git a/client/coral-framework/graphql/mutations/postFlag.graphql b/client/coral-framework/graphql/mutations/postFlag.graphql
new file mode 100644
index 000000000..cabc2feef
--- /dev/null
+++ b/client/coral-framework/graphql/mutations/postFlag.graphql
@@ -0,0 +1,10 @@
+mutation CreateFlag($flag: CreateFlagInput!) {
+  createFlag(flag:$flag) {
+    flag {
+      id
+    }
+    errors {
+      translation_key
+    }
+  }
+}
diff --git a/client/coral-framework/graphql/mutations/postLike.graphql b/client/coral-framework/graphql/mutations/postLike.graphql
new file mode 100644
index 000000000..350904352
--- /dev/null
+++ b/client/coral-framework/graphql/mutations/postLike.graphql
@@ -0,0 +1,10 @@
+mutation CreateLike ($like: CreateLikeInput!) {
+  createLike(like:$like) {
+    like {
+      id
+    }
+    errors {
+      translation_key
+    }
+  }
+}
diff --git a/client/coral-framework/graphql/queries/index.js b/client/coral-framework/graphql/queries/index.js
index 7ce065baa..ffd7dfdc9 100644
--- a/client/coral-framework/graphql/queries/index.js
+++ b/client/coral-framework/graphql/queries/index.js
@@ -13,7 +13,7 @@ function getQueryVariable(variable) {
   }
 
   // If no query is included, return a default string for development
-  return 'http://dev.default.stream';
+  return 'http://localhost/default/stream';
 }
 
 export const queryStream = graphql(STREAM_QUERY, {
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index 41c8f75fb..344ade150 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -8,9 +8,6 @@ const name = 'coral-plugin-commentbox';
 class CommentBox extends Component {
 
   static propTypes = {
-
-    // updateItem: PropTypes.func,
-    // comments: PropTypes.array,
     commentPostedHandler: PropTypes.func,
     postItem: PropTypes.func.isRequired,
     cancelButtonClicked: PropTypes.func,
@@ -29,10 +26,6 @@ class CommentBox extends Component {
 
   postComment = () => {
     const {
-
-      // child_id,
-      // updateItem,
-      // appendItemArray,
       commentPostedHandler,
       postItem,
       assetId,
@@ -48,28 +41,13 @@ class CommentBox extends Component {
       parent_id: parentId
     };
 
-    // let related;
-    // let parent_type;
-    // if (parent_id) {
-    //   comment.parent_id = parent_id;
-    //   related = 'children';
-    //   parent_type = 'comments';
-    // } else {
-    //   related = 'comments';
-    //   parent_type = 'assets';
-    // }
-    // if (child_id || parent_id) {
-    //   updateItem(child_id || parent_id, 'showReply', false, 'comments');
-    // }
-
     if (this.props.charCount && this.state.body.length > this.props.charCount) {
       return;
     }
     postItem(comment, 'comments')
       .then(({data}) => {
-        const postedComment = data.createComment;
+        const postedComment = data.createComment.comment;
 
-        // const commentId = postedComment.id;
         if (postedComment.status === 'REJECTED') {
           addNotification('error', lang.t('comment-post-banned-word'));
         } else if (postedComment.status === 'PREMOD') {
diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js
index ec62f5396..e94dfc5fc 100644
--- a/client/coral-plugin-flags/FlagButton.js
+++ b/client/coral-plugin-flags/FlagButton.js
@@ -12,7 +12,7 @@ class FlagButton extends Component {
     showMenu: false,
     itemType: '',
     reason: '',
-    note: '',
+    message: '',
     step: 0,
     posted: false,
     localPost: null,
@@ -23,7 +23,7 @@ class FlagButton extends Component {
   onReportClick = () => {
     const {currentUser, flag, deleteAction} = this.props;
     const {localPost, localDelete} = this.state;
-    const flagged = (flag && flag.current && !localDelete) || localPost;
+    const flagged = (flag && flag.current_user && !localDelete) || localPost;
     if (!currentUser) {
       const offset = document.getElementById(`c_${this.props.id}`).getBoundingClientRect().top - 75;
       this.props.showSignInDialog(offset);
@@ -31,15 +31,15 @@ class FlagButton extends Component {
     }
     if (flagged) {
       this.setState((prev) => prev.localPost ? {...prev, localPost: null, step: 0} : {...prev, localDelete: true});
-      deleteAction(localPost || flag.current.id);
+      deleteAction(localPost || flag.current_user.id);
     } else {
       this.setState({showMenu: !this.state.showMenu});
     }
   }
 
   onPopupContinue = () => {
-    const {postAction, id, author_id} = this.props;
-    const {itemType, reason, step, posted} = this.state;
+    const {postFlag, id, author_id} = this.props;
+    const {itemType, reason, step, posted, message} = this.state;
 
     // Proceed to the next step or close the menu if we've reached the end
     if (step + 1 >= this.props.getPopupMenu.length) {
@@ -67,13 +67,14 @@ class FlagButton extends Component {
       if (itemType === 'COMMENTS') {
         this.setState({localPost: 'temp'});
       }
-      postAction({
+      postFlag({
         item_id,
         item_type: itemType,
-        action_type: 'FLAG'
+        reason,
+        message
       }).then(({data}) => {
         if (itemType === 'COMMENTS') {
-          this.setState({localPost: data.createAction.id});
+          this.setState({localPost: data.createFlag.flag.id});
         }
       });
     }
@@ -99,7 +100,7 @@ class FlagButton extends Component {
   }
 
   onNoteTextChange = (e) => {
-    this.setState({note: e.target.value});
+    this.setState({message: e.target.value});
   }
 
   handleClickOutside () {
@@ -109,7 +110,7 @@ class FlagButton extends Component {
   render () {
     const {flag, getPopupMenu} = this.props;
     const {localPost, localDelete} = this.state;
-    const flagged = (flag && flag.current && !localDelete) || localPost;
+    const flagged = (flag && flag.current_user && !localDelete) || localPost;
     const popupMenu = getPopupMenu[this.state.step](this.state.itemType);
 
     return <div className={`${name}-container`}>
@@ -150,15 +151,15 @@ class FlagButton extends Component {
                 }
                 {
                   this.state.reason && <div>
-                  <label htmlFor={'note'} className={`${name}-popup-radio-label`}>
+                  <label htmlFor={'message'} className={`${name}-popup-radio-label`}>
                     {lang.t('flag-reason')}
                   </label><br/>
                   <textarea
                       className={`${name}-reason-text`}
-                      id="note"
+                      id="message"
                       rows={4}
                       onChange={this.onNoteTextChange}
-                      value={this.state.note}/>
+                      value={this.state.message}/>
                   </div>
                 }
               </form>
diff --git a/client/coral-plugin-likes/LikeButton.js b/client/coral-plugin-likes/LikeButton.js
index 8d497bcef..9b3abfb00 100644
--- a/client/coral-plugin-likes/LikeButton.js
+++ b/client/coral-plugin-likes/LikeButton.js
@@ -12,7 +12,7 @@ class LikeButton extends Component {
       count: PropTypes.number
     }),
     id: PropTypes.string,
-    postAction: PropTypes.func.isRequired,
+    postLike: PropTypes.func.isRequired,
     deleteAction: PropTypes.func.isRequired,
     showSignInDialog: PropTypes.func.isRequired,
     currentUser: PropTypes.shape({
@@ -26,9 +26,9 @@ class LikeButton extends Component {
   }
 
   render() {
-    const {like, id, postAction, deleteAction, showSignInDialog, currentUser} = this.props;
+    const {like, id, postLike, deleteAction, showSignInDialog, currentUser} = this.props;
     const {localPost, localDelete} = this.state;
-    const liked = (like && like.current && !localDelete) || localPost;
+    const liked = (like && like.current_user && !localDelete) || localPost;
     let count = like ? like.count : 0;
     if (localPost) {count += 1;}
     if (localDelete) {count -= 1;}
@@ -42,28 +42,23 @@ class LikeButton extends Component {
       if (currentUser.banned) {
         return;
       }
-      if (!liked) {
-        this.setState({localPost: 'temp', localDelete: false});
-        postAction({
+      if (!liked) { // this comment has not yet been liked by this user.
+        this.setState({localPost: 'temp'});
+        postLike({
           item_id: id,
-          item_type: 'COMMENTS',
-          action_type: 'LIKE'
+          item_type: 'COMMENTS'
         }).then(({data}) => {
-          this.setState({localPost: data.createAction.id});
+          this.setState({localPost: data.createLike.like.id});
         });
       } else {
         this.setState((prev) => prev.localPost ? {...prev, localPost: null} : {...prev, localDelete: true});
-        deleteAction(localPost || like.current.id);
+        deleteAction(localPost || like.current_user.id);
       }
     };
 
     return <div className={`${name}-container`}>
       <button onClick={onLikeClick} className={`${name}-button ${liked && 'likedButton'}`}>
-        {
-          liked
-          ? <span className={`${name}-button-text`}>{lang.t('liked')}</span>
-        : <span className={`${name}-button-text`}>{lang.t('like')}</span>
-        }
+        <span className={`${name}-button-text`}>{lang.t(liked ? 'liked' : 'like')}</span>
         <i className={`${name}-icon material-icons`}
           aria-hidden={true}>thumb_up</i>
         <span className={`${name}-like-count`}>{count > 0 && count}</span>
diff --git a/client/coral-plugin-stream/Stream.js b/client/coral-plugin-stream/Stream.js
index 633a98502..c62ef7081 100644
--- a/client/coral-plugin-stream/Stream.js
+++ b/client/coral-plugin-stream/Stream.js
@@ -58,6 +58,9 @@ const StreamQuery = gql`fragment commentView on Comment {
   user {
     name: displayName
   }
+  tags {
+    name
+  }
   actions {
     type: action_type
     count
diff --git a/client/coral-plugin-tag-label/TagLabel.js b/client/coral-plugin-tag-label/TagLabel.js
new file mode 100644
index 000000000..0bceca225
--- /dev/null
+++ b/client/coral-plugin-tag-label/TagLabel.js
@@ -0,0 +1,9 @@
+import React from 'react';
+
+import styles from './styles.css';
+
+const TagLabel = ({isStaff}) => <div className={`${styles.staff}`}>
+  {isStaff ? 'Staff' : ''}
+</div>;
+
+export default TagLabel;
diff --git a/client/coral-plugin-tag-label/styles.css b/client/coral-plugin-tag-label/styles.css
new file mode 100644
index 000000000..03dc3dbc8
--- /dev/null
+++ b/client/coral-plugin-tag-label/styles.css
@@ -0,0 +1,7 @@
+.staff {
+  background-color: #4C1066;
+  color: white;
+  display: inline-block;
+  margin: 10px 10px;
+  padding: 5px 5px;
+}
diff --git a/errors.js b/errors.js
index 7ee932c96..7debe6a43 100644
--- a/errors.js
+++ b/errors.js
@@ -121,6 +121,7 @@ const ErrInvalidAssetURL = new APIError('asset_url is invalid', {
 // ErrNotAuthorized is an error that is returned in the event an operation is
 // deemed not authorized.
 const ErrNotAuthorized = new APIError('not authorized', {
+  translation_key: 'NOT_AUTHORIZED',
   status: 401
 });
 
diff --git a/graph/loaders/actions.js b/graph/loaders/actions.js
index c41f17219..2dd6472a0 100644
--- a/graph/loaders/actions.js
+++ b/graph/loaders/actions.js
@@ -5,6 +5,15 @@ const util = require('./util');
 const ActionsService = require('../../services/actions');
 const ActionModel = require('../../models/action');
 
+/**
+ * Gets actions based on their item id's.
+ */
+const genActionsByItemID = (_, item_ids) => {
+  return ActionsService
+    .findByItemIdArray(item_ids)
+    .then(util.arrayJoinBy(item_ids, 'item_id'));
+};
+
 /**
  * Looks up actions based on the requested id's all bounded by the user.
  * @param  {Object} context the context of the request
@@ -35,6 +44,7 @@ const getItemIdsByActionTypeAndItemType = (_, action_type, item_type) => {
  */
 module.exports = (context) => ({
   Actions: {
+    getByID: new DataLoader((ids) => genActionsByItemID(context, ids)),
     getSummariesByItemID: new DataLoader((ids) => genActionSummariessByItemID(context, ids)),
     getByTypes: ({action_type, item_type}) => getItemIdsByActionTypeAndItemType(context, action_type, item_type)
   }
diff --git a/graph/mutators/action.js b/graph/mutators/action.js
index b5264fd49..3499719e1 100644
--- a/graph/mutators/action.js
+++ b/graph/mutators/action.js
@@ -1,6 +1,7 @@
 const ActionModel = require('../../models/action');
 const ActionsService = require('../../services/actions');
 const UsersService = require('../../services/users');
+const errors = require('../../errors');
 
 /**
  * Creates an action on a item. If the item is a user flag, sets the user's status to
@@ -11,11 +12,12 @@ const UsersService = require('../../services/users');
  * @param  {String} action_type type of the action
  * @return {Promise}            resolves to the action created
  */
-const createAction = ({user = {}}, {item_id, item_type, action_type, metadata = {}}) => {
+const createAction = ({user = {}}, {item_id, item_type, action_type, group_id, metadata = {}}) => {
   return ActionsService.insertUserAction({
     item_id,
     item_type,
     user_id: user.id,
+    group_id,
     action_type,
     metadata
   }).then((action) => {
@@ -58,8 +60,8 @@ module.exports = (context) => {
 
   return {
     Action: {
-      create: () => {},
-      delete: () => {}
+      create: () => Promise.reject(errors.ErrNotAuthorized),
+      delete: () => Promise.reject(errors.ErrNotAuthorized)
     }
   };
 };
diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js
index 3c35b0e60..6214c9df8 100644
--- a/graph/mutators/comment.js
+++ b/graph/mutators/comment.js
@@ -36,6 +36,12 @@ const createComment = ({user, loaders: {Comments}}, {body, asset_id, parent_id =
       }
     }
 
+    if (user.hasRoles('ADMIN')) {
+      return CommentsService
+        .addTag(comment.id, 'STAFF', user.id)
+        .then(() => comment);
+    }
+
     return comment;
   });
 };
@@ -171,7 +177,7 @@ module.exports = (context) => {
 
   return {
     Comment: {
-      create: () => {}
+      create: () => Promise.reject(errors.ErrNotAuthorized)
     }
   };
 };
diff --git a/graph/resolvers/action.js b/graph/resolvers/action.js
index f8aa60245..0962f59af 100644
--- a/graph/resolvers/action.js
+++ b/graph/resolvers/action.js
@@ -1,4 +1,12 @@
 const Action = {
+  __resolveType({action_type}) {
+    switch (action_type) {
+    case 'FLAG':
+      return 'FlagAction';
+    case 'LIKE':
+      return 'LikeAction';
+    }
+  },
 
   // This will load the user for the specific action. We'll limit this to the
   // admin users only or the current logged in user.
diff --git a/graph/resolvers/action_summary.js b/graph/resolvers/action_summary.js
index 48eff50c7..93848d285 100644
--- a/graph/resolvers/action_summary.js
+++ b/graph/resolvers/action_summary.js
@@ -1,3 +1,12 @@
-const ActionSummary = {};
+const ActionSummary = {
+  __resolveType({action_type}) {
+    switch (action_type) {
+    case 'FLAG':
+      return 'FlagActionSummary';
+    case 'LIKE':
+      return 'LikeActionSummary';
+    }
+  },
+};
 
 module.exports = ActionSummary;
diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index 110067174..ef77ff6b5 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -16,7 +16,16 @@ const Comment = {
   replyCount({id}, _, {loaders: {Comments}}) {
     return Comments.countByParentID.load(id);
   },
-  actions({id}, _, {loaders: {Actions}}) {
+  actions({id}, _, {user, loaders: {Actions}}) {
+
+    // Only return the actions if the user is not an admin.
+    if (user && user.hasRoles('ADMIN')) {
+      return Actions.getByID.load(id);
+    }
+
+    return null;
+  },
+  action_summaries({id}, _, {loaders: {Actions}}) {
     return Actions.getSummariesByItemID.load(id);
   },
   asset({asset_id}, _, {loaders: {Assets}}) {
diff --git a/graph/resolvers/flag_action.js b/graph/resolvers/flag_action.js
new file mode 100644
index 000000000..44cf7a410
--- /dev/null
+++ b/graph/resolvers/flag_action.js
@@ -0,0 +1,9 @@
+const FlagAction = {
+
+  // Stored in the metadata, extract and return.
+  reason({metadata: {reason}}) {
+    return reason;
+  }
+};
+
+module.exports = FlagAction;
diff --git a/graph/resolvers/flag_action_summary.js b/graph/resolvers/flag_action_summary.js
new file mode 100644
index 000000000..58dda689e
--- /dev/null
+++ b/graph/resolvers/flag_action_summary.js
@@ -0,0 +1,7 @@
+const FlagActionSummary = {
+  reason({group_id}) {
+    return group_id;
+  }
+};
+
+module.exports = FlagActionSummary;
diff --git a/graph/resolvers/generic_user_error.js b/graph/resolvers/generic_user_error.js
new file mode 100644
index 000000000..45b656f5b
--- /dev/null
+++ b/graph/resolvers/generic_user_error.js
@@ -0,0 +1,3 @@
+const GenericUserError = {};
+
+module.exports = GenericUserError;
diff --git a/graph/resolvers/index.js b/graph/resolvers/index.js
index f25664f34..84dd10fdc 100644
--- a/graph/resolvers/index.js
+++ b/graph/resolvers/index.js
@@ -1,21 +1,33 @@
-const Action = require('./action');
 const ActionSummary = require('./action_summary');
+const Action = require('./action');
 const Asset = require('./asset');
 const Comment = require('./comment');
 const Date = require('./date');
+const FlagActionSummary = require('./flag_action_summary');
+const FlagAction = require('./flag_action');
+const GenericUserError = require('./generic_user_error');
+const LikeAction = require('./like_action');
 const RootMutation = require('./root_mutation');
 const RootQuery = require('./root_query');
 const Settings = require('./settings');
+const UserError = require('./user_error');
 const User = require('./user');
+const ValidationUserError = require('./validation_user_error');
 
 module.exports = {
-  Action,
   ActionSummary,
+  Action,
   Asset,
   Comment,
   Date,
+  FlagActionSummary,
+  FlagAction,
+  GenericUserError,
+  LikeAction,
   RootMutation,
   RootQuery,
   Settings,
-  User
+  UserError,
+  User,
+  ValidationUserError,
 };
diff --git a/graph/resolvers/like_action.js b/graph/resolvers/like_action.js
new file mode 100644
index 000000000..12d10f81e
--- /dev/null
+++ b/graph/resolvers/like_action.js
@@ -0,0 +1,5 @@
+const LikeAction = {
+
+};
+
+module.exports = LikeAction;
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index a1d25189b..dba537879 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -1,12 +1,31 @@
+/**
+ * Wraps up a promise to return an object with the resolution of the promise
+ * keyed at `key` or an error caught at `errors`.
+ */
+const wrapResponse = (key) => (promise) => {
+  return promise.then((value) => {
+    let res = {};
+    if (key) {
+      res[key] = value;
+    }
+    return res;
+  }).catch((err) => ({
+    errors: [err]
+  }));
+};
+
 const RootMutation = {
   createComment(_, {asset_id, parent_id, body}, {mutators: {Comment}}) {
-    return Comment.create({asset_id, parent_id, body});
+    return wrapResponse('comment')(Comment.create({asset_id, parent_id, body}));
   },
-  createAction(_, {action}, {mutators: {Action}}) {
-    return Action.create(action);
+  createLike(_, {like: {item_id, item_type}}, {mutators: {Action}}) {
+    return wrapResponse('like')(Action.create({item_id, item_type, action_type: 'LIKE'}));
+  },
+  createFlag(_, {flag: {item_id, item_type, reason, message}}, {mutators: {Action}}) {
+    return wrapResponse('flag')(Action.create({item_id, item_type, action_type: 'FLAG', group_id: reason, metadata: {message}}));
   },
   deleteAction(_, {id}, {mutators: {Action}}) {
-    return Action.delete({id});
+    return wrapResponse(null)(Action.delete({id}));
   },
   setUserStatus(_, {id, status}, {mutators: {User}}) {
     return User.setUserStatus({id, status});
diff --git a/graph/resolvers/user.js b/graph/resolvers/user.js
index c75cdbf54..13efe29e9 100644
--- a/graph/resolvers/user.js
+++ b/graph/resolvers/user.js
@@ -1,7 +1,15 @@
 const User = {
-  actions({id}, _, {loaders: {Actions}}) {
+  action_summaries({id}, _, {loaders: {Actions}}) {
     return Actions.getSummariesByItemID.load(id);
   },
+  actions({id}, _, {user, loaders: {Actions}}) {
+
+    // Only return the actions if the user is not an admin.
+    if (user && user.hasRoles('ADMIN')) {
+      return Actions.getByID.load(id);
+    }
+
+  },
   comments({id}, _, {loaders: {Comments}, user}) {
 
     // If the user is not an admin, only return comment list for the owner of
diff --git a/graph/resolvers/user_error.js b/graph/resolvers/user_error.js
new file mode 100644
index 000000000..3716fa126
--- /dev/null
+++ b/graph/resolvers/user_error.js
@@ -0,0 +1,11 @@
+const UserError = {
+  __resolveType({field_name}) {
+    if (field_name) {
+      return 'ValidationUserError';
+    }
+
+    return 'GenericUserError';
+  }
+};
+
+module.exports = UserError;
diff --git a/graph/resolvers/validation_user_error.js b/graph/resolvers/validation_user_error.js
new file mode 100644
index 000000000..211a0e505
--- /dev/null
+++ b/graph/resolvers/validation_user_error.js
@@ -0,0 +1,3 @@
+const ValidationUserError = {};
+
+module.exports = ValidationUserError;
diff --git a/graph/schema.js b/graph/schema.js
index b4b42b809..2fca1a87f 100644
--- a/graph/schema.js
+++ b/graph/schema.js
@@ -1,8 +1,15 @@
 const tools = require('graphql-tools');
+const maskErrors = require('graphql-errors').maskErrors;
 
 const resolvers = require('./resolvers');
 const typeDefs = require('./typeDefs');
 
 const schema = tools.makeExecutableSchema({typeDefs, resolvers});
 
+if (process.env.NODE_ENV === 'production') {
+
+  // Mask errors that are thrown if we are in a production environment.
+  maskErrors(schema);
+}
+
 module.exports = schema;
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index a655a77f3..d91dbbdd7 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -1,16 +1,97 @@
-# Establishes the ordering of the content by their created_at time stamp.
-enum SORT_ORDER {
-  # newest to oldest order.
-  REVERSE_CHRONOLOGICAL
-
-  # oldest to newer order.
-  CHRONOLOGICAL
-}
+################################################################################
+## Custom Scalar Types
+################################################################################
 
 # Date represented as an ISO8601 string.
 scalar Date
 
+
+################################################################################
+## Users
+################################################################################
+
+# Roles that a user can have, these can be combined.
+enum USER_ROLES {
+
+  # an administrator of the site
+  ADMIN
+
+  # a moderator of the site
+  MODERATOR
+}
+
+# Any person who can author comments, create actions, and view comments on a
+# stream.
+type User {
+
+  # The ID of the User.
+  id: ID!
+
+  # display name of a user.
+  displayName: String!
+
+  # Action summaries against the user.
+  action_summaries: [ActionSummary]
+
+  # Actions completed on the parent.
+  actions: [Action]
+
+  # the current roles of the user.
+  roles: [USER_ROLES]
+
+  # determines whether the user can edit their username
+  canEditName: Boolean
+
+  # returns all comments based on a query.
+  comments(query: CommentsQuery): [Comment]
+
+  # returns user status
+  status: USER_STATUS
+}
+
+type Tag {
+  # the actual tag for the comment.
+  name: String!
+
+  # the user that assigned the tag. If NULL then the system automatically tagged it.
+  assigned_by: String
+
+  # the time when the tag was assigned.
+  created_at: Date!
+}
+
+################################################################################
+## Comments
+################################################################################
+
+# The statuses that a comment may have.
+enum COMMENT_STATUS {
+
+  # The comment has been accepted by a moderator.
+  ACCEPTED
+
+  # The comment has been rejected by a moderator.
+  REJECTED
+
+  # The comment was created while the asset's premoderation option was on, and
+  # new comments that haven't been moderated yet are referred to as
+  # "premoderated" or "premod" comments.
+  PREMOD
+}
+
+# The types of action there are as enum's.
+enum ACTION_TYPE {
+
+  # Represents a LikeAction.
+  LIKE
+
+  # Represents a FlagAction.
+  FLAG
+}
+
+# CommentsQuery allows the ability to query comments by a specific methods.
 input CommentsQuery {
+
   # current status of a comment.
   statuses: [COMMENT_STATUS]
 
@@ -30,48 +111,25 @@ input CommentsQuery {
   # skip results from the last created_at timestamp.
   cursor: Date
 
+  # filter by a specific tag name.
+  tag: [String]
+
   # sort the results by created_at.
   sort: SORT_ORDER = REVERSE_CHRONOLOGICAL
 }
 
-enum USER_ROLES {
-  # an administrator of the site
-  ADMIN
-
-  # a moderator of the site
-  MODERATOR
-}
-
-# Any person who can author comments, create actions, and view comments on a
-# stream.
-type User {
-  id: ID!
-
-  # display name of a user.
-  displayName: String!
-
-  # actions against a specific user.
-  actions: [ActionSummary]
-
-  # the current roles of the user.
-  roles: [USER_ROLES]
-
-  # determines whether the user can edit their username
-  canEditName: Boolean
-
-  # returns all comments based on a query.
-  comments(query: CommentsQuery): [Comment]
-
-  # returns user status
-  status: USER_STATUS
-}
-
+# Comment is the base representation of user interaction in Talk.
 type Comment {
+
+  # The ID of the comment.
   id: ID!
 
-  # the actual comment data.
+  # The actual comment data.
   body: String!
 
+  # the tags on the comment
+  tags: [Tag]
+
   # the user who authored the comment.
   user: User
 
@@ -81,68 +139,153 @@ type Comment {
   # the replies that were made to the comment.
   replies(sort: SORT_ORDER = CHRONOLOGICAL, limit: Int = 3): [Comment]
 
-  # the count of replies on a comment
+  # The count of replies on a comment.
   replyCount: Int
 
-  # the actions made against a comment.
-  actions: [ActionSummary]
+  # Actions completed on the parent.
+  actions: [Action]
 
-  # the asset that a comment was made on.
+  # Action summaries against a comment.
+  action_summaries: [ActionSummary]
+
+  # The asset that a comment was made on.
   asset: Asset
 
-  # the current status of a comment.
+  # The current status of a comment.
   status: COMMENT_STATUS
 
-  # the time when the comment was created
+  # The time when the comment was created
   created_at: Date!
 }
 
-enum ITEM_TYPE {
-  ASSETS
-  COMMENTS
-  USERS
-}
+################################################################################
+## Actions
+################################################################################
 
-enum ACTION_TYPE {
-  LIKE
-  FLAG
-}
+# An action rendered against a parent enity item.
+interface Action {
 
-type Action {
+  # The ID of the action.
   id: ID!
-  action_type: ACTION_TYPE!
 
-  item_id: ID!
-  item_type: ITEM_TYPE!
+  # The author of the action.
+  user: User
 
-  user: User!
+  # The time when the Action was updated.
   updated_at: Date
+
+  # The time when the Action was created.
   created_at: Date
 }
 
-type ActionSummary {
-  action_type: ACTION_TYPE!
-  item_type: ITEM_TYPE!
+# A summary of actions based on the specific grouping of the group_id.
+interface ActionSummary {
+
+  # The count of actions with this group.
   count: Int
+
+  # The current user's action.
   current_user: Action
 }
 
+# LikeAction is used by users who "like" a specific entity.
+type LikeAction implements Action {
+
+  # The ID of the action.
+  id: ID!
+
+  # The author of the action.
+  user: User
+
+  # The time when the Action was updated.
+  updated_at: Date
+
+  # The time when the Action was created.
+  created_at: Date
+}
+
+# LikeActionSummary is counts the amount of "likes" that a specific entity has.
+type LikeActionSummary implements ActionSummary {
+
+  # The count of likes against the parent entity.
+  count: Int!
+
+  current_user: LikeAction
+}
+
+# A FLAG action that contains flag metadata.
+type FlagAction implements Action {
+
+  # The ID of the Flag Action.
+  id: ID!
+
+  # The reason for which the Flag Action was created.
+  reason: String
+
+  # An optional message sent with the flagging action by the user.
+  message: String
+
+  # The user who created the action.
+  user: User
+
+  # The time when the Flag Action was updated.
+  updated_at: Date
+
+  # The time when the Flag Action was created.
+  created_at: Date
+}
+
+# Summary for Flag Action with a a unique reason.
+type FlagActionSummary implements ActionSummary {
+
+  # The total count of flags with this reason.
+  count: Int!
+
+  # The reason for which the Flag Action was created.
+  reason: String
+
+  # The flag by the current user against the parent entity with this reason.
+  current_user: FlagAction
+}
+
+################################################################################
+## Settings
+################################################################################
+
+# The moderation mode of the site.
 enum MODERATION_MODE {
+
+  # Comments posted while in `PRE` mode will be labeled with a `PREMOD`
+  # status and will require a moderator decision before being visible.
   PRE
+
+  # Comments posted while in `POST` will be visible immediately.
   POST
 }
 
+# Site wide global settings.
 type Settings {
+
+  # Moderation mode for the site.
   moderation: MODERATION_MODE!
+
+  # Enables a requirement for email confirmation before a user can login.
+  requireEmailConfirmation: Boolean
+
   infoBoxEnable: Boolean
   infoBoxContent: String
   closeTimeout: Int
   closedMessage: String
   charCountEnable: Boolean
   charCount: Int
-  requireEmailConfirmation: Boolean
+
 }
 
+################################################################################
+## Assets
+################################################################################
+
+# Where comments are made on.
 type Asset {
 
   # The current ID of the asset.
@@ -174,12 +317,52 @@ type Asset {
   created_at: Date
 }
 
-enum COMMENT_STATUS {
-  ACCEPTED
-  REJECTED
-  PREMOD
+################################################################################
+## Errors
+################################################################################
+
+# Any error rendered due to the user's input.
+interface UserError {
+
+  # Translation key relating to a translatable string containing details to be
+  # displayed to the end user.
+  translation_key: String!
 }
 
+# A generic error not related to validation reasons.
+type GenericUserError implements UserError {
+
+  # Translation key relating to a translatable string containing details to be
+  # displayed to the end user.
+  translation_key: String!
+}
+
+# A validation error that affects the input.
+type ValidationUserError implements UserError {
+
+  # Translation key relating to a translatable string containing details to be
+  # displayed to the end user.
+  translation_key: String!
+
+  # The field in question that caused the error.
+  field_name: String!
+}
+
+################################################################################
+## Queries
+################################################################################
+
+# Establishes the ordering of the content by their created_at time stamp.
+enum SORT_ORDER {
+
+  # newest to oldest order.
+  REVERSE_CHRONOLOGICAL
+
+  # oldest to newer order.
+  CHRONOLOGICAL
+}
+
+# All queries that can be executed.
 enum USER_STATUS {
   ACTIVE
   BANNED
@@ -189,47 +372,133 @@ enum USER_STATUS {
 
 type RootQuery {
 
-  # retrieves site wide settings and defaults.
+  # Site wide settings and defaults.
   settings: Settings
 
-  # retrieves all assets.
+  # All assets.
   assets: [Asset]
 
-  # retrieves a specific asset.
+  # Find or create an asset by url, or just find with the ID.
   asset(id: ID, url: String): Asset
 
-  # retrieves comments based on the input query.
+  # Comments returned based on a query.
   comments(query: CommentsQuery!): [Comment]
 
-  # retrieves the current logged in user.
+  # The currently logged in user based on the request.
   me: User
 }
 
-input CreateActionInput {
-  # the type of action.
-  action_type: ACTION_TYPE!
+################################################################################
+## Mutations
+################################################################################
 
-  # the type of the item.
-  item_type: ITEM_TYPE!
+# Response defines what can be expected from any response to a mutation action.
+interface Response {
 
-  # the id of the item that is related to the action.
-  item_id: ID!
+  # An array of errors relating to the mutation that occured.
+  errors: [UserError]
 }
 
+# CreateCommentResponse is returned with the comment that was created and any
+# errors that may have occured in the attempt to create it.
+type CreateCommentResponse implements Response {
+
+  # The comment that was created.
+  comment: Comment
+
+  # An array of errors relating to the mutation that occured.
+  errors: [UserError]
+}
+
+# Used to represent the item type for an action.
+enum ACTION_ITEM_TYPE {
+
+  # The action references a entity of type Asset.
+  ASSETS
+
+  # The action references a entity of type Comment.
+  COMMENTS
+
+  # The action references a entity of type User.
+  USERS
+}
+
+input CreateLikeInput {
+
+  # The item's id for which we are to create a like.
+  item_id: ID!
+
+  # The type of the item for which we are to create the like.
+  item_type: ACTION_ITEM_TYPE!
+}
+
+type CreateLikeResponse implements Response {
+
+  # The like that was created.
+  like: LikeAction
+
+  # An array of errors relating to the mutation that occured.
+  errors: [UserError]
+}
+
+input CreateFlagInput {
+
+  # The item's id for which we are to create a flag.
+  item_id: ID!
+
+  # The type of the item for which we are to create the flag.
+  item_type: ACTION_ITEM_TYPE!
+
+  # The reason for flagging the item.
+  reason: String!
+
+  # An optional message sent with the flagging action by the user.
+  message: String
+}
+
+# CreateFlagResponse is the response returned with possibly some errors
+# relating to the creating the flag action attempt and possibly the flag that
+# was created.
+type CreateFlagResponse implements Response {
+
+  # The like that was created.
+  flag: FlagAction
+
+  # An array of errors relating to the mutation that occured.
+  errors: [UserError]
+}
+
+# DeleteActionResponse is the response returned with possibly some errors
+# relating to the delete action attempt.
+type DeleteActionResponse implements Response {
+
+  # An array of errors relating to the mutation that occured.
+  errors: [UserError]
+}
+
+# All mutations for the application are defined on this object.
 type RootMutation {
-  # creates a comment on the asset.
-  createComment(asset_id: ID!, parent_id: ID, body: String!): Comment
 
-  # creates an action based on an input.
-  createAction(action: CreateActionInput!): Action
+  # Creates a comment on the asset.
+  createComment(asset_id: ID!, parent_id: ID, body: String!): CreateCommentResponse
 
-  # delete an action based on the action id.
-  deleteAction(id: ID!): Boolean
+  # Creates a like on an entity.
+  createLike(like: CreateLikeInput!): CreateLikeResponse
 
-  # sets user status
+  # Creates a flag on an entity.
+  createFlag(flag: CreateFlagInput!): CreateFlagResponse
+
+  # Delete an action based on the action id.
+  deleteAction(id: ID!): DeleteActionResponse
+
+  # Sets user status
   setUserStatus(id: ID!, status: USER_STATUS!): Boolean
 }
 
+################################################################################
+## Schema
+################################################################################
+
 schema {
   query: RootQuery
   mutation: RootMutation
diff --git a/models/action.js b/models/action.js
index ed871f56b..36d83574e 100644
--- a/models/action.js
+++ b/models/action.js
@@ -29,6 +29,12 @@ const ActionSchema = new Schema({
   },
   item_id: String,
   user_id: String,
+
+  // The element that summaries will additionally group on in addtion to their action_type, item_type, and
+  // item_id.
+  group_id: String,
+
+  // Additional metadata stored on the field.
   metadata: Schema.Types.Mixed
 }, {
   timestamps: {
diff --git a/models/comment.js b/models/comment.js
index b656f9238..ac44d904e 100644
--- a/models/comment.js
+++ b/models/comment.js
@@ -30,6 +30,24 @@ const StatusSchema = new Schema({
   _id: false
 });
 
+/**
+ * The Mongo schema for a Comment Tag.
+ * @type {Schema}
+ */
+const TagSchema = new Schema({
+  name: String,
+
+  // The User ID of the user that assigned the status.
+  assigned_by: {
+    type: String,
+    default: null
+  },
+
+  created_at: Date
+}, {
+  _id: false
+});
+
 /**
  * The Mongo schema for a Comment.
  * @type {Schema}
@@ -49,6 +67,7 @@ const CommentSchema = new Schema({
   author_id: String,
   status_history: [StatusSchema],
   status: {type: String, default: null},
+  tags: [TagSchema],
   parent_id: String
 }, {
   timestamps: {
diff --git a/package.json b/package.json
index 548119cfc..a40e1ad97 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "express": "^4.14.0",
     "express-session": "^1.14.2",
     "graphql": "^0.8.2",
+    "graphql-errors": "^2.1.0",
     "graphql-server-express": "^0.5.0",
     "graphql-tag": "^1.2.3",
     "graphql-tools": "^0.9.0",
@@ -120,6 +121,7 @@
     "eslint-plugin-standard": "^2.0.1",
     "exports-loader": "^0.6.3",
     "fetch-mock": "^5.5.0",
+    "graphql-docs": "^0.2.0",
     "hammerjs": "^2.0.8",
     "ignore-styles": "^5.0.1",
     "immutable": "^3.8.1",
diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index 19346274d..96f3911d4 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -127,21 +127,4 @@ router.put('/:comment_id/status', authorization.needed('ADMIN'), (req, res, next
     });
 });
 
-router.post('/:comment_id/actions', (req, res, next) => {
-
-  const {
-    action_type,
-    metadata
-  } = req.body;
-
-  CommentsService
-    .addAction(req.params.comment_id, req.user.id, action_type, metadata)
-    .then((action) => {
-      res.status(201).json(action);
-    })
-    .catch((err) => {
-      next(err);
-    });
-});
-
 module.exports = router;
diff --git a/services/actions.js b/services/actions.js
index c336dd974..0bcb81af0 100644
--- a/services/actions.js
+++ b/services/actions.js
@@ -26,7 +26,8 @@ module.exports = class ActionsService {
       action_type: action.action_type,
       item_type: action.item_type,
       item_id: action.item_id,
-      user_id: action.user_id
+      user_id: action.user_id,
+      group_id: action.group_id
     };
 
     // Create/Update the action.
@@ -86,68 +87,70 @@ module.exports = class ActionsService {
    * @param {String} ids array of user identifiers (uuid)
   */
   static getActionSummaries(item_ids, current_user_id = '') {
-    return ActionModel.aggregate([
-      {
 
-        // only grab items that match the specified item id's
-        $match: {
-          item_id: {
-            $in: item_ids
-          }
-        }
+    // only grab items that match the specified item id's
+    let $match = {
+      item_id: {
+        $in: item_ids
+      }
+    };
+
+    let $group = {
+
+      // group unique documents by these properties, we are leveraging the
+      // fact that each uuid is completly unique.
+      _id: {
+        item_id: '$item_id',
+        action_type: '$action_type',
+        group_id: '$group_id'
       },
-      {
-        $group: {
 
-          // group unique documents by these properties, we are leveraging the
-          // fact that each uuid is completly unique.
-          _id: {
-            item_id: '$item_id',
-            action_type: '$action_type'
-          },
-
-          // and sum up all actions matching the above grouping criteria
-          count: {
-            $sum: 1
-          },
-
-          // we are leveraging the fact that each uuid is completly unique and
-          // just grabbing the last instance of the item type here.
-          item_type: {
-            $last: '$item_type'
-          },
-
-          current_user: {
-            $max: {
-              $cond: {
-                if: {
-                  $eq: ['$user_id', current_user_id],
-                },
-                then: '$$CURRENT',
-                else: null
-              }
-            }
-          }
-        }
+      // and sum up all actions matching the above grouping criteria
+      count: {
+        $sum: 1
       },
-      {
-        $project: {
 
-          // suppress the _id field
-          _id: false,
+      // we are leveraging the fact that each uuid is completly unique and
+      // just grabbing the last instance of the item type here.
+      item_type: {
+        $first: '$item_type'
+      },
 
-          // map the fields from the _id grouping down a level
-          item_id: '$_id.item_id',
-          action_type: '$_id.action_type',
-
-          // map the field directly
-          count: '$count',
-          item_type: '$item_type',
-
-          // set the current user to false here
-          current_user: '$current_user'
+      current_user: {
+        $max: {
+          $cond: {
+            if: {
+              $eq: ['$user_id', current_user_id],
+            },
+            then: '$$CURRENT',
+            else: null
+          }
         }
       }
+    };
+
+    let $project = {
+
+      // suppress the _id field
+      _id: false,
+
+      // map the fields from the _id grouping down a level
+      item_id: '$_id.item_id',
+      action_type: '$_id.action_type',
+      group_id: '$_id.group_id',
+
+      // map the field directly
+      count: '$count',
+      item_type: '$item_type',
+
+      // set the current user to false here
+      current_user: '$current_user'
+    };
+
+    return ActionModel.aggregate([
+      {$match},
+      {$group},
+      {$project}
     ]);
   }
 
diff --git a/services/comments.js b/services/comments.js
index 5d39a129e..fc05341cb 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -3,6 +3,10 @@ const CommentModel = require('../models/comment');
 const ActionModel = require('../models/action');
 const ActionsService = require('./actions');
 
+const ALLOWED_TAGS = [
+  {name: 'STAFF'}
+];
+
 module.exports = class CommentsService {
 
   /**
@@ -33,6 +37,7 @@ module.exports = class CommentsService {
         type: status,
         created_at: new Date()
       }] : [],
+      tags: [],
       status,
       author_id
     });
@@ -40,6 +45,33 @@ module.exports = class CommentsService {
     return comment.save();
   }
 
+  /**
+   * Adds a tag if it doesn't already exist on the comment.
+   */
+  static addTag(id, name, assigned_by) {
+
+    if (ALLOWED_TAGS.find((t) => t.name === name) == null) {
+      return Promise.reject(new Error('tag not allowed'));
+    }
+
+    return CommentModel.update({
+      id,
+      tags: {
+        $ne: {
+          name
+        }
+      }
+    }, {
+      $push: {
+        tags: {
+          name,
+          assigned_by,
+          created_at: new Date()
+        }
+      }
+    });
+  }
+
   /**
    * Finds a comment by the id.
    * @param {String} id  identifier of comment (uuid)
diff --git a/test/routes/api/comments/index.js b/test/routes/api/comments/index.js
index c305f9f6b..0ee19fc5e 100644
--- a/test/routes/api/comments/index.js
+++ b/test/routes/api/comments/index.js
@@ -267,79 +267,3 @@ describe('/api/v1/comments/:comment_id', () => {
     });
   });
 });
-
-describe('/api/v1/comments/:comment_id/actions', () => {
-
-  const comments = [{
-    id: 'abc',
-    body: 'comment 10',
-    asset_id: 'asset',
-    author_id: '123',
-    status_history: []
-  }, {
-    id: 'def',
-    body: 'comment 20',
-    asset_id: 'asset',
-    author_id: '456',
-    status: 'REJECTED',
-    status_history: [{
-      type: 'REJECTED'
-    }]
-  }, {
-    id: 'hij',
-    body: 'comment 30',
-    asset_id: '456',
-    status: 'ACCEPTED',
-    status_history: [{
-      type: 'ACCEPTED'
-    }]
-  }];
-
-  const users = [{
-    displayName: 'Ana',
-    email: 'ana@gmail.com',
-    password: '123456789'
-  }, {
-    displayName: 'Maria',
-    email: 'maria@gmail.com',
-    password: '123456789'
-  }];
-
-  const actions = [{
-    action_type: 'FLAG',
-    item_type: 'COMMENTS',
-    item_id: 'abc'
-  }, {
-    action_type: 'LIKE',
-    item_type: 'COMMENTS',
-    item_id: 'hij'
-  }];
-
-  beforeEach(() => {
-    return SettingsService.init(settings).then(() => {
-      return Promise.all([
-        CommentModel.create(comments),
-        UsersService.createLocalUsers(users),
-        ActionModel.create(actions)
-      ]);
-    });
-  });
-
-  describe('#post', () => {
-    it('it should create an action', () => {
-      return chai.request(app)
-        .post('/api/v1/comments/abc/actions')
-        .set(passport.inject({id: '456', roles: ['ADMIN']}))
-        .send({'action_type': 'flag', 'metadata': {'reason': 'Comment is too awesome.'}})
-        .then((res) => {
-          expect(res).to.have.status(201);
-          expect(res).to.have.body;
-
-          expect(res.body).to.have.property('action_type', 'flag');
-          expect(res.body).to.have.property('metadata');
-          expect(res.body.metadata).to.deep.equal({'reason': 'Comment is too awesome.'});
-          expect(res.body).to.have.property('item_id', 'abc');
-        });
-    });
-  });
-});
diff --git a/test/services/comments.js b/test/services/comments.js
index fc2105cb1..c27050ae7 100644
--- a/test/services/comments.js
+++ b/test/services/comments.js
@@ -70,11 +70,14 @@ describe('services.CommentsService', () => {
   const users = [{
     email: 'stampi@gmail.com',
     displayName: 'Stampi',
-    password: '1Coral!!'
+    password: '1Coral!!',
+    roles: ['ADMIN'],
+    _id: '1'
   }, {
     email: 'sockmonster@gmail.com',
     displayName: 'Sockmonster',
-    password: '2Coral!!'
+    password: '2Coral!!',
+    _id : '2'
   }];
 
   const actions = [{
@@ -256,4 +259,40 @@ describe('services.CommentsService', () => {
     });
 
   });
+
+  describe('#tagByStaff()', () => {
+
+    it('creates a new comment by admin', () => {
+      return UsersService.findLocalUser('stampi@gmail.com', '1Coral!!').then((user) => {
+        return UsersService.addRoleToUser(user.id, 'ADMIN').then(() => {
+          UsersService.findById(user.id).then((u) => {
+            return CommentsService
+              .publicCreate({
+                body: 'This is a comment!',
+                status: 'ACCEPTED',
+                author_id: u.id
+              }).then((c) => {
+                expect(c).to.not.be.null;
+                expect(c.tags).to.not.have.length(0);
+                expect(c.tags[0].name).to.be.equal('STAFF');
+              });
+          });
+        });
+      });
+    });
+
+    it('creates a new comment by non admin', () => {
+      return UsersService.findLocalUser('sockmonster@gmail.com', '2Coral!!').then((user) => {
+        return CommentsService
+          .publicCreate({
+            body: 'This is a comment!',
+            status: 'ACCEPTED',
+            author_id: user.id
+          }).then((c) => {
+            expect(c).to.not.be.null;
+            expect(c.tags).to.have.length(0);
+          });
+      });
+    });
+  });
 });
diff --git a/views/admin/docs.ejs b/views/admin/docs.ejs
new file mode 100644
index 000000000..de288e055
--- /dev/null
+++ b/views/admin/docs.ejs
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Talk: GraphQL Docs</title>
+    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
+    <style media="screen">
+      body, #root {
+        width: 100%;
+        height: 100%;
+        margin: 0;
+        background-color: #FAFAFA;
+        font-family: 'Roboto', sans-serif;
+      }
+
+      .wrapper {
+        margin: 0 auto;
+        max-width: 800px;
+      }
+
+      a {
+        border-bottom: 2px dotted #f67150;
+        color: #333 !important;
+        text-decoration: none;
+        font-weight: bold;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script src="/client/coral-docs/bundle.js" charset="utf-8"></script>
+  </body>
+</html>
diff --git a/webpack.config.js b/webpack.config.js
index dde801744..5a7bb297b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -7,7 +7,8 @@ const webpack = require('webpack');
 // Edit the build targets and embeds below.
 
 const buildTargets = [
-  'coral-admin'
+  'coral-admin',
+  'coral-docs'
 ];
 
 const buildEmbeds = [
diff --git a/yarn.lock b/yarn.lock
index e76614702..f1c047be2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1011,7 +1011,7 @@ babel-register@^6.22.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.2"
 
-babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0:
+babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.6.1:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"
   dependencies:
@@ -3307,6 +3307,21 @@ graphql-anywhere@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-2.1.0.tgz#888c0a1718db3ff866b313070747777380560f69"
 
+graphql-docs@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/graphql-docs/-/graphql-docs-0.2.0.tgz#cf803f9c9d354fa03e89073d74e419261a5bfa74"
+  dependencies:
+    marked "^0.3.5"
+    request "^2.74.0"
+    yargs "^5.0.0"
+
+graphql-errors@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/graphql-errors/-/graphql-errors-2.1.0.tgz#831c8c491b354859ee7a0c07bff101af64731195"
+  dependencies:
+    babel-runtime "^6.6.1"
+    uuid "^2.0.2"
+
 graphql-server-core@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/graphql-server-core/-/graphql-server-core-0.5.2.tgz#7e23fc516cb754e42c16f92928b595c354d6c8a7"
@@ -4480,7 +4495,7 @@ lodash.assign@^3.0.0:
     lodash._createassigner "^3.0.0"
     lodash.keys "^3.0.0"
 
-lodash.assign@^4.0.3, lodash.assign@^4.0.6:
+lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.1.0, lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
 
@@ -4696,6 +4711,10 @@ map-stream@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
 
+marked@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"
+
 material-design-lite@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/material-design-lite/-/material-design-lite-1.3.0.tgz#d004ce3fee99a1eeb74a78b8a325134a5f1171d3"
@@ -6707,7 +6726,7 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request@2.79.0, request@^2.55.0, request@^2.79.0:
+request@2.79.0, request@^2.55.0, request@^2.74.0, request@^2.79.0:
   version "2.79.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
   dependencies:
@@ -7286,7 +7305,7 @@ supports-color@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"
 
-supports-color@3.1.2:
+supports-color@3.1.2, supports-color@^3.1.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
   dependencies:
@@ -7300,7 +7319,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
+supports-color@^3.1.2, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
@@ -7658,7 +7677,7 @@ utils-merge@1.0.0, utils-merge@1.x.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
 
-uuid@^2.0.1, uuid@^2.0.3:
+uuid@^2.0.1, uuid@^2.0.2, uuid@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
 
@@ -7908,6 +7927,13 @@ yargs-parser@^2.4.1:
     camelcase "^3.0.0"
     lodash.assign "^4.0.6"
 
+yargs-parser@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-3.2.0.tgz#5081355d19d9d0c8c5d81ada908cb4e6d186664f"
+  dependencies:
+    camelcase "^3.0.0"
+    lodash.assign "^4.1.0"
+
 yargs-parser@^4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
@@ -7933,6 +7959,25 @@ yargs@^4.0.0:
     y18n "^3.2.1"
     yargs-parser "^2.4.1"
 
+yargs@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-5.0.0.tgz#3355144977d05757dbb86d6e38ec056123b3a66e"
+  dependencies:
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    lodash.assign "^4.2.0"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    window-size "^0.2.0"
+    y18n "^3.2.1"
+    yargs-parser "^3.2.0"
+
 yargs@^6.0.0:
   version "6.6.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"