From 707d65a11901d24b81c3207e125c7a28c2900056 Mon Sep 17 00:00:00 2001
From: Tessa Thornton <tessathornton@gmail.com>
Date: Wed, 12 Feb 2020 09:22:07 -0500
Subject: [PATCH] Support multisite (#2799)

* resovle import error by removing useContext from ui component

* update snaps

* create useUIContext hook

* add site and community models

* create sites and communities on install

* add site name to install wizard

* add site id to stories

* pass site id to stream query in embed

* fix spec

* add sites query

* list sites in organization config

* add route for new sites

* add create site mutation

* view and update sites

* show embed codes for sites

* add site id to comments

* allow filtering moderation queues by site id

* add site selector to queue

* move sites config routes

* Revert "move sites config routes"

This reverts commit 4ed5345d3e1df6263f8390b64214956c43c4d8cd.

* update sites routes

* show site name in moderate card

* remove site selector from queue selector

* style create site form

* edit site form

* clean up ts

* move :storyID paths to /storeis/:storyID

* make queues respect site id

* add site switcher

* styles for site selector

* add global notifications

* style app notifications

* clear notifications after x miliseconds

* use notification component in add site form

* fix types

* make notifications dismissable

* dismiss site created notification

* remove button letter spacing if lowercase

* filter stories by site in search

* add site name to story search results

* add site column to stories table

* filter stories table by site

* make sure notification displays after site creation

* paginate sites table

* paginage site selector

* add paginated site filter to stories table

* fix merge conflicts

* sort by createdAt

* default to 20 sites

* delete comments

* add translation tags

* make site ID not mandatory

* Fix tests and specs

* only include site id in embed code for multisite

* update tenant cache when adding first site

* only show site selector if multiple sites

* use story url instead of site id for story upsert

* update snaps

* make ui conditional on multisite

* update snaps and remove unnecessary site ID

* sloppily calculate counts for filtered queues

* get origins of allowed domains

* add migration

* enable migration

* only show permitted domains if mulltisite is false

* remove site id from embed code

* update snaps

* undo updates to singletonresolver

* remove refernces to communities

* fix mints

* remove community reference

* update copy in installation

* use sites services in installer

* remove unused loader

* correct error text for useNotification

* order sites by name

* make multisite a computed property

* use map/filter instead of for/of for url origins

* add missing/incorrect translations

* remove references to siteID

* remove references to tenant isURLpermitted

* add comments to schema updates

* simplify filtering stories by site

* remove domains config from advanced

* fix: adjusted CSP header generation

* add migration to create indexes on site

* clear notifications on navigate

* remove count for filtering by site

* throw duplicate error for allowed domains

* handle errors for create/update sites

* remove contacturl and contactemail from sites

* fix types for counts

* sort imports

* ensure props get passed down to link version of button component

* add url and email fields back into organization config

* sort imports

* fix moderation queues resolver types

* fix appearance of sites dropdown

* add status role to notificaiton

* remove duplicate layout file

* fix: rename allowedDomains -> allowdOrigins

* move Link conditional from button to basebutton component

* fix merge conflict

* fix mutation optimistic response

* make sure to prop gets passed to link

* change labels on install steps

* show story's site in site selector when moderating by story

* feat: support site counting

* update snap

* remove multisite from settings

* move paginated select to admin/components

* fix circular import errors

* remove uicontext component from v2 timestamp

Co-authored-by: Wyatt Johnson <accounts+github@wyattjoh.ca>
---
 src/core/build/createWebpackConfig.ts         |   5 -
 .../GlobalNotificationContext.tsx             |  45 ++
 .../NotificationContainer.tsx                 |  12 +
 .../admin/App/GlobalNotification/index.ts     |   3 +
 .../App/GlobalNotification/useNotification.ts |  39 ++
 src/core/client/admin/App/Main.tsx            |   9 +-
 .../App/__snapshots__/Main.spec.tsx.snap      |   5 +-
 .../components/ModerateCard/ModerateCard.css  |  12 +-
 .../ModerateCard/ModerateCard.spec.tsx        |   1 +
 .../components/ModerateCard/ModerateCard.tsx  |  13 +-
 .../ModerateCard/ModerateCardContainer.tsx    |  12 +-
 .../__snapshots__/ModerateCard.spec.tsx.snap  |   8 +-
 .../PaginatedSelect/PaginatedSelect.css       |  45 ++
 .../PaginatedSelect/PaginatedSelect.tsx       |  98 +++++
 .../admin/components/PaginatedSelect/index.ts |   1 +
 .../client/admin/helpers/getModerationLink.ts |  10 -
 .../admin/helpers/getQueueConnection.ts       |   9 +-
 src/core/client/admin/helpers/index.ts        |   1 -
 src/core/client/admin/local/local.graphql     |   1 +
 src/core/client/admin/routeConfig.tsx         |  50 ++-
 .../admin/routes/Configure/Configure.tsx      |  32 +-
 .../admin/routes/Configure/ConfigureLinks.tsx |  38 ++
 .../Advanced/AdvancedConfigContainer.tsx      |   7 -
 .../sections/Advanced/EmbedCodeContainer.tsx  |  26 --
 .../Advanced/PermittedDomainsConfig.tsx       |  71 ---
 .../Organization/EmptySitesMessage.tsx        |  10 +
 .../OrganizationConfigContainer.tsx           |  12 +-
 .../Organization/OrganizationConfigRoute.tsx  |  18 +-
 .../Organization/SiteRowContainer.tsx         |  49 +++
 .../sections/Organization/SitesConfig.tsx     |  67 +++
 .../Organization/SitesConfigContainer.tsx     |  94 ++++
 .../sections/Organization/SitesTable.tsx      |  63 +++
 .../Configure/sections/Sites/AddSiteRoute.tsx |  75 ++++
 .../sections/Sites/CreateSiteForm.tsx         | 147 +++++++
 .../sections/Sites/CreateSiteMutation.ts      |  57 +++
 .../Configure/sections/Sites/EditSiteForm.tsx | 167 ++++++++
 .../{Advanced => Sites}/EmbedCode.css         |   0
 .../{Advanced => Sites}/EmbedCode.tsx         |  30 +-
 .../Configure/sections/Sites/SiteRoute.tsx    |  66 +++
 .../Configure/sections/Sites/SitesRoute.tsx   |  27 ++
 .../sections/Sites/UpdateSiteMutation.ts      |  41 ++
 .../routes/Configure/sections/Sites/index.ts  |   1 +
 .../admin/routes/Moderate/Moderate.spec.tsx   |   7 +
 .../client/admin/routes/Moderate/Moderate.tsx |  35 +-
 .../routes/Moderate/ModerateContainer.tsx     |  56 ++-
 .../ModerateNavigationContainer.tsx           |  11 +-
 .../ModerateNavigation/Navigation.tsx         |  27 +-
 .../routes/Moderate/ModerateSearchBar/Bar.css |  10 +-
 .../routes/Moderate/ModerateSearchBar/Bar.tsx |  18 +-
 .../Moderate/ModerateSearchBar/Field.css      |  14 +-
 .../Moderate/ModerateSearchBar/Field.tsx      |  16 +-
 .../ModerateSearchBar/ModerateAllOption.css   |   4 +
 .../ModerateSearchBar/ModerateAllOption.tsx   |   9 +-
 .../ModerateSearchBarContainer.tsx            |  73 +++-
 .../ModerateSearchBar/SearchStoryFetch.ts     |  11 +-
 .../routes/Moderate/Queue/QueueRoute.tsx      |  34 +-
 .../Moderate/Queue/QueueViewNewMutation.tsx   |   8 +-
 .../Moderate/SiteSelector/SiteSelector.css    |   8 +
 .../Moderate/SiteSelector/SiteSelector.tsx    |  76 ++++
 .../SiteSelector/SiteSelectorContainer.tsx    | 101 +++++
 .../SiteSelector/SiteSelectorSelected.css     |   4 +
 .../SiteSelector/SiteSelectorSelected.tsx     |  26 ++
 .../SiteSelector/SiteSelectorSite.css         |  14 +
 .../SiteSelector/SiteSelectorSite.tsx         |  44 ++
 .../routes/Moderate/SiteSelector/index.ts     |   2 +
 .../__snapshots__/Moderate.spec.tsx.snap      |  14 +
 .../routes/Stories/SiteFilter/SiteFilter.css  |   9 +
 .../routes/Stories/SiteFilter/SiteFilter.tsx  |  79 ++++
 .../SiteFilter/SiteFilterContainer.tsx        |  97 +++++
 .../Stories/SiteFilter/SiteFilterOption.css   |   9 +
 .../Stories/SiteFilter/SiteFilterOption.tsx   |  56 +++
 .../Stories/SiteFilter/SiteFilterSelected.css |   3 +
 .../Stories/SiteFilter/SiteFilterSelected.tsx |  25 ++
 .../admin/routes/Stories/SiteFilter/index.ts  |   1 +
 .../client/admin/routes/Stories/StoryRow.css  |   2 +
 .../client/admin/routes/Stories/StoryRow.tsx  |  14 +-
 .../routes/Stories/StoryRowContainer.tsx      |   8 +
 .../admin/routes/Stories/StoryTable.css       |   6 +
 .../admin/routes/Stories/StoryTable.tsx       |  20 +-
 .../routes/Stories/StoryTableContainer.tsx    |  38 +-
 .../admin/routes/Stories/StoryTableFilter.tsx |   4 +-
 .../admin/test/auth/redirectLoggedIn.spec.tsx |   2 +
 .../test/auth/redirectLoggedOut.spec.tsx      |   2 +
 .../admin/test/auth/restricted.spec.tsx       |   2 +
 .../admin/test/auth/signInWithEmail.spec.tsx  |   2 +
 .../client/admin/test/auth/signOut.spec.tsx   |   2 +
 .../__snapshots__/advanced.spec.tsx.snap      | 139 ------
 .../__snapshots__/organization.spec.tsx.snap  | 203 +++++++--
 .../admin/test/configure/advanced.spec.tsx    | 103 -----
 .../test/configure/organization.spec.tsx      |  69 +--
 src/core/client/admin/test/fixtures.ts        |  38 +-
 .../__snapshots__/regularQueue.spec.tsx.snap  |  70 ++-
 .../__snapshots__/rejectedQueue.spec.tsx.snap |  40 +-
 .../admin/test/moderate/feature.spec.tsx      |   4 +
 .../admin/test/moderate/liveCounts.spec.tsx   |   4 +
 .../admin/test/moderate/regularQueue.spec.tsx |   6 +-
 .../regularQueueLiveNewComments.spec.tsx      |   4 +
 .../moderate/regularQueueLiveStatus.spec.tsx  |   4 +
 .../test/moderate/rejectedQueue.spec.tsx      |   6 +-
 .../admin/test/moderate/searchBar.spec.tsx    |  10 +-
 .../admin/test/moderate/tabBar.spec.tsx       |   2 +
 .../__snapshots__/stories.spec.tsx.snap       | 404 +++++++++---------
 .../admin/test/stories/stories.spec.tsx       |   6 +-
 src/core/client/embed/index.html              |  22 +-
 .../helpers/getModerationLink.spec.ts         |  46 ++
 .../framework/helpers/getModerationLink.ts    |  31 ++
 src/core/client/framework/helpers/index.ts    |   1 +
 src/core/client/framework/helpers/urls.tsx    |   2 +-
 .../framework/lib/bootstrap/CoralContext.tsx  |   1 +
 .../framework/lib/bootstrap/withContext.tsx   |   2 +-
 .../lib/relay/withLocalStateContainer.tsx     |   2 +-
 src/core/client/framework/rest/install.ts     |   7 +-
 src/core/client/install/App/Header.tsx        |   2 +-
 src/core/client/install/App/InstallWizard.tsx |  32 +-
 .../install/App/steps/AddOrganizationStep.tsx |  61 ++-
 .../App/steps/CreateYourAccountStep.tsx       |   6 +-
 .../client/install/App/steps/FinalStep.tsx    |  19 +-
 .../App/steps/PermittedDomainsStep.tsx        |  14 +-
 src/core/client/stream/local/local.graphql    |   1 +
 .../tabs/Comments/Stream/StreamContainer.tsx  |   1 +
 .../Configure/ModerateStreamContainer.tsx     |   4 +-
 .../closedOrDisabledCommentStream.spec.tsx    |   4 +-
 .../renderConfigure.spec.tsx.snap             |   2 +-
 src/core/client/stream/test/fixtures.ts       |  10 +
 src/core/client/test/helpers/fixture.ts       |   1 -
 .../components/AbsoluteTime/AbsoluteTime.tsx  |  13 +-
 .../ui/components/UIContext/UIContext.ts      |   4 +
 .../client/ui/components/UIContext/index.ts   |   2 +-
 src/core/client/ui/components/index.ts        |   6 +-
 .../v2/AppNotification/AppNotification.css    |  15 +
 .../v2/AppNotification/AppNotification.tsx    |  49 +++
 .../ui/components/v2/AppNotification/index.ts |   1 +
 .../components/v2/BaseButton/BaseButton.tsx   |   7 +
 .../client/ui/components/v2/Button/Button.css |   6 +-
 .../client/ui/components/v2/Button/Button.tsx |   8 +-
 .../components/v2/SelectField/SelectField.css |   5 +-
 src/core/client/ui/components/v2/index.ts     |   1 +
 src/core/common/errors.ts                     |   8 +-
 .../common/helpers/isNonNullArray.spec.ts     |  11 +
 src/core/common/helpers/isNonNullArray.ts     |   9 +
 src/core/common/types.ts                      |  10 +
 src/core/server/app/handlers/api/install.ts   |  19 +-
 .../server/app/handlers/api/story/count.ts    |   4 +-
 .../server/app/middleware/csp/tenant.spec.ts  |  44 +-
 src/core/server/app/middleware/csp/tenant.ts  | 106 ++++-
 src/core/server/app/router/client.ts          |  23 +-
 src/core/server/app/router/index.ts           |   1 +
 src/core/server/app/url.ts                    |   2 +-
 src/core/server/errors/index.ts               |  32 +-
 src/core/server/errors/translations.ts        |   2 +-
 src/core/server/graph/loaders/Comments.ts     |   3 +-
 src/core/server/graph/loaders/Sites.ts        |  25 ++
 src/core/server/graph/loaders/Stories.ts      |  14 +-
 src/core/server/graph/loaders/index.ts        |   2 +
 src/core/server/graph/mutators/Comments.ts    |  13 +-
 src/core/server/graph/mutators/Sites.ts       |  14 +
 src/core/server/graph/mutators/Stories.ts     |   8 +-
 src/core/server/graph/mutators/index.ts       |   2 +
 src/core/server/graph/resolvers/Comment.ts    |   1 +
 .../server/graph/resolvers/CommentCounts.ts   |   7 +-
 .../server/graph/resolvers/ModerationQueue.ts |   2 +-
 .../graph/resolvers/ModerationQueues.ts       |  48 ++-
 src/core/server/graph/resolvers/Mutation.ts   |   7 +
 src/core/server/graph/resolvers/Query.ts      |   2 +
 src/core/server/graph/resolvers/Settings.ts   |   6 +-
 src/core/server/graph/resolvers/Story.ts      |   1 +
 src/core/server/graph/schema/schema.graphql   | 146 ++++++-
 src/core/server/locales/da/errors.ftl         |   1 -
 src/core/server/locales/en-US/errors.ftl      |   2 +-
 src/core/server/locales/fi-FI/errors.ftl      |   3 +-
 src/core/server/locales/fr-FR/errors.ftl      |   1 -
 src/core/server/locales/pt-BR/errors.ftl      |   1 -
 src/core/server/models/action/comment.spec.ts |   3 +
 src/core/server/models/action/comment.ts      |   7 +-
 src/core/server/models/comment/comment.ts     |  14 +-
 .../index.ts => comment/counts/counts.ts}     | 197 ++++-----
 .../server/models/comment/counts/empty.ts     |  41 ++
 .../server/models/comment/counts/index.ts     |   3 +
 .../{story => comment}/counts/shared.ts       |  60 +--
 src/core/server/models/comment/helpers.ts     |  29 +-
 src/core/server/models/comment/index.ts       |   1 +
 src/core/server/models/site/index.ts          | 175 ++++++++
 src/core/server/models/story/counts/empty.ts  |  19 -
 src/core/server/models/story/index.ts         |  67 ++-
 src/core/server/models/tenant/tenant.ts       |   7 +-
 src/core/server/models/user/user.ts           |  28 +-
 src/core/server/services/comments/actions.ts  |  94 ++--
 .../services/comments/moderation/counts.ts    |   9 +-
 .../services/comments/pipeline/pipeline.ts    |   2 +-
 src/core/server/services/events/comments.ts   |   7 +-
 src/core/server/services/migrate/batch.ts     |  80 ++++
 src/core/server/services/migrate/migration.ts |  15 +-
 .../migrations/1579189174931_create_sites.ts  | 235 ++++++++++
 .../1579878509162_add_indexes_to_sites.ts     |  17 +
 .../server/services/mongodb/collections.ts    |   7 +-
 src/core/server/services/sites/index.ts       |  72 ++++
 src/core/server/services/sites/url.spec.ts    |  82 ++++
 .../server/services/{tenant => sites}/url.ts  |  14 +-
 src/core/server/services/stories/index.ts     | 145 +++----
 src/core/server/services/tenant/url.spec.ts   | 105 -----
 src/core/server/stacks/approveComment.ts      |   8 +-
 src/core/server/stacks/createComment.ts       |  23 +-
 src/core/server/stacks/editComment.ts         |  30 +-
 src/core/server/stacks/helpers/index.ts       |   2 +-
 .../server/stacks/helpers/publishChanges.ts   |   6 +-
 ...AllCounts.ts => updateAllCommentCounts.ts} |  56 ++-
 src/core/server/stacks/rejectComment.ts       |   8 +-
 src/locales/en-US/admin.ftl                   |  33 ++
 src/locales/en-US/install.ftl                 |  64 ++-
 src/locales/pt-BR/install.ftl                 |   2 +-
 210 files changed, 4695 insertions(+), 1632 deletions(-)
 create mode 100644 src/core/client/admin/App/GlobalNotification/GlobalNotificationContext.tsx
 create mode 100644 src/core/client/admin/App/GlobalNotification/NotificationContainer.tsx
 create mode 100644 src/core/client/admin/App/GlobalNotification/index.ts
 create mode 100644 src/core/client/admin/App/GlobalNotification/useNotification.ts
 create mode 100644 src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css
 create mode 100644 src/core/client/admin/components/PaginatedSelect/PaginatedSelect.tsx
 create mode 100644 src/core/client/admin/components/PaginatedSelect/index.ts
 delete mode 100644 src/core/client/admin/helpers/getModerationLink.ts
 create mode 100644 src/core/client/admin/routes/Configure/ConfigureLinks.tsx
 delete mode 100644 src/core/client/admin/routes/Configure/sections/Advanced/EmbedCodeContainer.tsx
 delete mode 100644 src/core/client/admin/routes/Configure/sections/Advanced/PermittedDomainsConfig.tsx
 create mode 100644 src/core/client/admin/routes/Configure/sections/Organization/EmptySitesMessage.tsx
 create mode 100644 src/core/client/admin/routes/Configure/sections/Organization/SiteRowContainer.tsx
 create mode 100644 src/core/client/admin/routes/Configure/sections/Organization/SitesConfig.tsx
 create mode 100644 src/core/client/admin/routes/Configure/sections/Organization/SitesConfigContainer.tsx
 create mode 100644 src/core/client/admin/routes/Configure/sections/Organization/SitesTable.tsx
 create mode 100644 src/core/client/admin/routes/Configure/sections/Sites/AddSiteRoute.tsx
 create mode 100644 src/core/client/admin/routes/Configure/sections/Sites/CreateSiteForm.tsx
 create mode 100644 src/core/client/admin/routes/Configure/sections/Sites/CreateSiteMutation.ts
 create mode 100644 src/core/client/admin/routes/Configure/sections/Sites/EditSiteForm.tsx
 rename src/core/client/admin/routes/Configure/sections/{Advanced => Sites}/EmbedCode.css (100%)
 rename src/core/client/admin/routes/Configure/sections/{Advanced => Sites}/EmbedCode.tsx (78%)
 create mode 100644 src/core/client/admin/routes/Configure/sections/Sites/SiteRoute.tsx
 create mode 100644 src/core/client/admin/routes/Configure/sections/Sites/SitesRoute.tsx
 create mode 100644 src/core/client/admin/routes/Configure/sections/Sites/UpdateSiteMutation.ts
 create mode 100644 src/core/client/admin/routes/Configure/sections/Sites/index.ts
 create mode 100644 src/core/client/admin/routes/Moderate/SiteSelector/SiteSelector.css
 create mode 100644 src/core/client/admin/routes/Moderate/SiteSelector/SiteSelector.tsx
 create mode 100644 src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorContainer.tsx
 create mode 100644 src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSelected.css
 create mode 100644 src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSelected.tsx
 create mode 100644 src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSite.css
 create mode 100644 src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSite.tsx
 create mode 100644 src/core/client/admin/routes/Moderate/SiteSelector/index.ts
 create mode 100644 src/core/client/admin/routes/Stories/SiteFilter/SiteFilter.css
 create mode 100644 src/core/client/admin/routes/Stories/SiteFilter/SiteFilter.tsx
 create mode 100644 src/core/client/admin/routes/Stories/SiteFilter/SiteFilterContainer.tsx
 create mode 100644 src/core/client/admin/routes/Stories/SiteFilter/SiteFilterOption.css
 create mode 100644 src/core/client/admin/routes/Stories/SiteFilter/SiteFilterOption.tsx
 create mode 100644 src/core/client/admin/routes/Stories/SiteFilter/SiteFilterSelected.css
 create mode 100644 src/core/client/admin/routes/Stories/SiteFilter/SiteFilterSelected.tsx
 create mode 100644 src/core/client/admin/routes/Stories/SiteFilter/index.ts
 create mode 100644 src/core/client/framework/helpers/getModerationLink.spec.ts
 create mode 100644 src/core/client/framework/helpers/getModerationLink.ts
 create mode 100644 src/core/client/ui/components/v2/AppNotification/AppNotification.css
 create mode 100644 src/core/client/ui/components/v2/AppNotification/AppNotification.tsx
 create mode 100644 src/core/client/ui/components/v2/AppNotification/index.ts
 create mode 100644 src/core/common/helpers/isNonNullArray.spec.ts
 create mode 100644 src/core/common/helpers/isNonNullArray.ts
 create mode 100644 src/core/server/graph/loaders/Sites.ts
 create mode 100644 src/core/server/graph/mutators/Sites.ts
 rename src/core/server/models/{story/counts/index.ts => comment/counts/counts.ts} (61%)
 create mode 100644 src/core/server/models/comment/counts/empty.ts
 create mode 100644 src/core/server/models/comment/counts/index.ts
 rename src/core/server/models/{story => comment}/counts/shared.ts (80%)
 create mode 100644 src/core/server/models/site/index.ts
 delete mode 100644 src/core/server/models/story/counts/empty.ts
 create mode 100644 src/core/server/services/migrate/batch.ts
 create mode 100644 src/core/server/services/migrate/migrations/1579189174931_create_sites.ts
 create mode 100644 src/core/server/services/migrate/migrations/1579878509162_add_indexes_to_sites.ts
 create mode 100644 src/core/server/services/sites/index.ts
 create mode 100644 src/core/server/services/sites/url.spec.ts
 rename src/core/server/services/{tenant => sites}/url.ts (79%)
 delete mode 100644 src/core/server/services/tenant/url.spec.ts
 rename src/core/server/stacks/helpers/{updateAllCounts.ts => updateAllCommentCounts.ts} (55%)

diff --git a/src/core/build/createWebpackConfig.ts b/src/core/build/createWebpackConfig.ts
index 0f063f3b9..898e934d8 100644
--- a/src/core/build/createWebpackConfig.ts
+++ b/src/core/build/createWebpackConfig.ts
@@ -501,11 +501,6 @@ export default function createWebpackConfig(
               exclude: [/\.(js|ts|tsx)$/, /\.html$/, /\.json$/],
               loader: require.resolve("file-loader"),
               options: {
-                // Because the resources loaded via CSS can sometimes be loaded
-                // directly from a CSS file, this will ensure that they are
-                // relative to those referencing files.
-                publicPath: (loaderPublicPath: string) =>
-                  "../../" + loaderPublicPath,
                 name: isProduction
                   ? "assets/media/[name].[hash:8].[ext]"
                   : "assets/media/[name].[ext]",
diff --git a/src/core/client/admin/App/GlobalNotification/GlobalNotificationContext.tsx b/src/core/client/admin/App/GlobalNotification/GlobalNotificationContext.tsx
new file mode 100644
index 000000000..3c963c459
--- /dev/null
+++ b/src/core/client/admin/App/GlobalNotification/GlobalNotificationContext.tsx
@@ -0,0 +1,45 @@
+import React, { createContext, ReactNode, useMemo, useReducer } from "react";
+
+interface State {
+  message: ReactNode | null;
+  visible: boolean;
+}
+
+type Action =
+  | {
+      type: "SET_MESSAGE";
+    } & State
+  | {
+      type: "CLEAR_MESSAGE";
+    };
+
+// TODO (tessalt) can't figure out types for this
+const NotificationContext = createContext<State | any>({
+  message: null,
+  visible: false,
+});
+
+function notificationReducer(state: State, action: Action): State {
+  switch (action.type) {
+    case "SET_MESSAGE": {
+      return { message: action.message, visible: true };
+    }
+    case "CLEAR_MESSAGE": {
+      return { message: null, visible: false };
+    }
+    default: {
+      throw new Error("unsupported action");
+    }
+  }
+}
+
+function NotificationProvider(props: any) {
+  const [state, dispatch] = useReducer(notificationReducer, {
+    message: null,
+    visible: false,
+  });
+  const value = useMemo(() => [state, dispatch], [state]);
+  return <NotificationContext.Provider value={value} {...props} />;
+}
+
+export { NotificationProvider, NotificationContext };
diff --git a/src/core/client/admin/App/GlobalNotification/NotificationContainer.tsx b/src/core/client/admin/App/GlobalNotification/NotificationContainer.tsx
new file mode 100644
index 000000000..6a9da2619
--- /dev/null
+++ b/src/core/client/admin/App/GlobalNotification/NotificationContainer.tsx
@@ -0,0 +1,12 @@
+import React, { FunctionComponent } from "react";
+import useNotification from "./useNotification";
+
+const NotificationContainer: FunctionComponent<{}> = () => {
+  const { state } = useNotification();
+  if (!state.visible) {
+    return null;
+  }
+  return <div role="status">{state.message}</div>;
+};
+
+export default NotificationContainer;
diff --git a/src/core/client/admin/App/GlobalNotification/index.ts b/src/core/client/admin/App/GlobalNotification/index.ts
new file mode 100644
index 000000000..896c4d306
--- /dev/null
+++ b/src/core/client/admin/App/GlobalNotification/index.ts
@@ -0,0 +1,3 @@
+export { NotificationProvider } from "./GlobalNotificationContext";
+export { default as NotificationContainer } from "./NotificationContainer";
+export { default as useNotification } from "./useNotification";
diff --git a/src/core/client/admin/App/GlobalNotification/useNotification.ts b/src/core/client/admin/App/GlobalNotification/useNotification.ts
new file mode 100644
index 000000000..9aea0cac6
--- /dev/null
+++ b/src/core/client/admin/App/GlobalNotification/useNotification.ts
@@ -0,0 +1,39 @@
+import { useRouter } from "found";
+import { ReactNode, useContext } from "react";
+
+import { NotificationContext } from "./GlobalNotificationContext";
+
+function useNotification() {
+  const context = useContext(NotificationContext);
+  if (!context) {
+    throw new Error(
+      "useNotification must be used within a NotificationProvider"
+    );
+  }
+  const [state, dispatch] = context;
+
+  const { router } = useRouter();
+
+  const setMessage = (message: ReactNode, timeout?: number) => {
+    dispatch({ type: "SET_MESSAGE", message });
+    if (timeout) {
+      setTimeout(() => {
+        dispatch({ type: "CLEAR_MESSAGE" });
+      }, timeout);
+    }
+    router.addTransitionHook(() => {
+      dispatch({ type: "CLEAR_MESSAGE" });
+      return true;
+    });
+  };
+
+  const clearMessage = () => dispatch({ type: "CLEAR_MESSAGE" });
+  return {
+    state,
+    dispatch,
+    setMessage,
+    clearMessage,
+  };
+}
+
+export default useNotification;
diff --git a/src/core/client/admin/App/Main.tsx b/src/core/client/admin/App/Main.tsx
index 28cd1a922..99d77a780 100644
--- a/src/core/client/admin/App/Main.tsx
+++ b/src/core/client/admin/App/Main.tsx
@@ -5,6 +5,10 @@ import { LogoHorizontal } from "coral-ui/components";
 import { AppBar, Begin, Divider, End } from "coral-ui/components/v2/AppBar";
 
 import { DecisionHistoryButton } from "./DecisionHistory";
+import {
+  NotificationContainer,
+  NotificationProvider,
+} from "./GlobalNotification";
 import NavigationContainer from "./Navigation";
 import UserMenuContainer from "./UserMenu";
 import Version from "./Version";
@@ -32,7 +36,10 @@ const Main: FunctionComponent<Props> = ({ children, viewer }) => (
         <UserMenuContainer viewer={viewer} />
       </End>
     </AppBar>
-    {children}
+    <NotificationProvider>
+      <NotificationContainer />
+      {children}
+    </NotificationProvider>
     <Version />
   </div>
 );
diff --git a/src/core/client/admin/App/__snapshots__/Main.spec.tsx.snap b/src/core/client/admin/App/__snapshots__/Main.spec.tsx.snap
index 7a5a9c95f..192e75437 100644
--- a/src/core/client/admin/App/__snapshots__/Main.spec.tsx.snap
+++ b/src/core/client/admin/App/__snapshots__/Main.spec.tsx.snap
@@ -28,7 +28,10 @@ exports[`renders correctly 1`] = `
       />
     </withPropsOnChange(End)>
   </withPropsOnChange(AppBar)>
-  child
+  <NotificationProvider>
+    <NotificationContainer />
+    child
+  </NotificationProvider>
   <Version />
 </div>
 `;
diff --git a/src/core/client/admin/components/ModerateCard/ModerateCard.css b/src/core/client/admin/components/ModerateCard/ModerateCard.css
index bb8375909..84aafec8f 100644
--- a/src/core/client/admin/components/ModerateCard/ModerateCard.css
+++ b/src/core/client/admin/components/ModerateCard/ModerateCard.css
@@ -142,13 +142,23 @@ $moderateCardLinkTextColor: var(--v2-colors-teal-700);
 
 .storyTitle {
   color: $moderateCardStoryTitleColor;
+}
+
+.commentOn {
   font-size: var(--v2-font-size-2);
-  font-weight: var(--v2-font-weight-primary-regular);
   font-family: var(--v2-font-family-primary);
   line-height: var(--v2-line-height-reset);
   margin-bottom: var(--v2-spacing-1);
 }
 
+.siteName {
+  font-weight: var(--v2-font-weight-primary-regular);
+}
+
+.storyTitle {
+  font-weight: var(--v2-font-weight-primary-semi-bold);
+}
+
 .borderless {
   border-width: 0px;
   box-shadow: none;
diff --git a/src/core/client/admin/components/ModerateCard/ModerateCard.spec.tsx b/src/core/client/admin/components/ModerateCard/ModerateCard.spec.tsx
index 850dec2b1..59a505cf7 100644
--- a/src/core/client/admin/components/ModerateCard/ModerateCard.spec.tsx
+++ b/src/core/client/admin/components/ModerateCard/ModerateCard.spec.tsx
@@ -23,6 +23,7 @@ const baseProps: PropTypesOf<typeof ModerateCardN> = {
   viewContextHref: "http://localhost/comment",
   suspectWords: ["suspect"],
   bannedWords: ["banned"],
+  siteName: null,
   onApprove: noop,
   onReject: noop,
   onFeature: noop,
diff --git a/src/core/client/admin/components/ModerateCard/ModerateCard.tsx b/src/core/client/admin/components/ModerateCard/ModerateCard.tsx
index d45f13a1d..32e873a74 100644
--- a/src/core/client/admin/components/ModerateCard/ModerateCard.tsx
+++ b/src/core/client/admin/components/ModerateCard/ModerateCard.tsx
@@ -16,6 +16,7 @@ import {
   Card,
   Flex,
   HorizontalGutter,
+  Icon,
   TextLink,
   Timestamp,
 } from "coral-ui/components/v2";
@@ -52,6 +53,7 @@ interface Props {
   showStory: boolean;
   storyTitle?: React.ReactNode;
   storyHref?: string;
+  siteName: string | null;
   onModerateStory?: React.EventHandler<React.MouseEvent>;
   onApprove: () => void;
   onReject: () => void;
@@ -96,6 +98,7 @@ const ModerateCard: FunctionComponent<Props> = ({
   storyTitle,
   storyHref,
   onModerateStory,
+  siteName,
   moderatedBy,
   selected,
   onFocusOrClick,
@@ -250,7 +253,15 @@ const ModerateCard: FunctionComponent<Props> = ({
                     </Localized>
                     <span>:</span>
                   </div>
-                  <div className={styles.storyTitle}>{storyTitle}</div>
+                  <div className={styles.commentOn}>
+                    {siteName && (
+                      <span className={styles.siteName}>
+                        {siteName}
+                        <Icon>keyboard_arrow_right</Icon>
+                      </span>
+                    )}
+                    <span className={styles.storyTitle}>{storyTitle}</span>
+                  </div>
                   <div>
                     <Localized id="moderate-comment-moderateStory">
                       <TextLink
diff --git a/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx b/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx
index 94c77f45f..fbfeb65a5 100644
--- a/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx
+++ b/src/core/client/admin/components/ModerateCard/ModerateCardContainer.tsx
@@ -4,12 +4,12 @@ import { graphql } from "react-relay";
 
 import NotAvailable from "coral-admin/components/NotAvailable";
 import BanModal from "coral-admin/components/UserStatus/BanModal";
-import { getModerationLink } from "coral-admin/helpers";
 import {
   ApproveCommentMutation,
   RejectCommentMutation,
 } from "coral-admin/mutations";
 import FadeInTransition from "coral-framework/components/FadeInTransition";
+import { getModerationLink } from "coral-framework/helpers";
 import {
   MutationProp,
   withFragmentContainer,
@@ -162,7 +162,7 @@ const ModerateCardContainer: FunctionComponent<Props> = ({
 
   const handleModerateStory = useCallback(
     (e: React.MouseEvent) => {
-      router.push(getModerationLink("default", comment.story.id));
+      router.push(getModerationLink({ storyID: comment.story.id }));
       if (e.preventDefault) {
         e.preventDefault();
       }
@@ -227,6 +227,7 @@ const ModerateCardContainer: FunctionComponent<Props> = ({
           selected={selected}
           selectPrev={selectPrev}
           selectNext={selectNext}
+          siteName={settings.multisite ? comment.site.name : null}
           onBan={openBanModal}
           moderatedBy={
             <ModeratedByContainer
@@ -242,7 +243,7 @@ const ModerateCardContainer: FunctionComponent<Props> = ({
               <NotAvailable />
             )
           }
-          storyHref={getModerationLink("default", comment.story.id)}
+          storyHref={getModerationLink({ storyID: comment.story.id })}
           onModerateStory={handleModerateStory}
           mini={mini}
           hideUsername={hideUsername}
@@ -300,6 +301,10 @@ const enhanced = withFragmentContainer<Props>({
           title
         }
       }
+      site {
+        id
+        name
+      }
       permalink
       enteredLive
       deleted
@@ -314,6 +319,7 @@ const enhanced = withFragmentContainer<Props>({
         banned
         suspect
       }
+      multisite
       ...MarkersContainer_settings
     }
   `,
diff --git a/src/core/client/admin/components/ModerateCard/__snapshots__/ModerateCard.spec.tsx.snap b/src/core/client/admin/components/ModerateCard/__snapshots__/ModerateCard.spec.tsx.snap
index 88fd87c7a..e6cfd6121 100644
--- a/src/core/client/admin/components/ModerateCard/__snapshots__/ModerateCard.spec.tsx.snap
+++ b/src/core/client/admin/components/ModerateCard/__snapshots__/ModerateCard.spec.tsx.snap
@@ -761,9 +761,13 @@ exports[`renders story info 1`] = `
               </span>
             </div>
             <div
-              className="ModerateCard-storyTitle"
+              className="ModerateCard-commentOn"
             >
-              Cancer cured!
+              <span
+                className="ModerateCard-storyTitle"
+              >
+                Cancer cured!
+              </span>
             </div>
             <div>
               <Localized
diff --git a/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css b/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css
new file mode 100644
index 000000000..acd4b5af6
--- /dev/null
+++ b/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css
@@ -0,0 +1,45 @@
+.root {
+  margin-top: var(--v2-spacing-2);
+}
+
+.dropdown {
+  max-height: 15em;
+  width: calc(20 * var(--mini-unit));
+  overflow: auto;
+}
+
+.wrapper {
+  overflow-x: hidden;
+  /* adjust for button line-height being > 1 */
+  margin-top: -2px;
+}
+
+.button {
+  color: var(--v2-colors-mono-500) !important;
+  border-width: 0;
+  width: calc(20 * var(--mini-unit));
+  margin-right: calc(var(--v2-spacing-1) / 2);
+  font-size: var(--v2-font-size-3);
+  line-height: var(--v2-line-height-min);
+  justify-content: space-between;
+}
+
+.buttonIconLeft {
+  width: 20px;
+  margin-right: calc(var(--v2-spacing-1) / 2);
+}
+
+.buttonIconRight {
+  width: 16px;
+}
+
+.buttonIconLeft,
+.buttonIconRight {
+  /* adjust for button line-height being > 1 */
+  margin-top: -2px;
+}
+
+.buttonText {
+  overflow-x: hidden;
+  text-overflow: ellipsis;
+}
diff --git a/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.tsx b/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.tsx
new file mode 100644
index 000000000..7f33dc885
--- /dev/null
+++ b/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.tsx
@@ -0,0 +1,98 @@
+import cn from "classnames";
+import React, { FunctionComponent } from "react";
+
+import AutoLoadMore from "coral-admin/components/AutoLoadMore";
+import { IntersectionProvider } from "coral-framework/lib/intersection";
+import {
+  Button,
+  ButtonIcon,
+  ClickOutside,
+  Dropdown,
+  Flex,
+  Popover,
+  Spinner,
+} from "coral-ui/components/v2";
+
+import styles from "./PaginatedSelect.css";
+
+interface Props {
+  onLoadMore: () => void;
+  icon?: string;
+  hasMore: boolean;
+  disableLoadMore: boolean;
+  loading: boolean;
+  selected: React.ReactNode;
+  className?: string;
+}
+
+const PaginatedSelect: FunctionComponent<Props> = ({
+  loading,
+  onLoadMore,
+  disableLoadMore,
+  hasMore,
+  children,
+  icon,
+  selected,
+  className,
+}) => {
+  return (
+    <Popover
+      id=""
+      placement="bottom-end"
+      modifiers={{ arrow: { enabled: false }, offset: { offset: "0, 4" } }}
+      body={({ toggleVisibility }) => (
+        <ClickOutside onClickOutside={toggleVisibility}>
+          <IntersectionProvider>
+            <Dropdown className={styles.dropdown}>
+              {children}
+              {loading && (
+                <Flex justifyContent="center">
+                  <Spinner />
+                </Flex>
+              )}
+              {hasMore && (
+                <Flex justifyContent="center">
+                  <AutoLoadMore
+                    disableLoadMore={disableLoadMore}
+                    onLoadMore={onLoadMore}
+                  />
+                </Flex>
+              )}
+            </Dropdown>
+          </IntersectionProvider>
+        </ClickOutside>
+      )}
+    >
+      {({ toggleVisibility, ref, visible }) => (
+        <Button
+          className={cn(styles.button, className)}
+          variant="flat"
+          adornmentLeft
+          color="mono"
+          onClick={toggleVisibility}
+          ref={ref}
+          uppercase={false}
+        >
+          {icon && (
+            <ButtonIcon className={styles.buttonIconLeft}>{icon}</ButtonIcon>
+          )}
+          <Flex alignItems="center" className={styles.wrapper}>
+            {selected}
+          </Flex>
+          {!visible && (
+            <ButtonIcon className={styles.buttonIconRight}>
+              keyboard_arrow_down
+            </ButtonIcon>
+          )}
+          {visible && (
+            <ButtonIcon className={styles.buttonIconRight}>
+              keyboard_arrow_up
+            </ButtonIcon>
+          )}
+        </Button>
+      )}
+    </Popover>
+  );
+};
+
+export default PaginatedSelect;
diff --git a/src/core/client/admin/components/PaginatedSelect/index.ts b/src/core/client/admin/components/PaginatedSelect/index.ts
new file mode 100644
index 000000000..bcf587a6a
--- /dev/null
+++ b/src/core/client/admin/components/PaginatedSelect/index.ts
@@ -0,0 +1 @@
+export { default } from "./PaginatedSelect";
diff --git a/src/core/client/admin/helpers/getModerationLink.ts b/src/core/client/admin/helpers/getModerationLink.ts
deleted file mode 100644
index a8707b1e0..000000000
--- a/src/core/client/admin/helpers/getModerationLink.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-const basePath = "/admin/moderate";
-
-export default function getModerationLink(
-  queue?: "default" | "reported" | "pending" | "unmoderated" | "rejected",
-  storyID?: string | null
-) {
-  const queuePart = queue && queue !== "default" ? `/${queue}` : "";
-  const storyPart = storyID ? `/${encodeURIComponent(storyID)}` : "";
-  return `${basePath}${queuePart}${storyPart}`;
-}
diff --git a/src/core/client/admin/helpers/getQueueConnection.ts b/src/core/client/admin/helpers/getQueueConnection.ts
index ae16fd954..bded7865a 100644
--- a/src/core/client/admin/helpers/getQueueConnection.ts
+++ b/src/core/client/admin/helpers/getQueueConnection.ts
@@ -13,16 +13,21 @@ import {
 export default function getQueueConnection(
   store: RecordSourceSelectorProxy | RecordSourceProxy,
   queue: GQLMODERATION_QUEUE_RL | "REJECTED",
-  storyID?: string | null
+  storyID?: string | null,
+  siteID?: string | null
 ): RecordProxy | null | undefined {
   const root = store.getRoot();
   if (queue === "REJECTED") {
     return ConnectionHandler.getConnection(root, "RejectedQueue_comments", {
       status: GQLCOMMENT_STATUS.REJECTED,
       storyID,
+      siteID,
     });
   }
-  const queuesRecord = root.getLinkedRecord("moderationQueues", { storyID })!;
+  const queuesRecord = root.getLinkedRecord("moderationQueues", {
+    storyID,
+    siteID,
+  })!;
   if (!queuesRecord) {
     return undefined;
   }
diff --git a/src/core/client/admin/helpers/index.ts b/src/core/client/admin/helpers/index.ts
index 56b0ff727..1555be6e2 100644
--- a/src/core/client/admin/helpers/index.ts
+++ b/src/core/client/admin/helpers/index.ts
@@ -1,2 +1 @@
 export { default as getQueueConnection } from "./getQueueConnection";
-export { default as getModerationLink } from "./getModerationLink";
diff --git a/src/core/client/admin/local/local.graphql b/src/core/client/admin/local/local.graphql
index eff5f0146..a9516b153 100644
--- a/src/core/client/admin/local/local.graphql
+++ b/src/core/client/admin/local/local.graphql
@@ -31,6 +31,7 @@ type Local {
   redirectPath: String
   authView: View
   authError: String
+  siteID: String
 }
 
 extend type Query {
diff --git a/src/core/client/admin/routeConfig.tsx b/src/core/client/admin/routeConfig.tsx
index d6a8eabc1..bcc148404 100644
--- a/src/core/client/admin/routeConfig.tsx
+++ b/src/core/client/admin/routeConfig.tsx
@@ -18,6 +18,9 @@ import {
   SlackConfigRoute,
   WordListConfigRoute,
 } from "./routes/Configure/sections";
+import { Sites } from "./routes/Configure/sections/Sites";
+import AddSiteRoute from "./routes/Configure/sections/Sites/AddSiteRoute";
+import SiteRoute from "./routes/Configure/sections/Sites/SiteRoute";
 import ForgotPasswordRoute from "./routes/ForgotPassword";
 import InviteRoute from "./routes/Invite";
 import LoginRoute from "./routes/Login";
@@ -45,17 +48,49 @@ export default makeRouteConfig(
         <Route path="moderate" {...ModerateRoute.routeConfig}>
           <Redirect from="/" to="/admin/moderate/reported" />
           <Route path="reported" {...ReportedQueueRoute.routeConfig} />
-          <Route path="reported/:storyID" {...ReportedQueueRoute.routeConfig} />
+          <Route
+            path="reported/stories/:storyID"
+            {...ReportedQueueRoute.routeConfig}
+          />
+          <Route
+            path="reported/sites/:siteID"
+            {...ReportedQueueRoute.routeConfig}
+          />
           <Route path="pending" {...PendingQueueRoute.routeConfig} />
-          <Route path="pending/:storyID" {...PendingQueueRoute.routeConfig} />
+          <Route
+            path="pending/stories/:storyID"
+            {...PendingQueueRoute.routeConfig}
+          />
+          <Route
+            path="pending/sites/:siteID"
+            {...PendingQueueRoute.routeConfig}
+          />
           <Route path="unmoderated" {...UnmoderatedQueueRoute.routeConfig} />
           <Route
-            path="unmoderated/:storyID"
+            path="unmoderated/stories/:storyID"
+            {...UnmoderatedQueueRoute.routeConfig}
+          />
+          <Route
+            path="unmoderated/sites/:siteID"
             {...UnmoderatedQueueRoute.routeConfig}
           />
           <Route path="rejected" {...RejectedQueueRoute.routeConfig} />
-          <Route path="rejected/:storyID" {...RejectedQueueRoute.routeConfig} />
-          <Redirect from=":storyID" to="/admin/moderate/reported/:storyID" />
+          <Route
+            path="rejected/stories/:storyID"
+            {...RejectedQueueRoute.routeConfig}
+          />
+          <Route
+            path="rejected/sites/:siteID"
+            {...RejectedQueueRoute.routeConfig}
+          />
+          <Redirect
+            from="stories/:storyID"
+            to="/admin/moderate/reported/stories/:storyID"
+          />
+          <Redirect
+            from="sites/:siteID"
+            to="/admin/moderate/reported/sites/:siteID"
+          />
         </Route>
         <Route path="stories" {...StoriesRoute.routeConfig} />
         <Route path="community" {...CommunityRoute.routeConfig} />
@@ -78,6 +113,11 @@ export default makeRouteConfig(
             <Route path="email" {...EmailConfigRoute.routeConfig} />
             <Route path="slack" {...SlackConfigRoute.routeConfig} />
           </Route>
+          <Route path="configure/organization/sites" Component={Sites}>
+            <Redirect from="/" to="/admin/configure/organization/sites/new" />
+            <Route path="new" {...AddSiteRoute.routeConfig} />
+            <Route path=":siteID" {...SiteRoute.routeConfig} />
+          </Route>
         </Route>
       </Route>
     </Route>
diff --git a/src/core/client/admin/routes/Configure/Configure.tsx b/src/core/client/admin/routes/Configure/Configure.tsx
index 346b528be..a7c9d2ce6 100644
--- a/src/core/client/admin/routes/Configure/Configure.tsx
+++ b/src/core/client/admin/routes/Configure/Configure.tsx
@@ -7,10 +7,9 @@ import { Form, FormSpy } from "react-final-form";
 import MainLayout from "coral-admin/components/MainLayout";
 import { Button, CallOut, HorizontalGutter } from "coral-ui/components/v2";
 
+import ConfigureLinks from "./ConfigureLinks";
 import Layout from "./Layout";
-import Link from "./Link";
 import Main from "./Main";
-import Navigation from "./Navigation";
 import SideBar from "./SideBar";
 
 interface Props {
@@ -32,34 +31,7 @@ const Configure: FunctionComponent<Props> = ({
           <Layout>
             <SideBar>
               <HorizontalGutter size="double">
-                <Navigation>
-                  <Localized id="configure-sideBarNavigation-general">
-                    <Link to="/admin/configure/general">General</Link>
-                  </Localized>
-                  <Localized id="configure-sideBarNavigation-organization">
-                    <Link to="/admin/configure/organization">Organization</Link>
-                  </Localized>
-                  <Localized id="configure-sideBarNavigation-moderation">
-                    <Link to="/admin/configure/moderation">Moderation</Link>
-                  </Localized>
-                  <Localized id="configure-sideBarNavigation-bannedAndSuspectWords">
-                    <Link to="/admin/configure/wordList">
-                      Banned and Suspect Words
-                    </Link>
-                  </Localized>
-                  <Localized id="configure-sideBarNavigation-authentication">
-                    <Link to="/admin/configure/auth">Authentication</Link>
-                  </Localized>
-                  <Localized id="configure-sideBarNavigation-email">
-                    <Link to="/admin/configure/email">Email</Link>
-                  </Localized>
-                  <Localized id="configure-sideBarNavigation-slack">
-                    <Link to="/admin/configure/slack">Slack</Link>
-                  </Localized>
-                  <Localized id="configure-sideBarNavigation-advanced">
-                    <Link to="/admin/configure/advanced">Advanced</Link>
-                  </Localized>
-                </Navigation>
+                <ConfigureLinks />
               </HorizontalGutter>
               <HorizontalGutter size="double">
                 <Localized id="configure-sideBar-saveChanges">
diff --git a/src/core/client/admin/routes/Configure/ConfigureLinks.tsx b/src/core/client/admin/routes/Configure/ConfigureLinks.tsx
new file mode 100644
index 000000000..64c0531dd
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/ConfigureLinks.tsx
@@ -0,0 +1,38 @@
+import { Localized } from "@fluent/react/compat";
+import React, { FunctionComponent } from "react";
+
+import Link from "./Link";
+import Navigation from "./Navigation";
+
+const ConfigureLinks: FunctionComponent<{}> = () => {
+  return (
+    <Navigation>
+      <Localized id="configure-sideBarNavigation-general">
+        <Link to="/admin/configure/general">General</Link>
+      </Localized>
+      <Localized id="configure-sideBarNavigation-organization">
+        <Link to="/admin/configure/organization">Organization</Link>
+      </Localized>
+      <Localized id="configure-sideBarNavigation-moderation">
+        <Link to="/admin/configure/moderation">Moderation</Link>
+      </Localized>
+      <Localized id="configure-sideBarNavigation-bannedAndSuspectWords">
+        <Link to="/admin/configure/wordList">Banned and Suspect Words</Link>
+      </Localized>
+      <Localized id="configure-sideBarNavigation-authentication">
+        <Link to="/admin/configure/auth">Authentication</Link>
+      </Localized>
+      <Localized id="configure-sideBarNavigation-email">
+        <Link to="/admin/configure/email">Email</Link>
+      </Localized>
+      <Localized id="configure-sideBarNavigation-slack">
+        <Link to="/admin/configure/slack">Slack</Link>
+      </Localized>
+      <Localized id="configure-sideBarNavigation-advanced">
+        <Link to="/admin/configure/advanced">Advanced</Link>
+      </Localized>
+    </Navigation>
+  );
+};
+
+export default ConfigureLinks;
diff --git a/src/core/client/admin/routes/Configure/sections/Advanced/AdvancedConfigContainer.tsx b/src/core/client/admin/routes/Configure/sections/Advanced/AdvancedConfigContainer.tsx
index 00fa67f46..b6de315d4 100644
--- a/src/core/client/admin/routes/Configure/sections/Advanced/AdvancedConfigContainer.tsx
+++ b/src/core/client/admin/routes/Configure/sections/Advanced/AdvancedConfigContainer.tsx
@@ -12,8 +12,6 @@ import { AdvancedConfigContainer_settings } from "coral-admin/__generated__/Adva
 
 import CommentStreamLiveUpdatesContainer from "./CommentStreamLiveUpdatesContainer";
 import CustomCSSConfig from "./CustomCSSConfig";
-import EmbedCodeContainer from "./EmbedCodeContainer";
-import PermittedDomainsConfig from "./PermittedDomainsConfig";
 import StoryCreationConfig from "./StoryCreationConfig";
 
 interface Props {
@@ -29,13 +27,11 @@ const AdvancedConfigContainer: React.FunctionComponent<Props> = ({
   useMemo(() => form.initialize(purgeMetadata(settings)), []);
   return (
     <HorizontalGutter size="double" data-testid="configure-advancedContainer">
-      <EmbedCodeContainer settings={settings} />
       <CustomCSSConfig disabled={submitting} />
       <CommentStreamLiveUpdatesContainer
         disabled={submitting}
         settings={settings}
       />
-      <PermittedDomainsConfig disabled={submitting} />
       <StoryCreationConfig disabled={submitting} />
     </HorizontalGutter>
   );
@@ -45,11 +41,8 @@ const enhanced = withFragmentContainer<Props>({
   settings: graphql`
     fragment AdvancedConfigContainer_settings on Settings {
       ...CustomCSSConfig_formValues @relay(mask: false)
-      ...PermittedDomainsConfig_formValues @relay(mask: false)
       ...CommentStreamLiveUpdates_formValues @relay(mask: false)
       ...StoryCreationConfig_formValues @relay(mask: false)
-
-      ...EmbedCodeContainer_settings
       ...CommentStreamLiveUpdatesContainer_settings
     }
   `,
diff --git a/src/core/client/admin/routes/Configure/sections/Advanced/EmbedCodeContainer.tsx b/src/core/client/admin/routes/Configure/sections/Advanced/EmbedCodeContainer.tsx
deleted file mode 100644
index 268e0a0a2..000000000
--- a/src/core/client/admin/routes/Configure/sections/Advanced/EmbedCodeContainer.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React, { FunctionComponent } from "react";
-import { graphql } from "react-relay";
-
-import { withFragmentContainer } from "coral-framework/lib/relay";
-
-import { EmbedCodeContainer_settings } from "coral-admin/__generated__/EmbedCodeContainer_settings.graphql";
-
-import EmbedCode from "./EmbedCode";
-
-interface Props {
-  settings: EmbedCodeContainer_settings;
-}
-
-const EmbedCodeContainer: FunctionComponent<Props> = ({ settings }) => {
-  return <EmbedCode staticURI={settings.staticURI} />;
-};
-
-const enhanced = withFragmentContainer<Props>({
-  settings: graphql`
-    fragment EmbedCodeContainer_settings on Settings {
-      staticURI
-    }
-  `,
-})(EmbedCodeContainer);
-
-export default enhanced;
diff --git a/src/core/client/admin/routes/Configure/sections/Advanced/PermittedDomainsConfig.tsx b/src/core/client/admin/routes/Configure/sections/Advanced/PermittedDomainsConfig.tsx
deleted file mode 100644
index 6cf992571..000000000
--- a/src/core/client/admin/routes/Configure/sections/Advanced/PermittedDomainsConfig.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Localized } from "@fluent/react/compat";
-import React, { FunctionComponent } from "react";
-import { Field } from "react-final-form";
-import { graphql } from "react-relay";
-
-import { formatStringList, parseStringList } from "coral-framework/lib/form";
-import { validateStrictURLList } from "coral-framework/lib/validation";
-import { FormField, FormFieldDescription } from "coral-ui/components/v2";
-
-import ConfigBox from "../../ConfigBox";
-import Header from "../../Header";
-import TextFieldWithValidation from "../../TextFieldWithValidation";
-
-// eslint-disable-next-line no-unused-expressions
-graphql`
-  fragment PermittedDomainsConfig_formValues on Settings {
-    allowedDomains
-  }
-`;
-
-interface Props {
-  disabled: boolean;
-}
-
-const PermittedDomainsConfig: FunctionComponent<Props> = ({ disabled }) => (
-  <ConfigBox
-    title={
-      <Localized id="configure-advanced-permittedDomains">
-        <Header htmlFor="configure-advanced-allowedDomains">
-          Permitted domains
-        </Header>
-      </Localized>
-    }
-  >
-    <FormField>
-      <Localized
-        id="configure-advanced-permittedDomains-description"
-        strong={<strong />}
-      >
-        <FormFieldDescription>
-          The domains you would like to permit for Coral, e.g. your local,
-          staging and production environments including the scheme (ex.
-          http://localhost:3000, https://staging.domain.com,
-          https://domain.com).
-        </FormFieldDescription>
-      </Localized>
-      <Field
-        name="allowedDomains"
-        parse={parseStringList}
-        format={formatStringList}
-        validate={validateStrictURLList}
-      >
-        {({ input, meta }) => (
-          <TextFieldWithValidation
-            {...input}
-            id={`configure-advanced-${input.name}`}
-            disabled={disabled}
-            autoComplete="off"
-            autoCorrect="off"
-            autoCapitalize="off"
-            spellCheck={false}
-            meta={meta}
-            fullWidth
-          />
-        )}
-      </Field>
-    </FormField>
-  </ConfigBox>
-);
-
-export default PermittedDomainsConfig;
diff --git a/src/core/client/admin/routes/Configure/sections/Organization/EmptySitesMessage.tsx b/src/core/client/admin/routes/Configure/sections/Organization/EmptySitesMessage.tsx
new file mode 100644
index 000000000..4ebc7ceab
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Organization/EmptySitesMessage.tsx
@@ -0,0 +1,10 @@
+import { Localized } from "@fluent/react/compat";
+import React, { FunctionComponent } from "react";
+
+const EmptySitesMessage: FunctionComponent = props => (
+  <Localized id="sites-emptyMessage">
+    <div>We could not find any sites matching your criteria.</div>
+  </Localized>
+);
+
+export default EmptySitesMessage;
diff --git a/src/core/client/admin/routes/Configure/sections/Organization/OrganizationConfigContainer.tsx b/src/core/client/admin/routes/Configure/sections/Organization/OrganizationConfigContainer.tsx
index 429820ad0..ec8e43ab2 100644
--- a/src/core/client/admin/routes/Configure/sections/Organization/OrganizationConfigContainer.tsx
+++ b/src/core/client/admin/routes/Configure/sections/Organization/OrganizationConfigContainer.tsx
@@ -6,7 +6,6 @@ import {
   purgeMetadata,
   withFragmentContainer,
 } from "coral-framework/lib/relay";
-import { HorizontalGutter } from "coral-ui/components";
 
 import { OrganizationConfigContainer_settings as SettingsData } from "coral-admin/__generated__/OrganizationConfigContainer_settings.graphql";
 
@@ -25,22 +24,19 @@ const OrganizationConfigContainer: React.FunctionComponent<Props> = ({
   const form = useForm();
   useMemo(() => form.initialize(purgeMetadata(settings)), []);
   return (
-    <HorizontalGutter
-      size="double"
-      data-testid="configure-organizationContainer"
-    >
+    <>
       <OrganizationNameConfig disabled={submitting} />
-      <OrganizationContactEmailConfig disabled={submitting} />
       <OrganizationURLConfig disabled={submitting} />
-    </HorizontalGutter>
+      <OrganizationContactEmailConfig disabled={submitting} />
+    </>
   );
 };
 const enhanced = withFragmentContainer<Props>({
   settings: graphql`
     fragment OrganizationConfigContainer_settings on Settings {
       ...OrganizationNameConfig_formValues @relay(mask: false)
-      ...OrganizationContactEmailConfig_formValues @relay(mask: false)
       ...OrganizationURLConfig_formValues @relay(mask: false)
+      ...OrganizationContactEmailConfig_formValues @relay(mask: false)
     }
   `,
 })(OrganizationConfigContainer);
diff --git a/src/core/client/admin/routes/Configure/sections/Organization/OrganizationConfigRoute.tsx b/src/core/client/admin/routes/Configure/sections/Organization/OrganizationConfigRoute.tsx
index e5f3c49f2..1e2d4480e 100644
--- a/src/core/client/admin/routes/Configure/sections/Organization/OrganizationConfigRoute.tsx
+++ b/src/core/client/admin/routes/Configure/sections/Organization/OrganizationConfigRoute.tsx
@@ -2,11 +2,12 @@ import React from "react";
 import { graphql } from "react-relay";
 
 import { withRouteConfig } from "coral-framework/lib/router";
-import { Delay, Spinner } from "coral-ui/components/v2";
+import { Delay, HorizontalGutter, Spinner } from "coral-ui/components/v2";
 
 import { OrganizationConfigRouteQueryResponse } from "coral-admin/__generated__/OrganizationConfigRouteQuery.graphql";
 
 import OrganizationConfigContainer from "./OrganizationConfigContainer";
+import SitesConfigContainer from "./SitesConfigContainer";
 
 interface Props {
   data: OrganizationConfigRouteQueryResponse | null;
@@ -23,10 +24,16 @@ class OrganizationConfigRoute extends React.Component<Props> {
       );
     }
     return (
-      <OrganizationConfigContainer
-        settings={this.props.data.settings}
-        submitting={this.props.submitting}
-      />
+      <HorizontalGutter
+        spacing={4}
+        data-testid="configure-organizationContainer"
+      >
+        <OrganizationConfigContainer
+          settings={this.props.data.settings}
+          submitting={this.props.submitting}
+        />
+        <SitesConfigContainer query={this.props.data} />
+      </HorizontalGutter>
     );
   }
 }
@@ -37,6 +44,7 @@ const enhanced = withRouteConfig<Props>({
       settings {
         ...OrganizationConfigContainer_settings
       }
+      ...SitesConfigContainer_query
     }
   `,
   cacheConfig: { force: true },
diff --git a/src/core/client/admin/routes/Configure/sections/Organization/SiteRowContainer.tsx b/src/core/client/admin/routes/Configure/sections/Organization/SiteRowContainer.tsx
new file mode 100644
index 000000000..09aad23a1
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Organization/SiteRowContainer.tsx
@@ -0,0 +1,49 @@
+import { Localized } from "@fluent/react/compat";
+import React, { FunctionComponent } from "react";
+
+import { graphql, withFragmentContainer } from "coral-framework/lib/relay";
+import { Button, Flex, Icon } from "coral-ui/components/v2";
+import { TableCell, TableRow } from "coral-ui/components/v2/Table";
+
+import { SiteRowContainer_site } from "coral-admin/__generated__/SiteRowContainer_site.graphql";
+
+interface Props {
+  site: SiteRowContainer_site;
+}
+
+const SiteRowContainer: FunctionComponent<Props> = ({ site }) => {
+  return (
+    <TableRow>
+      <TableCell>{site.name}</TableCell>
+      <TableCell>
+        <Flex justifyContent="flex-end">
+          <Localized
+            id="configure-sites-site-details"
+            icon={<Icon>keyboard_arrow_right</Icon>}
+          >
+            <Button
+              variant="text"
+              to={`/admin/configure/organization/sites/${site.id}`}
+              iconRight
+            >
+              Details
+              <Icon>keyboard_arrow_right</Icon>
+            </Button>
+          </Localized>
+        </Flex>
+      </TableCell>
+    </TableRow>
+  );
+};
+
+const enhanced = withFragmentContainer<Props>({
+  site: graphql`
+    fragment SiteRowContainer_site on Site {
+      id
+      name
+      createdAt
+    }
+  `,
+})(SiteRowContainer);
+
+export default enhanced;
diff --git a/src/core/client/admin/routes/Configure/sections/Organization/SitesConfig.tsx b/src/core/client/admin/routes/Configure/sections/Organization/SitesConfig.tsx
new file mode 100644
index 000000000..694faf4b1
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Organization/SitesConfig.tsx
@@ -0,0 +1,67 @@
+import { Localized } from "@fluent/react/compat";
+import React, { FunctionComponent } from "react";
+
+import { PropTypesOf } from "coral-framework/types";
+import { Button, FormFieldDescription, Icon } from "coral-ui/components/v2";
+
+import ConfigBox from "../../ConfigBox";
+import Header from "../../Header";
+import SiteRowContainer from "./SiteRowContainer";
+import SitesTable from "./SitesTable";
+
+interface Props {
+  sites: Array<{ id: string } & PropTypesOf<typeof SiteRowContainer>["site"]>;
+  onLoadMore: () => void;
+  hasMore: boolean;
+  disableLoadMore: boolean;
+  loading: boolean;
+}
+
+const SitesConfig: FunctionComponent<Props> = ({
+  sites,
+  loading,
+  disableLoadMore,
+  onLoadMore,
+  hasMore,
+}) => {
+  return (
+    <ConfigBox
+      title={
+        <Localized id="configure-organization-sites">
+          <Header htmlFor="configure-organization-organization.sites">
+            Sites
+          </Header>
+        </Localized>
+      }
+    >
+      <Localized id="configure-organization-sites-explanation">
+        <FormFieldDescription>
+          Add a new site to your organization or edit an existing site's
+          details.
+        </FormFieldDescription>
+      </Localized>
+      <Localized
+        id="configure-organization-sites-add-site"
+        icon={<Icon>add</Icon>}
+      >
+        <Button
+          to="/admin/configure/organization/sites/new"
+          iconLeft
+          size="large"
+        >
+          <Icon>add</Icon>
+          Add a site
+        </Button>
+      </Localized>
+      <SitesTable
+        sites={sites}
+        loading={loading}
+        onLoadMore={onLoadMore}
+        hasMore={hasMore}
+        disableLoadMore={disableLoadMore}
+      />
+    </ConfigBox>
+  );
+};
+
+export default SitesConfig;
diff --git a/src/core/client/admin/routes/Configure/sections/Organization/SitesConfigContainer.tsx b/src/core/client/admin/routes/Configure/sections/Organization/SitesConfigContainer.tsx
new file mode 100644
index 000000000..bd813e1cc
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Organization/SitesConfigContainer.tsx
@@ -0,0 +1,94 @@
+import React from "react";
+import { graphql, RelayPaginationProp } from "react-relay";
+
+import { IntersectionProvider } from "coral-framework/lib/intersection";
+import {
+  useLoadMore,
+  useRefetch,
+  withPaginationContainer,
+} from "coral-framework/lib/relay";
+
+import { SitesConfigContainer_query as QueryData } from "coral-admin/__generated__/SitesConfigContainer_query.graphql";
+import { SitesConfigContainerPaginationQueryVariables } from "coral-admin/__generated__/SitesConfigContainerPaginationQuery.graphql";
+
+import SitesConfig from "./SitesConfig";
+
+interface Props {
+  query: QueryData | null;
+  relay: RelayPaginationProp;
+}
+const SitesConfigContainer: React.FunctionComponent<Props> = props => {
+  const sites = props.query
+    ? props.query.sites.edges.map(edge => edge.node)
+    : [];
+  const [loadMore, isLoadingMore] = useLoadMore(props.relay, 10);
+  const [, isRefetching] = useRefetch<
+    SitesConfigContainerPaginationQueryVariables
+  >(props.relay);
+  return (
+    <IntersectionProvider>
+      <SitesConfig
+        loading={!props.query || isRefetching}
+        sites={sites}
+        onLoadMore={loadMore}
+        hasMore={!isRefetching && props.relay.hasMore()}
+        disableLoadMore={isLoadingMore}
+      />
+    </IntersectionProvider>
+  );
+};
+
+type FragmentVariables = SitesConfigContainerPaginationQueryVariables;
+
+const enhanced = withPaginationContainer<
+  Props,
+  SitesConfigContainerPaginationQueryVariables,
+  FragmentVariables
+>(
+  {
+    query: graphql`
+      fragment SitesConfigContainer_query on Query
+        @argumentDefinitions(
+          count: { type: "Int!", defaultValue: 20 }
+          cursor: { type: "Cursor" }
+        ) {
+        sites(first: $count, after: $cursor)
+          @connection(key: "SitesConfig_sites") {
+          edges {
+            node {
+              id
+              ...SiteRowContainer_site
+            }
+          }
+        }
+      }
+    `,
+  },
+  {
+    direction: "forward",
+    getConnectionFromProps(props) {
+      return props.query && props.query.sites;
+    },
+    // This is also the default implementation of `getFragmentVariables` if it isn't provided.
+    getFragmentVariables(prevVars, totalCount) {
+      return {
+        ...prevVars,
+        count: totalCount,
+      };
+    },
+    getVariables(props, { count, cursor }, fragmentVariables) {
+      return {
+        count,
+        cursor,
+      };
+    },
+    query: graphql`
+      # Pagination query to be fetched upon calling 'loadMore'.
+      # Notice that we re-use our fragment, and the shape of this query matches our fragment spec.
+      query SitesConfigContainerPaginationQuery($count: Int!, $cursor: Cursor) {
+        ...SitesConfigContainer_query @arguments(count: $count, cursor: $cursor)
+      }
+    `,
+  }
+)(SitesConfigContainer);
+export default enhanced;
diff --git a/src/core/client/admin/routes/Configure/sections/Organization/SitesTable.tsx b/src/core/client/admin/routes/Configure/sections/Organization/SitesTable.tsx
new file mode 100644
index 000000000..246a6625c
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Organization/SitesTable.tsx
@@ -0,0 +1,63 @@
+import { Localized } from "@fluent/react/compat";
+import React, { FunctionComponent } from "react";
+
+import AutoLoadMore from "coral-admin/components/AutoLoadMore";
+import { PropTypesOf } from "coral-framework/types";
+import {
+  Flex,
+  Spinner,
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableRow,
+} from "coral-ui/components/v2";
+
+import EmptySitesMessage from "./EmptySitesMessage";
+import SiteRowContainer from "./SiteRowContainer";
+
+interface Props {
+  sites: Array<{ id: string } & PropTypesOf<typeof SiteRowContainer>["site"]>;
+  onLoadMore: () => void;
+  hasMore: boolean;
+  disableLoadMore: boolean;
+  loading: boolean;
+}
+
+const SitesTable: FunctionComponent<Props> = props => {
+  return (
+    <>
+      <Table fullWidth>
+        <TableHead>
+          <TableRow>
+            <Localized id="site-table-siteName">
+              <TableCell>Site name</TableCell>
+            </Localized>
+            <TableCell />
+          </TableRow>
+        </TableHead>
+        <TableBody>
+          {props.sites.map(site => (
+            <SiteRowContainer site={site} key={site.id} />
+          ))}
+        </TableBody>
+      </Table>
+      {!props.loading && props.sites.length === 0 && <EmptySitesMessage />}
+      {props.loading && (
+        <Flex justifyContent="center">
+          <Spinner />
+        </Flex>
+      )}
+      {props.hasMore && (
+        <Flex justifyContent="center">
+          <AutoLoadMore
+            disableLoadMore={props.disableLoadMore}
+            onLoadMore={props.onLoadMore}
+          />
+        </Flex>
+      )}
+    </>
+  );
+};
+
+export default SitesTable;
diff --git a/src/core/client/admin/routes/Configure/sections/Sites/AddSiteRoute.tsx b/src/core/client/admin/routes/Configure/sections/Sites/AddSiteRoute.tsx
new file mode 100644
index 000000000..ae1fc9c71
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Sites/AddSiteRoute.tsx
@@ -0,0 +1,75 @@
+import { Localized } from "@fluent/react/compat";
+import { useRouter } from "found";
+import React, { FunctionComponent, useCallback } from "react";
+
+import { useNotification } from "coral-admin/App/GlobalNotification";
+import { graphql } from "coral-framework/lib/relay";
+import { withRouteConfig } from "coral-framework/lib/router";
+import { AppNotification } from "coral-ui/components/v2";
+
+import { AddSiteRouteQueryResponse } from "coral-admin/__generated__/AddSiteRouteQuery.graphql";
+
+import ConfigBox from "../../ConfigBox";
+import Header from "../../Header";
+import CreateSiteForm from "./CreateSiteForm";
+
+interface Props {
+  data: AddSiteRouteQueryResponse | null;
+}
+
+const AddSiteRoute: FunctionComponent<Props> = props => {
+  const { router } = useRouter();
+  const { setMessage, clearMessage } = useNotification();
+  const onSiteCreate = useCallback(
+    (id: string, name: string) => {
+      router.replace(`/admin/configure/organization/sites/${id}`);
+      setMessage(
+        <Localized
+          id="configure-sites-add-success"
+          $site={name}
+          $org={props.data && props.data.settings.organization.name}
+        >
+          <AppNotification icon="check_circle_outline" onClose={clearMessage}>
+            {name} has been added to{" "}
+            {props.data && props.data.settings.organization.name}
+          </AppNotification>
+        </Localized>
+      );
+    },
+    [props.data]
+  );
+  if (!props.data) {
+    return null;
+  }
+  return (
+    <ConfigBox
+      title={
+        <Localized
+          id="configure-sites-add-new-site"
+          $site={props.data.settings.organization.name}
+        >
+          <Header>
+            Add a new site to {props.data.settings.organization.name}
+          </Header>
+        </Localized>
+      }
+    >
+      <CreateSiteForm onCreate={onSiteCreate} />
+    </ConfigBox>
+  );
+};
+
+const enhanced = withRouteConfig<Props>({
+  query: graphql`
+    query AddSiteRouteQuery {
+      settings {
+        organization {
+          name
+        }
+      }
+    }
+  `,
+  cacheConfig: { force: true },
+})(AddSiteRoute);
+
+export default enhanced;
diff --git a/src/core/client/admin/routes/Configure/sections/Sites/CreateSiteForm.tsx b/src/core/client/admin/routes/Configure/sections/Sites/CreateSiteForm.tsx
new file mode 100644
index 000000000..37c70577a
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Sites/CreateSiteForm.tsx
@@ -0,0 +1,147 @@
+import { Localized } from "@fluent/react/compat";
+import { FormApi } from "final-form";
+import React, { FunctionComponent, useCallback, useState } from "react";
+import { Field, Form } from "react-final-form";
+
+import { formatStringList, parseStringList } from "coral-framework/lib/form";
+import { useMutation } from "coral-framework/lib/relay";
+import {
+  required,
+  validateStrictURLList,
+} from "coral-framework/lib/validation";
+import {
+  Button,
+  ButtonIcon,
+  CallOut,
+  Flex,
+  FormField,
+  FormFieldHeader,
+  HorizontalGutter,
+  Label,
+} from "coral-ui/components/v2";
+
+import HelperText from "../../HelperText";
+import TextFieldWithValidation from "../../TextFieldWithValidation";
+import CreateSiteMutation from "./CreateSiteMutation";
+
+interface Props {
+  onCreate: (id: string, name: string) => void;
+}
+
+const CreateSiteForm: FunctionComponent<Props> = ({ onCreate }) => {
+  const createSite = useMutation(CreateSiteMutation);
+  const [submitError, setSubmitError] = useState<null | string>(null);
+  const onSubmit = useCallback(
+    async (input, form: FormApi) => {
+      try {
+        const response = await createSite({ site: input });
+        if (response && response.site) {
+          onCreate(response.site.id, response.site.name);
+        }
+      } catch (error) {
+        setSubmitError(error.message);
+      }
+    },
+    [onCreate]
+  );
+  return (
+    <div>
+      <Form onSubmit={onSubmit}>
+        {({ handleSubmit, invalid, submitting, ...formProps }) => (
+          <form onSubmit={handleSubmit}>
+            <HorizontalGutter spacing={4}>
+              <FormField>
+                <FormFieldHeader>
+                  <Localized id="configure-sites-site-form-name">
+                    <Label>Site name</Label>
+                  </Localized>
+                  <Localized id="configure-sites-site-form-name-explanation">
+                    <HelperText>
+                      Site name will appear on emails sent by Coral to your
+                      community and organization members.
+                    </HelperText>
+                  </Localized>
+                </FormFieldHeader>
+                <Field name="name" validate={required}>
+                  {({ input, meta }) => (
+                    <TextFieldWithValidation
+                      {...input}
+                      id={input.name}
+                      fullWidth
+                      meta={meta}
+                    />
+                  )}
+                </Field>
+              </FormField>
+              <FormField>
+                <FormFieldHeader>
+                  <Localized id="configure-sites-site-form-domains">
+                    <Label>Site permitted domains</Label>
+                  </Localized>
+                  <Localized id="configure-sites-site-form-domains-explanation">
+                    <HelperText>
+                      Domains where your Coral comment streams are allowed to be
+                      embedded (ex. http://localhost:3000,
+                      https://staging.domain.com, https://domain.com).
+                    </HelperText>
+                  </Localized>
+                </FormFieldHeader>
+                <Field
+                  name="allowedOrigins"
+                  parse={parseStringList}
+                  format={formatStringList}
+                  validate={validateStrictURLList}
+                >
+                  {({ input, meta }) => (
+                    <TextFieldWithValidation
+                      {...input}
+                      id={`configure-advanced-${input.name}`}
+                      autoComplete="off"
+                      autoCorrect="off"
+                      autoCapitalize="off"
+                      spellCheck={false}
+                      meta={meta}
+                      fullWidth
+                    />
+                  )}
+                </Field>
+              </FormField>
+              {submitError && (
+                <CallOut fullWidth color="error">
+                  {submitError}
+                </CallOut>
+              )}
+              <Flex itemGutter justifyContent="flex-end">
+                <Localized id="configure-sites-site-form-cancel">
+                  <Button
+                    variant="outline"
+                    size="large"
+                    color="mono"
+                    to="/admin/configure/organization"
+                  >
+                    Cancel
+                  </Button>
+                </Localized>
+                <Localized
+                  id="configure-sites-site-form-submit"
+                  icon={<ButtonIcon>add</ButtonIcon>}
+                >
+                  <Button
+                    disabled={submitting}
+                    iconLeft
+                    type="submit"
+                    size="large"
+                  >
+                    Add site
+                  </Button>
+                </Localized>
+              </Flex>
+            </HorizontalGutter>
+          </form>
+        )}
+      </Form>
+    </div>
+  );
+};
+
+export default CreateSiteForm;
diff --git a/src/core/client/admin/routes/Configure/sections/Sites/CreateSiteMutation.ts b/src/core/client/admin/routes/Configure/sections/Sites/CreateSiteMutation.ts
new file mode 100644
index 000000000..6702c5c04
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Sites/CreateSiteMutation.ts
@@ -0,0 +1,57 @@
+import { graphql } from "react-relay";
+import { Environment } from "relay-runtime";
+
+import { CoralContext } from "coral-framework/lib/bootstrap";
+import {
+  commitMutationPromiseNormalized,
+  createMutation,
+  MutationInput,
+} from "coral-framework/lib/relay";
+
+import { CreateSiteMutation as MutationTypes } from "coral-admin/__generated__/CreateSiteMutation.graphql";
+
+let clientMutationId = 0;
+
+const CreateSiteMutation = createMutation(
+  "createSite",
+  (
+    environment: Environment,
+    input: MutationInput<MutationTypes>,
+    { uuidGenerator }: CoralContext
+  ) => {
+    const id = uuidGenerator();
+    const now = new Date();
+    return commitMutationPromiseNormalized<MutationTypes>(environment, {
+      mutation: graphql`
+        mutation CreateSiteMutation($input: CreateSiteInput!) {
+          createSite(input: $input) {
+            site {
+              id
+              name
+              createdAt
+            }
+            clientMutationId
+          }
+        }
+      `,
+      variables: {
+        input: {
+          ...input,
+          clientMutationId: clientMutationId.toString(),
+        },
+      },
+      optimisticResponse: {
+        createSite: {
+          site: {
+            id,
+            createdAt: now.toISOString(),
+            name: input.site.name,
+          },
+          clientMutationId: (clientMutationId++).toString(),
+        },
+      },
+    });
+  }
+);
+
+export default CreateSiteMutation;
diff --git a/src/core/client/admin/routes/Configure/sections/Sites/EditSiteForm.tsx b/src/core/client/admin/routes/Configure/sections/Sites/EditSiteForm.tsx
new file mode 100644
index 000000000..e4a8ca4ee
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Sites/EditSiteForm.tsx
@@ -0,0 +1,167 @@
+import { Localized } from "@fluent/react/compat";
+import { FormApi } from "final-form";
+import React, { FunctionComponent, useCallback, useState } from "react";
+import { Field, Form } from "react-final-form";
+import { graphql } from "react-relay";
+
+import { formatStringList, parseStringList } from "coral-framework/lib/form";
+import { useMutation, withFragmentContainer } from "coral-framework/lib/relay";
+import {
+  required,
+  validateStrictURLList,
+} from "coral-framework/lib/validation";
+import {
+  Button,
+  CallOut,
+  Flex,
+  FormField,
+  FormFieldHeader,
+  HorizontalGutter,
+  Label,
+} from "coral-ui/components/v2";
+
+import { EditSiteForm_settings as SettingsData } from "coral-admin/__generated__/EditSiteForm_settings.graphql";
+import { EditSiteForm_site as SiteData } from "coral-admin/__generated__/EditSiteForm_site.graphql";
+
+import HelperText from "../../HelperText";
+import TextFieldWithValidation from "../../TextFieldWithValidation";
+import EmbedCode from "./EmbedCode";
+import UpdateSiteMutation from "./UpdateSiteMutation";
+
+interface Props {
+  site: SiteData;
+  settings: SettingsData;
+  onEditSuccess: (name: string) => void;
+}
+
+const EditSiteForm: FunctionComponent<Props> = ({
+  site,
+  settings,
+  onEditSuccess,
+}) => {
+  const updateSite = useMutation(UpdateSiteMutation);
+  const [submitError, setSubmitError] = useState<null | string>(null);
+  const onSubmit = useCallback(async (input, form: FormApi) => {
+    try {
+      const result = await updateSite({ site: input, id: site.id });
+      if (result) {
+        onEditSuccess(result.site.name);
+      }
+    } catch (error) {
+      setSubmitError(error.message);
+    }
+  }, []);
+  return (
+    <div>
+      <Form onSubmit={onSubmit}>
+        {({ handleSubmit, invalid, submitting, ...formProps }) => (
+          <form onSubmit={handleSubmit}>
+            <HorizontalGutter spacing={4}>
+              <FormField>
+                <FormFieldHeader>
+                  <Localized id="configure-sites-site-form-name">
+                    <Label>Site name</Label>
+                  </Localized>
+                  <Localized id="configure-sites-site-form-name-explanation">
+                    <HelperText>
+                      Site name will appear on emails sent by Coral to your
+                      community and organization members.
+                    </HelperText>
+                  </Localized>
+                </FormFieldHeader>
+                <Field name="name" validate={required} defaultValue={site.name}>
+                  {({ input, meta }) => (
+                    <TextFieldWithValidation
+                      {...input}
+                      id={input.name}
+                      fullWidth
+                      meta={meta}
+                    />
+                  )}
+                </Field>
+              </FormField>
+              <FormField>
+                <FormFieldHeader>
+                  <Localized id="configure-sites-site-form-domains">
+                    <Label>Site permitted domains</Label>
+                  </Localized>
+                  <Localized id="configure-sites-site-form-domains-explanation">
+                    <HelperText>
+                      Domains where your Coral comment streams are allowed to be
+                      embedded (ex. http://localhost:3000,
+                      https://staging.domain.com, https://domain.com).
+                    </HelperText>
+                  </Localized>
+                </FormFieldHeader>
+                <Field
+                  name="allowedOrigins"
+                  defaultValue={site.allowedOrigins}
+                  parse={parseStringList}
+                  format={formatStringList}
+                  validate={validateStrictURLList}
+                >
+                  {({ input, meta }) => (
+                    <TextFieldWithValidation
+                      {...input}
+                      id={`configure-advanced-${input.name}`}
+                      autoComplete="off"
+                      autoCorrect="off"
+                      autoCapitalize="off"
+                      spellCheck={false}
+                      meta={meta}
+                      fullWidth
+                    />
+                  )}
+                </Field>
+              </FormField>
+              <FormField>
+                <FormFieldHeader>
+                  <Localized id="configure-sites-site-form-embed-code">
+                    <Label>Embed code</Label>
+                  </Localized>
+                </FormFieldHeader>
+
+                <EmbedCode staticURI={settings.staticURI} />
+              </FormField>
+              {submitError && (
+                <CallOut fullWidth color="error">
+                  {submitError}
+                </CallOut>
+              )}
+              <Flex itemGutter justifyContent="flex-end">
+                <Localized id="configure-sites-site-form-save">
+                  <Button
+                    disabled={submitting}
+                    iconLeft
+                    type="submit"
+                    size="large"
+                  >
+                    Save changes
+                  </Button>
+                </Localized>
+              </Flex>
+            </HorizontalGutter>
+          </form>
+        )}
+      </Form>
+    </div>
+  );
+};
+
+const enhanced = withFragmentContainer<Props>({
+  site: graphql`
+    fragment EditSiteForm_site on Site {
+      name
+      createdAt
+      id
+      allowedOrigins
+    }
+  `,
+  settings: graphql`
+    fragment EditSiteForm_settings on Settings {
+      staticURI
+    }
+  `,
+})(EditSiteForm);
+
+export default enhanced;
diff --git a/src/core/client/admin/routes/Configure/sections/Advanced/EmbedCode.css b/src/core/client/admin/routes/Configure/sections/Sites/EmbedCode.css
similarity index 100%
rename from src/core/client/admin/routes/Configure/sections/Advanced/EmbedCode.css
rename to src/core/client/admin/routes/Configure/sections/Sites/EmbedCode.css
diff --git a/src/core/client/admin/routes/Configure/sections/Advanced/EmbedCode.tsx b/src/core/client/admin/routes/Configure/sections/Sites/EmbedCode.tsx
similarity index 78%
rename from src/core/client/admin/routes/Configure/sections/Advanced/EmbedCode.tsx
rename to src/core/client/admin/routes/Configure/sections/Sites/EmbedCode.tsx
index 712f019b1..dc85f954d 100644
--- a/src/core/client/admin/routes/Configure/sections/Advanced/EmbedCode.tsx
+++ b/src/core/client/admin/routes/Configure/sections/Sites/EmbedCode.tsx
@@ -1,19 +1,10 @@
-import { Localized } from "@fluent/react/compat";
 import { stripIndent } from "common-tags";
 import React, { FunctionComponent, useMemo } from "react";
 
 import { CopyButton } from "coral-framework/components";
 import { GetMessage, withGetMessage } from "coral-framework/lib/i18n";
 import { getLocationOrigin } from "coral-framework/utils";
-import {
-  FieldSet,
-  FormFieldDescription,
-  HorizontalGutter,
-  Textarea,
-} from "coral-ui/components/v2";
-
-import ConfigBox from "../../ConfigBox";
-import Header from "../../Header";
+import { HorizontalGutter, Textarea } from "coral-ui/components/v2";
 
 import styles from "./EmbedCode.css";
 
@@ -84,20 +75,7 @@ const EmbedCode: FunctionComponent<Props> = ({ staticURI, getMessage }) => {
   }, [staticURI]);
 
   return (
-    <ConfigBox
-      title={
-        <Localized id="configure-advanced-embedCode-title">
-          <Header container={<legend />}>Embed code</Header>
-        </Localized>
-      }
-      container={<FieldSet />}
-    >
-      <Localized id="configure-advanced-embedCode-explanation">
-        <FormFieldDescription>
-          Copy and paste the code below into your CMS to embed Coral comment
-          streams in each of your site’s stories.
-        </FormFieldDescription>
-      </Localized>
+    <>
       <Textarea
         rows={embed.rows}
         className={styles.textArea}
@@ -105,9 +83,9 @@ const EmbedCode: FunctionComponent<Props> = ({ staticURI, getMessage }) => {
         value={embed.text}
       />
       <HorizontalGutter className={styles.copyArea}>
-        <CopyButton text={embed.text} />
+        <CopyButton variant="regular" color="mono" text={embed.text} />
       </HorizontalGutter>
-    </ConfigBox>
+    </>
   );
 };
 
diff --git a/src/core/client/admin/routes/Configure/sections/Sites/SiteRoute.tsx b/src/core/client/admin/routes/Configure/sections/Sites/SiteRoute.tsx
new file mode 100644
index 000000000..face8c837
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Sites/SiteRoute.tsx
@@ -0,0 +1,66 @@
+import { Localized } from "@fluent/react/compat";
+import React, { FunctionComponent, useCallback } from "react";
+
+import { useNotification } from "coral-admin/App/GlobalNotification";
+import { graphql } from "coral-framework/lib/relay";
+import { withRouteConfig } from "coral-framework/lib/router";
+import { AppNotification } from "coral-ui/components/v2";
+
+import { SiteRouteQueryResponse } from "coral-admin/__generated__/SiteRouteQuery.graphql";
+
+import ConfigBox from "../../ConfigBox";
+import Header from "../../Header";
+import EditSiteForm from "./EditSiteForm";
+
+interface Props {
+  data: SiteRouteQueryResponse;
+}
+
+const AddSiteRoute: FunctionComponent<Props> = ({ data }) => {
+  if (!data || !data.site) {
+    return null;
+  }
+  const { site } = data;
+  const { setMessage, clearMessage } = useNotification();
+  const onSiteEdit = useCallback((name: string) => {
+    setMessage(
+      <Localized id="configure-sites-edit-success" $site={name}>
+        <AppNotification icon="check_circle_outline" onClose={clearMessage}>
+          Changes to {name} have been saved
+        </AppNotification>
+      </Localized>
+    );
+  }, []);
+  return (
+    <ConfigBox
+      title={
+        <Localized id="configure-sites-site-edit" $site={site.name}>
+          <Header>Edit {site.name} details</Header>
+        </Localized>
+      }
+    >
+      <EditSiteForm
+        onEditSuccess={onSiteEdit}
+        site={site}
+        settings={data.settings}
+      />
+    </ConfigBox>
+  );
+};
+
+const enhanced = withRouteConfig<Props>({
+  query: graphql`
+    query SiteRouteQuery($siteID: ID!) {
+      site(id: $siteID) {
+        name
+        ...EditSiteForm_site
+      }
+      settings {
+        ...EditSiteForm_settings
+      }
+    }
+  `,
+  cacheConfig: { force: true },
+})(AddSiteRoute);
+
+export default enhanced;
diff --git a/src/core/client/admin/routes/Configure/sections/Sites/SitesRoute.tsx b/src/core/client/admin/routes/Configure/sections/Sites/SitesRoute.tsx
new file mode 100644
index 000000000..3835c2c0a
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Sites/SitesRoute.tsx
@@ -0,0 +1,27 @@
+import React, { FunctionComponent } from "react";
+
+import MainLayout from "coral-admin/components/MainLayout";
+
+import ConfigureLinks from "../../ConfigureLinks";
+import Layout from "../../Layout";
+import Main from "../../Main";
+import SideBar from "../../SideBar";
+
+interface Props {
+  children: React.ReactElement;
+}
+
+const SitesRoute: FunctionComponent<Props> = props => {
+  return (
+    <MainLayout>
+      <Layout>
+        <SideBar>
+          <ConfigureLinks />
+        </SideBar>
+        <Main>{props.children}</Main>
+      </Layout>
+    </MainLayout>
+  );
+};
+
+export default SitesRoute;
diff --git a/src/core/client/admin/routes/Configure/sections/Sites/UpdateSiteMutation.ts b/src/core/client/admin/routes/Configure/sections/Sites/UpdateSiteMutation.ts
new file mode 100644
index 000000000..05e85bb58
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Sites/UpdateSiteMutation.ts
@@ -0,0 +1,41 @@
+import { graphql } from "react-relay";
+import { Environment } from "relay-runtime";
+
+import {
+  commitMutationPromiseNormalized,
+  createMutation,
+  MutationInput,
+} from "coral-framework/lib/relay";
+
+import { UpdateSiteMutation as MutationTypes } from "coral-admin/__generated__/UpdateSiteMutation.graphql";
+
+const clientMutationId = 0;
+
+const UpdateSiteMutation = createMutation(
+  "updateSite",
+  (environment: Environment, input: MutationInput<MutationTypes>) => {
+    return commitMutationPromiseNormalized<MutationTypes>(environment, {
+      mutation: graphql`
+        mutation UpdateSiteMutation($input: UpdateSiteInput!) {
+          updateSite(input: $input) {
+            site {
+              id
+              name
+              createdAt
+              allowedOrigins
+            }
+            clientMutationId
+          }
+        }
+      `,
+      variables: {
+        input: {
+          ...input,
+          clientMutationId: clientMutationId.toString(),
+        },
+      },
+    });
+  }
+);
+
+export default UpdateSiteMutation;
diff --git a/src/core/client/admin/routes/Configure/sections/Sites/index.ts b/src/core/client/admin/routes/Configure/sections/Sites/index.ts
new file mode 100644
index 000000000..ef5391c25
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Sites/index.ts
@@ -0,0 +1 @@
+export { default, default as Sites } from "./SitesRoute";
diff --git a/src/core/client/admin/routes/Moderate/Moderate.spec.tsx b/src/core/client/admin/routes/Moderate/Moderate.spec.tsx
index 5e3860d4e..ffefb1403 100644
--- a/src/core/client/admin/routes/Moderate/Moderate.spec.tsx
+++ b/src/core/client/admin/routes/Moderate/Moderate.spec.tsx
@@ -13,6 +13,13 @@ it("renders correctly", () => {
     allStories: true,
     moderationQueues: {},
     story: {},
+    site: null,
+    query: "",
+    routeParams: {},
+    queueName: "",
+    settings: {
+      multisite: false,
+    },
   };
   const renderer = createRenderer();
   renderer.render(<ModerateN {...props} />);
diff --git a/src/core/client/admin/routes/Moderate/Moderate.tsx b/src/core/client/admin/routes/Moderate/Moderate.tsx
index a382fd553..ceaa5c6f0 100644
--- a/src/core/client/admin/routes/Moderate/Moderate.tsx
+++ b/src/core/client/admin/routes/Moderate/Moderate.tsx
@@ -14,24 +14,43 @@ import { SubBar } from "coral-ui/components/v2/SubBar";
 import HotkeysModal from "./HotkeysModal";
 import ModerateNavigationContainer from "./ModerateNavigation";
 import ModerateSearchBarContainer from "./ModerateSearchBar";
+import { SiteSelectorContainer } from "./SiteSelector";
 
 import styles from "./Moderate.css";
 
+interface RouteParams {
+  storyID?: string;
+  siteID?: string;
+}
+
 interface Props {
   story: PropTypesOf<typeof ModerateNavigationContainer>["story"] &
     PropTypesOf<typeof ModerateSearchBarContainer>["story"];
+  site:
+    | { id: string } & PropTypesOf<typeof ModerateNavigationContainer>["site"] &
+        PropTypesOf<typeof SiteSelectorContainer>["site"]
+    | null;
+  query: PropTypesOf<typeof SiteSelectorContainer>["query"];
   moderationQueues: PropTypesOf<
     typeof ModerateNavigationContainer
   >["moderationQueues"];
   allStories: boolean;
+  settings: PropTypesOf<typeof ModerateSearchBarContainer>["settings"] | null;
   children?: React.ReactNode;
+  queueName: string;
+  routeParams: RouteParams;
 }
 
 const Moderate: FunctionComponent<Props> = ({
   moderationQueues,
   story,
+  site,
+  query,
   allStories,
   children,
+  queueName,
+  routeParams,
+  settings,
 }) => {
   const [showHotkeysModal, setShowHotkeysModal] = useState(false);
   const closeModal = useCallback(() => {
@@ -50,14 +69,26 @@ const Moderate: FunctionComponent<Props> = ({
       key.unbind(HOTKEYS.GUIDE);
     };
   }, []);
-
   return (
     <div data-testid="moderate-container">
-      <ModerateSearchBarContainer story={story} allStories={allStories} />
+      <ModerateSearchBarContainer
+        story={story}
+        settings={settings}
+        allStories={allStories}
+        siteID={routeParams.siteID || null}
+        siteSelector={
+          <SiteSelectorContainer
+            queueName={queueName}
+            site={site}
+            query={query}
+          />
+        }
+      />
       <SubBar data-testid="moderate-tabBar-container">
         <ModerateNavigationContainer
           moderationQueues={moderationQueues}
           story={story}
+          site={story ? null : site}
         />
       </SubBar>
       <div className={styles.background} />
diff --git a/src/core/client/admin/routes/Moderate/ModerateContainer.tsx b/src/core/client/admin/routes/Moderate/ModerateContainer.tsx
index d712b0e32..8cf36fe94 100644
--- a/src/core/client/admin/routes/Moderate/ModerateContainer.tsx
+++ b/src/core/client/admin/routes/Moderate/ModerateContainer.tsx
@@ -11,6 +11,7 @@ import Moderate from "./Moderate";
 
 interface RouteParams {
   storyID?: string;
+  siteID?: string;
 }
 
 interface Props {
@@ -24,18 +25,46 @@ class ModerateContainer extends React.Component<Props> {
 
   public render() {
     const allStories = !this.props.match.params.storyID;
+    // TODO: (tessalt) get active route in a better way
+    const queueName = [
+      "default",
+      "reported",
+      "pending",
+      "unmoderated",
+      "rejected",
+    ].find(name => {
+      return this.props.match.location.pathname.includes(name);
+    });
     if (!this.props.data) {
       return (
-        <Moderate moderationQueues={null} story={null} allStories={allStories}>
+        <Moderate
+          moderationQueues={null}
+          story={null}
+          site={null}
+          settings={null}
+          query={this.props.data}
+          routeParams={this.props.match.params}
+          queueName={queueName || "default"}
+          allStories={allStories}
+        >
           <Spinner />
         </Moderate>
       );
     }
+
     return (
       <Moderate
         moderationQueues={this.props.data.moderationQueues}
         story={this.props.data.story || null}
+        site={
+          this.props.data.site ||
+          (this.props.data.story ? this.props.data.story.site : null)
+        }
+        routeParams={this.props.match.params}
+        query={this.props.data}
         allStories={allStories}
+        settings={this.props.data.settings}
+        queueName={queueName || "default"}
       >
         {this.props.children}
       </Moderate>
@@ -45,21 +74,42 @@ class ModerateContainer extends React.Component<Props> {
 
 const enhanced = withRouteConfig<Props>({
   query: graphql`
-    query ModerateContainerQuery($storyID: ID, $includeStory: Boolean!) {
+    query ModerateContainerQuery(
+      $storyID: ID
+      $includeStory: Boolean!
+      $siteID: ID
+      $includeSite: Boolean!
+    ) {
+      settings {
+        ...ModerateSearchBarContainer_settings
+      }
       story(id: $storyID) @include(if: $includeStory) {
         ...ModerateNavigationContainer_story
         ...ModerateSearchBarContainer_story
+        site {
+          id
+          ...ModerateNavigationContainer_site
+          ...SiteSelectorSelected_site
+        }
       }
-      moderationQueues(storyID: $storyID) {
+      site(id: $siteID) @include(if: $includeSite) {
+        id
+        ...ModerateNavigationContainer_site
+        ...SiteSelectorSelected_site
+      }
+      moderationQueues(storyID: $storyID, siteID: $siteID) {
         ...ModerateNavigationContainer_moderationQueues
       }
+      ...SiteSelectorContainer_query
     }
   `,
   cacheConfig: { force: true },
   prepareVariables: (params, match) => {
     return {
       storyID: match.params.storyID,
+      siteID: match.params.siteID,
       includeStory: Boolean(match.params.storyID),
+      includeSite: Boolean(match.params.siteID),
     };
   },
 })(withRouter(ModerateContainer));
diff --git a/src/core/client/admin/routes/Moderate/ModerateNavigation/ModerateNavigationContainer.tsx b/src/core/client/admin/routes/Moderate/ModerateNavigation/ModerateNavigationContainer.tsx
index eee34ea16..d2b1ebff4 100644
--- a/src/core/client/admin/routes/Moderate/ModerateNavigation/ModerateNavigationContainer.tsx
+++ b/src/core/client/admin/routes/Moderate/ModerateNavigation/ModerateNavigationContainer.tsx
@@ -8,6 +8,7 @@ import {
 } from "coral-framework/lib/relay";
 
 import { ModerateNavigationContainer_moderationQueues as ModerationQueuesData } from "coral-admin/__generated__/ModerateNavigationContainer_moderationQueues.graphql";
+import { ModerateNavigationContainer_site as SiteData } from "coral-admin/__generated__/ModerateNavigationContainer_site.graphql";
 import { ModerateNavigationContainer_story as StoryData } from "coral-admin/__generated__/ModerateNavigationContainer_story.graphql";
 
 import ModerateCountsCommentEnteredSubscription from "./ModerateCountsCommentEnteredSubscription";
@@ -17,6 +18,7 @@ import Navigation from "./Navigation";
 interface Props {
   moderationQueues: ModerationQueuesData | null;
   story: StoryData | null;
+  site: SiteData | null;
 }
 
 const ModerateNavigationContainer: React.FunctionComponent<Props> = props => {
@@ -33,6 +35,7 @@ const ModerateNavigationContainer: React.FunctionComponent<Props> = props => {
     }
     const vars = {
       storyID: props.story && props.story.id,
+      siteID: props.site && props.site.id,
     };
     const disposable = combineDisposables(
       subscribeToCommentEntered(vars),
@@ -41,7 +44,7 @@ const ModerateNavigationContainer: React.FunctionComponent<Props> = props => {
     return () => {
       disposable.dispose();
     };
-  }, [Boolean(props.moderationQueues), props.story]);
+  }, [Boolean(props.moderationQueues), props.story, props.site]);
 
   if (!props.moderationQueues) {
     return <Navigation />;
@@ -52,6 +55,7 @@ const ModerateNavigationContainer: React.FunctionComponent<Props> = props => {
       reportedCount={props.moderationQueues.reported.count}
       pendingCount={props.moderationQueues.pending.count}
       storyID={props.story && props.story.id}
+      siteID={props.site && props.site.id}
     />
   );
 };
@@ -62,6 +66,11 @@ const enhanced = withFragmentContainer<Props>({
       id
     }
   `,
+  site: graphql`
+    fragment ModerateNavigationContainer_site on Site {
+      id
+    }
+  `,
   moderationQueues: graphql`
     fragment ModerateNavigationContainer_moderationQueues on ModerationQueues {
       unmoderated {
diff --git a/src/core/client/admin/routes/Moderate/ModerateNavigation/Navigation.tsx b/src/core/client/admin/routes/Moderate/ModerateNavigation/Navigation.tsx
index 84c9dd71e..6642d6915 100644
--- a/src/core/client/admin/routes/Moderate/ModerateNavigation/Navigation.tsx
+++ b/src/core/client/admin/routes/Moderate/ModerateNavigation/Navigation.tsx
@@ -1,19 +1,21 @@
 import { Localized } from "@fluent/react/compat";
 import { Match, Router, withRouter } from "found";
 import key from "keymaster";
+import { isNumber } from "lodash";
 import React, { FunctionComponent, useEffect, useMemo } from "react";
 
 import { HOTKEYS } from "coral-admin/constants";
-import { getModerationLink } from "coral-admin/helpers";
+import { getModerationLink } from "coral-framework/helpers";
 import { Counter, Icon, SubBarNavigation } from "coral-ui/components/v2";
 
 import NavigationLink from "./NavigationLink";
 
 interface Props {
-  unmoderatedCount?: number;
-  reportedCount?: number;
-  pendingCount?: number;
+  unmoderatedCount?: number | null;
+  reportedCount?: number | null;
+  pendingCount?: number | null;
   storyID?: string | null;
+  siteID?: string | null;
   router: Router;
   match: Match;
 }
@@ -23,17 +25,18 @@ const Navigation: FunctionComponent<Props> = ({
   reportedCount,
   pendingCount,
   storyID,
+  siteID,
   router,
   match,
 }) => {
   const moderationLinks = useMemo(() => {
     return [
-      getModerationLink("reported", storyID),
-      getModerationLink("pending", storyID),
-      getModerationLink("unmoderated", storyID),
-      getModerationLink("rejected", storyID),
+      getModerationLink({ queue: "reported", storyID, siteID }),
+      getModerationLink({ queue: "pending", storyID, siteID }),
+      getModerationLink({ queue: "unmoderated", storyID, siteID }),
+      getModerationLink({ queue: "rejected", storyID, siteID }),
     ];
-  }, [storyID]);
+  }, [storyID, siteID]);
 
   useEffect(() => {
     key(HOTKEYS.SWITCH_QUEUE, () => {
@@ -67,7 +70,7 @@ const Navigation: FunctionComponent<Props> = ({
         <Localized id="moderate-navigation-reported">
           <span>Reported</span>
         </Localized>
-        {reportedCount !== undefined && (
+        {isNumber(reportedCount) && (
           <Counter data-testid="moderate-navigation-reported-count">
             {reportedCount}
           </Counter>
@@ -78,7 +81,7 @@ const Navigation: FunctionComponent<Props> = ({
         <Localized id="moderate-navigation-pending">
           <span>Pending</span>
         </Localized>
-        {pendingCount !== undefined && (
+        {isNumber(pendingCount) && (
           <Counter data-testid="moderate-navigation-pending-count">
             {pendingCount}
           </Counter>
@@ -89,7 +92,7 @@ const Navigation: FunctionComponent<Props> = ({
         <Localized id="moderate-navigation-unmoderated">
           <span>Unmoderated</span>
         </Localized>
-        {unmoderatedCount !== undefined && (
+        {isNumber(unmoderatedCount) && (
           <Counter data-testid="moderate-navigation-unmoderated-count">
             {unmoderatedCount}
           </Counter>
diff --git a/src/core/client/admin/routes/Moderate/ModerateSearchBar/Bar.css b/src/core/client/admin/routes/Moderate/ModerateSearchBar/Bar.css
index d192c8a7a..d1c4a2229 100644
--- a/src/core/client/admin/routes/Moderate/ModerateSearchBar/Bar.css
+++ b/src/core/client/admin/routes/Moderate/ModerateSearchBar/Bar.css
@@ -11,9 +11,17 @@
   z-index: 100;
 }
 
+.popover,
+.popoverNarrow {
+  border: 0;
+}
+
 .popover {
   width: calc(94 * var(--mini-unit));
-  border: 0;
+}
+
+.popoverNarrow {
+  width: calc(84 * var(--mini-unit));
 }
 
 .listBox {
diff --git a/src/core/client/admin/routes/Moderate/ModerateSearchBar/Bar.tsx b/src/core/client/admin/routes/Moderate/ModerateSearchBar/Bar.tsx
index 2cd55f16c..2b1957951 100644
--- a/src/core/client/admin/routes/Moderate/ModerateSearchBar/Bar.tsx
+++ b/src/core/client/admin/routes/Moderate/ModerateSearchBar/Bar.tsx
@@ -34,12 +34,22 @@ interface Props {
   options: Array<ListBoxOption & { group: Group }>;
   /** onSearch will be called whenenver the user submits the search */
   onSearch?: (value: string) => void;
+
+  siteSelector: React.ReactNode;
+
+  multisite: boolean;
 }
 
 /**
  * Bar is the container of the whole search bar.
  */
-const Bar: FunctionComponent<Props> = ({ title, options, onSearch }) => {
+const Bar: FunctionComponent<Props> = ({
+  title,
+  options,
+  onSearch,
+  siteSelector,
+  multisite,
+}) => {
   const [focused, focusHandlers] = useFocus();
   const preventFocusLossHandlers = usePreventFocusLoss(focused);
   const submitHandler = useCallback(
@@ -80,6 +90,7 @@ const Bar: FunctionComponent<Props> = ({ title, options, onSearch }) => {
         aria-expanded={focused}
       >
         <Backdrop className={styles.bumpZIndex} active={focused} />
+        {multisite ? siteSelector : null}
         <Form onSubmit={submitHandler}>
           {({ handleSubmit }) => (
             <Localized
@@ -96,7 +107,9 @@ const Bar: FunctionComponent<Props> = ({ title, options, onSearch }) => {
                 <Popover
                   id={"moderate-searchBar-popover"}
                   placement="bottom"
-                  classes={{ popover: styles.popover }}
+                  classes={{
+                    popover: multisite ? styles.popoverNarrow : styles.popover,
+                  }}
                   visible={focused}
                   eventsEnabled={false}
                   modifiers={{
@@ -166,6 +179,7 @@ const Bar: FunctionComponent<Props> = ({ title, options, onSearch }) => {
                   {({ ref }) => (
                     <div ref={ref}>
                       <Field
+                        multisite={multisite}
                         title={title}
                         ref={searchInput}
                         {...combineEventHandlers(
diff --git a/src/core/client/admin/routes/Moderate/ModerateSearchBar/Field.css b/src/core/client/admin/routes/Moderate/ModerateSearchBar/Field.css
index a34d4be89..63aff6d22 100644
--- a/src/core/client/admin/routes/Moderate/ModerateSearchBar/Field.css
+++ b/src/core/client/admin/routes/Moderate/ModerateSearchBar/Field.css
@@ -5,15 +5,24 @@
   height: calc(4 * var(--mini-unit));
 }
 
+.hasSiteSelector {
+  width: calc(84 * var(--mini-unit));
+}
+
 .begin {
   background-color: $story-search-input-background;
+  min-width: calc(4 * var(--mini-unit));
   border-top-left-radius: var(--v2-round-corners);
   border-bottom-left-radius: var(--v2-round-corners);
-  min-width: calc(5 * var(--mini-unit));
   flex-shrink: 0;
   pointer-events: none;
 }
 
+.adornmentLeft {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
 .beginStories {
   font-size: var(--v2-font-size-2);
   font-weight: var(--v2-font-weight-primary-semi-bold);
@@ -93,8 +102,9 @@
 }
 
 .inputWithTitle {
-  text-align: center;
   &::placeholder {
+    font-weight: var(--v2-font-weight-primary-bold);
+    color: var(--v2-colors-mono-500);
     opacity: 1;
   }
 }
diff --git a/src/core/client/admin/routes/Moderate/ModerateSearchBar/Field.tsx b/src/core/client/admin/routes/Moderate/ModerateSearchBar/Field.tsx
index 802d71c63..cb68f2cd2 100644
--- a/src/core/client/admin/routes/Moderate/ModerateSearchBar/Field.tsx
+++ b/src/core/client/admin/routes/Moderate/ModerateSearchBar/Field.tsx
@@ -14,6 +14,7 @@ interface Props extends HTMLAttributes<HTMLInputElement> {
   className?: string;
   focused?: boolean;
   forwardRef?: Ref<HTMLInputElement>;
+  multisite: boolean;
 }
 
 /**
@@ -26,13 +27,24 @@ const Field: FunctionComponent<Props> = ({
   onBlur,
   onChange,
   forwardRef,
+  multisite,
   ...rest
 }) => {
   return (
     <FormField name="search">
       {({ input }) => (
-        <Flex className={cn(className, styles.root)} alignItems="stretch">
-          <Flex className={styles.begin} alignItems="center">
+        <Flex
+          className={cn(className, styles.root, {
+            [styles.hasSiteSelector]: multisite,
+          })}
+          alignItems="stretch"
+        >
+          <Flex
+            className={cn(styles.begin, {
+              [styles.adornmentLeft]: multisite,
+            })}
+            alignItems="center"
+          >
             <Icon className={styles.searchIcon} size="md">
               search
             </Icon>
diff --git a/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateAllOption.css b/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateAllOption.css
index 5a7a38a2c..162796611 100644
--- a/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateAllOption.css
+++ b/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateAllOption.css
@@ -22,3 +22,7 @@
   font-weight: var(--font-weight-medium);
   margin-top: -2px;
 }
+
+.button {
+  border-radius: 0;
+}
diff --git a/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateAllOption.tsx b/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateAllOption.tsx
index af530572b..0c6436984 100644
--- a/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateAllOption.tsx
+++ b/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateAllOption.tsx
@@ -26,7 +26,14 @@ const ModerateAllOption: FunctionComponent<Props> = ({
       aria-selected={selected}
       {...rest}
     >
-      <Button href={href} color="dark" anchor fullWidth tabIndex={-1}>
+      <Button
+        className={styles.button}
+        href={href}
+        color="dark"
+        anchor
+        fullWidth
+        tabIndex={-1}
+      >
         <Localized id="moderate-searchBar-moderateAllStories">
           <span>Moderate all stories</span>
         </Localized>
diff --git a/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateSearchBarContainer.tsx b/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateSearchBarContainer.tsx
index 843569038..74484e810 100644
--- a/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateSearchBarContainer.tsx
+++ b/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateSearchBarContainer.tsx
@@ -9,7 +9,7 @@ import React, {
 } from "react";
 import { graphql } from "react-relay";
 
-import { getModerationLink } from "coral-admin/helpers";
+import { getModerationLink } from "coral-framework/helpers";
 import { useEffectWhenChanged } from "coral-framework/hooks";
 import { useFetch, withFragmentContainer } from "coral-framework/lib/relay";
 import { PropTypesOf } from "coral-framework/types";
@@ -20,6 +20,7 @@ import {
   ListBoxOptionElement,
 } from "coral-ui/hooks/useComboBox";
 
+import { ModerateSearchBarContainer_settings as SettingsData } from "coral-admin/__generated__/ModerateSearchBarContainer_settings.graphql";
 import { ModerateSearchBarContainer_story as ModerationQueuesData } from "coral-admin/__generated__/ModerateSearchBarContainer_story.graphql";
 
 import Bar from "./Bar";
@@ -33,7 +34,10 @@ interface Props {
   router: Router;
   match: Match;
   story: ModerationQueuesData | null;
+  settings: SettingsData | null;
   allStories: boolean;
+  siteSelector: React.ReactNode;
+  siteID: string | null;
 }
 
 type SearchBarOptions = PropTypesOf<typeof Bar>["options"];
@@ -111,7 +115,11 @@ function getContextOptionsWhenModeratingStory(
 }
 
 type OnSearchCallback = (search: string) => void;
-
+interface SearchParams {
+  query: string;
+  limit: number;
+  siteID?: string;
+}
 /**
  * useSearchOptions
  *
@@ -120,7 +128,8 @@ type OnSearchCallback = (search: string) => void;
  */
 function useSearchOptions(
   onClickOrEnter: ListBoxOptionClickOrEnterHandler,
-  story: ModerationQueuesData | null
+  story: ModerationQueuesData | null,
+  siteID: string | null
 ): [SearchBarOptions, OnSearchCallback] {
   const searchStory = useFetch(SearchStoryFetch);
 
@@ -149,7 +158,14 @@ function useSearchOptions(
         },
       ]);
 
-      const stories = await searchStory({ query: search, limit: 5 });
+      const searchParams: SearchParams = {
+        query: search,
+        limit: 5,
+      };
+      if (siteID) {
+        searchParams.siteID = siteID;
+      }
+      const stories = await searchStory(searchParams);
       if (searchCount !== searchCountRef.current) {
         // This result is old, so we can discard it.
         return;
@@ -164,8 +180,13 @@ function useSearchOptions(
           nextSearchOptions.push({
             element: (
               <Option
-                href={getModerationLink("default", e.node.id)}
-                details={e.node.metadata && e.node.metadata.author}
+                href={getModerationLink({ storyID: e.node.id })}
+                details={
+                  <Flex itemGutter>
+                    <strong>{e.node.site.name}</strong>
+                    {e.node.metadata && e.node.metadata.author}
+                  </Flex>
+                }
               >
                 <GoToAriaInfo /> {e.node.metadata && e.node.metadata.title}
               </Option>
@@ -203,7 +224,7 @@ function useSearchOptions(
       }
       setSearchOptions(nextSearchOptions);
     },
-    [story, searchStory, setSearchOptions]
+    [story, searchStory, setSearchOptions, siteID]
   );
 
   return [searchOptions, onSearch];
@@ -217,7 +238,8 @@ const ModerateSearchBarContainer: React.FunctionComponent<Props> = props => {
 
   const [searchOptions, onSearch] = useSearchOptions(
     linkNavHandler,
-    props.story
+    props.story,
+    props.siteID
   );
 
   const options = [...contextOptions, ...searchOptions];
@@ -231,16 +253,35 @@ const ModerateSearchBarContainer: React.FunctionComponent<Props> = props => {
   if (props.allStories) {
     return (
       <Localized id="moderate-searchBar-allStories" attrs={{ title: true }}>
-        <Bar title="All stories" {...childProps} />
+        <Bar
+          siteSelector={props.siteSelector}
+          multisite={props.settings ? props.settings.multisite : false}
+          title="All stories"
+          {...childProps}
+        />
       </Localized>
     );
   }
   if (!props.story) {
-    return <Bar title={""} {...childProps} />;
+    return (
+      <Bar
+        multisite={props.settings ? props.settings.multisite : false}
+        siteSelector={props.siteSelector}
+        title={""}
+        {...childProps}
+      />
+    );
   }
   const t = props.story.metadata && props.story.metadata.title;
   if (t) {
-    return <Bar title={t} {...childProps} />;
+    return (
+      <Bar
+        multisite={props.settings ? props.settings.multisite : false}
+        siteSelector={props.siteSelector}
+        title={t}
+        {...childProps}
+      />
+    );
   }
   return (
     <Localized
@@ -248,6 +289,8 @@ const ModerateSearchBarContainer: React.FunctionComponent<Props> = props => {
       attrs={{ title: true }}
     >
       <Bar
+        siteSelector={props.siteSelector}
+        multisite={props.settings ? props.settings.multisite : false}
         title={"Title not available"}
         options={options}
         onSearch={onSearch}
@@ -258,9 +301,17 @@ const ModerateSearchBarContainer: React.FunctionComponent<Props> = props => {
 
 const enhanced = withRouter(
   withFragmentContainer<Props>({
+    settings: graphql`
+      fragment ModerateSearchBarContainer_settings on Settings {
+        multisite
+      }
+    `,
     story: graphql`
       fragment ModerateSearchBarContainer_story on Story {
         id
+        site {
+          name
+        }
         metadata {
           title
           author
diff --git a/src/core/client/admin/routes/Moderate/ModerateSearchBar/SearchStoryFetch.ts b/src/core/client/admin/routes/Moderate/ModerateSearchBar/SearchStoryFetch.ts
index d366b997b..db5f0b4e5 100644
--- a/src/core/client/admin/routes/Moderate/ModerateSearchBar/SearchStoryFetch.ts
+++ b/src/core/client/admin/routes/Moderate/ModerateSearchBar/SearchStoryFetch.ts
@@ -15,11 +15,18 @@ const SearchStoryFetch = createFetch(
     return fetchQuery<QueryTypes>(
       environment,
       graphql`
-        query SearchStoryFetchQuery($query: String!, $limit: Int!) {
-          stories(query: $query, first: $limit) {
+        query SearchStoryFetchQuery(
+          $query: String!
+          $limit: Int!
+          $siteID: ID
+        ) {
+          stories(query: $query, first: $limit, siteID: $siteID) {
             edges {
               node {
                 id
+                site {
+                  name
+                }
                 metadata {
                   title
                   author
diff --git a/src/core/client/admin/routes/Moderate/Queue/QueueRoute.tsx b/src/core/client/admin/routes/Moderate/Queue/QueueRoute.tsx
index b71ee260b..2a040eb37 100644
--- a/src/core/client/admin/routes/Moderate/Queue/QueueRoute.tsx
+++ b/src/core/client/admin/routes/Moderate/Queue/QueueRoute.tsx
@@ -34,6 +34,7 @@ interface Props {
   relay: RelayPaginationProp;
   emptyElement: React.ReactElement;
   storyID?: string;
+  siteID?: string;
   count?: string;
 }
 
@@ -51,12 +52,17 @@ export const QueueRoute: FunctionComponent<Props> = props => {
   );
   const viewNew = useMutation(QueueViewNewMutation);
   const onViewNew = useCallback(() => {
-    viewNew({ queue: props.queueName, storyID: props.storyID || null });
-  }, [props.queueName, props.storyID, viewNew]);
+    viewNew({
+      queue: props.queueName,
+      storyID: props.storyID || null,
+      siteID: props.siteID || null,
+    });
+  }, [props.queueName, props.storyID, props.siteID, viewNew]);
   useEffect(() => {
     const vars = {
       queue: props.queueName,
       storyID: props.storyID || null,
+      siteID: props.siteID || null,
     };
     const disposable = combineDisposables(
       subscribeToQueueCommentEntered(vars),
@@ -67,6 +73,7 @@ export const QueueRoute: FunctionComponent<Props> = props => {
     };
   }, [
     props.storyID,
+    props.siteID,
     props.queueName,
     subscribeToQueueCommentEntered,
     subscribeToQueueCommentLeft,
@@ -124,6 +131,7 @@ const createQueueRoute = (
             viewer={null}
             emptyElement={emptyElement}
             storyID={match.params.storyID}
+            siteID={match.params.siteID}
           />
         );
       }
@@ -138,6 +146,7 @@ const createQueueRoute = (
           viewer={data.viewer}
           emptyElement={emptyElement}
           storyID={match.params.storyID}
+          siteID={match.params.siteID}
         />
       );
     },
@@ -210,8 +219,8 @@ const createQueueRoute = (
 export const PendingQueueRoute = createQueueRoute(
   GQLMODERATION_QUEUE.PENDING,
   graphql`
-    query QueueRoutePendingQuery($storyID: ID, $count: Int) {
-      moderationQueues(storyID: $storyID) {
+    query QueueRoutePendingQuery($storyID: ID, $siteID: ID, $count: Int) {
+      moderationQueues(storyID: $storyID, siteID: $siteID) {
         pending {
           ...QueueRoute_queue @arguments(count: $count)
         }
@@ -229,10 +238,11 @@ export const PendingQueueRoute = createQueueRoute(
     # Notice that we re-use our fragment, and the shape of this query matches our fragment spec.
     query QueueRoutePaginationPendingQuery(
       $storyID: ID
+      $siteID: ID
       $count: Int!
       $cursor: Cursor
     ) {
-      moderationQueues(storyID: $storyID) {
+      moderationQueues(storyID: $storyID, siteID: $siteID) {
         pending {
           ...QueueRoute_queue @arguments(count: $count, cursor: $cursor)
         }
@@ -250,8 +260,8 @@ export const PendingQueueRoute = createQueueRoute(
 export const ReportedQueueRoute = createQueueRoute(
   GQLMODERATION_QUEUE.REPORTED,
   graphql`
-    query QueueRouteReportedQuery($storyID: ID) {
-      moderationQueues(storyID: $storyID) {
+    query QueueRouteReportedQuery($storyID: ID, $siteID: ID) {
+      moderationQueues(storyID: $storyID, siteID: $siteID) {
         reported {
           ...QueueRoute_queue
         }
@@ -269,10 +279,11 @@ export const ReportedQueueRoute = createQueueRoute(
     # Notice that we re-use our fragment, and the shape of this query matches our fragment spec.
     query QueueRoutePaginationReportedQuery(
       $storyID: ID
+      $siteID: ID
       $count: Int!
       $cursor: Cursor
     ) {
-      moderationQueues(storyID: $storyID) {
+      moderationQueues(storyID: $storyID, siteID: $siteID) {
         reported {
           ...QueueRoute_queue @arguments(count: $count, cursor: $cursor)
         }
@@ -290,8 +301,8 @@ export const ReportedQueueRoute = createQueueRoute(
 export const UnmoderatedQueueRoute = createQueueRoute(
   GQLMODERATION_QUEUE.UNMODERATED,
   graphql`
-    query QueueRouteUnmoderatedQuery($storyID: ID) {
-      moderationQueues(storyID: $storyID) {
+    query QueueRouteUnmoderatedQuery($storyID: ID, $siteID: ID) {
+      moderationQueues(storyID: $storyID, siteID: $siteID) {
         unmoderated {
           ...QueueRoute_queue
         }
@@ -309,10 +320,11 @@ export const UnmoderatedQueueRoute = createQueueRoute(
     # Notice that we re-use our fragment, and the shape of this query matches our fragment spec.
     query QueueRoutePaginationUnmoderatedQuery(
       $storyID: ID
+      $siteID: ID
       $count: Int!
       $cursor: Cursor
     ) {
-      moderationQueues(storyID: $storyID) {
+      moderationQueues(storyID: $storyID, siteID: $siteID) {
         unmoderated {
           ...QueueRoute_queue @arguments(count: $count, cursor: $cursor)
         }
diff --git a/src/core/client/admin/routes/Moderate/Queue/QueueViewNewMutation.tsx b/src/core/client/admin/routes/Moderate/Queue/QueueViewNewMutation.tsx
index 22d667653..c41e2d33c 100644
--- a/src/core/client/admin/routes/Moderate/Queue/QueueViewNewMutation.tsx
+++ b/src/core/client/admin/routes/Moderate/Queue/QueueViewNewMutation.tsx
@@ -9,6 +9,7 @@ import { GQLMODERATION_QUEUE } from "coral-framework/schema";
 
 interface QueueViewNewInput {
   storyID: string | null;
+  siteID: string | null;
   queue: GQLMODERATION_QUEUE;
 }
 
@@ -16,7 +17,12 @@ const QueueViewNewMutation = createMutation(
   "viewNew",
   async (environment: Environment, input: QueueViewNewInput) => {
     await commitLocalUpdatePromisified(environment, async store => {
-      const connection = getQueueConnection(store, input.queue, input.storyID);
+      const connection = getQueueConnection(
+        store,
+        input.queue,
+        input.storyID,
+        input.siteID
+      );
       if (!connection) {
         return;
       }
diff --git a/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelector.css b/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelector.css
new file mode 100644
index 000000000..9756af271
--- /dev/null
+++ b/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelector.css
@@ -0,0 +1,8 @@
+.button {
+  height: calc(4 * var(--mini-unit));
+}
+
+.buttonText {
+  overflow-x: hidden;
+  text-overflow: ellipsis;
+}
diff --git a/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelector.tsx b/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelector.tsx
new file mode 100644
index 000000000..1a107c534
--- /dev/null
+++ b/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelector.tsx
@@ -0,0 +1,76 @@
+import { Localized } from "@fluent/react/compat";
+import React, { FunctionComponent } from "react";
+
+import PaginatedSelect from "coral-admin/components/PaginatedSelect";
+import { getModerationLink, QUEUE_NAME } from "coral-framework/helpers";
+import { PropTypesOf } from "coral-framework/types";
+
+import SiteSelectorSelected from "./SiteSelectorSelected";
+import SiteSelectorSite from "./SiteSelectorSite";
+
+import styles from "./SiteSelector.css";
+
+interface Props {
+  sites: Array<{ id: string } & PropTypesOf<typeof SiteSelectorSite>["site"]>;
+  site:
+    | { id: string } & PropTypesOf<typeof SiteSelectorSelected>["site"]
+    | null;
+  queueName: string;
+  onLoadMore: () => void;
+  hasMore: boolean;
+  disableLoadMore: boolean;
+  loading: boolean;
+}
+
+const SiteSelector: FunctionComponent<Props> = ({
+  sites,
+  site,
+  queueName,
+  loading,
+  onLoadMore,
+  disableLoadMore,
+  hasMore,
+}) => {
+  return (
+    <PaginatedSelect
+      icon="web_asset"
+      loading={loading}
+      onLoadMore={onLoadMore}
+      disableLoadMore={disableLoadMore}
+      hasMore={hasMore}
+      className={styles.button}
+      selected={
+        <>
+          {site && <SiteSelectorSelected site={site} />}
+
+          {!site && (
+            <Localized id="site-selector-all-sites">
+              <span className={styles.buttonText}>All sites</span>
+            </Localized>
+          )}
+        </>
+      }
+    >
+      <>
+        <SiteSelectorSite
+          link={getModerationLink({ queue: queueName as QUEUE_NAME })}
+          site={null}
+          active={!site}
+        />
+        {sites.map(s => (
+          <SiteSelectorSite
+            link={getModerationLink({
+              queue: queueName as QUEUE_NAME,
+              siteID: s.id,
+            })}
+            key={s.id}
+            site={s}
+            active={(site && site.id === s.id) || false}
+          />
+        ))}
+      </>
+    </PaginatedSelect>
+  );
+};
+
+export default SiteSelector;
diff --git a/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorContainer.tsx b/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorContainer.tsx
new file mode 100644
index 000000000..6bb8e53a4
--- /dev/null
+++ b/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorContainer.tsx
@@ -0,0 +1,101 @@
+import React from "react";
+import { graphql, RelayPaginationProp } from "react-relay";
+
+import {
+  useLoadMore,
+  useRefetch,
+  withPaginationContainer,
+} from "coral-framework/lib/relay";
+import { PropTypesOf } from "coral-ui/types";
+
+import { SiteSelectorContainer_query as QueryData } from "coral-admin/__generated__/SiteSelectorContainer_query.graphql";
+import { SiteSelectorContainerPaginationQueryVariables } from "coral-admin/__generated__/SiteSelectorContainerPaginationQuery.graphql";
+
+import SiteSelector from "./SiteSelector";
+
+interface Props {
+  query: QueryData | null;
+  site: PropTypesOf<typeof SiteSelector>["site"] | null;
+  relay: RelayPaginationProp;
+  queueName: string;
+}
+
+const SiteSelectorContainer: React.FunctionComponent<Props> = props => {
+  const sites = props.query
+    ? props.query.sites.edges.map(edge => edge.node)
+    : [];
+  const [loadMore, isLoadingMore] = useLoadMore(props.relay, 10);
+  const [, isRefetching] = useRefetch<
+    SiteSelectorContainerPaginationQueryVariables
+  >(props.relay);
+  return (
+    <SiteSelector
+      loading={!props.query || isRefetching}
+      sites={sites}
+      site={props.site}
+      onLoadMore={loadMore}
+      hasMore={!isRefetching && props.relay.hasMore()}
+      disableLoadMore={isLoadingMore}
+      queueName={props.queueName}
+    />
+  );
+};
+
+type FragmentVariables = SiteSelectorContainerPaginationQueryVariables;
+
+const enhanced = withPaginationContainer<
+  Props,
+  SiteSelectorContainerPaginationQueryVariables,
+  FragmentVariables
+>(
+  {
+    query: graphql`
+      fragment SiteSelectorContainer_query on Query
+        @argumentDefinitions(
+          count: { type: "Int!", defaultValue: 10 }
+          cursor: { type: "Cursor" }
+        ) {
+        sites(first: $count, after: $cursor)
+          @connection(key: "SitesConfig_sites") {
+          edges {
+            node {
+              id
+              ...SiteSelectorSite_site
+            }
+          }
+        }
+      }
+    `,
+  },
+  {
+    direction: "forward",
+    getConnectionFromProps(props) {
+      return props.query && props.query.sites;
+    },
+    // This is also the default implementation of `getFragmentVariables` if it isn't provided.
+    getFragmentVariables(prevVars, totalCount) {
+      return {
+        ...prevVars,
+        count: totalCount,
+      };
+    },
+    getVariables(props, { count, cursor }, fragmentVariables) {
+      return {
+        count,
+        cursor,
+      };
+    },
+    query: graphql`
+      # Pagination query to be fetched upon calling 'loadMore'.
+      # Notice that we re-use our fragment, and the shape of this query matches our fragment spec.
+      query SiteSelectorContainerPaginationQuery(
+        $count: Int!
+        $cursor: Cursor
+      ) {
+        ...SiteSelectorContainer_query
+          @arguments(count: $count, cursor: $cursor)
+      }
+    `,
+  }
+)(SiteSelectorContainer);
+export default enhanced;
diff --git a/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSelected.css b/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSelected.css
new file mode 100644
index 000000000..c7b5db56b
--- /dev/null
+++ b/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSelected.css
@@ -0,0 +1,4 @@
+.root {
+  overflow-x: hidden;
+  text-overflow: ellipsis;
+}
diff --git a/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSelected.tsx b/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSelected.tsx
new file mode 100644
index 000000000..db33241c3
--- /dev/null
+++ b/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSelected.tsx
@@ -0,0 +1,26 @@
+import React, { FunctionComponent } from "react";
+
+import { graphql, withFragmentContainer } from "coral-framework/lib/relay";
+
+import { SiteSelectorSelected_site } from "coral-admin/__generated__/SiteSelectorSelected_site.graphql";
+
+import styles from "./SiteSelectorSelected.css";
+
+interface Props {
+  site: SiteSelectorSelected_site;
+}
+
+const SiteSelectorSelected: FunctionComponent<Props> = ({ site }) => {
+  return <span className={styles.root}>{site.name}</span>;
+};
+
+const enhanced = withFragmentContainer<Props>({
+  site: graphql`
+    fragment SiteSelectorSelected_site on Site {
+      name
+      id
+    }
+  `,
+})(SiteSelectorSelected);
+
+export default enhanced;
diff --git a/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSite.css b/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSite.css
new file mode 100644
index 000000000..761acd473
--- /dev/null
+++ b/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSite.css
@@ -0,0 +1,14 @@
+.root {
+  font-family: var(--v2-font-family-primary);
+  font-weight: var(--v2-font-weight-primary-regular);
+  font-size: var(--v2-font-size-1);
+  color: var(--v2-colors-mono-500);
+  line-height: var(--v2-line-height-reset);
+  display: block;
+  text-decoration: none;
+  padding: var(--v2-spacing-2) var(--v2-spacing-4);
+}
+
+.active {
+  font-weight: var(--v2-font-weight-primary-bold);
+}
diff --git a/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSite.tsx b/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSite.tsx
new file mode 100644
index 000000000..854fd7056
--- /dev/null
+++ b/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorSite.tsx
@@ -0,0 +1,44 @@
+import { Localized } from "@fluent/react/compat";
+import cn from "classnames";
+import { Link } from "found";
+import React, { FunctionComponent } from "react";
+
+import { graphql, withFragmentContainer } from "coral-framework/lib/relay";
+
+import { SiteSelectorSite_site } from "coral-admin/__generated__/SiteSelectorSite_site.graphql";
+
+import styles from "./SiteSelectorSite.css";
+
+interface Props {
+  site: SiteSelectorSite_site | null;
+  active?: boolean;
+  link?: string;
+}
+
+const SiteSelectorSite: FunctionComponent<Props> = ({ site, link, active }) => {
+  return (
+    <Link
+      className={cn(styles.root, {
+        [styles.active]: active,
+      })}
+      to={link || ""}
+    >
+      {site ? (
+        site.name
+      ) : (
+        <Localized id="sites-selector-allSites">All sites</Localized>
+      )}
+    </Link>
+  );
+};
+
+const enhanced = withFragmentContainer<Props>({
+  site: graphql`
+    fragment SiteSelectorSite_site on Site {
+      name
+      id
+    }
+  `,
+})(SiteSelectorSite);
+
+export default enhanced;
diff --git a/src/core/client/admin/routes/Moderate/SiteSelector/index.ts b/src/core/client/admin/routes/Moderate/SiteSelector/index.ts
new file mode 100644
index 000000000..b4d2b7853
--- /dev/null
+++ b/src/core/client/admin/routes/Moderate/SiteSelector/index.ts
@@ -0,0 +1,2 @@
+export { default, default as SiteSelector } from "./SiteSelector";
+export { default as SiteSelectorContainer } from "./SiteSelectorContainer";
diff --git a/src/core/client/admin/routes/Moderate/__snapshots__/Moderate.spec.tsx.snap b/src/core/client/admin/routes/Moderate/__snapshots__/Moderate.spec.tsx.snap
index c9fa046b4..2a720a9d5 100644
--- a/src/core/client/admin/routes/Moderate/__snapshots__/Moderate.spec.tsx.snap
+++ b/src/core/client/admin/routes/Moderate/__snapshots__/Moderate.spec.tsx.snap
@@ -6,6 +6,19 @@ exports[`renders correctly 1`] = `
 >
   <ForwardRef(render)
     allStories={true}
+    settings={
+      Object {
+        "multisite": false,
+      }
+    }
+    siteID={null}
+    siteSelector={
+      <Relay(SiteSelectorContainer)
+        query=""
+        queueName=""
+        site={null}
+      />
+    }
     story={Object {}}
   />
   <withPropsOnChange(SubBar)
@@ -13,6 +26,7 @@ exports[`renders correctly 1`] = `
   >
     <Relay(ModerateNavigationContainer)
       moderationQueues={Object {}}
+      site={null}
       story={Object {}}
     />
   </withPropsOnChange(SubBar)>
diff --git a/src/core/client/admin/routes/Stories/SiteFilter/SiteFilter.css b/src/core/client/admin/routes/Stories/SiteFilter/SiteFilter.css
new file mode 100644
index 000000000..3343004a3
--- /dev/null
+++ b/src/core/client/admin/routes/Stories/SiteFilter/SiteFilter.css
@@ -0,0 +1,9 @@
+.buttonText {
+  font-weight: var(--v2-font-weight-primary-regular);
+}
+
+.root {
+  border-radius: var(--round-corners);
+  border: 1px solid var(--v2-palette-input-border);
+  height: 34px;
+}
diff --git a/src/core/client/admin/routes/Stories/SiteFilter/SiteFilter.tsx b/src/core/client/admin/routes/Stories/SiteFilter/SiteFilter.tsx
new file mode 100644
index 000000000..a6d2e36d3
--- /dev/null
+++ b/src/core/client/admin/routes/Stories/SiteFilter/SiteFilter.tsx
@@ -0,0 +1,79 @@
+import { Localized } from "@fluent/react/compat";
+import React, { FunctionComponent } from "react";
+
+import PaginatedSelect from "coral-admin/components/PaginatedSelect";
+import { PropTypesOf } from "coral-framework/types";
+import { FieldSet, HorizontalGutter, Label } from "coral-ui/components/v2";
+
+import SiteFilterOption from "./SiteFilterOption";
+import SiteFilterSelected from "./SiteFilterSelected";
+
+import styles from "./SiteFilter.css";
+
+interface Props {
+  sites: Array<
+    { id: string } & PropTypesOf<typeof SiteFilterOption>["site"] &
+      PropTypesOf<typeof SiteFilterSelected>["site"]
+  >;
+  siteID: string | null;
+  onSelect: (id: string | null) => void;
+  onLoadMore: () => void;
+  hasMore: boolean;
+  disableLoadMore: boolean;
+  loading: boolean;
+}
+
+const SiteFilter: FunctionComponent<Props> = ({
+  siteID,
+  sites,
+  onSelect,
+  onLoadMore,
+  hasMore,
+  disableLoadMore,
+  loading,
+}) => {
+  const selected = sites.find(s => s.id === siteID);
+  return (
+    <FieldSet>
+      <HorizontalGutter spacing={2}>
+        <Localized id="stories-filter-sites">
+          <Label>Site</Label>
+        </Localized>
+        <PaginatedSelect
+          onLoadMore={onLoadMore}
+          hasMore={hasMore}
+          disableLoadMore={disableLoadMore}
+          className={styles.root}
+          loading={loading}
+          selected={
+            <>
+              {selected ? (
+                <SiteFilterSelected site={selected} />
+              ) : (
+                <Localized id="sites-filter-sites-allSites">
+                  <span className={styles.buttonText}>All sites</span>
+                </Localized>
+              )}
+            </>
+          }
+        >
+          <SiteFilterOption
+            onSelect={() => onSelect(null)}
+            site={null}
+            active={!siteID}
+          />
+          {sites.map(s => (
+            <SiteFilterOption
+              onSelect={id => onSelect(id)}
+              site={s}
+              active={s.id === siteID}
+              key={s.id}
+            />
+          ))}
+        </PaginatedSelect>
+      </HorizontalGutter>
+    </FieldSet>
+  );
+};
+
+export default SiteFilter;
diff --git a/src/core/client/admin/routes/Stories/SiteFilter/SiteFilterContainer.tsx b/src/core/client/admin/routes/Stories/SiteFilter/SiteFilterContainer.tsx
new file mode 100644
index 000000000..17edf76fb
--- /dev/null
+++ b/src/core/client/admin/routes/Stories/SiteFilter/SiteFilterContainer.tsx
@@ -0,0 +1,97 @@
+import React from "react";
+import { graphql, RelayPaginationProp } from "react-relay";
+
+import {
+  useLoadMore,
+  useRefetch,
+  withPaginationContainer,
+} from "coral-framework/lib/relay";
+
+import { SiteFilterContainer_query as QueryData } from "coral-admin/__generated__/SiteFilterContainer_query.graphql";
+import { SiteFilterContainerPaginationQueryVariables } from "coral-admin/__generated__/SiteFilterContainerPaginationQuery.graphql";
+
+import SiteFilter from "./SiteFilter";
+
+interface Props {
+  query: QueryData | null;
+  relay: RelayPaginationProp;
+  siteID: string | null;
+  onSelect: (id: string) => void;
+}
+
+const SiteFilterContainer: React.FunctionComponent<Props> = props => {
+  const sites = props.query
+    ? props.query.sites.edges.map(edge => edge.node)
+    : [];
+  const [loadMore, isLoadingMore] = useLoadMore(props.relay, 10);
+  const [, isRefetching] = useRefetch<
+    SiteFilterContainerPaginationQueryVariables
+  >(props.relay);
+  return (
+    <SiteFilter
+      onSelect={props.onSelect}
+      loading={!props.query || isRefetching}
+      sites={sites}
+      siteID={props.siteID}
+      onLoadMore={loadMore}
+      hasMore={!isRefetching && props.relay.hasMore()}
+      disableLoadMore={isLoadingMore}
+    />
+  );
+};
+
+type FragmentVariables = SiteFilterContainerPaginationQueryVariables;
+
+const enhanced = withPaginationContainer<
+  Props,
+  SiteFilterContainerPaginationQueryVariables,
+  FragmentVariables
+>(
+  {
+    query: graphql`
+      fragment SiteFilterContainer_query on Query
+        @argumentDefinitions(
+          count: { type: "Int!", defaultValue: 10 }
+          cursor: { type: "Cursor" }
+        ) {
+        sites(first: $count, after: $cursor)
+          @connection(key: "SitesConfig_sites") {
+          edges {
+            node {
+              id
+              ...SiteFilterOption_site
+              ...SiteFilterSelected_site
+            }
+          }
+        }
+      }
+    `,
+  },
+  {
+    direction: "forward",
+    getConnectionFromProps(props) {
+      return props.query && props.query.sites;
+    },
+    // This is also the default implementation of `getFragmentVariables` if it isn't provided.
+    getFragmentVariables(prevVars, totalCount) {
+      return {
+        ...prevVars,
+        count: totalCount,
+      };
+    },
+    getVariables(props, { count, cursor }, fragmentVariables) {
+      return {
+        count,
+        cursor,
+      };
+    },
+    query: graphql`
+      # Pagination query to be fetched upon calling 'loadMore'.
+      # Notice that we re-use our fragment, and the shape of this query matches our fragment spec.
+      query SiteFilterContainerPaginationQuery($count: Int!, $cursor: Cursor) {
+        ...SiteFilterContainer_query @arguments(count: $count, cursor: $cursor)
+      }
+    `,
+  }
+)(SiteFilterContainer);
+export default enhanced;
diff --git a/src/core/client/admin/routes/Stories/SiteFilter/SiteFilterOption.css b/src/core/client/admin/routes/Stories/SiteFilter/SiteFilterOption.css
new file mode 100644
index 000000000..c8e2a5246
--- /dev/null
+++ b/src/core/client/admin/routes/Stories/SiteFilter/SiteFilterOption.css
@@ -0,0 +1,9 @@
+.root {
+  display: block;
+  font-weight: var(--v2-font-weight-primary-regular);
+  padding: var(--v2-spacing-2);
+}
+
+.active {
+  font-weight: var(--v2-font-weight-primary-bold);
+}
diff --git a/src/core/client/admin/routes/Stories/SiteFilter/SiteFilterOption.tsx b/src/core/client/admin/routes/Stories/SiteFilter/SiteFilterOption.tsx
new file mode 100644
index 000000000..7cff6836d
--- /dev/null
+++ b/src/core/client/admin/routes/Stories/SiteFilter/SiteFilterOption.tsx
@@ -0,0 +1,56 @@
+import { Localized } from "@fluent/react/compat";
+import cn from "classnames";
+import React, { FunctionComponent, useCallback } from "react";
+
+import { graphql, withFragmentContainer } from "coral-framework/lib/relay";
+import { Button } from "coral-ui/components/v2";
+
+import { SiteFilterOption_site } from "coral-admin/__generated__/SiteFilterOption_site.graphql";
+
+import styles from "./SiteFilterOption.css";
+
+interface Props {
+  site: SiteFilterOption_site | null;
+  onSelect: (id: string | null) => void;
+  active: boolean;
+}
+
+const SiteFilterOption: FunctionComponent<Props> = ({
+  site,
+  onSelect,
+  active,
+}) => {
+  const root = cn(styles.root, {
+    [styles.active]: active,
+  });
+  const onClick = useCallback(() => {
+    onSelect(site ? site.id : null);
+  }, [site]);
+  return (
+    <Button
+      uppercase={false}
+      color="mono"
+      variant="text"
+      onClick={onClick}
+      className={root}
+    >
+      {site && site.name}
+      {!site && (
+        <Localized id="site-filter-option-allSites">
+          <span>All sites</span>
+        </Localized>
+      )}
+    </Button>
+  );
+};
+
+const enhanced = withFragmentContainer<Props>({
+  site: graphql`
+    fragment SiteFilterOption_site on Site {
+      name
+      id
+    }
+  `,
+})(SiteFilterOption);
+
+export default enhanced;
diff --git a/src/core/client/admin/routes/Stories/SiteFilter/SiteFilterSelected.css b/src/core/client/admin/routes/Stories/SiteFilter/SiteFilterSelected.css
new file mode 100644
index 000000000..73deed1fb
--- /dev/null
+++ b/src/core/client/admin/routes/Stories/SiteFilter/SiteFilterSelected.css
@@ -0,0 +1,3 @@
+.root {
+  font-weight: var(--v2-font-weight-primary-regular);
+}
diff --git a/src/core/client/admin/routes/Stories/SiteFilter/SiteFilterSelected.tsx b/src/core/client/admin/routes/Stories/SiteFilter/SiteFilterSelected.tsx
new file mode 100644
index 000000000..200b24b92
--- /dev/null
+++ b/src/core/client/admin/routes/Stories/SiteFilter/SiteFilterSelected.tsx
@@ -0,0 +1,25 @@
+import React, { FunctionComponent } from "react";
+
+import { graphql, withFragmentContainer } from "coral-framework/lib/relay";
+
+import { SiteFilterSelected_site } from "coral-admin/__generated__/SiteFilterSelected_site.graphql";
+
+import styles from "./SiteFilterSelected.css";
+
+interface Props {
+  site: SiteFilterSelected_site;
+}
+
+const SiteFilterSelected: FunctionComponent<Props> = ({ site }) => {
+  return <span className={styles.root}>{site.name}</span>;
+};
+
+const enhanced = withFragmentContainer<Props>({
+  site: graphql`
+    fragment SiteFilterSelected_site on Site {
+      name
+    }
+  `,
+})(SiteFilterSelected);
+
+export default enhanced;
diff --git a/src/core/client/admin/routes/Stories/SiteFilter/index.ts b/src/core/client/admin/routes/Stories/SiteFilter/index.ts
new file mode 100644
index 000000000..31cdfe2a3
--- /dev/null
+++ b/src/core/client/admin/routes/Stories/SiteFilter/index.ts
@@ -0,0 +1 @@
+export { default } from "./SiteFilterContainer";
diff --git a/src/core/client/admin/routes/Stories/StoryRow.css b/src/core/client/admin/routes/Stories/StoryRow.css
index fdb9903b9..e282f348d 100644
--- a/src/core/client/admin/routes/Stories/StoryRow.css
+++ b/src/core/client/admin/routes/Stories/StoryRow.css
@@ -17,3 +17,5 @@
 }
 .statusColumn {
 }
+.siteColumn {
+}
diff --git a/src/core/client/admin/routes/Stories/StoryRow.tsx b/src/core/client/admin/routes/Stories/StoryRow.tsx
index b2d28696a..751adb8ad 100644
--- a/src/core/client/admin/routes/Stories/StoryRow.tsx
+++ b/src/core/client/admin/routes/Stories/StoryRow.tsx
@@ -2,7 +2,7 @@ import { Link } from "found";
 import React, { FunctionComponent } from "react";
 
 import NotAvailable from "coral-admin/components/NotAvailable";
-import { getModerationLink } from "coral-admin/helpers";
+import { getModerationLink } from "coral-framework/helpers";
 import { PropTypesOf } from "coral-framework/types";
 import { TableCell, TableRow, TextLink } from "coral-ui/components/v2";
 
@@ -17,18 +17,28 @@ interface Props {
   publishDate: string | null;
   story: PropTypesOf<typeof StoryStatus>["story"];
   viewer: PropTypesOf<typeof StoryStatus>["viewer"];
+  siteName: string;
+  siteID: string;
+  multisite: boolean;
 }
 
 const UserRow: FunctionComponent<Props> = props => (
   <TableRow>
     <TableCell className={styles.titleColumn}>
-      <Link to={getModerationLink("default", props.storyID)} as={TextLink}>
+      <Link to={getModerationLink({ storyID: props.storyID })} as={TextLink}>
         {props.title || <NotAvailable />}
       </Link>
     </TableCell>
     <TableCell className={styles.authorColumn}>
       {props.author || <NotAvailable />}
     </TableCell>
+    {props.multisite && (
+      <TableCell className={styles.siteColumn}>
+        <Link to={getModerationLink({ siteID: props.siteID })} as={TextLink}>
+          {props.siteName}
+        </Link>
+      </TableCell>
+    )}
     <TableCell className={styles.publishDateColumn}>
       {props.publishDate || <NotAvailable />}
     </TableCell>
diff --git a/src/core/client/admin/routes/Stories/StoryRowContainer.tsx b/src/core/client/admin/routes/Stories/StoryRowContainer.tsx
index fc493f700..81156b06e 100644
--- a/src/core/client/admin/routes/Stories/StoryRowContainer.tsx
+++ b/src/core/client/admin/routes/Stories/StoryRowContainer.tsx
@@ -12,6 +12,7 @@ import StoryRow from "./StoryRow";
 interface Props {
   story: StoryData;
   viewer: ViewerData;
+  multisite: boolean;
 }
 
 const StoryRowContainer: FunctionComponent<Props> = props => {
@@ -26,6 +27,9 @@ const StoryRowContainer: FunctionComponent<Props> = props => {
       author={author}
       story={props.story}
       viewer={props.viewer}
+      siteName={props.story.site.name}
+      siteID={props.story.site.id}
+      multisite={props.multisite}
       publishDate={
         publishedAt
           ? new Intl.DateTimeFormat(locales, {
@@ -57,6 +61,10 @@ const enhanced = withFragmentContainer<Props>({
         author
         publishedAt
       }
+      site {
+        name
+        id
+      }
       isClosed
       ...StoryStatusChangeContainer_story
     }
diff --git a/src/core/client/admin/routes/Stories/StoryTable.css b/src/core/client/admin/routes/Stories/StoryTable.css
index 8c57dd597..9d9468128 100644
--- a/src/core/client/admin/routes/Stories/StoryTable.css
+++ b/src/core/client/admin/routes/Stories/StoryTable.css
@@ -3,6 +3,9 @@ $tableHeaderAltTextColor: var(--v2-colors-mono-100);
 .titleColumn {
   width: 50%;
 }
+.titleColumnNarrow {
+  width: 32.5%;
+}
 .authorColumn {
   width: 17.5%;
 }
@@ -12,6 +15,9 @@ $tableHeaderAltTextColor: var(--v2-colors-mono-100);
 .statusColumn {
   width: 15%;
 }
+.siteColumn {
+  width: 17.5%;
+}
 .clickToModerate {
   font-size: var(--v2-font-size-2);
   font-weight: var(--v2-font-weight-primary-semi-bold);
diff --git a/src/core/client/admin/routes/Stories/StoryTable.tsx b/src/core/client/admin/routes/Stories/StoryTable.tsx
index bc5ed2b1d..0d6793b8b 100644
--- a/src/core/client/admin/routes/Stories/StoryTable.tsx
+++ b/src/core/client/admin/routes/Stories/StoryTable.tsx
@@ -1,4 +1,5 @@
 import { Localized } from "@fluent/react/compat";
+import cn from "classnames";
 import React, { FunctionComponent } from "react";
 
 import AutoLoadMore from "coral-admin/components/AutoLoadMore";
@@ -28,6 +29,7 @@ interface Props {
   disableLoadMore: boolean;
   loading: boolean;
   isSearching: boolean;
+  multisite: boolean;
 }
 
 const StoryTable: FunctionComponent<Props> = props => (
@@ -36,7 +38,11 @@ const StoryTable: FunctionComponent<Props> = props => (
       <Table fullWidth>
         <TableHead>
           <TableRow>
-            <TableCell className={styles.titleColumn}>
+            <TableCell
+              className={cn(styles.titleColumn, {
+                [styles.titleColumnNarrow]: props.multisite,
+              })}
+            >
               <Localized id="stories-column-title">
                 <span>Title</span>
               </Localized>{" "}
@@ -52,6 +58,11 @@ const StoryTable: FunctionComponent<Props> = props => (
             <Localized id="stories-column-author">
               <TableCell className={styles.authorColumn}>Author</TableCell>
             </Localized>
+            {props.multisite && (
+              <Localized id="stories-column-site">
+                <TableCell className={styles.siteColumn}>Site</TableCell>
+              </Localized>
+            )}
             <Localized id="stories-column-publishDate">
               <TableCell className={styles.publishDateColumn}>
                 Publish Date
@@ -65,7 +76,12 @@ const StoryTable: FunctionComponent<Props> = props => (
         <TableBody>
           {!props.loading &&
             props.stories.map(u => (
-              <StoryRowContainer key={u.id} story={u} viewer={props.viewer!} />
+              <StoryRowContainer
+                key={u.id}
+                story={u}
+                viewer={props.viewer!}
+                multisite={props.multisite}
+              />
             ))}
         </TableBody>
       </Table>
diff --git a/src/core/client/admin/routes/Stories/StoryTableContainer.tsx b/src/core/client/admin/routes/Stories/StoryTableContainer.tsx
index c0ae70580..afa4aa428 100644
--- a/src/core/client/admin/routes/Stories/StoryTableContainer.tsx
+++ b/src/core/client/admin/routes/Stories/StoryTableContainer.tsx
@@ -8,11 +8,12 @@ import {
   withPaginationContainer,
 } from "coral-framework/lib/relay";
 import { GQLSTORY_STATUS_RL } from "coral-framework/schema";
-import { HorizontalGutter } from "coral-ui/components/v2";
+import { Flex, HorizontalGutter } from "coral-ui/components/v2";
 
 import { StoryTableContainer_query as QueryData } from "coral-admin/__generated__/StoryTableContainer_query.graphql";
 import { StoryTableContainerPaginationQueryVariables } from "coral-admin/__generated__/StoryTableContainerPaginationQuery.graphql";
 
+import SiteFilterContainer from "./SiteFilter";
 import StoryTable from "./StoryTable";
 import StoryTableFilter from "./StoryTableFilter";
 
@@ -34,30 +35,42 @@ const StoryTableContainer: FunctionComponent<Props> = props => {
   const [statusFilter, setStatusFilter] = useState<GQLSTORY_STATUS_RL | null>(
     null
   );
+  const [siteFilter, setSiteFilter] = useState<string | null>(null);
   const [, isRefetching] = useRefetch<
     Pick<
       StoryTableContainerPaginationQueryVariables,
-      "searchFilter" | "statusFilter"
+      "searchFilter" | "statusFilter" | "siteID"
     >
   >(props.relay, {
     searchFilter: searchFilter || null,
     statusFilter,
+    siteID: siteFilter,
   });
 
   return (
     <IntersectionProvider>
       <HorizontalGutter size="double">
-        <StoryTableFilter
-          onSetStatusFilter={setStatusFilter}
-          statusFilter={statusFilter}
-          onSetSearchFilter={setSearchFilter}
-          searchFilter={searchFilter}
-        />
+        <Flex itemGutter="double">
+          <StoryTableFilter
+            onSetStatusFilter={setStatusFilter}
+            statusFilter={statusFilter}
+            onSetSearchFilter={setSearchFilter}
+            searchFilter={searchFilter}
+          />
+          {props.query && props.query.settings.multisite && (
+            <SiteFilterContainer
+              query={props.query}
+              siteID={siteFilter}
+              onSelect={setSiteFilter}
+            />
+          )}
+        </Flex>
         <StoryTable
           viewer={props.query && props.query.viewer}
           loading={!props.query || isRefetching}
           stories={stories}
           onLoadMore={loadMore}
+          multisite={props.query ? props.query.settings.multisite : false}
           hasMore={!isRefetching && props.relay.hasMore()}
           disableLoadMore={isLoadingMore}
           isSearching={Boolean(statusFilter) || Boolean(searchFilter)}
@@ -83,15 +96,21 @@ const enhanced = withPaginationContainer<
           cursor: { type: "Cursor" }
           statusFilter: { type: "STORY_STATUS" }
           searchFilter: { type: "String" }
+          siteID: { type: "ID" }
         ) {
         viewer {
           ...StoryRowContainer_viewer
         }
+        settings {
+          multisite
+        }
+        ...SiteFilterContainer_query
         stories(
           first: $count
           after: $cursor
           status: $statusFilter
           query: $searchFilter
+          siteID: $siteID
         ) @connection(key: "StoryTable_stories") {
           edges {
             node {
@@ -121,6 +140,7 @@ const enhanced = withPaginationContainer<
         cursor,
         statusFilter: fragmentVariables.statusFilter,
         searchFilter: fragmentVariables.searchFilter,
+        siteID: fragmentVariables.siteID,
       };
     },
     query: graphql`
@@ -131,6 +151,7 @@ const enhanced = withPaginationContainer<
         $cursor: Cursor
         $statusFilter: STORY_STATUS
         $searchFilter: String
+        $siteID: ID
       ) {
         ...StoryTableContainer_query
           @arguments(
@@ -138,6 +159,7 @@ const enhanced = withPaginationContainer<
             cursor: $cursor
             statusFilter: $statusFilter
             searchFilter: $searchFilter
+            siteID: $siteID
           )
       }
     `,
diff --git a/src/core/client/admin/routes/Stories/StoryTableFilter.tsx b/src/core/client/admin/routes/Stories/StoryTableFilter.tsx
index c20e3b71b..e023b5649 100644
--- a/src/core/client/admin/routes/Stories/StoryTableFilter.tsx
+++ b/src/core/client/admin/routes/Stories/StoryTableFilter.tsx
@@ -83,8 +83,8 @@ const StoryTableFilter: FunctionComponent<Props> = props => (
     </FieldSet>
     <FieldSet>
       <HorizontalGutter spacing={2}>
-        <Localized id="stories-filter-showMe">
-          <Label>Show Me</Label>
+        <Localized id="stories-filter-statuses">
+          <Label>Status</Label>
         </Localized>
         <Localized
           id="stories-filter-statusSelectField"
diff --git a/src/core/client/admin/test/auth/redirectLoggedIn.spec.tsx b/src/core/client/admin/test/auth/redirectLoggedIn.spec.tsx
index 40047644f..bf33a8a6f 100644
--- a/src/core/client/admin/test/auth/redirectLoggedIn.spec.tsx
+++ b/src/core/client/admin/test/auth/redirectLoggedIn.spec.tsx
@@ -17,6 +17,7 @@ import {
   emptyModerationQueues,
   emptyRejectedComments,
   settings,
+  siteConnection,
   users,
 } from "../fixtures";
 
@@ -36,6 +37,7 @@ async function createTestRenderer(
             QueryToModerationQueuesResolver
           >(() => emptyModerationQueues),
           comments: () => emptyRejectedComments,
+          sites: () => siteConnection,
           viewer: () => viewer,
         },
       }),
diff --git a/src/core/client/admin/test/auth/redirectLoggedOut.spec.tsx b/src/core/client/admin/test/auth/redirectLoggedOut.spec.tsx
index f33a9eef7..b320f730b 100644
--- a/src/core/client/admin/test/auth/redirectLoggedOut.spec.tsx
+++ b/src/core/client/admin/test/auth/redirectLoggedOut.spec.tsx
@@ -18,6 +18,7 @@ import {
   emptyModerationQueues,
   emptyRejectedComments,
   settings,
+  siteConnection,
 } from "../fixtures";
 
 async function createTestRenderer(
@@ -30,6 +31,7 @@ async function createTestRenderer(
       createResolversStub<GQLResolver>({
         Query: {
           settings: () => settings,
+          sites: () => siteConnection,
           moderationQueues: createQueryResolverStub<
             QueryToModerationQueuesResolver
           >(() => emptyModerationQueues),
diff --git a/src/core/client/admin/test/auth/restricted.spec.tsx b/src/core/client/admin/test/auth/restricted.spec.tsx
index ed4dd4445..faaf4f05a 100644
--- a/src/core/client/admin/test/auth/restricted.spec.tsx
+++ b/src/core/client/admin/test/auth/restricted.spec.tsx
@@ -17,6 +17,7 @@ import {
   emptyModerationQueues,
   emptyRejectedComments,
   settings,
+  siteConnection,
   users,
 } from "../fixtures";
 
@@ -35,6 +36,7 @@ async function createTestRenderer(
           moderationQueues: () => emptyModerationQueues,
           comments: () => emptyRejectedComments,
           viewer: () => viewer,
+          sites: () => siteConnection,
         },
       }),
       params.resolvers
diff --git a/src/core/client/admin/test/auth/signInWithEmail.spec.tsx b/src/core/client/admin/test/auth/signInWithEmail.spec.tsx
index b916e3204..4d1a496c5 100644
--- a/src/core/client/admin/test/auth/signInWithEmail.spec.tsx
+++ b/src/core/client/admin/test/auth/signInWithEmail.spec.tsx
@@ -19,6 +19,7 @@ import {
   emptyModerationQueues,
   emptyRejectedComments,
   settings,
+  siteConnection,
 } from "../fixtures";
 
 async function createTestRenderer(
@@ -36,6 +37,7 @@ async function createTestRenderer(
           settings: () => settings,
           moderationQueues: () => emptyModerationQueues,
           comments: () => emptyRejectedComments,
+          sites: () => siteConnection,
         },
       }),
       params.resolvers
diff --git a/src/core/client/admin/test/auth/signOut.spec.tsx b/src/core/client/admin/test/auth/signOut.spec.tsx
index afd1dd278..1030f4899 100644
--- a/src/core/client/admin/test/auth/signOut.spec.tsx
+++ b/src/core/client/admin/test/auth/signOut.spec.tsx
@@ -16,6 +16,7 @@ import {
   emptyModerationQueues,
   emptyRejectedComments,
   settings,
+  siteConnection,
   users,
 } from "../fixtures";
 
@@ -32,6 +33,7 @@ async function createTestRenderer(
         Query: {
           settings: () => settings,
           moderationQueues: () => emptyModerationQueues,
+          sites: () => siteConnection,
           comments: () => emptyRejectedComments,
           viewer: () => viewer,
         },
diff --git a/src/core/client/admin/test/configure/__snapshots__/advanced.spec.tsx.snap b/src/core/client/admin/test/configure/__snapshots__/advanced.spec.tsx.snap
index 9ecd0a802..2e7d8cbe5 100644
--- a/src/core/client/admin/test/configure/__snapshots__/advanced.spec.tsx.snap
+++ b/src/core/client/admin/test/configure/__snapshots__/advanced.spec.tsx.snap
@@ -127,85 +127,6 @@ exports[`renders configure advanced 1`] = `
           className="Box-root HorizontalGutter-root HorizontalGutter-double"
           data-testid="configure-advancedContainer"
         >
-          <fieldset
-            className="FieldSet-root Box-root ConfigBox-root"
-          >
-            <div
-              className="Box-root Flex-root ConfigBox-title Flex-flex Flex-justifySpaceBetween"
-            >
-              <div>
-                <legend
-                  className="Header-root"
-                >
-                  Embed code
-                </legend>
-              </div>
-              <div />
-            </div>
-            <div
-              className="ConfigBox-content"
-            >
-              <fieldset
-                className="FieldSet-root Box-root HorizontalGutter-root HorizontalGutter-spacing-4"
-              >
-                <p
-                  className="FormFieldDescription-root"
-                >
-                  Copy and paste the code below into your CMS to embed Coral comment streams in
-each of your site’s stories.
-                </p>
-                <textarea
-                  className="Textarea-root EmbedCode-textArea"
-                  readOnly={true}
-                  rows={24}
-                  value="<div id=\\"coral_thread\\"></div>
-<script type=\\"text/javascript\\">
-  (function() {
-      var d = document, s = d.createElement('script');
-      s.src = 'http://localhost/assets/js/embed.js';
-      s.async = false;
-      s.defer = true;
-      s.onload = function() {
-          Coral.createStreamEmbed({
-              id: \\"coral_thread\\",
-              autoRender: true,
-              rootURL: 'http://localhost',
-              // Uncomment these lines and replace with the ID of the
-              // story's ID and URL from your CMS to provide the
-              // tightest integration. Refer to our documentation at
-              // https://docs.coralproject.net for all the configuration
-              // options.
-              // storyID: '\${storyID}',
-              // storyURL: '\${storyURL}',
-          });
-      };
-      (d.head || d.body).appendChild(s);
-  })();
-</script>"
-                />
-                <div
-                  className="Box-root HorizontalGutter-root EmbedCode-copyArea HorizontalGutter-full"
-                >
-                  <button
-                    className="BaseButton-root Button-root Button-sizeRegular Button-colorMono Button-variantFlat Button-uppercase"
-                    data-color="mono"
-                    data-variant="flat"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    onMouseOut={[Function]}
-                    onMouseOver={[Function]}
-                    onTouchEnd={[Function]}
-                    type="button"
-                  >
-                    <span>
-                      Copy
-                    </span>
-                  </button>
-                </div>
-              </fieldset>
-            </div>
-          </fieldset>
           <div
             className="Box-root ConfigBox-root"
           >
@@ -349,66 +270,6 @@ When disabled, users will have to refresh the page to see new comments.
               </div>
             </div>
           </div>
-          <div
-            className="Box-root ConfigBox-root"
-          >
-            <div
-              className="Box-root Flex-root ConfigBox-title Flex-flex Flex-justifySpaceBetween"
-            >
-              <div>
-                <label
-                  className="Header-root"
-                  htmlFor="configure-advanced-allowedDomains"
-                >
-                  Permitted domains
-                </label>
-              </div>
-              <div />
-            </div>
-            <div
-              className="ConfigBox-content"
-            >
-              <div
-                className="Box-root HorizontalGutter-root HorizontalGutter-spacing-4"
-              >
-                <div
-                  className="Box-root HorizontalGutter-root FormField-root HorizontalGutter-spacing-2"
-                >
-                  <p
-                    className="FormFieldDescription-root"
-                  >
-                    Domains where your Coral instance is allowed to be embedded
-including the scheme (ex. http://localhost:3000, https://staging.domain.com,
-https://domain.com).
-                  </p>
-                  <div
-                    className="Box-root HorizontalGutter-root HorizontalGutter-spacing-2"
-                  >
-                    <div
-                      className="TextField-root TextField-fullWidth"
-                    >
-                      <input
-                        autoCapitalize="off"
-                        autoComplete="off"
-                        autoCorrect="off"
-                        className="TextField-input TextField-colorRegular"
-                        disabled={false}
-                        id="configure-advanced-allowedDomains"
-                        name="allowedDomains"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        onFocus={[Function]}
-                        placeholder=""
-                        spellCheck={false}
-                        type="text"
-                        value="http://localhost:8080"
-                      />
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
           <div
             className="Box-root ConfigBox-root"
           >
diff --git a/src/core/client/admin/test/configure/__snapshots__/organization.spec.tsx.snap b/src/core/client/admin/test/configure/__snapshots__/organization.spec.tsx.snap
index 15099328f..2c3e878fa 100644
--- a/src/core/client/admin/test/configure/__snapshots__/organization.spec.tsx.snap
+++ b/src/core/client/admin/test/configure/__snapshots__/organization.spec.tsx.snap
@@ -124,7 +124,7 @@ exports[`renders configure organization 1`] = `
         className="Main-root"
       >
         <div
-          className="Box-root HorizontalGutter-root HorizontalGutter-double"
+          className="Box-root HorizontalGutter-root HorizontalGutter-spacing-4"
           data-testid="configure-organizationContainer"
         >
           <div
@@ -181,6 +181,60 @@ exports[`renders configure organization 1`] = `
               </div>
             </div>
           </div>
+          <div
+            className="Box-root ConfigBox-root"
+          >
+            <div
+              className="Box-root Flex-root ConfigBox-title Flex-flex Flex-justifySpaceBetween"
+            >
+              <div>
+                <label
+                  className="Header-root"
+                  htmlFor="configure-organization-organization.url"
+                >
+                  Organization URL
+                </label>
+              </div>
+              <div />
+            </div>
+            <div
+              className="ConfigBox-content"
+            >
+              <div
+                className="Box-root HorizontalGutter-root HorizontalGutter-spacing-4"
+              >
+                <p
+                  className="FormFieldDescription-root"
+                >
+                  Your organization url will appear on emails sent by Coral to your community and organization members.
+                </p>
+                <div
+                  className="Box-root HorizontalGutter-root HorizontalGutter-spacing-2"
+                >
+                  <div
+                    className="TextField-root TextField-fullWidth"
+                  >
+                    <input
+                      autoCapitalize="off"
+                      autoComplete="off"
+                      autoCorrect="off"
+                      className="TextField-input TextField-colorRegular"
+                      disabled={false}
+                      id="configure-organization-organization.url"
+                      name="organization.url"
+                      onBlur={[Function]}
+                      onChange={[Function]}
+                      onFocus={[Function]}
+                      placeholder=""
+                      spellCheck={false}
+                      type="text"
+                      value="https://test.com/"
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
           <div
             className="Box-root ConfigBox-root"
           >
@@ -247,9 +301,9 @@ moderation questions.
               <div>
                 <label
                   className="Header-root"
-                  htmlFor="configure-organization-organization.url"
+                  htmlFor="configure-organization-organization.sites"
                 >
-                  Organization URL
+                  Sites
                 </label>
               </div>
               <div />
@@ -263,32 +317,129 @@ moderation questions.
                 <p
                   className="FormFieldDescription-root"
                 >
-                  Your organization url will appear on emails sent by Coral to your community and organization members.
+                  Add a new site to your organization or edit an existing site's details.
                 </p>
-                <div
-                  className="Box-root HorizontalGutter-root HorizontalGutter-spacing-2"
+                <a
+                  className="BaseButton-root Button-root Button-sizeLarge Button-colorRegular Button-variantRegular Button-uppercase Button-iconLeft"
+                  data-color="regular"
+                  data-variant="regular"
+                  href="/admin/configure/organization/sites/new"
+                  onBlur={[Function]}
+                  onClick={[Function]}
+                  onFocus={[Function]}
+                  onMouseOut={[Function]}
+                  onMouseOver={[Function]}
+                  onTouchEnd={[Function]}
+                  type="button"
                 >
-                  <div
-                    className="TextField-root TextField-fullWidth"
+                  <i
+                    aria-hidden="true"
+                    className="Icon-root Icon-sm"
                   >
-                    <input
-                      autoCapitalize="off"
-                      autoComplete="off"
-                      autoCorrect="off"
-                      className="TextField-input TextField-colorRegular"
-                      disabled={false}
-                      id="configure-organization-organization.url"
-                      name="organization.url"
-                      onBlur={[Function]}
-                      onChange={[Function]}
-                      onFocus={[Function]}
-                      placeholder=""
-                      spellCheck={false}
-                      type="text"
-                      value="https://test.com/"
-                    />
-                  </div>
-                </div>
+                    add
+                  </i>
+                   Add site
+                </a>
+                <table
+                  className="Table-root Table-fullWidth"
+                >
+                  <thead
+                    className="TableHead-root"
+                  >
+                    <tr
+                      className="TableRow-root"
+                    >
+                      <th
+                        className="TableCell-root TableCell-header"
+                      >
+                        Site name
+                      </th>
+                      <th
+                        className="TableCell-root TableCell-header"
+                      />
+                    </tr>
+                  </thead>
+                  <tbody
+                    className="TableBody-root"
+                  >
+                    <tr
+                      className="TableRow-root TableRow-body"
+                    >
+                      <td
+                        className="TableCell-root TableCell-body"
+                      >
+                        Test Site
+                      </td>
+                      <td
+                        className="TableCell-root TableCell-body"
+                      >
+                        <div
+                          className="Box-root Flex-root Flex-flex Flex-justifyFlexEnd"
+                        >
+                          <a
+                            className="BaseButton-root Button-root Button-sizeRegular Button-colorRegular Button-variantText Button-uppercase Button-iconRight"
+                            data-color="regular"
+                            data-variant="text"
+                            href="/admin/configure/organization/sites/site-1"
+                            onBlur={[Function]}
+                            onClick={[Function]}
+                            onFocus={[Function]}
+                            onMouseOut={[Function]}
+                            onMouseOver={[Function]}
+                            onTouchEnd={[Function]}
+                            type="button"
+                          >
+                            Details 
+                            <i
+                              aria-hidden="true"
+                              className="Icon-root Icon-sm"
+                            >
+                              keyboard_arrow_right
+                            </i>
+                          </a>
+                        </div>
+                      </td>
+                    </tr>
+                    <tr
+                      className="TableRow-root TableRow-body"
+                    >
+                      <td
+                        className="TableCell-root TableCell-body"
+                      >
+                        Second Site
+                      </td>
+                      <td
+                        className="TableCell-root TableCell-body"
+                      >
+                        <div
+                          className="Box-root Flex-root Flex-flex Flex-justifyFlexEnd"
+                        >
+                          <a
+                            className="BaseButton-root Button-root Button-sizeRegular Button-colorRegular Button-variantText Button-uppercase Button-iconRight"
+                            data-color="regular"
+                            data-variant="text"
+                            href="/admin/configure/organization/sites/site-2"
+                            onBlur={[Function]}
+                            onClick={[Function]}
+                            onFocus={[Function]}
+                            onMouseOut={[Function]}
+                            onMouseOver={[Function]}
+                            onTouchEnd={[Function]}
+                            type="button"
+                          >
+                            Details 
+                            <i
+                              aria-hidden="true"
+                              className="Icon-root Icon-sm"
+                            >
+                              keyboard_arrow_right
+                            </i>
+                          </a>
+                        </div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
               </div>
             </div>
           </div>
diff --git a/src/core/client/admin/test/configure/advanced.spec.tsx b/src/core/client/admin/test/configure/advanced.spec.tsx
index d12b2ac86..bb70dfa14 100644
--- a/src/core/client/admin/test/configure/advanced.spec.tsx
+++ b/src/core/client/admin/test/configure/advanced.spec.tsx
@@ -175,106 +175,3 @@ it("renders without live configuration when not configurable", async () => {
     within(advancedContainer).queryByLabelText("Comment Stream Live Updates")
   ).toEqual(null);
 });
-
-it("change permitted domains to be empty", async () => {
-  const resolvers = createResolversStub<GQLResolver>({
-    Mutation: {
-      updateSettings: ({ variables }) => {
-        expectAndFail(variables.settings.allowedDomains).toEqual([]);
-        return {
-          settings: pureMerge(settings, variables.settings),
-        };
-      },
-    },
-  });
-  const {
-    configureContainer,
-    advancedContainer,
-    saveChangesButton,
-  } = await createTestRenderer({
-    resolvers,
-  });
-
-  const permittedDomainsField = within(advancedContainer).getByLabelText(
-    "Permitted domains"
-  );
-
-  // Let's change the permitted domains.
-  act(() => permittedDomainsField.props.onChange(""));
-
-  // Send form
-  act(() => {
-    within(configureContainer)
-      .getByType("form")
-      .props.onSubmit();
-  });
-
-  // Submit button and text field should be disabled.
-  expect(saveChangesButton.props.disabled).toBe(true);
-  expect(permittedDomainsField.props.disabled).toBe(true);
-
-  // Wait for submission to be finished
-  await act(async () => {
-    await wait(() => {
-      expect(permittedDomainsField.props.disabled).toBe(false);
-    });
-  });
-
-  // Should have successfully sent with server.
-  expect(resolvers.Mutation!.updateSettings!.called).toBe(true);
-});
-
-it("change permitted domains to include more domains", async () => {
-  const resolvers = createResolversStub<GQLResolver>({
-    Mutation: {
-      updateSettings: ({ variables }) => {
-        expectAndFail(variables.settings.allowedDomains).toEqual([
-          "http://localhost:8080",
-          "http://localhost:3000",
-        ]);
-        return {
-          settings: pureMerge(settings, variables.settings),
-        };
-      },
-    },
-  });
-  const {
-    configureContainer,
-    advancedContainer,
-    saveChangesButton,
-  } = await createTestRenderer({
-    resolvers,
-  });
-
-  const permittedDomainsField = within(advancedContainer).getByLabelText(
-    "Permitted domains"
-  );
-
-  // Let's change the permitted domains.
-  act(() =>
-    permittedDomainsField.props.onChange(
-      "http://localhost:8080, http://localhost:3000"
-    )
-  );
-
-  // Send form
-  act(() => {
-    within(configureContainer)
-      .getByType("form")
-      .props.onSubmit();
-  });
-
-  // Submit button and text field should be disabled.
-  expect(saveChangesButton.props.disabled).toBe(true);
-  expect(permittedDomainsField.props.disabled).toBe(true);
-
-  // Wait for submission to be finished
-  await act(async () => {
-    await wait(() => {
-      expect(permittedDomainsField.props.disabled).toBe(false);
-    });
-  });
-
-  // Should have successfully sent with server.
-  expect(resolvers.Mutation!.updateSettings!.called).toBe(true);
-});
diff --git a/src/core/client/admin/test/configure/organization.spec.tsx b/src/core/client/admin/test/configure/organization.spec.tsx
index bb59f13e8..4d0968d5d 100644
--- a/src/core/client/admin/test/configure/organization.spec.tsx
+++ b/src/core/client/admin/test/configure/organization.spec.tsx
@@ -11,7 +11,7 @@ import {
 } from "coral-framework/testHelpers";
 
 import create from "../create";
-import { settings, users } from "../fixtures";
+import { settings, siteConnection, users } from "../fixtures";
 
 beforeEach(() => {
   replaceHistoryLocation("http://localhost/admin/configure/organization");
@@ -29,6 +29,7 @@ async function createTestRenderer(
         Query: {
           settings: () => settings,
           viewer: () => viewer,
+          sites: () => siteConnection,
         },
       }),
       params.resolvers
@@ -126,69 +127,3 @@ it("change organization name", async () => {
   // Should have successfully sent with server.
   expect(resolvers.Mutation!.updateSettings!.called).toBe(true);
 });
-
-it("change organization contact email", async () => {
-  const resolvers = createResolversStub<GQLResolver>({
-    Mutation: {
-      updateSettings: ({ variables }) => {
-        expectAndFail(variables.settings.organization!.contactEmail).toEqual(
-          "test@coralproject.net"
-        );
-        return {
-          settings: pureMerge(settings, variables.settings),
-        };
-      },
-    },
-  });
-  const {
-    configureContainer,
-    organizationContainer,
-    saveChangesButton,
-  } = await createTestRenderer({ resolvers });
-
-  const organizationEmailField = within(organizationContainer).getByLabelText(
-    "Organization email"
-  );
-
-  // Let's change some organization name.
-  act(() => organizationEmailField.props.onChange(""));
-
-  // Send form
-  act(() => {
-    within(configureContainer)
-      .getByType("form")
-      .props.onSubmit();
-  });
-
-  // Should show validation error.
-  within(organizationContainer).getByText("This field is required.");
-
-  // Let's change to some valid organization name.
-  act(() => organizationEmailField.props.onChange("test@coralproject.net"));
-
-  // Should not show validation error.
-  expect(
-    within(organizationContainer).queryByText("This field is required.")
-  ).toBeNull();
-
-  // Send form
-  act(() => {
-    within(configureContainer)
-      .getByType("form")
-      .props.onSubmit();
-  });
-
-  // Submit button and text field should be disabled.
-  expect(saveChangesButton.props.disabled).toBe(true);
-  expect(organizationEmailField.props.disabled).toBe(true);
-
-  // Wait for submission to be finished
-  await act(async () => {
-    await wait(() => {
-      expect(organizationEmailField.props.disabled).toBe(false);
-    });
-  });
-
-  // Should have successfully sent with server.
-  expect(resolvers.Mutation!.updateSettings!.called).toBe(true);
-});
diff --git a/src/core/client/admin/test/fixtures.ts b/src/core/client/admin/test/fixtures.ts
index 732652dbb..38c8f579f 100644
--- a/src/core/client/admin/test/fixtures.ts
+++ b/src/core/client/admin/test/fixtures.ts
@@ -13,6 +13,8 @@ import {
   GQLMODERATION_MODE,
   GQLModerationQueues,
   GQLSettings,
+  GQLSite,
+  GQLSitesConnection,
   GQLStoriesConnection,
   GQLStory,
   GQLSTORY_STATUS,
@@ -65,7 +67,6 @@ export const settings = createFixture<GQLSettings>({
     smtp: {},
   },
   customCSSURL: "",
-  allowedDomains: ["http://localhost:8080"],
   editCommentWindowLength: 30000,
   communityGuidelines: {
     enabled: false,
@@ -169,6 +170,7 @@ export const settings = createFixture<GQLSettings>({
   slack: {
     channels: [],
   },
+  multisite: false,
 });
 
 export const settingsWithEmptyAuth = createFixture<GQLSettings>(
@@ -236,6 +238,28 @@ export const settingsWithEmptyAuth = createFixture<GQLSettings>(
   settings
 );
 
+export const site = createFixture<GQLSite>({
+  name: "Test Site",
+  id: "site-id",
+  createdAt: "2018-05-06T18:24:00.000Z",
+  allowedOrigins: ["http://test-site.com"],
+});
+
+export const sites = createFixtures<GQLSite>([
+  {
+    name: "Test Site",
+    id: "site-1",
+    createdAt: "2018-07-06T18:24:00.000Z",
+    allowedOrigins: ["http://test-site.com"],
+  },
+  {
+    name: "Second Site",
+    id: "site-2",
+    createdAt: "2018-09-06T18:24:00.000Z",
+    allowedOrigins: ["http://test-2-site.com"],
+  },
+]);
+
 export const moderationActions = createFixtures<GQLCommentModerationAction>([
   {
     id: "07e8f815-e165-4b5d-b438-7163415c8cf7",
@@ -463,6 +487,7 @@ export const stories = createFixtures<GQLStory>([
       title: "Finally a Cure for Cancer",
       publishedAt: "2018-11-29T16:01:51.897Z",
     },
+    site: sites[0],
   },
   {
     id: "story-2",
@@ -476,6 +501,7 @@ export const stories = createFixtures<GQLStory>([
       title: "First Colony on Mars",
       publishedAt: "2018-11-29T16:01:51.897Z",
     },
+    site: sites[1],
   },
   {
     id: "story-3",
@@ -489,6 +515,7 @@ export const stories = createFixtures<GQLStory>([
       title: "World hunger has been defeated",
       publishedAt: "2018-11-29T16:01:51.897Z",
     },
+    site: sites[1],
   },
 ]);
 
@@ -548,6 +575,7 @@ export const baseComment = createFixture<GQLComment>({
     nodes: [],
   },
   story: stories[0],
+  site: sites[0],
   // TODO: Should be allowed to pass null here..
   parent: undefined,
   deleted: undefined,
@@ -828,3 +856,11 @@ export const disabledLocalRegistration = createFixture<GQLSettings>(
     },
   })
 );
+
+export const siteConnection = createFixture<GQLSitesConnection>({
+  edges: [
+    { node: sites[0], cursor: sites[0].createdAt },
+    { node: sites[1], cursor: sites[1].createdAt },
+  ],
+  pageInfo: { endCursor: null, hasNextPage: false },
+});
diff --git a/src/core/client/admin/test/moderate/__snapshots__/regularQueue.spec.tsx.snap b/src/core/client/admin/test/moderate/__snapshots__/regularQueue.spec.tsx.snap
index 3b3ebf1d1..c376462d7 100644
--- a/src/core/client/admin/test/moderate/__snapshots__/regularQueue.spec.tsx.snap
+++ b/src/core/client/admin/test/moderate/__snapshots__/regularQueue.spec.tsx.snap
@@ -134,14 +134,18 @@ exports[`approves comment in reported queue: dangling 1`] = `
               </span>
             </div>
             <div
-              className="ModerateCard-storyTitle"
+              className="ModerateCard-commentOn"
             >
-              Finally a Cure for Cancer
+              <span
+                className="ModerateCard-storyTitle"
+              >
+                Finally a Cure for Cancer
+              </span>
             </div>
             <div>
               <a
                 className="TextLink-root ModerateCard-link"
-                href="/admin/moderate/story-1"
+                href="/admin/moderate/stories/story-1"
                 onClick={[Function]}
               >
                 Moderate Story
@@ -387,14 +391,18 @@ exports[`rejects comment in reported queue: dangling 1`] = `
               </span>
             </div>
             <div
-              className="ModerateCard-storyTitle"
+              className="ModerateCard-commentOn"
             >
-              Finally a Cure for Cancer
+              <span
+                className="ModerateCard-storyTitle"
+              >
+                Finally a Cure for Cancer
+              </span>
             </div>
             <div>
               <a
                 className="TextLink-root ModerateCard-link"
-                href="/admin/moderate/story-1"
+                href="/admin/moderate/stories/story-1"
                 onClick={[Function]}
               >
                 Moderate Story
@@ -637,14 +645,18 @@ exports[`renders reported queue with comments 1`] = `
                     </span>
                   </div>
                   <div
-                    className="ModerateCard-storyTitle"
+                    className="ModerateCard-commentOn"
                   >
-                    Finally a Cure for Cancer
+                    <span
+                      className="ModerateCard-storyTitle"
+                    >
+                      Finally a Cure for Cancer
+                    </span>
                   </div>
                   <div>
                     <a
                       className="TextLink-root ModerateCard-link"
-                      href="/admin/moderate/story-1"
+                      href="/admin/moderate/stories/story-1"
                       onClick={[Function]}
                     >
                       Moderate Story
@@ -874,14 +886,18 @@ exports[`renders reported queue with comments 1`] = `
                     </span>
                   </div>
                   <div
-                    className="ModerateCard-storyTitle"
+                    className="ModerateCard-commentOn"
                   >
-                    Finally a Cure for Cancer
+                    <span
+                      className="ModerateCard-storyTitle"
+                    >
+                      Finally a Cure for Cancer
+                    </span>
                   </div>
                   <div>
                     <a
                       className="TextLink-root ModerateCard-link"
-                      href="/admin/moderate/story-1"
+                      href="/admin/moderate/stories/story-1"
                       onClick={[Function]}
                     >
                       Moderate Story
@@ -1127,14 +1143,18 @@ exports[`renders reported queue with comments 2`] = `
                     </span>
                   </div>
                   <div
-                    className="ModerateCard-storyTitle"
+                    className="ModerateCard-commentOn"
                   >
-                    Finally a Cure for Cancer
+                    <span
+                      className="ModerateCard-storyTitle"
+                    >
+                      Finally a Cure for Cancer
+                    </span>
                   </div>
                   <div>
                     <a
                       className="TextLink-root ModerateCard-link"
-                      href="/admin/moderate/story-1"
+                      href="/admin/moderate/stories/story-1"
                       onClick={[Function]}
                     >
                       Moderate Story
@@ -1364,14 +1384,18 @@ exports[`renders reported queue with comments 2`] = `
                     </span>
                   </div>
                   <div
-                    className="ModerateCard-storyTitle"
+                    className="ModerateCard-commentOn"
                   >
-                    Finally a Cure for Cancer
+                    <span
+                      className="ModerateCard-storyTitle"
+                    >
+                      Finally a Cure for Cancer
+                    </span>
                   </div>
                   <div>
                     <a
                       className="TextLink-root ModerateCard-link"
-                      href="/admin/moderate/story-1"
+                      href="/admin/moderate/stories/story-1"
                       onClick={[Function]}
                     >
                       Moderate Story
@@ -1607,14 +1631,18 @@ exports[`renders reported queue with comments and load more 1`] = `
               </span>
             </div>
             <div
-              className="ModerateCard-storyTitle"
+              className="ModerateCard-commentOn"
             >
-              Finally a Cure for Cancer
+              <span
+                className="ModerateCard-storyTitle"
+              >
+                Finally a Cure for Cancer
+              </span>
             </div>
             <div>
               <a
                 className="TextLink-root ModerateCard-link"
-                href="/admin/moderate/story-1"
+                href="/admin/moderate/stories/story-1"
                 onClick={[Function]}
               >
                 Moderate Story
diff --git a/src/core/client/admin/test/moderate/__snapshots__/rejectedQueue.spec.tsx.snap b/src/core/client/admin/test/moderate/__snapshots__/rejectedQueue.spec.tsx.snap
index 2358f98de..84e6286ec 100644
--- a/src/core/client/admin/test/moderate/__snapshots__/rejectedQueue.spec.tsx.snap
+++ b/src/core/client/admin/test/moderate/__snapshots__/rejectedQueue.spec.tsx.snap
@@ -134,14 +134,18 @@ exports[`approves comment in rejected queue: dangling 1`] = `
               </span>
             </div>
             <div
-              className="ModerateCard-storyTitle"
+              className="ModerateCard-commentOn"
             >
-              Finally a Cure for Cancer
+              <span
+                className="ModerateCard-storyTitle"
+              >
+                Finally a Cure for Cancer
+              </span>
             </div>
             <div>
               <a
                 className="TextLink-root ModerateCard-link"
-                href="/admin/moderate/story-1"
+                href="/admin/moderate/stories/story-1"
                 onClick={[Function]}
               >
                 Moderate Story
@@ -384,14 +388,18 @@ exports[`renders rejected queue with comments 1`] = `
                     </span>
                   </div>
                   <div
-                    className="ModerateCard-storyTitle"
+                    className="ModerateCard-commentOn"
                   >
-                    Finally a Cure for Cancer
+                    <span
+                      className="ModerateCard-storyTitle"
+                    >
+                      Finally a Cure for Cancer
+                    </span>
                   </div>
                   <div>
                     <a
                       className="TextLink-root ModerateCard-link"
-                      href="/admin/moderate/story-1"
+                      href="/admin/moderate/stories/story-1"
                       onClick={[Function]}
                     >
                       Moderate Story
@@ -621,14 +629,18 @@ exports[`renders rejected queue with comments 1`] = `
                     </span>
                   </div>
                   <div
-                    className="ModerateCard-storyTitle"
+                    className="ModerateCard-commentOn"
                   >
-                    Finally a Cure for Cancer
+                    <span
+                      className="ModerateCard-storyTitle"
+                    >
+                      Finally a Cure for Cancer
+                    </span>
                   </div>
                   <div>
                     <a
                       className="TextLink-root ModerateCard-link"
-                      href="/admin/moderate/story-1"
+                      href="/admin/moderate/stories/story-1"
                       onClick={[Function]}
                     >
                       Moderate Story
@@ -864,14 +876,18 @@ exports[`renders rejected queue with comments and load more 1`] = `
               </span>
             </div>
             <div
-              className="ModerateCard-storyTitle"
+              className="ModerateCard-commentOn"
             >
-              Finally a Cure for Cancer
+              <span
+                className="ModerateCard-storyTitle"
+              >
+                Finally a Cure for Cancer
+              </span>
             </div>
             <div>
               <a
                 className="TextLink-root ModerateCard-link"
-                href="/admin/moderate/story-1"
+                href="/admin/moderate/stories/story-1"
                 onClick={[Function]}
               >
                 Moderate Story
diff --git a/src/core/client/admin/test/moderate/feature.spec.tsx b/src/core/client/admin/test/moderate/feature.spec.tsx
index d7b5916aa..23afebaab 100644
--- a/src/core/client/admin/test/moderate/feature.spec.tsx
+++ b/src/core/client/admin/test/moderate/feature.spec.tsx
@@ -19,6 +19,8 @@ import {
   emptyRejectedComments,
   featuredComments,
   settings,
+  site,
+  siteConnection,
   unmoderatedComments,
   users,
 } from "../fixtures";
@@ -37,6 +39,8 @@ async function createTestRenderer(
           viewer: () => viewer,
           moderationQueues: () => emptyModerationQueues,
           comments: () => emptyRejectedComments,
+          site: () => site,
+          sites: () => siteConnection,
         },
       }),
       params.resolvers
diff --git a/src/core/client/admin/test/moderate/liveCounts.spec.tsx b/src/core/client/admin/test/moderate/liveCounts.spec.tsx
index eb4f67fd4..1b16a5d50 100644
--- a/src/core/client/admin/test/moderate/liveCounts.spec.tsx
+++ b/src/core/client/admin/test/moderate/liveCounts.spec.tsx
@@ -20,6 +20,8 @@ import {
   emptyRejectedComments,
   reportedComments,
   settings,
+  site,
+  siteConnection,
   users,
 } from "../fixtures";
 
@@ -41,6 +43,8 @@ async function createTestRenderer(
           viewer: () => viewer,
           moderationQueues: () => emptyModerationQueues,
           comments: () => emptyRejectedComments,
+          site: () => site,
+          sites: () => siteConnection,
         },
       }),
       params.resolvers
diff --git a/src/core/client/admin/test/moderate/regularQueue.spec.tsx b/src/core/client/admin/test/moderate/regularQueue.spec.tsx
index 5ef6bf0a1..332fdf17d 100644
--- a/src/core/client/admin/test/moderate/regularQueue.spec.tsx
+++ b/src/core/client/admin/test/moderate/regularQueue.spec.tsx
@@ -25,6 +25,8 @@ import {
   emptyRejectedComments,
   reportedComments,
   settings,
+  site,
+  siteConnection,
   users,
 } from "../fixtures";
 
@@ -43,9 +45,11 @@ async function createTestRenderer(
       createResolversStub<GQLResolver>({
         Query: {
           settings: () => settings,
+          site: () => site,
           viewer: () => viewer,
           moderationQueues: () => emptyModerationQueues,
           comments: () => emptyRejectedComments,
+          sites: () => siteConnection,
         },
       }),
       params.resolvers
@@ -267,7 +271,7 @@ it("shows a moderate story", async () => {
     moderateStory.props.onClick({});
     // Expect a routing request was made to the right url.
     expect(transitionControl.history[0].pathname).toBe(
-      `/admin/moderate/${reportedComments[0].story.id}`
+      `/admin/moderate/stories/${reportedComments[0].story.id}`
     );
   });
 });
diff --git a/src/core/client/admin/test/moderate/regularQueueLiveNewComments.spec.tsx b/src/core/client/admin/test/moderate/regularQueueLiveNewComments.spec.tsx
index aed19966c..2f1c3d706 100644
--- a/src/core/client/admin/test/moderate/regularQueueLiveNewComments.spec.tsx
+++ b/src/core/client/admin/test/moderate/regularQueueLiveNewComments.spec.tsx
@@ -20,6 +20,8 @@ import {
   emptyRejectedComments,
   reportedComments,
   settings,
+  site,
+  siteConnection,
   users,
 } from "../fixtures";
 
@@ -38,6 +40,8 @@ async function createTestRenderer(
           viewer: () => viewer,
           moderationQueues: () => emptyModerationQueues,
           comments: () => emptyRejectedComments,
+          sites: () => siteConnection,
+          site: () => site,
         },
       }),
       params.resolvers
diff --git a/src/core/client/admin/test/moderate/regularQueueLiveStatus.spec.tsx b/src/core/client/admin/test/moderate/regularQueueLiveStatus.spec.tsx
index 391c52ad0..ae329f243 100644
--- a/src/core/client/admin/test/moderate/regularQueueLiveStatus.spec.tsx
+++ b/src/core/client/admin/test/moderate/regularQueueLiveStatus.spec.tsx
@@ -21,6 +21,8 @@ import {
   emptyRejectedComments,
   reportedComments,
   settings,
+  site,
+  siteConnection,
   users,
 } from "../fixtures";
 
@@ -38,6 +40,8 @@ async function createTestRenderer(
         Query: {
           settings: () => settings,
           viewer: () => viewer,
+          sites: () => siteConnection,
+          site: () => site,
           moderationQueues: () =>
             pureMerge(emptyModerationQueues, {
               reported: {
diff --git a/src/core/client/admin/test/moderate/rejectedQueue.spec.tsx b/src/core/client/admin/test/moderate/rejectedQueue.spec.tsx
index 21dbc299c..9ee42091e 100644
--- a/src/core/client/admin/test/moderate/rejectedQueue.spec.tsx
+++ b/src/core/client/admin/test/moderate/rejectedQueue.spec.tsx
@@ -22,6 +22,8 @@ import {
   rejectedComments,
   reportedComments,
   settings,
+  site,
+  siteConnection,
   users,
 } from "../fixtures";
 
@@ -43,6 +45,8 @@ async function createTestRenderer(
           viewer: () => viewer,
           moderationQueues: () => emptyModerationQueues,
           comments: () => emptyRejectedComments,
+          site: () => site,
+          sites: () => siteConnection,
         },
       }),
       params.resolvers
@@ -136,7 +140,7 @@ it("shows a moderate story", async () => {
   moderateStory.props.onClick({});
   // Expect a routing request was made to the right url.
   expect(transitionControl.history[0].pathname).toBe(
-    `/admin/moderate/${reportedComments[0].story.id}`
+    `/admin/moderate/stories/${reportedComments[0].story.id}`
   );
 });
 
diff --git a/src/core/client/admin/test/moderate/searchBar.spec.tsx b/src/core/client/admin/test/moderate/searchBar.spec.tsx
index bd0f69c75..98b56888c 100644
--- a/src/core/client/admin/test/moderate/searchBar.spec.tsx
+++ b/src/core/client/admin/test/moderate/searchBar.spec.tsx
@@ -20,6 +20,8 @@ import {
   emptyRejectedComments,
   emptyStories,
   settings,
+  site,
+  siteConnection,
   stories,
   storyConnection,
   users,
@@ -43,6 +45,8 @@ async function createTestRenderer(
           viewer: () => viewer,
           moderationQueues: () => emptyModerationQueues,
           comments: () => emptyRejectedComments,
+          site: () => site,
+          sites: () => siteConnection,
         },
       }),
       params.resolvers
@@ -165,7 +169,7 @@ describe("all stories", () => {
 
       // Expect a routing request was made to the right url.
       expect(transitionControl.history[0].pathname).toBe(
-        `/admin/moderate/${story.id}`
+        `/admin/moderate/stories/${story.id}`
       );
     });
     it("search with too many results", async () => {
@@ -216,7 +220,9 @@ describe("all stories", () => {
 });
 describe("specified story", () => {
   beforeEach(() => {
-    replaceHistoryLocation(`http://localhost/admin/moderate/${stories[0].id}`);
+    replaceHistoryLocation(
+      `http://localhost/admin/moderate/stories/${stories[0].id}`
+    );
   });
   it("renders search bar", async () => {
     await act(async () => {
diff --git a/src/core/client/admin/test/moderate/tabBar.spec.tsx b/src/core/client/admin/test/moderate/tabBar.spec.tsx
index 7b35c90a0..c860cff2b 100644
--- a/src/core/client/admin/test/moderate/tabBar.spec.tsx
+++ b/src/core/client/admin/test/moderate/tabBar.spec.tsx
@@ -15,6 +15,7 @@ import {
   emptyModerationQueues,
   emptyRejectedComments,
   settings,
+  siteConnection,
   users,
 } from "../fixtures";
 
@@ -35,6 +36,7 @@ async function createTestRenderer(
           settings: () => settings,
           viewer: () => viewer,
           moderationQueues: () => emptyModerationQueues,
+          sites: () => siteConnection,
           comments: () => emptyRejectedComments,
         },
       }),
diff --git a/src/core/client/admin/test/stories/__snapshots__/stories.spec.tsx.snap b/src/core/client/admin/test/stories/__snapshots__/stories.spec.tsx.snap
index 194dd32f1..bb67e420c 100644
--- a/src/core/client/admin/test/stories/__snapshots__/stories.spec.tsx.snap
+++ b/src/core/client/admin/test/stories/__snapshots__/stories.spec.tsx.snap
@@ -11,115 +11,119 @@ exports[`renders empty stories 1`] = `
     <div
       className="Box-root Flex-root Flex-flex Flex-doubleItemGutter gutter"
     >
-      <fieldset
-        className="FieldSet-root"
+      <div
+        className="Box-root Flex-root Flex-flex Flex-doubleItemGutter gutter"
       >
-        <div
-          className="Box-root HorizontalGutter-root HorizontalGutter-spacing-2"
+        <fieldset
+          className="FieldSet-root"
         >
-          <label
-            className="Label-root"
+          <div
+            className="Box-root HorizontalGutter-root HorizontalGutter-spacing-2"
           >
-            Search
-          </label>
-          <form
-            autoComplete="off"
-            id="configure-form"
-            onSubmit={[Function]}
-          >
-            <div
-              className="TextField-root StoryTableFilter-textField"
+            <label
+              className="Label-root"
             >
-              <input
-                aria-label="Search by story title or author"
-                className="TextField-input TextField-colorDark TextField-seamlessAdornment"
-                name="search"
+              Search
+            </label>
+            <form
+              autoComplete="off"
+              id="configure-form"
+              onSubmit={[Function]}
+            >
+              <div
+                className="TextField-root StoryTableFilter-textField"
+              >
+                <input
+                  aria-label="Search by story title or author"
+                  className="TextField-input TextField-colorDark TextField-seamlessAdornment"
+                  name="search"
+                  onBlur={[Function]}
+                  onChange={[Function]}
+                  onFocus={[Function]}
+                  placeholder="Search by story title or author..."
+                  type="text"
+                  value=""
+                />
+                <div
+                  className="TextField-adornment"
+                >
+                  <button
+                    aria-label="Search"
+                    className="BaseButton-root Button-root Button-sizeRegular Button-colorDark Button-variantRegular Button-uppercase Button-adornmentRight StoryTableFilter-adornment"
+                    data-color="dark"
+                    data-variant="regular"
+                    onBlur={[Function]}
+                    onFocus={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="submit"
+                  >
+                    <i
+                      aria-hidden="true"
+                      className="Icon-root Icon-md"
+                    >
+                      search
+                    </i>
+                  </button>
+                </div>
+              </div>
+            </form>
+          </div>
+        </fieldset>
+        <fieldset
+          className="FieldSet-root"
+        >
+          <div
+            className="Box-root HorizontalGutter-root HorizontalGutter-spacing-2"
+          >
+            <label
+              className="Label-root"
+            >
+              Status
+            </label>
+            <span
+              className="SelectField-root"
+            >
+              <select
+                aria-label="Search by status"
+                className="SelectField-select"
                 onBlur={[Function]}
                 onChange={[Function]}
                 onFocus={[Function]}
-                placeholder="Search by story title or author..."
-                type="text"
                 value=""
-              />
-              <div
-                className="TextField-adornment"
               >
-                <button
-                  aria-label="Search"
-                  className="BaseButton-root Button-root Button-sizeRegular Button-colorDark Button-variantRegular Button-uppercase Button-adornmentRight StoryTableFilter-adornment"
-                  data-color="dark"
-                  data-variant="regular"
-                  onBlur={[Function]}
-                  onFocus={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="submit"
+                <option
+                  value=""
                 >
-                  <i
-                    aria-hidden="true"
-                    className="Icon-root Icon-md"
-                  >
-                    search
-                  </i>
-                </button>
-              </div>
-            </div>
-          </form>
-        </div>
-      </fieldset>
-      <fieldset
-        className="FieldSet-root"
-      >
-        <div
-          className="Box-root HorizontalGutter-root HorizontalGutter-spacing-2"
-        >
-          <label
-            className="Label-root"
-          >
-            Show Me
-          </label>
-          <span
-            className="SelectField-root"
-          >
-            <select
-              aria-label="Search by status"
-              className="SelectField-select"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              value=""
-            >
-              <option
-                value=""
+                  All Stories
+                </option>
+                <option
+                  value="OPEN"
+                >
+                  Open Stories
+                </option>
+                <option
+                  value="CLOSED"
+                >
+                  Closed Stories
+                </option>
+              </select>
+              <span
+                aria-hidden={true}
+                className="SelectField-afterWrapper"
               >
-                All Stories
-              </option>
-              <option
-                value="OPEN"
-              >
-                Open Stories
-              </option>
-              <option
-                value="CLOSED"
-              >
-                Closed Stories
-              </option>
-            </select>
-            <span
-              aria-hidden={true}
-              className="SelectField-afterWrapper"
-            >
-              <i
-                aria-hidden="true"
-                className="Icon-root Icon-sm"
-              >
-                expand_more
-              </i>
+                <i
+                  aria-hidden="true"
+                  className="Icon-root Icon-sm"
+                >
+                  expand_more
+                </i>
+              </span>
             </span>
-          </span>
-        </div>
-      </fieldset>
+          </div>
+        </fieldset>
+      </div>
     </div>
     <div
       className="Box-root HorizontalGutter-root HorizontalGutter-double"
@@ -178,7 +182,7 @@ exports[`renders empty stories 1`] = `
             >
               <a
                 className="TextLink-root"
-                href="/admin/moderate/story-1"
+                href="/admin/moderate/stories/story-1"
                 onClick={[Function]}
               >
                 Finally a Cure for Cancer
@@ -249,7 +253,7 @@ exports[`renders empty stories 1`] = `
             >
               <a
                 className="TextLink-root"
-                href="/admin/moderate/story-2"
+                href="/admin/moderate/stories/story-2"
                 onClick={[Function]}
               >
                 First Colony on Mars
@@ -330,115 +334,119 @@ exports[`renders stories 1`] = `
     <div
       className="Box-root Flex-root Flex-flex Flex-doubleItemGutter gutter"
     >
-      <fieldset
-        className="FieldSet-root"
+      <div
+        className="Box-root Flex-root Flex-flex Flex-doubleItemGutter gutter"
       >
-        <div
-          className="Box-root HorizontalGutter-root HorizontalGutter-spacing-2"
+        <fieldset
+          className="FieldSet-root"
         >
-          <label
-            className="Label-root"
+          <div
+            className="Box-root HorizontalGutter-root HorizontalGutter-spacing-2"
           >
-            Search
-          </label>
-          <form
-            autoComplete="off"
-            id="configure-form"
-            onSubmit={[Function]}
-          >
-            <div
-              className="TextField-root StoryTableFilter-textField"
+            <label
+              className="Label-root"
             >
-              <input
-                aria-label="Search by story title or author"
-                className="TextField-input TextField-colorDark TextField-seamlessAdornment"
-                name="search"
+              Search
+            </label>
+            <form
+              autoComplete="off"
+              id="configure-form"
+              onSubmit={[Function]}
+            >
+              <div
+                className="TextField-root StoryTableFilter-textField"
+              >
+                <input
+                  aria-label="Search by story title or author"
+                  className="TextField-input TextField-colorDark TextField-seamlessAdornment"
+                  name="search"
+                  onBlur={[Function]}
+                  onChange={[Function]}
+                  onFocus={[Function]}
+                  placeholder="Search by story title or author..."
+                  type="text"
+                  value=""
+                />
+                <div
+                  className="TextField-adornment"
+                >
+                  <button
+                    aria-label="Search"
+                    className="BaseButton-root Button-root Button-sizeRegular Button-colorDark Button-variantRegular Button-uppercase Button-adornmentRight StoryTableFilter-adornment"
+                    data-color="dark"
+                    data-variant="regular"
+                    onBlur={[Function]}
+                    onFocus={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="submit"
+                  >
+                    <i
+                      aria-hidden="true"
+                      className="Icon-root Icon-md"
+                    >
+                      search
+                    </i>
+                  </button>
+                </div>
+              </div>
+            </form>
+          </div>
+        </fieldset>
+        <fieldset
+          className="FieldSet-root"
+        >
+          <div
+            className="Box-root HorizontalGutter-root HorizontalGutter-spacing-2"
+          >
+            <label
+              className="Label-root"
+            >
+              Status
+            </label>
+            <span
+              className="SelectField-root"
+            >
+              <select
+                aria-label="Search by status"
+                className="SelectField-select"
                 onBlur={[Function]}
                 onChange={[Function]}
                 onFocus={[Function]}
-                placeholder="Search by story title or author..."
-                type="text"
                 value=""
-              />
-              <div
-                className="TextField-adornment"
               >
-                <button
-                  aria-label="Search"
-                  className="BaseButton-root Button-root Button-sizeRegular Button-colorDark Button-variantRegular Button-uppercase Button-adornmentRight StoryTableFilter-adornment"
-                  data-color="dark"
-                  data-variant="regular"
-                  onBlur={[Function]}
-                  onFocus={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="submit"
+                <option
+                  value=""
                 >
-                  <i
-                    aria-hidden="true"
-                    className="Icon-root Icon-md"
-                  >
-                    search
-                  </i>
-                </button>
-              </div>
-            </div>
-          </form>
-        </div>
-      </fieldset>
-      <fieldset
-        className="FieldSet-root"
-      >
-        <div
-          className="Box-root HorizontalGutter-root HorizontalGutter-spacing-2"
-        >
-          <label
-            className="Label-root"
-          >
-            Show Me
-          </label>
-          <span
-            className="SelectField-root"
-          >
-            <select
-              aria-label="Search by status"
-              className="SelectField-select"
-              onBlur={[Function]}
-              onChange={[Function]}
-              onFocus={[Function]}
-              value=""
-            >
-              <option
-                value=""
+                  All Stories
+                </option>
+                <option
+                  value="OPEN"
+                >
+                  Open Stories
+                </option>
+                <option
+                  value="CLOSED"
+                >
+                  Closed Stories
+                </option>
+              </select>
+              <span
+                aria-hidden={true}
+                className="SelectField-afterWrapper"
               >
-                All Stories
-              </option>
-              <option
-                value="OPEN"
-              >
-                Open Stories
-              </option>
-              <option
-                value="CLOSED"
-              >
-                Closed Stories
-              </option>
-            </select>
-            <span
-              aria-hidden={true}
-              className="SelectField-afterWrapper"
-            >
-              <i
-                aria-hidden="true"
-                className="Icon-root Icon-sm"
-              >
-                expand_more
-              </i>
+                <i
+                  aria-hidden="true"
+                  className="Icon-root Icon-sm"
+                >
+                  expand_more
+                </i>
+              </span>
             </span>
-          </span>
-        </div>
-      </fieldset>
+          </div>
+        </fieldset>
+      </div>
     </div>
     <div
       className="Box-root HorizontalGutter-root HorizontalGutter-double"
@@ -497,7 +505,7 @@ exports[`renders stories 1`] = `
             >
               <a
                 className="TextLink-root"
-                href="/admin/moderate/story-1"
+                href="/admin/moderate/stories/story-1"
                 onClick={[Function]}
               >
                 Finally a Cure for Cancer
@@ -568,7 +576,7 @@ exports[`renders stories 1`] = `
             >
               <a
                 className="TextLink-root"
-                href="/admin/moderate/story-2"
+                href="/admin/moderate/stories/story-2"
                 onClick={[Function]}
               >
                 First Colony on Mars
diff --git a/src/core/client/admin/test/stories/stories.spec.tsx b/src/core/client/admin/test/stories/stories.spec.tsx
index 5edebf59e..5519e5a9d 100644
--- a/src/core/client/admin/test/stories/stories.spec.tsx
+++ b/src/core/client/admin/test/stories/stories.spec.tsx
@@ -24,6 +24,8 @@ import create from "../create";
 import {
   emptyStories,
   settings,
+  site,
+  siteConnection,
   stories,
   storyConnection,
   users,
@@ -45,6 +47,8 @@ async function createTestRenderer(
         Query: {
           settings: () => settings,
           viewer: () => viewer,
+          site: () => site,
+          sites: () => siteConnection,
           stories: ({ variables }) => {
             expectAndFail(variables.status).toBeFalsy();
             return storyConnection;
@@ -114,7 +118,7 @@ it("goes to moderation when clicking on title", async () => {
   await act(async () => {
     await wait(() => {
       expect(transitionControl.history[0].pathname).toBe(
-        `/admin/moderate/${story.id}`
+        `/admin/moderate/stories/${story.id}`
       );
     });
   });
diff --git a/src/core/client/embed/index.html b/src/core/client/embed/index.html
index 838c62c34..5d5dbf833 100644
--- a/src/core/client/embed/index.html
+++ b/src/core/client/embed/index.html
@@ -23,17 +23,19 @@
     <script>
       const CoralStreamEmbed = Coral.createStreamEmbed({
         id: "coralStreamEmbed",
+
         /**
-        *  You can listen to events using the example below.
-        *  The argument passed is the event emitter from
-        *  https://github.com/asyncly/EventEmitter2
-        *
-        *  events: function(events) {
-        *    events.onAny(function(eventName, data) {
-        *      console.log(eventName, data);
-        *    });
-        *  },
-        */
+         *
+         *  You can listen to events using the example below.
+         *  The argument passed is the event emitter from
+         *  https://github.com/asyncly/EventEmitter2
+         *
+         *  events: function(events) {
+         *    events.onAny(function(eventName, data) {
+         *      console.log(eventName, data);
+         *    });
+         *  },
+         */
       });
       window.CoralStreamEmbed = CoralStreamEmbed;
       CoralStreamEmbed.render();
diff --git a/src/core/client/framework/helpers/getModerationLink.spec.ts b/src/core/client/framework/helpers/getModerationLink.spec.ts
new file mode 100644
index 000000000..84af3d325
--- /dev/null
+++ b/src/core/client/framework/helpers/getModerationLink.spec.ts
@@ -0,0 +1,46 @@
+import getModerationLink from "./getModerationLink";
+
+describe("getModerationLink", () => {
+  it("renders the default", () => {
+    expect(getModerationLink()).toMatchInlineSnapshot(`"/admin/moderate"`);
+  });
+  it("renders with a specific queue", () => {
+    expect(getModerationLink({ queue: "pending" })).toMatchInlineSnapshot(
+      `"/admin/moderate/pending"`
+    );
+  });
+  it("renders with a specific story", () => {
+    expect(getModerationLink({ storyID: "story_123" })).toMatchInlineSnapshot(
+      `"/admin/moderate/stories/story_123"`
+    );
+  });
+  it("renders with a specific story", () => {
+    expect(getModerationLink({ siteID: "site_123" })).toMatchInlineSnapshot(
+      `"/admin/moderate/sites/site_123"`
+    );
+  });
+  it("renders with only one story or site", () => {
+    expect(
+      getModerationLink({ storyID: "story_123", siteID: "site_123" })
+    ).toMatchInlineSnapshot(`"/admin/moderate/stories/story_123"`);
+  });
+  it("renders with a specific story with a queue", () => {
+    expect(
+      getModerationLink({ queue: "pending", storyID: "story_123" })
+    ).toMatchInlineSnapshot(`"/admin/moderate/pending/stories/story_123"`);
+  });
+  it("renders with a specific story with a queue", () => {
+    expect(
+      getModerationLink({ queue: "pending", siteID: "site_123" })
+    ).toMatchInlineSnapshot(`"/admin/moderate/pending/sites/site_123"`);
+  });
+  it("renders with only one story or site with a queue", () => {
+    expect(
+      getModerationLink({
+        queue: "pending",
+        storyID: "story_123",
+        siteID: "site_123",
+      })
+    ).toMatchInlineSnapshot(`"/admin/moderate/pending/stories/story_123"`);
+  });
+});
diff --git a/src/core/client/framework/helpers/getModerationLink.ts b/src/core/client/framework/helpers/getModerationLink.ts
new file mode 100644
index 000000000..240b27811
--- /dev/null
+++ b/src/core/client/framework/helpers/getModerationLink.ts
@@ -0,0 +1,31 @@
+import urls from "./urls";
+
+export type QUEUE_NAME = "reported" | "pending" | "unmoderated" | "rejected";
+
+interface Options {
+  queue?: QUEUE_NAME;
+  storyID?: string | null;
+  siteID?: string | null;
+}
+
+export default function getModerationLink({
+  queue,
+  storyID,
+  siteID,
+}: Options = {}) {
+  const parts = [urls.admin.moderate];
+
+  // Add the queue.
+  if (queue) {
+    parts.push(queue);
+  }
+
+  // Add the storyID.
+  if (storyID) {
+    parts.push("stories", encodeURIComponent(storyID));
+  } else if (siteID) {
+    parts.push("sites", encodeURIComponent(siteID));
+  }
+
+  return parts.join("/");
+}
diff --git a/src/core/client/framework/helpers/index.ts b/src/core/client/framework/helpers/index.ts
index c125da627..9be8f6f8b 100644
--- a/src/core/client/framework/helpers/index.ts
+++ b/src/core/client/framework/helpers/index.ts
@@ -17,3 +17,4 @@ export {
   default as injectConditionalPolyfills,
 } from "./injectConditionalPolyfills";
 export { default as polyfillCSSVarsForIE11 } from "./polyfillCSSVarsForIE11";
+export { default as getModerationLink, QUEUE_NAME } from "./getModerationLink";
diff --git a/src/core/client/framework/helpers/urls.tsx b/src/core/client/framework/helpers/urls.tsx
index a55750d41..05d6f188d 100644
--- a/src/core/client/framework/helpers/urls.tsx
+++ b/src/core/client/framework/helpers/urls.tsx
@@ -1,6 +1,6 @@
 export default {
   admin: {
-    moderateReported: "/admin/moderate/reported",
+    moderate: "/admin/moderate",
   },
   embed: {
     stream: "/embed/stream",
diff --git a/src/core/client/framework/lib/bootstrap/CoralContext.tsx b/src/core/client/framework/lib/bootstrap/CoralContext.tsx
index c91433f4d..1f77da3aa 100644
--- a/src/core/client/framework/lib/bootstrap/CoralContext.tsx
+++ b/src/core/client/framework/lib/bootstrap/CoralContext.tsx
@@ -105,6 +105,7 @@ export const CoralContextProvider: FunctionComponent<{
           timeagoFormatter: value.timeagoFormatter,
           registerClickFarAway: value.registerClickFarAway,
           mediaQueryValues: value.mediaQueryValues,
+          locales: value.locales,
         }}
       >
         {children}
diff --git a/src/core/client/framework/lib/bootstrap/withContext.tsx b/src/core/client/framework/lib/bootstrap/withContext.tsx
index 82d7dcbc4..137216fcb 100644
--- a/src/core/client/framework/lib/bootstrap/withContext.tsx
+++ b/src/core/client/framework/lib/bootstrap/withContext.tsx
@@ -1,4 +1,4 @@
-import { createContextHOC } from "coral-framework/helpers";
+import createContextHOC from "coral-framework/helpers/createContextHOC";
 
 import { CoralContext, CoralContextConsumer } from "./CoralContext";
 
diff --git a/src/core/client/framework/lib/relay/withLocalStateContainer.tsx b/src/core/client/framework/lib/relay/withLocalStateContainer.tsx
index 9b8f505b6..024e14474 100644
--- a/src/core/client/framework/lib/relay/withLocalStateContainer.tsx
+++ b/src/core/client/framework/lib/relay/withLocalStateContainer.tsx
@@ -14,7 +14,7 @@ import {
   Snapshot,
 } from "relay-runtime";
 
-import { withContext } from "../bootstrap";
+import withContext from "../bootstrap/withContext";
 import { LOCAL_ID, LOCAL_TYPE } from "./localState";
 
 interface Props {
diff --git a/src/core/client/framework/rest/install.ts b/src/core/client/framework/rest/install.ts
index 8fee5184d..7f03377fc 100644
--- a/src/core/client/framework/rest/install.ts
+++ b/src/core/client/framework/rest/install.ts
@@ -9,9 +9,14 @@ export interface InstallInput {
       contactEmail: string;
       url: string;
     };
-    allowedDomains: string[];
     locale: LanguageCode;
   };
+  site: {
+    name: string;
+    contactEmail: string;
+    url: string;
+    allowedOrigins: string[];
+  };
   user: {
     username: string;
     password: string;
diff --git a/src/core/client/install/App/Header.tsx b/src/core/client/install/App/Header.tsx
index b8ad68ed5..8834703ef 100644
--- a/src/core/client/install/App/Header.tsx
+++ b/src/core/client/install/App/Header.tsx
@@ -23,7 +23,7 @@ const Header: FunctionComponent<HeaderProps> = ({ main }) => {
           [styles.headlineMain]: main,
         })}
       >
-        The Coral Project
+        Coral by Vox Media
       </Typography>
       <Localized id="install-header-title">
         <Typography
diff --git a/src/core/client/install/App/InstallWizard.tsx b/src/core/client/install/App/InstallWizard.tsx
index 47ae4c748..b12435526 100644
--- a/src/core/client/install/App/InstallWizard.tsx
+++ b/src/core/client/install/App/InstallWizard.tsx
@@ -14,13 +14,14 @@ import Wizard from "./Wizard";
 
 interface FormData {
   organizationName: string;
-  organizationContactEmail: string;
-  organizationURL: string;
+  siteName: string;
+  siteContactEmail: string;
+  siteURL: string;
   email: string;
   username: string;
   password: string;
   confirmPassword: string;
-  allowedDomains: string[];
+  allowedOrigins: string[];
   locale: LanguageCode;
 }
 
@@ -32,9 +33,10 @@ interface InstallWizardState {
 function shapeFinalData(data: FormData): InstallInput {
   const {
     organizationName,
-    organizationContactEmail,
-    organizationURL,
-    allowedDomains,
+    siteName,
+    siteContactEmail,
+    siteURL,
+    allowedOrigins,
     username,
     password,
     email,
@@ -45,12 +47,17 @@ function shapeFinalData(data: FormData): InstallInput {
     tenant: {
       organization: {
         name: organizationName,
-        contactEmail: organizationContactEmail,
-        url: organizationURL,
+        contactEmail: siteContactEmail,
+        url: siteURL,
       },
-      allowedDomains,
       locale,
     },
+    site: {
+      name: siteName,
+      contactEmail: siteContactEmail,
+      url: siteURL,
+      allowedOrigins,
+    },
     user: {
       username,
       password,
@@ -67,14 +74,15 @@ class InstallWizard extends Component<Props, InstallWizardState> {
   public state = {
     step: 0,
     data: {
-      organizationContactEmail: "",
       organizationName: "",
-      organizationURL: "",
+      siteContactEmail: "",
+      siteName: "",
+      siteURL: "",
       email: "",
       username: "",
       password: "",
       confirmPassword: "",
-      allowedDomains: [],
+      allowedOrigins: [],
       locale: "en-US" as LanguageCode,
     },
   };
diff --git a/src/core/client/install/App/steps/AddOrganizationStep.tsx b/src/core/client/install/App/steps/AddOrganizationStep.tsx
index 54f06ea7b..1a8624768 100644
--- a/src/core/client/install/App/steps/AddOrganizationStep.tsx
+++ b/src/core/client/install/App/steps/AddOrganizationStep.tsx
@@ -36,8 +36,9 @@ interface Props {
 
 interface FormProps {
   organizationName: string;
-  organizationContactEmail: string;
-  organizationURL: string;
+  siteName: string;
+  siteContactEmail: string;
+  siteURL: string;
 }
 
 class AddOrganizationStep extends React.Component<Props> {
@@ -51,8 +52,9 @@ class AddOrganizationStep extends React.Component<Props> {
         onSubmit={this.onSubmit}
         initialValues={{
           organizationName: this.props.data.organizationName,
-          organizationContactEmail: this.props.data.organizationContactEmail,
-          organizationURL: this.props.data.organizationURL,
+          siteName: this.props.data.organizationName,
+          siteContactEmail: this.props.data.siteContactEmail,
+          siteURL: this.props.data.siteURL,
         }}
       >
         {({ handleSubmit, submitting, submitError }) => (
@@ -84,7 +86,7 @@ class AddOrganizationStep extends React.Component<Props> {
                   <FormField>
                     <Localized id="install-addOrganization-orgName">
                       <InputLabel container={<label htmlFor={input.name} />}>
-                        Organization Name
+                        Organization name
                       </InputLabel>
                     </Localized>
                     <Localized
@@ -106,24 +108,24 @@ class AddOrganizationStep extends React.Component<Props> {
               </Field>
 
               <Field
-                name="organizationContactEmail"
+                name="siteContactEmail"
                 validate={composeValidators(required, validateEmail)}
               >
                 {({ input, meta }) => (
                   <FormField>
-                    <Localized id="install-addOrganization-orgEmail">
+                    <Localized id="install-addSite-siteEmail">
                       <InputLabel container={<label htmlFor={input.name} />}>
-                        Organization Contact Email
+                        Contact email
                       </InputLabel>
                     </Localized>
                     <Localized
-                      id="install-addOrganization-orgEmailTextField"
+                      id="install-addSite-siteEmailTextField"
                       attrs={{ placeholder: true }}
                     >
                       <TextField
                         {...input}
                         id={input.name}
-                        placeholder="Organization Contact Email"
+                        placeholder="Contact Email"
                         color={colorFromMeta(meta)}
                         disabled={submitting}
                         type="email"
@@ -138,18 +140,18 @@ class AddOrganizationStep extends React.Component<Props> {
               </Field>
 
               <Field
-                name="organizationURL"
+                name="siteURL"
                 validate={composeValidators(required, validateURL)}
               >
                 {({ input, meta }) => (
                   <FormField>
-                    <Localized id="install-addOrganization-orgURL">
+                    <Localized id="install-addSite-siteURL">
                       <InputLabel container={<label htmlFor={input.name} />}>
                         Organization URL
                       </InputLabel>
                     </Localized>
                     <Localized
-                      id="install-addOrganization-orgURLDescription"
+                      id="install-addSite-siteURLDescription"
                       strong={<strong />}
                     >
                       <InputDescription>
@@ -159,7 +161,7 @@ class AddOrganizationStep extends React.Component<Props> {
                       </InputDescription>
                     </Localized>
                     <Localized
-                      id="install-addOrganization-orgURLTextField"
+                      id="install-addSite-siteURLTextField"
                       attrs={{ placeholder: true }}
                     >
                       <TextField
@@ -175,6 +177,37 @@ class AddOrganizationStep extends React.Component<Props> {
                   </FormField>
                 )}
               </Field>
+              <Field name="siteName" validate={composeValidators(required)}>
+                {({ input, meta }) => (
+                  <FormField>
+                    <Localized id="install-addSite-siteName">
+                      <InputLabel container={<label htmlFor={input.name} />}>
+                        Site name
+                      </InputLabel>
+                    </Localized>
+                    <Localized id="install-addSite-siteNameDescription">
+                      <InputDescription>
+                        Site name will appear on emails sent by Coral to your
+                        community and organization members.
+                      </InputDescription>
+                    </Localized>
+                    <Localized
+                      id="install-addSite-siteNameTextField"
+                      attrs={{ placeholder: true }}
+                    >
+                      <TextField
+                        {...input}
+                        id={input.name}
+                        color={colorFromMeta(meta)}
+                        disabled={submitting}
+                        fullWidth
+                      />
+                    </Localized>
+                    <ValidationMessage meta={meta} fullWidth />
+                  </FormField>
+                )}
+              </Field>
+
               <Flex direction="row-reverse" itemGutter>
                 <NextButton submitting={submitting} />
                 <BackButton
diff --git a/src/core/client/install/App/steps/CreateYourAccountStep.tsx b/src/core/client/install/App/steps/CreateYourAccountStep.tsx
index f231d02c7..849315f1d 100644
--- a/src/core/client/install/App/steps/CreateYourAccountStep.tsx
+++ b/src/core/client/install/App/steps/CreateYourAccountStep.tsx
@@ -62,7 +62,7 @@ class CreateYourAccountStep extends Component<Props> {
             <HorizontalGutter size="double">
               <Localized id="install-createYourAccount-title">
                 <Typography variant="heading1" align="center">
-                  Create an Administrator Account
+                  Create an admin account
                 </Typography>
               </Localized>
 
@@ -118,7 +118,7 @@ class CreateYourAccountStep extends Component<Props> {
                     <Localized id="install-createYourAccount-usernameDescription">
                       <InputDescription>
                         An identifier displayed on your comments. You may use
-                        “_” and “.”
+                        “_” and “.” Spaces not permitted.
                       </InputDescription>
                     </Localized>
                     <Localized
@@ -184,7 +184,7 @@ class CreateYourAccountStep extends Component<Props> {
                   <FormField>
                     <Localized id="install-createYourAccount-confirmPassword">
                       <InputLabel container={<label htmlFor={input.name} />}>
-                        Confirm Password
+                        Confirm password
                       </InputLabel>
                     </Localized>
                     <Localized
diff --git a/src/core/client/install/App/steps/FinalStep.tsx b/src/core/client/install/App/steps/FinalStep.tsx
index 6353a8440..3265ba3bb 100644
--- a/src/core/client/install/App/steps/FinalStep.tsx
+++ b/src/core/client/install/App/steps/FinalStep.tsx
@@ -1,4 +1,5 @@
 import { Localized } from "@fluent/react/compat";
+import { Link } from "found";
 import React, { Component } from "react";
 
 import { urls } from "coral-framework/helpers";
@@ -8,7 +9,10 @@ class FinalStep extends Component {
   public render() {
     return (
       <Flex direction="column" justifyContent="center" itemGutter="double">
-        <Localized id="install-finalStep-description">
+        <Localized
+          id="install-finalStep-description"
+          $url={<Link to={urls.admin.moderate}>{urls.admin.moderate}</Link>}
+        >
           <Typography variant="bodyCopy">
             Thanks for installing Coral! We sent an email to verify your email
             address. While you finish setting up the account, you can start
@@ -16,23 +20,12 @@ class FinalStep extends Component {
           </Typography>
         </Localized>
         <Flex direction="row" itemGutter justifyContent="center">
-          <Localized id="install-finalStep-goToTheDocs">
-            <Button
-              anchor
-              color="regular"
-              variant="filled"
-              href="https://docs.coralproject.net"
-              target="_blank"
-            >
-              Go to the Docs
-            </Button>
-          </Localized>
           <Localized id="install-finalStep-goToAdmin">
             <Button
               anchor
               color="primary"
               variant="filled"
-              href={urls.admin.moderateReported}
+              href={urls.admin.moderate}
             >
               Go to Admin
             </Button>
diff --git a/src/core/client/install/App/steps/PermittedDomainsStep.tsx b/src/core/client/install/App/steps/PermittedDomainsStep.tsx
index 8e39d7da7..c44a791ca 100644
--- a/src/core/client/install/App/steps/PermittedDomainsStep.tsx
+++ b/src/core/client/install/App/steps/PermittedDomainsStep.tsx
@@ -27,7 +27,7 @@ import {
 import BackButton from "./BackButton";
 
 interface FormProps {
-  allowedDomains: string[];
+  allowedOrigins: string[];
 }
 
 interface FormSubmitProps extends FormProps, FormError {}
@@ -35,17 +35,17 @@ interface FormSubmitProps extends FormProps, FormError {}
 interface Props {
   onGoToNextStep: () => void;
   onGoToPreviousStep: () => void;
-  data: { allowedDomains: string[] };
-  onInstall: (newData: { allowedDomains: string[] }) => Promise<void>;
+  data: { allowedOrigins: string[] };
+  onInstall: (newData: { allowedOrigins: string[] }) => Promise<void>;
 }
 
 class PermittedDomainsStep extends Component<Props> {
   private onSubmit: OnSubmit<FormSubmitProps> = async (
-    { allowedDomains },
+    { allowedOrigins },
     form
   ) => {
     try {
-      await this.props.onInstall({ allowedDomains });
+      await this.props.onInstall({ allowedOrigins });
       return this.props.onGoToNextStep();
     } catch (error) {
       return { [FORM_ERROR]: error.message };
@@ -56,7 +56,7 @@ class PermittedDomainsStep extends Component<Props> {
       <Form
         onSubmit={this.onSubmit}
         initialValues={{
-          allowedDomains: this.props.data.allowedDomains,
+          allowedOrigins: this.props.data.allowedOrigins,
         }}
       >
         {({ handleSubmit, submitting, submitError }) => (
@@ -83,7 +83,7 @@ class PermittedDomainsStep extends Component<Props> {
               )}
 
               <Field
-                name="allowedDomains"
+                name="allowedOrigins"
                 parse={parseStringList}
                 format={formatStringList}
                 validate={validateStrictURLList}
diff --git a/src/core/client/stream/local/local.graphql b/src/core/client/stream/local/local.graphql
index f4518ceb9..fc779be88 100644
--- a/src/core/client/stream/local/local.graphql
+++ b/src/core/client/stream/local/local.graphql
@@ -65,6 +65,7 @@ type Local {
   storyID: String
   storyURL: String
   commentID: String
+  siteID: String
   commentsOrderBy: COMMENT_SORT!
   profileTab: PROFILE_TAB!
   commentsTab: COMMENTS_TAB!
diff --git a/src/core/client/stream/tabs/Comments/Stream/StreamContainer.tsx b/src/core/client/stream/tabs/Comments/Stream/StreamContainer.tsx
index b2bbd1552..663ed8e6a 100644
--- a/src/core/client/stream/tabs/Comments/Stream/StreamContainer.tsx
+++ b/src/core/client/stream/tabs/Comments/Stream/StreamContainer.tsx
@@ -86,6 +86,7 @@ export const StreamContainer: FunctionComponent<Props> = props => {
   const [local, setLocal] = useLocal<StreamContainerLocal>(
     graphql`
       fragment StreamContainerLocal on Local {
+        siteID
         commentsTab
         commentsOrderBy
       }
diff --git a/src/core/client/stream/tabs/Configure/ModerateStreamContainer.tsx b/src/core/client/stream/tabs/Configure/ModerateStreamContainer.tsx
index a82288a04..e94202adf 100644
--- a/src/core/client/stream/tabs/Configure/ModerateStreamContainer.tsx
+++ b/src/core/client/stream/tabs/Configure/ModerateStreamContainer.tsx
@@ -2,7 +2,7 @@ import { Localized } from "@fluent/react/compat";
 import React, { FunctionComponent, useMemo } from "react";
 import { graphql } from "react-relay";
 
-import { urls } from "coral-framework/helpers";
+import { getModerationLink } from "coral-framework/helpers";
 import { ExternalLink } from "coral-framework/lib/i18n/components";
 import {
   withFragmentContainer,
@@ -26,7 +26,7 @@ const ModerateStreamContainer: FunctionComponent<Props> = ({
   story: { id },
 }) => {
   const href = useMemo(() => {
-    let link = urls.admin.moderateReported + "/" + id;
+    let link = getModerationLink({ storyID: id });
     if (
       accessToken &&
       settings.auth.integrations.sso.enabled &&
diff --git a/src/core/client/stream/test/comments/stream/closedOrDisabledCommentStream.spec.tsx b/src/core/client/stream/test/comments/stream/closedOrDisabledCommentStream.spec.tsx
index 889e88e59..339a07f79 100644
--- a/src/core/client/stream/test/comments/stream/closedOrDisabledCommentStream.spec.tsx
+++ b/src/core/client/stream/test/comments/stream/closedOrDisabledCommentStream.spec.tsx
@@ -52,7 +52,9 @@ it("renders disabled comment stream", async () => {
     },
   });
   await waitForElement(() =>
-    within(testRenderer.root).getByText("commenting disabled", { exact: false })
+    within(testRenderer.root).getByText("commenting disabled", {
+      exact: false,
+    })
   );
 });
 
diff --git a/src/core/client/stream/test/configure/__snapshots__/renderConfigure.spec.tsx.snap b/src/core/client/stream/test/configure/__snapshots__/renderConfigure.spec.tsx.snap
index 9a17e5fcb..149422b63 100644
--- a/src/core/client/stream/test/configure/__snapshots__/renderConfigure.spec.tsx.snap
+++ b/src/core/client/stream/test/configure/__snapshots__/renderConfigure.spec.tsx.snap
@@ -58,7 +58,7 @@ exports[`renders configure 1`] = `
         >
           <a
             className="ExternalLink-root"
-            href="/admin/moderate/reported/story-1"
+            href="/admin/moderate/stories/story-1"
             rel="noopener noreferrer"
             target="_blank"
           >
diff --git a/src/core/client/stream/test/fixtures.ts b/src/core/client/stream/test/fixtures.ts
index 063a3c6a2..a7c5e2215 100644
--- a/src/core/client/stream/test/fixtures.ts
+++ b/src/core/client/stream/test/fixtures.ts
@@ -4,6 +4,7 @@ import {
   GQLDIGEST_FREQUENCY,
   GQLMODERATION_MODE,
   GQLSettings,
+  GQLSite,
   GQLStory,
   GQLTAG,
   GQLTag,
@@ -106,6 +107,14 @@ export const settings = createFixture<GQLSettings>({
     changeUsername: true,
     deleteAccount: true,
   },
+  multisite: false,
+});
+
+export const site = createFixture<GQLSite>({
+  name: "Test Site",
+  id: "site-id",
+  createdAt: "2018-05-06T18:24:00.000Z",
+  allowedOrigins: ["http://test-site.com"],
 });
 
 export const settingsWithoutLocalAuth = createFixture<GQLSettings>(
@@ -531,6 +540,7 @@ export const baseStory = createFixture<GQLStory>({
       configurable: true,
     },
   },
+  site,
 });
 
 export const moderators = createFixtures<GQLUser>(
diff --git a/src/core/client/test/helpers/fixture.ts b/src/core/client/test/helpers/fixture.ts
index 95990a0e8..2f7febccf 100644
--- a/src/core/client/test/helpers/fixture.ts
+++ b/src/core/client/test/helpers/fixture.ts
@@ -269,7 +269,6 @@ export function createSettings() {
       enabled: true,
     },
     customCSSURL: "",
-    allowedDomains: ["localhost:8080"],
     editCommentWindowLength: 30000,
     communityGuidelines: {
       enabled: false,
diff --git a/src/core/client/ui/components/AbsoluteTime/AbsoluteTime.tsx b/src/core/client/ui/components/AbsoluteTime/AbsoluteTime.tsx
index 17000410b..0fd61dae8 100644
--- a/src/core/client/ui/components/AbsoluteTime/AbsoluteTime.tsx
+++ b/src/core/client/ui/components/AbsoluteTime/AbsoluteTime.tsx
@@ -1,16 +1,21 @@
 import React, { FunctionComponent, useMemo } from "react";
 
-import { useCoralContext } from "coral-framework/lib/bootstrap";
-import { Typography } from "coral-ui/components";
+import { Typography, useUIContext } from "coral-ui/components";
 import { PropTypesOf } from "coral-ui/types";
 
 interface Props {
   date: string;
   className?: string;
+  locales?: string[];
 }
 
-const AbsoluteTime: FunctionComponent<Props> = ({ date, className }) => {
-  const { locales } = useCoralContext();
+const AbsoluteTime: FunctionComponent<Props> = ({
+  date,
+  className,
+  locales: localesFromProps,
+}) => {
+  const { locales: localesFromContext } = useUIContext();
+  const locales = localesFromProps || localesFromContext || ["en-US"];
   const formatted = useMemo(() => {
     const formatter = new Intl.DateTimeFormat(locales, {
       year: "numeric",
diff --git a/src/core/client/ui/components/UIContext/UIContext.ts b/src/core/client/ui/components/UIContext/UIContext.ts
index 6e734d277..71faeeaa1 100644
--- a/src/core/client/ui/components/UIContext/UIContext.ts
+++ b/src/core/client/ui/components/UIContext/UIContext.ts
@@ -14,8 +14,12 @@ export interface UIContextProps {
    * current frame for `ClickOutside`
    */
   registerClickFarAway?: ClickFarAwayRegister;
+
+  locales?: string[];
 }
 
 const UIContext = React.createContext<UIContextProps>({} as any);
 
+export const useUIContext = () => React.useContext(UIContext);
+
 export default UIContext;
diff --git a/src/core/client/ui/components/UIContext/index.ts b/src/core/client/ui/components/UIContext/index.ts
index 86504f205..22c2050ab 100644
--- a/src/core/client/ui/components/UIContext/index.ts
+++ b/src/core/client/ui/components/UIContext/index.ts
@@ -1 +1 @@
-export { default, UIContextProps } from "./UIContext";
+export { default, UIContextProps, useUIContext } from "./UIContext";
diff --git a/src/core/client/ui/components/index.ts b/src/core/client/ui/components/index.ts
index e6c14b1e5..09345e163 100644
--- a/src/core/client/ui/components/index.ts
+++ b/src/core/client/ui/components/index.ts
@@ -6,7 +6,11 @@ export { default as ButtonIcon } from "./Button/ButtonIcon";
 export { default as Typography } from "./Typography";
 export { default as Popover } from "./Popover";
 export { default as RelativeTime } from "./RelativeTime";
-export { default as UIContext, UIContextProps } from "./UIContext";
+export {
+  default as UIContext,
+  UIContextProps,
+  useUIContext,
+} from "./UIContext";
 export { default as Flex } from "./Flex";
 export { default as MatchMedia } from "./MatchMedia";
 export { default as TrapFocus } from "./TrapFocus";
diff --git a/src/core/client/ui/components/v2/AppNotification/AppNotification.css b/src/core/client/ui/components/v2/AppNotification/AppNotification.css
new file mode 100644
index 000000000..3da3fe913
--- /dev/null
+++ b/src/core/client/ui/components/v2/AppNotification/AppNotification.css
@@ -0,0 +1,15 @@
+.root {
+  font-family: var(--v2-font-family-primary);
+  font-weight: var(--v2-font-weight-primary-bold);
+  line-height: var(--v2-line-height-min);
+  padding: var(--v2-spacing-2);
+}
+
+.inner {
+  max-width: 1280px;
+  margin: 0 auto;
+}
+
+.success {
+  background-color: var(--v2-colors-green-300);
+}
diff --git a/src/core/client/ui/components/v2/AppNotification/AppNotification.tsx b/src/core/client/ui/components/v2/AppNotification/AppNotification.tsx
new file mode 100644
index 000000000..72afd22e1
--- /dev/null
+++ b/src/core/client/ui/components/v2/AppNotification/AppNotification.tsx
@@ -0,0 +1,49 @@
+import cn from "classnames";
+import React, { FunctionComponent } from "react";
+
+import { Button, ButtonIcon, Flex, Icon } from "coral-ui/components/v2";
+
+import styles from "./AppNotification.css";
+
+interface Props {
+  icon?: string;
+  onClose?: () => void;
+  color?: "success" | "alert" | "mono";
+}
+
+const AppNotification: FunctionComponent<Props> = ({
+  icon,
+  children,
+  onClose,
+  color,
+}) => {
+  const rootClassName = cn(styles.root, {
+    [styles.success]: color === "success",
+  });
+
+  return (
+    <div className={rootClassName}>
+      <Flex
+        alignItems="center"
+        justifyContent="space-between"
+        className={styles.inner}
+      >
+        <Flex alignItems="center" itemGutter>
+          {icon && <Icon>{icon}</Icon>}
+          {children}
+        </Flex>
+        {onClose && (
+          <Button variant="text" color="mono" onClick={onClose}>
+            <ButtonIcon>close</ButtonIcon>
+          </Button>
+        )}
+      </Flex>
+    </div>
+  );
+};
+
+AppNotification.defaultProps = {
+  color: "success",
+};
+
+export default AppNotification;
diff --git a/src/core/client/ui/components/v2/AppNotification/index.ts b/src/core/client/ui/components/v2/AppNotification/index.ts
new file mode 100644
index 000000000..adc0c3ba6
--- /dev/null
+++ b/src/core/client/ui/components/v2/AppNotification/index.ts
@@ -0,0 +1 @@
+export { default } from "./AppNotification";
diff --git a/src/core/client/ui/components/v2/BaseButton/BaseButton.tsx b/src/core/client/ui/components/v2/BaseButton/BaseButton.tsx
index 3e1562908..df70b4d95 100644
--- a/src/core/client/ui/components/v2/BaseButton/BaseButton.tsx
+++ b/src/core/client/ui/components/v2/BaseButton/BaseButton.tsx
@@ -1,4 +1,5 @@
 import cn from "classnames";
+import { Link } from "found";
 import React, {
   ButtonHTMLAttributes,
   EventHandler,
@@ -26,6 +27,8 @@ interface Props extends ButtonHTMLAttributes<HTMLButtonElement> {
   target?: string;
   rel?: string;
 
+  to?: string;
+
   /**
    * This prop can be used to add custom classnames.
    * It is handled by the `withStyles `HOC.
@@ -68,6 +71,10 @@ const BaseButton: FunctionComponent<Props> = ({
       React.ClassAttributes<HTMLButtonElement | HTMLAnchorElement>
   > = "button" as any;
 
+  if (rest.to) {
+    Element = Link as any;
+  }
+
   if (anchor) {
     Element = "a" as any;
   }
diff --git a/src/core/client/ui/components/v2/Button/Button.css b/src/core/client/ui/components/v2/Button/Button.css
index ee851aa8a..6a8331929 100644
--- a/src/core/client/ui/components/v2/Button/Button.css
+++ b/src/core/client/ui/components/v2/Button/Button.css
@@ -117,7 +117,6 @@ $button-text-dark-foreground-active: var(--v2-colors-blue-700);
   box-sizing: border-box;
   border: 1px solid transparent;
 
-  letter-spacing: 0.042em;
   transition: 0.2s ease-out background-color;
 
   font-family: var(--v2-font-family-primary);
@@ -154,6 +153,7 @@ $button-text-dark-foreground-active: var(--v2-colors-blue-700);
 
 .uppercase {
   text-transform: uppercase;
+  letter-spacing: 0.042em;
 }
 
 .root.disabled {
@@ -486,3 +486,7 @@ $button-text-dark-foreground-active: var(--v2-colors-blue-700);
     }
   }
 }
+
+.linkButton {
+  text-decoration: none;
+}
diff --git a/src/core/client/ui/components/v2/Button/Button.tsx b/src/core/client/ui/components/v2/Button/Button.tsx
index 9887f08d7..02c97f0e5 100644
--- a/src/core/client/ui/components/v2/Button/Button.tsx
+++ b/src/core/client/ui/components/v2/Button/Button.tsx
@@ -14,6 +14,7 @@ interface Props extends Omit<BaseButtonProps, "ref"> {
   anchor?: boolean;
   href?: string;
   target?: string;
+  to?: string;
   /**
    * This prop can be used to add custom classnames.
    * It is handled by the `withStyles `HOC.
@@ -69,6 +70,7 @@ export class Button extends React.Component<Props> {
       classes,
       color,
       className,
+      children,
       size,
       fullWidth,
       disabled,
@@ -80,6 +82,7 @@ export class Button extends React.Component<Props> {
       iconRight,
       adornmentLeft,
       adornmentRight,
+      to,
       ...rest
     } = this.props;
 
@@ -118,9 +121,12 @@ export class Button extends React.Component<Props> {
         type={type}
         data-variant={variant}
         data-color={color}
+        to={to}
         data-active={active}
         {...rest}
-      />
+      >
+        {children}
+      </BaseButton>
     );
   }
 }
diff --git a/src/core/client/ui/components/v2/SelectField/SelectField.css b/src/core/client/ui/components/v2/SelectField/SelectField.css
index 86048ce38..1cad8cc63 100644
--- a/src/core/client/ui/components/v2/SelectField/SelectField.css
+++ b/src/core/client/ui/components/v2/SelectField/SelectField.css
@@ -8,7 +8,7 @@
   display: inline-flex;
   justify-content: center;
   align-items: center;
-  right: var(--v2-spacing-2);;
+  right: var(--v2-spacing-2);
   height: 100%;
   user-select: none;
   pointer-events: none;
@@ -47,7 +47,8 @@
   border-radius: var(--round-corners);
   background-color: var(--v2-palette-input-background);
   border: 1px solid var(--v2-palette-input-border);
-  padding: var(--v2-spacing-2) var(--v2-spacing-6) var(--v2-spacing-2) var(--v2-spacing-2);
+  padding: calc(var(--v2-spacing-2) - 2px) var(--v2-spacing-6)
+    calc(var(--v2-spacing-2) - 2px) var(--v2-spacing-2);
 
   &::-ms-expand {
     display: none;
diff --git a/src/core/client/ui/components/v2/index.ts b/src/core/client/ui/components/v2/index.ts
index 418a83c51..e3cb88fca 100644
--- a/src/core/client/ui/components/v2/index.ts
+++ b/src/core/client/ui/components/v2/index.ts
@@ -66,3 +66,4 @@ export {
 } from "./ValidationMessage";
 export { BrandName, BrandMark, LogoHorizontal } from "./Brand";
 export { default as InputLabel } from "./InputLabel";
+export { default as AppNotification } from "./AppNotification";
diff --git a/src/core/common/errors.ts b/src/core/common/errors.ts
index 8046fb85c..e910afd4a 100644
--- a/src/core/common/errors.ts
+++ b/src/core/common/errors.ts
@@ -32,12 +32,6 @@ export enum ERROR_CODES {
    */
   STORY_URL_NOT_PERMITTED = "STORY_URL_NOT_PERMITTED",
 
-  /**
-   * URL_NOT_PERMITTED is used when a given URL is provided that can not be
-   * matched to the Tenant.
-   */
-  URL_NOT_PERMITTED = "URL_NOT_PERMITTED",
-
   /**
    * TOKEN_NOT_FOUND is used when a Token is referenced by ID but can not be
    * found to be associated with the given User.
@@ -338,4 +332,6 @@ export enum ERROR_CODES {
    * when it is not authorized to do so.
    */
   INSTALLATION_FORBIDDEN = "INSTALLATION_FORBIDDEN",
+
+  DUPLICATE_SITE_ORIGIN = "DUPLICATE_SITE_ORIGIN",
 }
diff --git a/src/core/common/helpers/isNonNullArray.spec.ts b/src/core/common/helpers/isNonNullArray.spec.ts
new file mode 100644
index 000000000..abeecff4a
--- /dev/null
+++ b/src/core/common/helpers/isNonNullArray.spec.ts
@@ -0,0 +1,11 @@
+import isNonNullArray from "./isNonNullArray";
+
+describe("isNonNullArray", () => {
+  it("returns true for an array with no null entries", () => {
+    expect(isNonNullArray([-1, undefined, 0, 1, 2, 3, 4, 5])).toBeTruthy();
+  });
+
+  it("returns false for an array with some null entries", () => {
+    expect(isNonNullArray([-1, 0, null, 2, 3, 4, 5])).toBeFalsy();
+  });
+});
diff --git a/src/core/common/helpers/isNonNullArray.ts b/src/core/common/helpers/isNonNullArray.ts
new file mode 100644
index 000000000..25d17fac8
--- /dev/null
+++ b/src/core/common/helpers/isNonNullArray.ts
@@ -0,0 +1,9 @@
+export default function isNonNullArray<T>(arr: (T | null)[]): arr is T[] {
+  for (const item of arr) {
+    if (item === null) {
+      return false;
+    }
+  }
+
+  return true;
+}
diff --git a/src/core/common/types.ts b/src/core/common/types.ts
index 082f21112..d4f63b598 100644
--- a/src/core/common/types.ts
+++ b/src/core/common/types.ts
@@ -60,3 +60,13 @@ export type DeepPartial<T> = T extends object
         : DeepPartial<T[P]>;
     }
   : T;
+
+/**
+ * FirstDeepPartial is like DeepPartial but applies only to the first parameters
+ * on the object.
+ */
+export type FirstDeepPartial<T> = T extends object
+  ? {
+      [P in keyof T]: DeepPartial<T[P]>;
+    }
+  : T;
diff --git a/src/core/server/app/handlers/api/install.ts b/src/core/server/app/handlers/api/install.ts
index 709d019d4..ab3478917 100644
--- a/src/core/server/app/handlers/api/install.ts
+++ b/src/core/server/app/handlers/api/install.ts
@@ -11,6 +11,7 @@ import {
   InstallationForbiddenError,
   TenantInstalledAlreadyError,
 } from "coral-server/errors";
+import { CreateSiteInput } from "coral-server/models/site";
 import { LocalProfile } from "coral-server/models/user";
 import {
   createJWTSigningConfig,
@@ -18,6 +19,7 @@ import {
   JWTSigningConfig,
 } from "coral-server/services/jwt";
 import { verifyInstallationTokenString } from "coral-server/services/management";
+import { create as createSite } from "coral-server/services/sites";
 import {
   install,
   InstallTenant,
@@ -92,6 +94,7 @@ export interface TenantInstallBody {
   tenant: Omit<InstallTenant, "domain" | "locale"> & {
     locale: LanguageCode | null;
   };
+  site: Omit<CreateSiteInput, "tenantID">;
   user: Required<Pick<CreateUser, "username" | "email"> & { password: string }>;
 }
 
@@ -108,16 +111,19 @@ const TenantInstallBodySchema = Joi.object().keys({
           .lowercase()
           .email(),
       }),
-      allowedDomains: Joi.array().items(
-        Joi.string()
-          .trim()
-          .uri({ scheme: ["http", "https"] })
-      ),
       locale: Joi.string()
         .default(null)
         .valid(LOCALES),
     })
     .optionalKeys("locale"),
+  site: Joi.object().keys({
+    name: Joi.string().trim(),
+    allowedOrigins: Joi.array().items(
+      Joi.string()
+        .trim()
+        .uri({ scheme: ["http", "https"] })
+    ),
+  }),
   user: Joi.object().keys({
     username: Joi.string().trim(),
     password: Joi.string(),
@@ -196,6 +202,7 @@ export const installHandler = ({
       // payload is invalid.
       const {
         tenant: { locale: tenantLocale, ...tenantInput },
+        site: siteInput,
         user: userInput,
       }: TenantInstallBody = validate(TenantInstallBodySchema, req.body);
 
@@ -228,6 +235,8 @@ export const installHandler = ({
         req.coral.now
       );
 
+      await createSite(mongo, tenant, siteInput);
+
       // Pull the user details out of the input for the user.
       const { email, username, password } = userInput;
 
diff --git a/src/core/server/app/handlers/api/story/count.ts b/src/core/server/app/handlers/api/story/count.ts
index 2eb481e32..da857dbcb 100644
--- a/src/core/server/app/handlers/api/story/count.ts
+++ b/src/core/server/app/handlers/api/story/count.ts
@@ -1,11 +1,11 @@
-import { RequestHandler } from "coral-server/types/express";
 import createDOMPurify from "dompurify";
 import { JSDOM } from "jsdom";
 
 import { AppOptions } from "coral-server/app";
-import { calculateTotalPublishedCommentCount } from "coral-server/models/story";
+import { calculateTotalPublishedCommentCount } from "coral-server/models/comment";
 import { translate } from "coral-server/services/i18n";
 import { find } from "coral-server/services/stories";
+import { RequestHandler } from "coral-server/types/express";
 
 const NUMBER_CLASSNAME = "coral-count-number";
 const TEXT_CLASSNAME = "coral-count-text";
diff --git a/src/core/server/app/middleware/csp/tenant.spec.ts b/src/core/server/app/middleware/csp/tenant.spec.ts
index 2c73a7edf..78989bb4f 100644
--- a/src/core/server/app/middleware/csp/tenant.spec.ts
+++ b/src/core/server/app/middleware/csp/tenant.spec.ts
@@ -2,61 +2,55 @@ import { generateFrameOptions } from "coral-server/app/middleware/csp/tenant";
 import { Request } from "coral-server/types/express";
 
 it("denies when the tenant has no specified domains", () => {
-  const tenant = { allowedDomains: [] };
+  const origins: string[] = [];
   const req = {} as Request;
 
-  expect(generateFrameOptions(req, tenant)).toEqual("deny");
+  expect(generateFrameOptions(req, origins)).toEqual("deny");
 });
 
 it("allow-from single domain when there is one domain", () => {
-  const tenant = { allowedDomains: ["https://coralproject.net"] };
+  const origins: string[] = ["https://coralproject.net"];
   const req = {} as Request;
 
-  expect(generateFrameOptions(req, tenant)).toEqual(
+  expect(generateFrameOptions(req, origins)).toEqual(
     "allow-from https://coralproject.net"
   );
 });
 
 it("deny from the domain when it does not provide and there are multiple tenants domains", () => {
-  const tenant = {
-    allowedDomains: [
-      "https://coralproject.net",
-      "https://news.coralproject.net",
-    ],
-  };
+  const origins: string[] = [
+    "https://coralproject.net",
+    "https://news.coralproject.net",
+  ];
   const req = { headers: {}, query: { parentUrl: "" } } as Request;
 
-  expect(generateFrameOptions(req, tenant)).toEqual("deny");
+  expect(generateFrameOptions(req, origins)).toEqual("deny");
 });
 
 it("allows from the domain when it does not provide a match and there are multiple tenants domains", () => {
-  const tenant = {
-    allowedDomains: [
-      "https://coralproject.net",
-      "https://news.coralproject.net",
-    ],
-  };
+  const origins: string[] = [
+    "https://coralproject.net",
+    "https://news.coralproject.net",
+  ];
   const req = {
     headers: {},
     query: { parentUrl: "https://blog.coralproject.net/a/page" },
   } as Request;
 
-  expect(generateFrameOptions(req, tenant)).toEqual("deny");
+  expect(generateFrameOptions(req, origins)).toEqual("deny");
 });
 
 it("allows from the domain when it does provide a match and there are multiple tenants domains", () => {
-  const tenant = {
-    allowedDomains: [
-      "https://coralproject.net",
-      "https://news.coralproject.net",
-    ],
-  };
+  const origins: string[] = [
+    "https://coralproject.net",
+    "https://news.coralproject.net",
+  ];
   const req = {
     headers: {},
     query: { parentUrl: "https://news.coralproject.net/a/page" },
   } as Request;
 
-  expect(generateFrameOptions(req, tenant)).toEqual(
+  expect(generateFrameOptions(req, origins)).toEqual(
     "allow-from https://news.coralproject.net"
   );
 });
diff --git a/src/core/server/app/middleware/csp/tenant.ts b/src/core/server/app/middleware/csp/tenant.ts
index 42f1ecced..0e6563bed 100644
--- a/src/core/server/app/middleware/csp/tenant.ts
+++ b/src/core/server/app/middleware/csp/tenant.ts
@@ -1,38 +1,105 @@
 import builder from "content-security-policy-builder";
+import { Db } from "mongodb";
+
+import { AppOptions } from "coral-server/app";
 import { extractParentsURL, getOrigin } from "coral-server/app/url";
-import { Tenant } from "coral-server/models/tenant";
-import { isURLPermitted } from "coral-server/services/tenant/url";
+import { retrieveSite, Site } from "coral-server/models/site";
+import { retrieveStory } from "coral-server/models/story";
+import { findSiteByURL } from "coral-server/services/sites";
+import { isURLPermitted } from "coral-server/services/sites/url";
 import { Request, RequestHandler } from "coral-server/types/express";
 
+interface RequestQuery {
+  parentUrl?: string;
+  storyURL?: string;
+  storyID?: string;
+}
+
+async function retrieveSiteFromEmbed(
+  mongo: Db,
+  req: Request
+): Promise<Site | null> {
+  if (!req.coral || !req.coral.tenant) {
+    // There is no tenant for the request, don't add any headers.
+    return null;
+  }
+
+  // Pull the tenant and the logger from the request.
+  const {
+    coral: { tenant },
+  } = req;
+
+  // Attempt to detect the site based on the query parameters.
+  const {
+    storyURL = "",
+    storyID = "",
+    parentUrl = "",
+  }: RequestQuery = req.query;
+
+  // If the storyURL is available, we can lookup the site directly based on it.
+  if (storyURL) {
+    // If the site can't be found based on it's allowed origins and the story
+    // URL (which is a allowed list), then we know it isn't allowed.
+    return findSiteByURL(mongo, tenant.id, storyURL);
+  }
+
+  // If the storyID is available, we can lookup the story and then it's site.
+  if (storyID) {
+    const story = await retrieveStory(mongo, tenant.id, storyID);
+    if (!story) {
+      // We can't lookup the story, therefore we can't lookup the site, abort.
+      return null;
+    }
+
+    // If the site can't be found based on it's allowed origins and the story
+    // URL (which is a allowed list), then we know it isn't allowed.
+    return retrieveSite(mongo, tenant.id, story.siteID);
+  }
+
+  // As the last fallback, if the storyURL and storyID cannot be found, then pym
+  // does provide us with a parentUrl that's the URL of the page embedding
+  // Coral. We'll try to find the site based on this URL.
+  if (parentUrl) {
+    return findSiteByURL(mongo, tenant.id, parentUrl);
+  }
+
+  return null;
+}
+
+type Options = Pick<AppOptions, "mongo">;
+
 /**
  * cspMiddleware handles adding the CSP middleware to each outgoing request.
  */
-export const cspTenantMiddleware: RequestHandler = (req, res, next) => {
-  if (!req.coral || !req.coral.tenant) {
-    // There is no tenant for the request, don't add any headers.
-    return next();
-  }
+export const cspSiteMiddleware = ({ mongo }: Options): RequestHandler => async (
+  req,
+  res,
+  next
+) => {
+  // Initially, we do not allow any origins.
+  const site = await retrieveSiteFromEmbed(mongo, req);
 
-  const tenant = req.coral.tenant;
+  // Grab the origins from the site.
+  const origins = site ? site.allowedOrigins : [];
 
   res.setHeader(
     "Content-Security-Policy",
-    generateContentSecurityPolicy(tenant)
+    generateContentSecurityPolicy(origins)
   );
 
   // Add some fallbacks for IE.
-  res.setHeader("X-Frame-Options", generateFrameOptions(req, tenant));
+  res.setHeader("X-Frame-Options", generateFrameOptions(req, origins));
   res.setHeader("X-XSS-Protection", "1; mode=block");
 
   next();
 };
 
-function generateContentSecurityPolicy(tenant: Pick<Tenant, "allowedDomains">) {
+function generateContentSecurityPolicy(allowedOrigins: string[]) {
   const directives: Record<string, any> = {};
 
   // Only the domains that are allowed by the tenant may embed Coral.
   directives.frameAncestors =
-    tenant.allowedDomains.length > 0 ? tenant.allowedDomains : ["'none'"];
+    allowedOrigins.length > 0 ? allowedOrigins : ["'none'"];
 
   // Build the directive.
   const directive = builder({ directives });
@@ -40,18 +107,15 @@ function generateContentSecurityPolicy(tenant: Pick<Tenant, "allowedDomains">) {
   return directive;
 }
 
-export function generateFrameOptions(
-  req: Request,
-  tenant: Pick<Tenant, "allowedDomains">
-) {
+export function generateFrameOptions(req: Request, allowedOrigins: string[]) {
   // If there aren't any domains, then we reject it.
-  if (tenant.allowedDomains.length === 0) {
+  if (allowedOrigins.length === 0) {
     return "deny";
   }
 
   // If there is only one domain on the tenant then return it!
-  if (tenant.allowedDomains.length === 1) {
-    return `allow-from ${getOrigin(tenant.allowedDomains[0])}`;
+  if (allowedOrigins.length === 1) {
+    return `allow-from ${getOrigin(allowedOrigins[0])}`;
   }
 
   const parentsURL = extractParentsURL(req);
@@ -66,7 +130,7 @@ export function generateFrameOptions(
   }
 
   // Determine if this origin is allowed.
-  if (!isURLPermitted(tenant, parentsURL)) {
+  if (!isURLPermitted({ allowedOrigins }, parentsURL)) {
     return "deny";
   }
 
@@ -74,7 +138,7 @@ export function generateFrameOptions(
   // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options
   // We need to find the domain that is asking so we can respond with the right
   // result, sort of like CORS!
-  const allowFrom = tenant.allowedDomains
+  const allowFrom = allowedOrigins
     .map(domain => getOrigin(domain))
     .find(origin => origin === parentsOrigin);
   if (!allowFrom) {
diff --git a/src/core/server/app/router/client.ts b/src/core/server/app/router/client.ts
index 789f3c67a..ceb596606 100644
--- a/src/core/server/app/router/client.ts
+++ b/src/core/server/app/router/client.ts
@@ -1,10 +1,11 @@
 import express, { Router } from "express";
 import { minify } from "html-minifier";
+import { Db } from "mongodb";
 import path from "path";
 
 import { LanguageCode } from "coral-common/helpers/i18n/locales";
 import { cacheHeadersMiddleware } from "coral-server/app/middleware/cacheHeaders";
-import { cspTenantMiddleware } from "coral-server/app/middleware/csp/tenant";
+import { cspSiteMiddleware } from "coral-server/app/middleware/csp/tenant";
 import { installedMiddleware } from "coral-server/app/middleware/installed";
 import { tenantMiddleware } from "coral-server/app/middleware/tenant";
 import logger from "coral-server/logger";
@@ -16,6 +17,11 @@ import Entrypoints, { Entrypoint } from "../helpers/entrypoints";
 export interface ClientTargetHandlerOptions {
   defaultLocale: LanguageCode;
 
+  /**
+   * mongo is used when trying to infer a site from the request.
+   */
+  mongo: Db;
+
   /**
    * entrypoint is the entrypoint entry to load.
    */
@@ -43,6 +49,9 @@ function createClientTargetRouter(options: ClientTargetHandlerOptions) {
   // Create a router.
   const router = express.Router();
 
+  // Add CSP headers to the request, which only apply when serving HTML content.
+  router.use(cspSiteMiddleware(options));
+
   // Always send the cache headers.
   router.use(cacheHeadersMiddleware(options.cacheDuration));
 
@@ -56,6 +65,7 @@ interface MountClientRouteOptions {
   defaultLocale: LanguageCode;
   tenantCache: TenantCache;
   staticURI: string;
+  mongo: Db;
 }
 
 const clientHandler = ({
@@ -96,7 +106,7 @@ const clientHandler = ({
 
 export function mountClientRoutes(
   router: Router,
-  { staticURI, tenantCache, defaultLocale }: MountClientRouteOptions
+  { staticURI, tenantCache, defaultLocale, mongo }: MountClientRouteOptions
 ) {
   // TODO: (wyattjoh) figure out a better way of referencing paths.
   // Load the entrypoint manifest.
@@ -127,9 +137,6 @@ export function mountClientRoutes(
     })
   );
 
-  // Add CSP headers to the request, which only apply when serving HTML content.
-  router.use(cspTenantMiddleware);
-
   // Add the embed targets.
   router.use(
     "/embed/stream",
@@ -138,6 +145,7 @@ export function mountClientRoutes(
       enableCustomCSS: true,
       entrypoint: entrypoints.get("stream"),
       defaultLocale,
+      mongo,
     })
   );
   router.use(
@@ -147,6 +155,7 @@ export function mountClientRoutes(
       cacheDuration: false,
       entrypoint: entrypoints.get("authCallback"),
       defaultLocale,
+      mongo,
     })
   );
   router.use(
@@ -156,6 +165,7 @@ export function mountClientRoutes(
       cacheDuration: false,
       entrypoint: entrypoints.get("auth"),
       defaultLocale,
+      mongo,
     })
   );
 
@@ -169,6 +179,7 @@ export function mountClientRoutes(
       cacheDuration: false,
       entrypoint: entrypoints.get("account"),
       defaultLocale,
+      mongo,
     })
   );
   // Add the standalone targets.
@@ -181,6 +192,7 @@ export function mountClientRoutes(
       cacheDuration: false,
       entrypoint: entrypoints.get("admin"),
       defaultLocale,
+      mongo,
     })
   );
   router.use(
@@ -195,6 +207,7 @@ export function mountClientRoutes(
       cacheDuration: false,
       entrypoint: entrypoints.get("install"),
       defaultLocale,
+      mongo,
     })
   );
 
diff --git a/src/core/server/app/router/index.ts b/src/core/server/app/router/index.ts
index 0b24e8586..5e1ec0126 100644
--- a/src/core/server/app/router/index.ts
+++ b/src/core/server/app/router/index.ts
@@ -37,6 +37,7 @@ export function createRouter(app: AppOptions, options: RouterOptions) {
       // not provided to the default current domain relative "/".
       staticURI: app.config.get("static_uri") || "/",
       tenantCache: app.tenantCache,
+      mongo: app.mongo,
     });
   } else {
     logger.warn("client routes are disabled");
diff --git a/src/core/server/app/url.ts b/src/core/server/app/url.ts
index 633d0392e..d7b00aa67 100644
--- a/src/core/server/app/url.ts
+++ b/src/core/server/app/url.ts
@@ -69,7 +69,7 @@ export function getHostname(url: string) {
 
 export function getOrigin(url: string) {
   try {
-    return new URL(url).origin;
+    return new URL(url).origin.toLowerCase();
   } catch (err) {
     return null;
   }
diff --git a/src/core/server/errors/index.ts b/src/core/server/errors/index.ts
index ae2c552e9..2ba259383 100644
--- a/src/core/server/errors/index.ts
+++ b/src/core/server/errors/index.ts
@@ -242,28 +242,8 @@ export class CommentBodyExceedsMaxLengthError extends CoralError {
   }
 }
 
-export class URLInvalidError extends CoralError {
-  constructor({
-    url,
-    ...properties
-  }: {
-    url: string;
-    allowedDomains: string[];
-    tenantDomain?: string;
-  }) {
-    super({
-      code: ERROR_CODES.URL_NOT_PERMITTED,
-      context: { pvt: properties, pub: { url } },
-    });
-  }
-}
-
 export class StoryURLInvalidError extends CoralError {
-  constructor(properties: {
-    storyURL: string;
-    allowedDomains: string[];
-    tenantDomain?: string;
-  }) {
+  constructor(properties: { storyURL: string; tenantDomain?: string }) {
     super({
       code: ERROR_CODES.STORY_URL_NOT_PERMITTED,
       context: { pvt: properties },
@@ -303,6 +283,16 @@ export class DuplicateStoryURLError extends CoralError {
   }
 }
 
+export class DuplicateSiteAllowedOriginError extends CoralError {
+  constructor(cause: MongoError, id: string | null, domains?: string[]) {
+    super({
+      cause,
+      code: ERROR_CODES.DUPLICATE_SITE_ORIGIN,
+      context: { pvt: { id, domains } },
+    });
+  }
+}
+
 export class DuplicateEmailError extends CoralError {
   constructor(email: string) {
     super({ code: ERROR_CODES.DUPLICATE_EMAIL, context: { pvt: { email } } });
diff --git a/src/core/server/errors/translations.ts b/src/core/server/errors/translations.ts
index 19bbbff19..4dd193c67 100644
--- a/src/core/server/errors/translations.ts
+++ b/src/core/server/errors/translations.ts
@@ -21,7 +21,6 @@ export const ERROR_TRANSLATIONS: Record<ERROR_CODES, string> = {
   STORY_CLOSED: "error-storyClosed",
   STORY_NOT_FOUND: "error-storyNotFound",
   STORY_URL_NOT_PERMITTED: "error-storyURLNotPermitted",
-  URL_NOT_PERMITTED: "error-urlNotPermitted",
   TENANT_INSTALLED_ALREADY: "error-tenantInstalledAlready",
   TENANT_NOT_FOUND: "error-tenantNotFound",
   TOKEN_INVALID: "error-tokenInvalid",
@@ -59,4 +58,5 @@ export const ERROR_TRANSLATIONS: Record<ERROR_CODES, string> = {
   REPEAT_POST: "error-repeatPost",
   INSTALLATION_FORBIDDEN: "error-installationForbidden",
   SCRAPE_FAILED: "error-scrapeFailed",
+  DUPLICATE_SITE_ORIGIN: "error-duplicateSiteOrigin",
 };
diff --git a/src/core/server/graph/loaders/Comments.ts b/src/core/server/graph/loaders/Comments.ts
index cbdcade7e..a9ce5ebea 100644
--- a/src/core/server/graph/loaders/Comments.ts
+++ b/src/core/server/graph/loaders/Comments.ts
@@ -18,9 +18,9 @@ import {
   retrieveRejectedCommentUserConnection,
   retrieveStoryCommentTagCounts,
 } from "coral-server/models/comment";
+import { retrieveSharedModerationQueueQueuesCounts } from "coral-server/models/comment/counts/shared";
 import { hasPublishedStatus } from "coral-server/models/comment/helpers";
 import { Connection } from "coral-server/models/helpers";
-import { retrieveSharedModerationQueueQueuesCounts } from "coral-server/models/story/counts/shared";
 import { User } from "coral-server/models/user";
 
 import {
@@ -233,6 +233,7 @@ export default (ctx: Context) => ({
       // The cursor passed here is always going to be a number.
       before: before as number,
     }).then(primeCommentsFromConnection(ctx)),
+
   sharedModerationQueueQueuesCounts: new SingletonResolver(
     () =>
       retrieveSharedModerationQueueQueuesCounts(
diff --git a/src/core/server/graph/loaders/Sites.ts b/src/core/server/graph/loaders/Sites.ts
new file mode 100644
index 000000000..0391f2775
--- /dev/null
+++ b/src/core/server/graph/loaders/Sites.ts
@@ -0,0 +1,25 @@
+import DataLoader from "dataloader";
+import { defaultTo } from "lodash";
+
+import TenantContext from "coral-server/graph/context";
+import {
+  retrieveManySites,
+  retrieveSiteConnection,
+  Site,
+} from "coral-server/models/site";
+
+import { QueryToSitesArgs } from "coral-server/graph/schema/__generated__/types";
+
+export default (ctx: TenantContext) => ({
+  site: new DataLoader<string, Site | null>(
+    ids => retrieveManySites(ctx.mongo, ctx.tenant.id, ids),
+    {
+      cache: !ctx.disableCaching,
+    }
+  ),
+  connection: ({ first, after }: QueryToSitesArgs) =>
+    retrieveSiteConnection(ctx.mongo, ctx.tenant.id, {
+      first: defaultTo(first, 20),
+      after,
+    }),
+});
diff --git a/src/core/server/graph/loaders/Stories.ts b/src/core/server/graph/loaders/Stories.ts
index d6bb2e90c..0a597ee73 100644
--- a/src/core/server/graph/loaders/Stories.ts
+++ b/src/core/server/graph/loaders/Stories.ts
@@ -42,6 +42,15 @@ const statusFilter = (
   }
 };
 
+const siteFilter = (siteID?: string): StoryConnectionInput["filter"] => {
+  if (siteID) {
+    return {
+      siteID,
+    };
+  }
+  return {};
+};
+
 const queryFilter = (query?: string): StoryConnectionInput["filter"] => {
   if (query) {
     return { $text: { $search: query } };
@@ -102,14 +111,15 @@ export default (ctx: GraphContext) => ({
       cache: !ctx.disableCaching,
     }
   ),
-  connection: ({ first, after, status, query }: QueryToStoriesArgs) =>
+  connection: ({ first, after, status, query, siteID }: QueryToStoriesArgs) =>
     retrieveStoryConnection(ctx.mongo, ctx.tenant.id, {
       first: defaultTo(first, 10),
       after,
       filter: {
+        // Merge the site filter into the connection filter.
+        ...siteFilter(siteID),
         // Merge the status filter into the connection filter.
         ...statusFilter(status),
-
         // Merge the query filters into the query.
         ...queryFilter(query),
       },
diff --git a/src/core/server/graph/loaders/index.ts b/src/core/server/graph/loaders/index.ts
index 989cc9467..2242dee87 100644
--- a/src/core/server/graph/loaders/index.ts
+++ b/src/core/server/graph/loaders/index.ts
@@ -4,6 +4,7 @@ import Auth from "./Auth";
 import CommentActions from "./CommentActions";
 import CommentModerationActions from "./CommentModerationActions";
 import Comments from "./Comments";
+import Sites from "./Sites";
 import Stories from "./Stories";
 import Users from "./Users";
 
@@ -14,4 +15,5 @@ export default (ctx: Context) => ({
   Stories: Stories(ctx),
   Comments: Comments(ctx),
   Users: Users(ctx),
+  Sites: Sites(ctx),
 });
diff --git a/src/core/server/graph/mutators/Comments.ts b/src/core/server/graph/mutators/Comments.ts
index e118916cf..6b9822cdd 100644
--- a/src/core/server/graph/mutators/Comments.ts
+++ b/src/core/server/graph/mutators/Comments.ts
@@ -102,7 +102,7 @@ export const Comments = (ctx: GraphContext) => ({
       ctx.now
     ),
   removeReaction: ({ commentID }: GQLRemoveCommentReactionInput) =>
-    removeReaction(ctx.mongo, ctx.redis, ctx.tenant, ctx.user!, {
+    removeReaction(ctx.mongo, ctx.redis, ctx.publisher, ctx.tenant, ctx.user!, {
       commentID,
     }),
   createDontAgree: ({
@@ -128,9 +128,14 @@ export const Comments = (ctx: GraphContext) => ({
       ctx.now
     ),
   removeDontAgree: ({ commentID }: GQLRemoveCommentDontAgreeInput) =>
-    removeDontAgree(ctx.mongo, ctx.redis, ctx.tenant, ctx.user!, {
-      commentID,
-    }),
+    removeDontAgree(
+      ctx.mongo,
+      ctx.redis,
+      ctx.publisher,
+      ctx.tenant,
+      ctx.user!,
+      { commentID }
+    ),
   createFlag: ({
     commentID,
     commentRevisionID,
diff --git a/src/core/server/graph/mutators/Sites.ts b/src/core/server/graph/mutators/Sites.ts
new file mode 100644
index 000000000..ebe14c99e
--- /dev/null
+++ b/src/core/server/graph/mutators/Sites.ts
@@ -0,0 +1,14 @@
+import TenantContext from "coral-server/graph/context";
+import {
+  GQLCreateSiteInput,
+  GQLUpdateSiteInput,
+} from "coral-server/graph/schema/__generated__/types";
+import { Site } from "coral-server/models/site";
+import { create, update } from "coral-server/services/sites";
+
+export const Sites = (ctx: TenantContext) => ({
+  create: async (input: GQLCreateSiteInput): Promise<Readonly<Site> | null> =>
+    create(ctx.mongo, ctx.tenant, input.site, ctx.now),
+  update: async (input: GQLUpdateSiteInput): Promise<Readonly<Site> | null> =>
+    update(ctx.mongo, ctx.tenant, input.id, input.site, ctx.now),
+});
diff --git a/src/core/server/graph/mutators/Stories.ts b/src/core/server/graph/mutators/Stories.ts
index 5c3828087..da544faaa 100644
--- a/src/core/server/graph/mutators/Stories.ts
+++ b/src/core/server/graph/mutators/Stories.ts
@@ -64,13 +64,7 @@ export const Stories = (ctx: GraphContext) => ({
   open: (input: GQLOpenStoryInput): Promise<Readonly<Story> | null> =>
     open(ctx.mongo, ctx.tenant, input.id, ctx.now),
   merge: async (input: GQLMergeStoriesInput): Promise<Readonly<Story> | null> =>
-    merge(
-      ctx.mongo,
-      ctx.redis,
-      ctx.tenant,
-      input.destinationID,
-      input.sourceIDs
-    ),
+    merge(ctx.mongo, ctx.tenant, input.destinationID, input.sourceIDs),
   remove: async (input: GQLRemoveStoryInput): Promise<Readonly<Story> | null> =>
     remove(ctx.mongo, ctx.tenant, input.id, input.includeComments),
   scrape: async (input: GQLScrapeStoryInput): Promise<Readonly<Story> | null> =>
diff --git a/src/core/server/graph/mutators/index.ts b/src/core/server/graph/mutators/index.ts
index f5a86f5cf..b093748d8 100644
--- a/src/core/server/graph/mutators/index.ts
+++ b/src/core/server/graph/mutators/index.ts
@@ -3,6 +3,7 @@ import GraphContext from "coral-server/graph/context";
 import { Actions } from "./Actions";
 import { Comments } from "./Comments";
 import { Settings } from "./Settings";
+import { Sites } from "./Sites";
 import { Stories } from "./Stories";
 import { Users } from "./Users";
 
@@ -12,4 +13,5 @@ export default (ctx: GraphContext) => ({
   Settings: Settings(ctx),
   Stories: Stories(ctx),
   Users: Users(ctx),
+  Sites: Sites(ctx),
 });
diff --git a/src/core/server/graph/resolvers/Comment.ts b/src/core/server/graph/resolvers/Comment.ts
index 9dd20bef9..f786d0d62 100644
--- a/src/core/server/graph/resolvers/Comment.ts
+++ b/src/core/server/graph/resolvers/Comment.ts
@@ -110,6 +110,7 @@ export const Comment: GQLCommentTypeResolver<comment.Comment> = {
       ? ctx.loaders.Comments.parents(c, input)
       : createConnection(),
   story: (c, input, ctx) => ctx.loaders.Stories.story.load(c.storyID),
+  site: (c, input, ctx) => ctx.loaders.Sites.site.load(c.siteID),
   permalink: async ({ id, storyID }, input, ctx) => {
     const story = await ctx.loaders.Stories.story.load(storyID);
     if (!story) {
diff --git a/src/core/server/graph/resolvers/CommentCounts.ts b/src/core/server/graph/resolvers/CommentCounts.ts
index bdefa4759..798f1014b 100644
--- a/src/core/server/graph/resolvers/CommentCounts.ts
+++ b/src/core/server/graph/resolvers/CommentCounts.ts
@@ -1,8 +1,7 @@
+import { calculateTotalPublishedCommentCount } from "coral-server/models/comment";
+import { Story } from "coral-server/models/story";
+
 import { GQLCommentCountsTypeResolver } from "coral-server/graph/schema/__generated__/types";
-import {
-  calculateTotalPublishedCommentCount,
-  Story,
-} from "coral-server/models/story";
 
 export type CommentCountsInput = Pick<Story, "commentCounts" | "id">;
 
diff --git a/src/core/server/graph/resolvers/ModerationQueue.ts b/src/core/server/graph/resolvers/ModerationQueue.ts
index e4b4ab63c..2b96742d9 100644
--- a/src/core/server/graph/resolvers/ModerationQueue.ts
+++ b/src/core/server/graph/resolvers/ModerationQueue.ts
@@ -12,7 +12,7 @@ import {
 export interface ModerationQueueInput {
   selector: string;
   connection: Partial<CommentConnectionInput>;
-  count: number;
+  count: number | null;
 }
 
 export const ModerationQueue: GQLModerationQueueTypeResolver<
diff --git a/src/core/server/graph/resolvers/ModerationQueues.ts b/src/core/server/graph/resolvers/ModerationQueues.ts
index 7f6e14a0b..658712e8b 100644
--- a/src/core/server/graph/resolvers/ModerationQueues.ts
+++ b/src/core/server/graph/resolvers/ModerationQueues.ts
@@ -1,9 +1,10 @@
-import { CommentConnectionInput } from "coral-server/models/comment";
-import { FilterQuery } from "coral-server/models/helpers";
 import {
+  CommentConnectionInput,
   CommentModerationCountsPerQueue,
-  Story,
-} from "coral-server/models/story";
+} from "coral-server/models/comment";
+import { FilterQuery } from "coral-server/models/helpers";
+import { Site } from "coral-server/models/site";
+import { Story } from "coral-server/models/story";
 import {
   PENDING_STATUS,
   REPORTED_STATUS,
@@ -11,10 +12,8 @@ import {
 } from "coral-server/services/comments/moderation/counts";
 
 import {
-  ApproveCommentPayloadToModerationQueuesResolver,
   GQLModerationQueuesTypeResolver,
   QueryToModerationQueuesResolver,
-  RejectCommentPayloadToModerationQueuesResolver,
 } from "coral-server/graph/schema/__generated__/types";
 
 import GraphContext from "../context";
@@ -37,7 +36,27 @@ const mergeModerationInputFilters = (
       ...filter,
     },
   },
-  count: input.counts[selector],
+  count: input.counts ? input.counts[selector] : null,
+});
+
+/**
+ * siteModerationInputResolver can be used to retrieve the moderationQueue for
+ * a specific site.
+ *
+ * @param site the site that will be used to base the comment moderation
+ *              queues on
+ */
+export const siteModerationInputResolver = async (
+  site: Site
+): Promise<ModerationQueuesInput> => ({
+  connection: {
+    filter: {
+      // This moderationQueues is being sourced from the Story, so require
+      // that all the comments for theses queues are also for this Story.
+      siteID: site.id,
+    },
+  },
+  counts: site.commentCounts.moderationQueue.queues,
 });
 
 /**
@@ -55,6 +74,7 @@ export const storyModerationInputResolver = (
       // This moderationQueues is being sourced from the Story, so require
       // that all the comments for theses queues are also for this Story.
       storyID: story.id,
+      siteID: story.siteID,
     },
   },
   counts: story.commentCounts.moderationQueue.queues,
@@ -88,10 +108,7 @@ export const sharedModerationInputResolver = async (
  * @param args the args of the payload containing potentially a Story ID
  * @param ctx the TenantContext for which we can use to retrieve the shared data
  */
-export const moderationQueuesResolver:
-  | QueryToModerationQueuesResolver
-  | ApproveCommentPayloadToModerationQueuesResolver
-  | RejectCommentPayloadToModerationQueuesResolver = async (
+export const moderationQueuesResolver: QueryToModerationQueuesResolver = async (
   source,
   args,
   ctx
@@ -105,6 +122,15 @@ export const moderationQueuesResolver:
     return storyModerationInputResolver(story);
   }
 
+  if (args.siteID) {
+    const site = await ctx.loaders.Sites.site.load(args.siteID);
+    if (!site) {
+      return null;
+    }
+
+    return siteModerationInputResolver(site);
+  }
+
   return sharedModerationInputResolver(source, args, ctx);
 };
 
diff --git a/src/core/server/graph/resolvers/Mutation.ts b/src/core/server/graph/resolvers/Mutation.ts
index 2500bb76f..4a1930f37 100644
--- a/src/core/server/graph/resolvers/Mutation.ts
+++ b/src/core/server/graph/resolvers/Mutation.ts
@@ -243,6 +243,13 @@ export const Mutation: Required<GQLMutationTypeResolver<void>> = {
   }),
   deleteAnnouncement: async (source, { input }, ctx) => ({
     settings: await ctx.mutators.Settings.deleteAnnouncement(),
+  }),
+  createSite: async (source, { input }, ctx) => ({
+    site: await ctx.mutators.Sites.create(input),
+    clientMutationId: input.clientMutationId,
+  }),
+  updateSite: async (source, { input }, ctx) => ({
+    site: await ctx.mutators.Sites.update(input),
     clientMutationId: input.clientMutationId,
   }),
 };
diff --git a/src/core/server/graph/resolvers/Query.ts b/src/core/server/graph/resolvers/Query.ts
index 2a13912a4..82c51ac8d 100644
--- a/src/core/server/graph/resolvers/Query.ts
+++ b/src/core/server/graph/resolvers/Query.ts
@@ -23,4 +23,6 @@ export const Query: Required<GQLQueryTypeResolver<void>> = {
   moderationQueues: moderationQueuesResolver,
   activeStories: (source, { limit = 10 }, ctx) =>
     ctx.loaders.Stories.activeStories(limit),
+  sites: (source, args, ctx) => ctx.loaders.Sites.connection(args),
+  site: (source, { id }, ctx) => (id ? ctx.loaders.Sites.site.load(id) : null),
 };
diff --git a/src/core/server/graph/resolvers/Settings.ts b/src/core/server/graph/resolvers/Settings.ts
index 78085bc44..fe0939ab8 100644
--- a/src/core/server/graph/resolvers/Settings.ts
+++ b/src/core/server/graph/resolvers/Settings.ts
@@ -14,7 +14,7 @@ const filterValidFeatureFlags = () => {
 
   // Return a type guard for the feature flag.
   return (flag: string | GQLFEATURE_FLAG): flag is GQLFEATURE_FLAG =>
-    flags.includes(flag);
+    flags.includes(flag as GQLFEATURE_FLAG);
 };
 
 export const Settings: GQLSettingsTypeResolver<Tenant> = {
@@ -23,4 +23,8 @@ export const Settings: GQLSettingsTypeResolver<Tenant> = {
     featureFlags.filter(filterValidFeatureFlags()),
   announcement: ({ announcement }) =>
     retrieveAnnouncementIfEnabled(announcement),
+  multisite: async ({ id }, input, ctx) => {
+    const sites = await ctx.loaders.Sites.connection({});
+    return sites.edges.length > 1;
+  },
 };
diff --git a/src/core/server/graph/resolvers/Story.ts b/src/core/server/graph/resolvers/Story.ts
index 482678df3..cef8ef679 100644
--- a/src/core/server/graph/resolvers/Story.ts
+++ b/src/core/server/graph/resolvers/Story.ts
@@ -31,4 +31,5 @@ export const Story: GQLStoryTypeResolver<story.Story> = {
   // options if they exist.
   settings: (s, input, ctx) => defaultsDeep({}, s.settings, ctx.tenant),
   moderationQueues: storyModerationInputResolver,
+  site: (s, input, ctx) => ctx.loaders.Sites.site.load(s.siteID),
 };
diff --git a/src/core/server/graph/schema/schema.graphql b/src/core/server/graph/schema/schema.graphql
index 9b3d03912..d7938bb88 100644
--- a/src/core/server/graph/schema/schema.graphql
+++ b/src/core/server/graph/schema/schema.graphql
@@ -388,7 +388,7 @@ type ModerationQueue {
   """
   count will return the number of Comments that are in this queue.
   """
-  count: Int!
+  count: Int
 
   """
   comments are the comments on the ModerationQueue.
@@ -1271,11 +1271,6 @@ type Settings {
   """
   staticURI: String @auth(roles: [ADMIN])
 
-  """
-  allowedDomains is the list of domains that stories can come from.
-  """
-  allowedDomains: [String!]! @auth(roles: [ADMIN])
-
   """
   locale is the specified locale for this Tenant.
   """
@@ -1404,6 +1399,10 @@ type Settings {
   newCommenters: NewCommentersConfiguration! @auth(roles: [ADMIN])
 
   announcement: Announcement
+  """
+  multisite is whether multiple sites exist for this tenant.
+  """
+  multisite: Boolean!
 }
 
 ################################################################################
@@ -2053,6 +2052,40 @@ type UsersConnection {
   pageInfo: PageInfo!
 }
 
+"""
+SiteEdge represents a unique Site in a SitesConnection.
+"""
+type SiteEdge {
+  """
+  node is the Site for this edge.
+  """
+  node: Site!
+
+  """
+  cursor is used in pagination.
+  """
+  cursor: Cursor!
+}
+
+"""
+UsersConnection represents a subset of a stories list.
+"""
+type SitesConnection {
+  """
+  edges are a subset of SiteEdge's.
+  """
+  edges: [SiteEdge!]!
+
+  """
+  nodes is a list of Site's.
+  """
+  nodes: [Site!]!
+
+  """
+  pageInfo is information to aid in pagination.
+  """
+  pageInfo: PageInfo!
+}
 ################################################################################
 ## Comment
 ################################################################################
@@ -2390,6 +2423,8 @@ type Comment {
   deleted is whether the comment has been deleted.
   """
   deleted: Boolean
+
+  site: Site!
 }
 
 type PageInfo {
@@ -2698,6 +2733,11 @@ type Story {
   lastCommentedAt is the last time someone commented on this story.
   """
   lastCommentedAt: Time @auth(roles: [ADMIN])
+
+  """
+  site is the site associated with the story
+  """
+  site: Site!
 }
 
 """
@@ -2778,6 +2818,7 @@ type Query {
     after: Cursor
     status: STORY_STATUS
     query: String
+    siteID: ID
   ): StoriesConnection! @auth(roles: [ADMIN, MODERATOR])
 
   """
@@ -2800,6 +2841,11 @@ type Query {
     status: USER_STATUS
   ): UsersConnection! @auth(roles: [ADMIN, MODERATOR])
 
+  site(id: ID): Site @auth(roles: [ADMIN, MODERATOR])
+
+  sites(first: Int = 10 @constraint(max: 50), after: Cursor): SitesConnection!
+    @auth(roles: [ADMIN, MODERATOR])
+
   """
   viewer is the current logged in User. If no user is currently logged in, it will
   return null. This is the only nullable field that can be returned that depends
@@ -2835,7 +2881,7 @@ type Query {
   moderationQueues returns the set of ModerationQueues that are available for
   all stories or if given the story identified by the `storyID`.
   """
-  moderationQueues(storyID: ID): ModerationQueues!
+  moderationQueues(storyID: ID, siteID: ID): ModerationQueues!
     @auth(roles: [ADMIN, MODERATOR])
 
   """
@@ -3691,11 +3737,6 @@ input SettingsInput {
   """
   live: LiveConfigurationInput
 
-  """
-  allowedDomains is the list of domains that stories can come from.
-  """
-  allowedDomains: [String!]
-
   """
   moderation is the moderation mode for all Stories on the site.
   """
@@ -5854,6 +5895,10 @@ type Mutation {
   deleteAnnouncement(
     input: DeleteAnnouncementInput!
   ): DeleteAnnouncementPayload! @auth(roles: [ADMIN])
+
+  createSite(input: CreateSiteInput!): CreateSitePayload! @auth(roles: [ADMIN])
+
+  updateSite(input: UpdateSiteInput!): UpdateSitePayload! @auth(roles: [ADMIN])
 }
 
 ##################
@@ -6038,3 +6083,80 @@ type Subscription {
   commentFeatured(storyID: ID!): CommentFeaturedPayload!
     @auth(roles: [MODERATOR, ADMIN])
 }
+
+type Site {
+  """
+  id is the identifier of the Site.
+  """
+  id: ID!
+
+  """
+  name is the name of the Site.
+  """
+  name: String!
+
+  """
+  allowedOrigins are the allowed origins for embeds.
+  """
+  allowedOrigins: [String!]!
+
+  """
+  createdAt is when the site was created.
+  """
+  createdAt: Time!
+}
+
+input CreateSite {
+  """
+  name is the name of the Site.
+  """
+  name: String!
+
+  """
+  allowedOrigins are the allowed origins for embeds.
+  """
+  allowedOrigins: [String!]!
+}
+
+input UpdateSite {
+  """
+  name is the name of the Site.
+  """
+  name: String
+
+  """
+  url is the Site URL, seen in email communications.
+  """
+  url: String
+
+  """
+  contactEmail is the contact email for the Site, seen in email communications.
+  """
+  contactEmail: String
+
+  """
+  allowedOrigins are the allowed origins for embeds.
+  """
+  allowedOrigins: [String!]
+}
+
+input CreateSiteInput {
+  clientMutationId: String!
+  site: CreateSite!
+}
+
+type CreateSitePayload {
+  clientMutationId: String!
+  site: Site!
+}
+
+input UpdateSiteInput {
+  clientMutationId: String!
+  site: UpdateSite!
+  id: ID!
+}
+
+type UpdateSitePayload {
+  clientMutationId: String!
+  site: Site!
+}
diff --git a/src/core/server/locales/da/errors.ftl b/src/core/server/locales/da/errors.ftl
index ca78d9be5..b1e103173 100644
--- a/src/core/server/locales/da/errors.ftl
+++ b/src/core/server/locales/da/errors.ftl
@@ -3,7 +3,6 @@ error-storyClosed = Det er ikke muligt at kommentere dette lige nu.
 error-commenatBodyTooShort = Kommentaren skal have mindst {$ min} tegn.
 error-commentBodyExceedsMaxLength = Kommentaren overskrider den maksimale længde på {$ max} tegn.
 error-storyURLNotPermitted = Den angivne historie-URL findes ikke på listen over tilladte domæner.
-error-urlNotPermitted = Denne URL ({$ url}) er ikke tilladt.
 error-duplicateStoryURL =  Denne URL-adresse findes allerede.
 error-tenantNotFound = ({$ værtsnavn}) ikke fundet.
 error-userNotFound = Bruger ({$userID}) eksisterer ikke.
diff --git a/src/core/server/locales/en-US/errors.ftl b/src/core/server/locales/en-US/errors.ftl
index 72e8a766a..82e52015f 100644
--- a/src/core/server/locales/en-US/errors.ftl
+++ b/src/core/server/locales/en-US/errors.ftl
@@ -5,7 +5,6 @@ error-commentBodyExceedsMaxLength =
   Comment body exceeds maximum length of {$max} characters.
 error-storyURLNotPermitted =
   The specified story URL does not exist in the permitted domains list.
-error-urlNotPermitted = The specified URL ({$url}) is not permitted.
 error-duplicateStoryURL =  The specified story URL already exists.
 error-tenantNotFound = Tenant hostname ({$hostname}) not found.
 error-userNotFound = User ({$userID}) not found.
@@ -60,3 +59,4 @@ error-rawQueryNotAuthorized = You are not authorized to execute this query.
 error-inviteIncludesExistingUser = A user with the email address { $email } already exists.
 error-repeatPost = Are you sure? This comment is very similar to your previous comment.
 error-installationForbidden = { -product-name } is already installed. To install another Tenant on this domain ({ $domain }) you need to generate an installation token.
+error-duplicateSiteOrigin = Allowed domains may only be associated with a single site.
diff --git a/src/core/server/locales/fi-FI/errors.ftl b/src/core/server/locales/fi-FI/errors.ftl
index f19bfab93..9c22968d0 100644
--- a/src/core/server/locales/fi-FI/errors.ftl
+++ b/src/core/server/locales/fi-FI/errors.ftl
@@ -5,7 +5,6 @@ error-commentBodyExceedsMaxLength =
   Kommenttisi on liian pitkä. Se voi olla korkeintaan {$max} merkkiä.
 error-storyURLNotPermitted =
   The specified story URL does not exist in the permitted domains list.
-error-urlNotPermitted = The specified URL ({$url}) is not permitted.
 error-duplicateStoryURL =  The specified story URL already exists.
 error-tenantNotFound = Tenant hostname ({$hostname}) not found.
 error-userNotFound = Käyttäjää ({$userID}) ei löydy.
@@ -59,4 +58,4 @@ error-persistedQueryNotFound = The persisted query with ID { $id } was not found
 error-rawQueryNotAuthorized = You are not authorized to execute this query.
 error-inviteIncludesExistingUser = A user with the email address { $email } already exists.
 error-repeatPost = Oletko varma, että haluat lähettää? Kirjoittamasi kommentti näyttää hyvin samanlaiselta kuin aiempi kommenttisi.
-error-installationForbidden = { -product-name } is already installed. To install another Tenant on this domain ({ $domain }) you need to generate an installation token.
\ No newline at end of file
+error-installationForbidden = { -product-name } is already installed. To install another Tenant on this domain ({ $domain }) you need to generate an installation token.
diff --git a/src/core/server/locales/fr-FR/errors.ftl b/src/core/server/locales/fr-FR/errors.ftl
index 483ef9dff..58e6539ce 100755
--- a/src/core/server/locales/fr-FR/errors.ftl
+++ b/src/core/server/locales/fr-FR/errors.ftl
@@ -5,7 +5,6 @@ error-commentBodyExceedsMaxLength =
   Le commentaire ne doit pas dépasser {$max} caractères.
 error-storyURLNotPermitted =
   L'URL de l'article n'existe pas dans les domaines autorisés.
-error-urlNotPermitted = L'url spécifiée : ({$url}) n'est pas autorisée.
 error-duplicateStoryURL = L'url spécifiée existe déjà.
 error-tenantNotFound = Le nom d'hôte ({$hostname}) n'a pas été trouvé.
 error-userNotFound = L'utilisateur ({$userID}) n'a pas été trouvé.
diff --git a/src/core/server/locales/pt-BR/errors.ftl b/src/core/server/locales/pt-BR/errors.ftl
index 181591c21..be307cb67 100644
--- a/src/core/server/locales/pt-BR/errors.ftl
+++ b/src/core/server/locales/pt-BR/errors.ftl
@@ -5,7 +5,6 @@ error-commentBodyExceedsMaxLength =
   O corpo do comentário excede o comprimento máximo de {$max} caracteres.
 error-storyURLNotPermitted =
   A URL da história especificada não existe na lista de domínios permitidos.
-error-urlNotPermitted = A URL especificada ({$url}) não é permitida.
 error-duplicateStoryURL =  A URL da história especificada já existe.
 error-tenantNotFound = Hostname do tenant ({$hostname}) não encontrado.
 error-userNotFound = Usuário ({$userID}) não encontrado.
diff --git a/src/core/server/models/action/comment.spec.ts b/src/core/server/models/action/comment.spec.ts
index 7ebda75d1..26306666b 100644
--- a/src/core/server/models/action/comment.spec.ts
+++ b/src/core/server/models/action/comment.spec.ts
@@ -127,6 +127,7 @@ describe("#filterDuplicateActions", () => {
     const actions: CreateActionInput[] = [
       {
         storyID: "1",
+        siteID: "1",
         actionType: ACTION_TYPE.FLAG,
         reason: GQLCOMMENT_FLAG_REASON.COMMENT_DETECTED_BANNED_WORD,
         commentID: "1",
@@ -135,6 +136,7 @@ describe("#filterDuplicateActions", () => {
       },
       {
         storyID: "1",
+        siteID: "1",
         actionType: ACTION_TYPE.FLAG,
         reason: GQLCOMMENT_FLAG_REASON.COMMENT_DETECTED_BANNED_WORD,
         commentID: "1",
@@ -143,6 +145,7 @@ describe("#filterDuplicateActions", () => {
       },
       {
         storyID: "1",
+        siteID: "1",
         actionType: ACTION_TYPE.FLAG,
         reason: GQLCOMMENT_FLAG_REASON.COMMENT_DETECTED_SUSPECT_WORD,
         commentID: "1",
diff --git a/src/core/server/models/action/comment.ts b/src/core/server/models/action/comment.ts
index 8a01efb26..56ccee8c7 100644
--- a/src/core/server/models/action/comment.ts
+++ b/src/core/server/models/action/comment.ts
@@ -113,6 +113,11 @@ export interface CommentAction extends TenantResource {
    */
   storyID: string;
 
+  /**
+   * siteID represents the ID of the Site where the comment was left on.
+   */
+  siteID: string;
+
   /**
    * userID is the ID of the User that left this Action. In the event that the
    * Action was left by Coral, it will be null.
@@ -474,7 +479,7 @@ export function invertEncodedActionCounts(
  * encodeActionCountKeys encodes the action into string keys which represents
  * the groupings as seen in `EncodedActionCounts`.
  */
-function encodeActionCountKeys(
+export function encodeActionCountKeys(
   action: Pick<CommentAction, "actionType" | "reason">
 ): string[] {
   const keys = [action.actionType as string];
diff --git a/src/core/server/models/comment/comment.ts b/src/core/server/models/comment/comment.ts
index 6e969248f..67652fcb0 100644
--- a/src/core/server/models/comment/comment.ts
+++ b/src/core/server/models/comment/comment.ts
@@ -33,11 +33,8 @@ import {
 } from "coral-server/graph/schema/__generated__/types";
 
 import { PUBLISHED_STATUSES } from "./constants";
-import {
-  CommentStatusCounts,
-  createEmptyCommentStatusCounts,
-  hasAncestors,
-} from "./helpers";
+import { CommentStatusCounts, createEmptyCommentStatusCounts } from "./counts";
+import { hasAncestors } from "./helpers";
 import { Revision } from "./revision";
 import { CommentTag } from "./tag";
 
@@ -78,6 +75,11 @@ export interface Comment extends TenantResource {
    */
   storyID: string;
 
+  /**
+   * siteID stores the ID of the Site that this Comment was left on.
+   */
+  siteID: string;
+
   /**
    * revisions stores all the revisions of the Comment body including the most
    * recent revision, the last revision is the most recent.
@@ -138,7 +140,7 @@ export type CreateCommentInput = Omit<
 > &
   Required<Pick<Revision, "body">> &
   Pick<Revision, "metadata"> &
-  Partial<Pick<Comment, "actionCounts">>;
+  Partial<Pick<Comment, "actionCounts" | "siteID">>;
 
 export async function createComment(
   mongo: Db,
diff --git a/src/core/server/models/story/counts/index.ts b/src/core/server/models/comment/counts/counts.ts
similarity index 61%
rename from src/core/server/models/story/counts/index.ts
rename to src/core/server/models/comment/counts/counts.ts
index 74d00da1d..1a8bf3ce1 100644
--- a/src/core/server/models/story/counts/index.ts
+++ b/src/core/server/models/comment/counts/counts.ts
@@ -1,24 +1,18 @@
-export * from "./empty";
-export * from "./shared";
-
 import { identity, isEmpty, pickBy } from "lodash";
-import { Db } from "mongodb";
+import { Collection } from "mongodb";
 
 import { DeepPartial } from "coral-common/types";
 import { dotize } from "coral-common/utils/dotize";
-import { GQLCOMMENT_STATUS } from "coral-server/graph/schema/__generated__/types";
 import logger from "coral-server/logger";
 import { EncodedCommentActionCounts } from "coral-server/models/action/comment";
 import { PUBLISHED_STATUSES } from "coral-server/models/comment/constants";
-import {
-  CommentStatusCounts,
-  createEmptyCommentStatusCounts,
-} from "coral-server/models/comment/helpers";
-import { retrieveStory, Story } from "coral-server/models/story";
-import { stories as collection } from "coral-server/services/mongodb/collections";
-import { AugmentedRedis } from "coral-server/services/redis";
 
-import { updateSharedCommentCounts } from "./shared";
+import { GQLCOMMENT_STATUS } from "coral-server/graph/schema/__generated__/types";
+
+import {
+  createEmptyCommentModerationQueueCounts,
+  createEmptyCommentStatusCounts,
+} from "./empty";
 
 /**
  * CommentModerationCountsPerQueue stores the number of Comments that exist in
@@ -60,117 +54,49 @@ export interface CommentModerationQueueCounts {
   queues: CommentModerationCountsPerQueue;
 }
 
+// TODO: (wyattjoh) write a test to verify that this set of counts is always in sync with GQLCOMMENT_STATUS.
+
 /**
- * StoryCommentCounts stores all the Comment Counts that will be stored on each
- * Story.
+ * CommentStatusCounts stores the count of Comments that have the particular
+ * statuses.
  */
-export interface StoryCommentCounts {
+export interface CommentStatusCounts {
+  [GQLCOMMENT_STATUS.APPROVED]: number;
+  [GQLCOMMENT_STATUS.NONE]: number;
+  [GQLCOMMENT_STATUS.PREMOD]: number;
+  [GQLCOMMENT_STATUS.REJECTED]: number;
+  [GQLCOMMENT_STATUS.SYSTEM_WITHHELD]: number;
+}
+
+/**
+ * RelatedCommentCounts stores all the Comment Counts that will be stored on
+ * each related document (like a Story, or a Site).
+ */
+export interface RelatedCommentCounts {
   /**
-   * actionCounts stores all the action counts for all Comment's on this Story.
+   * actionCounts stores all the action counts for all Comment's on this related
+   * document.
    */
   action: EncodedCommentActionCounts;
 
   /**
-   * commentCounts stores the different counts for each comment on the Story
-   * according to their statuses.
+   * commentCounts stores the different counts for each comment on the related
+   * document according to their statuses.
    */
   status: CommentStatusCounts;
 
   /**
-   * moderationQueue stores the number of Comments that exist in
-   * each of the ModerationQueue's on this Story.
+   * moderationQueue stores the number of Comments that exist in each of the
+   * ModerationQueue's on this related document.
    */
   moderationQueue: CommentModerationQueueCounts;
 }
 
-/**
- * updateStoryCommentStatusCount will update a given Story's status counts.
- *
- * @param mongo database handle
- * @param redis redis database handle
- * @param tenantID ID of the Tenant where this Story is
- * @param id ID of the Story where we're updating the counts
- * @param status the set of counts that we will update
- */
-export const updateStoryCommentStatusCount = (
-  mongo: Db,
-  redis: AugmentedRedis,
-  tenantID: string,
-  id: string,
-  status: Partial<CommentStatusCounts>
-) => updateStoryCounts(mongo, redis, tenantID, id, { status });
-
-/**
- * updateStoryCommentModerationQueueCounts will update the moderation queue
- * counts on a Story.
- *
- * @param mongo mongo database handle
- * @param redis redis database handle
- * @param tenantID ID of the Tenant where this Story is
- * @param id ID of the Story where we're updating the counts
- * @param moderationQueue the set of counts that we will update
- */
-export const updateStoryCommentModerationQueueCounts = (
-  mongo: Db,
-  redis: AugmentedRedis,
-  tenantID: string,
-  id: string,
-  moderationQueue: DeepPartial<CommentModerationQueueCounts>
-) => updateStoryCounts(mongo, redis, tenantID, id, { moderationQueue });
-
-export const updateStoryActionCounts = (
-  mongo: Db,
-  redis: AugmentedRedis,
-  tenantID: string,
-  id: string,
-  action: EncodedCommentActionCounts
-) => updateStoryCounts(mongo, redis, tenantID, id, { action });
-
-/**
- * updateStoryCounts will update the comment counts for the story indicated.
- *
- * @param mongo mongodb database handle
- * @param redis redis database handle
- * @param tenantID ID of the Tenant where the Story is on
- * @param id the ID of the Story that we are updating counts on
- * @param commentCounts the counts that we are updating
- */
-export async function updateStoryCounts(
-  mongo: Db,
-  redis: AugmentedRedis,
-  tenantID: string,
-  id: string,
-  commentCounts: DeepPartial<StoryCommentCounts>
-) {
-  // Update all the specific comment moderation queue counts.
-  const update: DeepPartial<Story> = { commentCounts };
-  const $inc = pickBy(dotize(update), identity);
-  if (isEmpty($inc)) {
-    // Nothing needs to be incremented, just return the story.
-    return retrieveStory(mongo, tenantID, id);
-  }
-
-  logger.trace({ update: { $inc } }, "incrementing story counts");
-
-  const result = await collection(mongo).findOneAndUpdate(
-    { id, tenantID },
-    { $inc },
-    // False to return the updated document instead of the original
-    // document.
-    { returnOriginal: false }
-  );
-
-  // Update the shared counts.
-  await updateSharedCommentCounts(redis, tenantID, commentCounts);
-
-  return result.value || null;
-}
-
 /**
  * mergeCommentStatusCount will merge an array of commentStatusCount's into one.
  */
 export function mergeCommentStatusCount(
-  statusCounts: CommentStatusCounts[]
+  ...statusCounts: CommentStatusCounts[]
 ): CommentStatusCounts {
   const mergedStatusCounts = createEmptyCommentStatusCounts();
   for (const commentCounts of statusCounts) {
@@ -197,6 +123,21 @@ export function mergeCommentStatusCount(
   return mergedStatusCounts;
 }
 
+export function mergeCommentModerationQueueCount(
+  ...moderationQueues: CommentModerationQueueCounts[]
+): CommentModerationQueueCounts {
+  const merged = createEmptyCommentModerationQueueCounts();
+
+  for (const moderationQueue of moderationQueues) {
+    merged.total += moderationQueue.total;
+    merged.queues.unmoderated += moderationQueue.queues.unmoderated;
+    merged.queues.pending += moderationQueue.queues.pending;
+    merged.queues.reported += moderationQueue.queues.reported;
+  }
+
+  return merged;
+}
+
 /**
  * calculateTotalCommentCount will compute the total amount of comments left on
  * an Asset by parsing the `CommentStatusCounts`.
@@ -239,3 +180,49 @@ export function calculateTotalPublishedCommentCount(
     0
   );
 }
+
+interface RelatedCommentCountsDocument {
+  id: string;
+  tenantID: string;
+  commentCounts: Partial<RelatedCommentCounts>;
+}
+
+export async function updateRelatedCommentCounts<
+  T extends RelatedCommentCountsDocument
+>(
+  collection: Collection<T>,
+  tenantID: string,
+  id: string,
+  commentCounts: DeepPartial<RelatedCommentCounts>
+) {
+  // Update all the specific comment moderation queue counts.
+  const update: DeepPartial<RelatedCommentCountsDocument> = { commentCounts };
+
+  // For each of the paths that we can update, we want to reduce it to a flat
+  // object that's dotted (via dotize). We then use the `pickBy` with `identity`
+  // to remove all the increment operations that are zero. This should leave
+  // only increments that are positive or negative numbers.
+  const $inc = pickBy(dotize(update), identity);
+
+  // If th object is empty, then we don't actually have anything to increment,
+  // lets return the object directly to stay consistent with the return API.
+  if (isEmpty($inc)) {
+    // Nothing needs to be incremented, just return the story.
+    return collection.findOne({ id, tenantID });
+  }
+
+  logger.trace(
+    { collection: collection.collectionName, tenantID, id, update: { $inc } },
+    "updating related comment counts"
+  );
+
+  const result = await collection.findOneAndUpdate(
+    { id, tenantID },
+    { $inc },
+    // False to return the updated document instead of the original
+    // document.
+    { returnOriginal: false }
+  );
+
+  return result.value || null;
+}
diff --git a/src/core/server/models/comment/counts/empty.ts b/src/core/server/models/comment/counts/empty.ts
new file mode 100644
index 000000000..c90639f5e
--- /dev/null
+++ b/src/core/server/models/comment/counts/empty.ts
@@ -0,0 +1,41 @@
+import { GQLCOMMENT_STATUS } from "coral-server/graph/schema/__generated__/types";
+
+import {
+  CommentModerationCountsPerQueue,
+  CommentModerationQueueCounts,
+  CommentStatusCounts,
+  RelatedCommentCounts,
+} from "./counts";
+
+export function createEmptyCommentModerationCountsPerQueue(): CommentModerationCountsPerQueue {
+  return {
+    unmoderated: 0,
+    reported: 0,
+    pending: 0,
+  };
+}
+
+export function createEmptyCommentModerationQueueCounts(): CommentModerationQueueCounts {
+  return {
+    total: 0,
+    queues: createEmptyCommentModerationCountsPerQueue(),
+  };
+}
+
+export function createEmptyCommentStatusCounts(): CommentStatusCounts {
+  return {
+    [GQLCOMMENT_STATUS.APPROVED]: 0,
+    [GQLCOMMENT_STATUS.NONE]: 0,
+    [GQLCOMMENT_STATUS.PREMOD]: 0,
+    [GQLCOMMENT_STATUS.REJECTED]: 0,
+    [GQLCOMMENT_STATUS.SYSTEM_WITHHELD]: 0,
+  };
+}
+
+export function createEmptyRelatedCommentCounts(): RelatedCommentCounts {
+  return {
+    action: {},
+    status: createEmptyCommentStatusCounts(),
+    moderationQueue: createEmptyCommentModerationQueueCounts(),
+  };
+}
diff --git a/src/core/server/models/comment/counts/index.ts b/src/core/server/models/comment/counts/index.ts
new file mode 100644
index 000000000..fae182b4d
--- /dev/null
+++ b/src/core/server/models/comment/counts/index.ts
@@ -0,0 +1,3 @@
+export * from "./counts";
+export * from "./empty";
+export * from "./shared";
diff --git a/src/core/server/models/story/counts/shared.ts b/src/core/server/models/comment/counts/shared.ts
similarity index 80%
rename from src/core/server/models/story/counts/shared.ts
rename to src/core/server/models/comment/counts/shared.ts
index f20ebadf6..4676d7c96 100644
--- a/src/core/server/models/story/counts/shared.ts
+++ b/src/core/server/models/comment/counts/shared.ts
@@ -2,13 +2,13 @@ import { flatten, flattenDeep, identity, isEmpty, pickBy } from "lodash";
 import { Db } from "mongodb";
 import ms from "ms";
 
-import { DeepPartial } from "coral-common/types";
+import { FirstDeepPartial } from "coral-common/types";
 import logger from "coral-server/logger";
 import {
   CommentModerationCountsPerQueue,
-  StoryCommentCounts,
-} from "coral-server/models/story/counts";
-import { stories as collection } from "coral-server/services/mongodb/collections";
+  RelatedCommentCounts,
+} from "coral-server/models/comment/counts";
+import { sites } from "coral-server/services/mongodb/collections";
 import { AugmentedPipeline, AugmentedRedis } from "coral-server/services/redis";
 
 import {
@@ -29,18 +29,19 @@ const COUNT_FRESHNESS_EXPIRY_SECONDS = Math.floor(ms("24h") / 1000);
 
 const freshenKey = (key: string) => `${key}:fresh`;
 
-const commentCountsActionKey = (tenantID: string) =>
-  `${tenantID}:commentCounts:action`;
-
-const commentCountsStatusKey = (tenantID: string) =>
-  `${tenantID}:commentCounts:status`;
-
 const commentCountsModerationQueueTotalKey = (tenantID: string) =>
   `${tenantID}:commentCounts:moderationQueue:total`;
 
 const commentCountsModerationQueueQueuesKey = (tenantID: string) =>
   `${tenantID}:commentCounts:moderationQueue:queues`;
 
+interface SharedModerationQueueCountsMatch {
+  tenantID: string;
+  createdAt: {
+    $lt: Date;
+  };
+}
+
 /**
  * recalculateSharedModerationQueueQueueCounts will reset the counts stored for
  * this Tenant.
@@ -61,13 +62,18 @@ export async function recalculateSharedModerationQueueQueueCounts(
   // Clear the existing cached queues.
   await redis.del(key, freshKey);
 
+  const match: SharedModerationQueueCountsMatch = {
+    tenantID,
+    createdAt: { $lt: now },
+  };
+
   // Fetch all the moderation queue counts.
-  const queueResults = collection<{
+  const queueResults = sites<{
     _id: string;
     total: number;
   }>(mongo).aggregate([
     {
-      $match: { tenantID, createdAt: { $lt: now } },
+      $match: match,
     },
     {
       $project: {
@@ -181,34 +187,11 @@ export async function retrieveSharedModerationQueueQueuesCounts(
 export async function updateSharedCommentCounts(
   redis: AugmentedRedis,
   tenantID: string,
-  commentCounts: DeepPartial<StoryCommentCounts>
+  commentCounts: FirstDeepPartial<RelatedCommentCounts>
 ) {
   const pipeline: AugmentedPipeline = redis.pipeline();
 
-  // HASH ${tenantID}:commentCounts:action
-
-  const action = pickBy(commentCounts.action || {}, identity);
-  if (!isEmpty(action)) {
-    // Determine the arguments that we will increment.
-    const args = flattenDeep(Object.entries(action));
-
-    // Add the command to the pipeline.
-    pipeline.mhincrby(commentCountsActionKey(tenantID), ...args);
-  }
-
-  // HASH ${tenantID}:commentCounts:status
-
-  const status = pickBy(commentCounts.status || {}, identity);
-  if (!isEmpty(status)) {
-    // Determine the arguments that we will increment.
-    const args = flattenDeep(Object.entries(status));
-
-    // Add the command to the pipeline.
-    pipeline.mhincrby(commentCountsStatusKey(tenantID), ...args);
-  }
-
-  // HASH ${tenantID}:commentCounts:moderationQueue:total
-
+  // Update the moderation queue total.
   const moderationQueue = commentCounts.moderationQueue || {};
   const moderationQueueTotal =
     typeof moderationQueue.total === "number" ? moderationQueue.total : 0;
@@ -220,8 +203,7 @@ export async function updateSharedCommentCounts(
     );
   }
 
-  // HASH ${tenantID}:commentCounts:moderationQueue:queues
-
+  // Update the moderation queue counts.
   const moderationQueueQueues = pickBy(moderationQueue.queues || {}, identity);
   if (!isEmpty(moderationQueueQueues)) {
     // Determine the arguments that we will increment.
diff --git a/src/core/server/models/comment/helpers.ts b/src/core/server/models/comment/helpers.ts
index f8aab82b0..98ac0d3f6 100644
--- a/src/core/server/models/comment/helpers.ts
+++ b/src/core/server/models/comment/helpers.ts
@@ -3,9 +3,12 @@ import {
   GQLTAG,
 } from "coral-server/graph/schema/__generated__/types";
 
-import { calculateTotalPublishedCommentCount } from "../story";
 import { Comment } from "./comment";
 import { MODERATOR_STATUSES, PUBLISHED_STATUSES } from "./constants";
+import {
+  calculateTotalPublishedCommentCount,
+  CommentStatusCounts,
+} from "./counts";
 import { Revision } from "./revision";
 
 /**
@@ -44,30 +47,6 @@ export function getLatestRevision(
   return comment.revisions[comment.revisions.length - 1];
 }
 
-// TODO: (wyattjoh) write a test to verify that this set of counts is always in sync with GQLCOMMENT_STATUS.
-
-/**
- * CommentStatusCounts stores the count of Comments that have the particular
- * statuses.
- */
-export interface CommentStatusCounts {
-  [GQLCOMMENT_STATUS.APPROVED]: number;
-  [GQLCOMMENT_STATUS.NONE]: number;
-  [GQLCOMMENT_STATUS.PREMOD]: number;
-  [GQLCOMMENT_STATUS.REJECTED]: number;
-  [GQLCOMMENT_STATUS.SYSTEM_WITHHELD]: number;
-}
-
-export function createEmptyCommentStatusCounts(): CommentStatusCounts {
-  return {
-    [GQLCOMMENT_STATUS.APPROVED]: 0,
-    [GQLCOMMENT_STATUS.NONE]: 0,
-    [GQLCOMMENT_STATUS.PREMOD]: 0,
-    [GQLCOMMENT_STATUS.REJECTED]: 0,
-    [GQLCOMMENT_STATUS.SYSTEM_WITHHELD]: 0,
-  };
-}
-
 export function calculateRejectionRate(counts: CommentStatusCounts): number {
   const published = calculateTotalPublishedCommentCount(counts);
   const rejected = counts[GQLCOMMENT_STATUS.REJECTED];
diff --git a/src/core/server/models/comment/index.ts b/src/core/server/models/comment/index.ts
index 12f108f0b..341c3945b 100644
--- a/src/core/server/models/comment/index.ts
+++ b/src/core/server/models/comment/index.ts
@@ -1,3 +1,4 @@
 export * from "./comment";
 export * from "./revision";
 export * from "./helpers";
+export * from "./counts";
diff --git a/src/core/server/models/site/index.ts b/src/core/server/models/site/index.ts
new file mode 100644
index 000000000..4f3220d0d
--- /dev/null
+++ b/src/core/server/models/site/index.ts
@@ -0,0 +1,175 @@
+import { identity, isNumber } from "lodash";
+import { Db, MongoError } from "mongodb";
+import uuid from "uuid";
+
+import { FirstDeepPartial, Omit } from "coral-common/types";
+import { getOrigin } from "coral-server/app/url";
+import { DuplicateSiteAllowedOriginError } from "coral-server/errors";
+import {
+  Connection,
+  ConnectionInput,
+  Query,
+  resolveConnection,
+} from "coral-server/models/helpers";
+import { TenantResource } from "coral-server/models/tenant";
+import { sites as collection } from "coral-server/services/mongodb/collections";
+
+import {
+  createEmptyRelatedCommentCounts,
+  RelatedCommentCounts,
+  updateRelatedCommentCounts,
+} from "../comment";
+
+export interface Site extends TenantResource {
+  readonly id: string;
+  name: string;
+  allowedOrigins: string[];
+  commentCounts: RelatedCommentCounts;
+  createdAt: Date;
+}
+
+export type CreateSiteInput = Omit<Site, "id" | "commentCounts" | "createdAt">;
+
+export type SiteConnectionInput = ConnectionInput<Site>;
+
+export function getURLOrigins(urls: ReadonlyArray<string>) {
+  return urls.map(url => getOrigin(url)).filter(identity) as string[];
+}
+
+/**
+ * create will create a new Site.
+ *
+ * @param mongo the MongoDB connection used to create the Site.
+ * @param input the customizable parts of the Site available during creation
+ */
+export async function createSite(
+  mongo: Db,
+  input: CreateSiteInput,
+  now = new Date()
+): Promise<Readonly<Site>> {
+  const site: Site = {
+    ...input,
+    id: uuid.v4(),
+    commentCounts: createEmptyRelatedCommentCounts(),
+    createdAt: now,
+  };
+
+  try {
+    await collection(mongo).insertOne(site);
+    return site;
+  } catch (err) {
+    // Evaluate the error, if it is in regards to violating the unique index,
+    // then return a duplicate Story error.
+    if (err instanceof MongoError && err.code === 11000) {
+      throw new DuplicateSiteAllowedOriginError(
+        err,
+        null,
+        input.allowedOrigins
+      );
+    }
+
+    throw err;
+  }
+}
+
+export async function retrieveSite(mongo: Db, tenantID: string, id: string) {
+  return collection(mongo).findOne({ id, tenantID });
+}
+
+export async function retrieveTenantSites(mongo: Db, tenantID: string) {
+  const cursor = collection(mongo).find({ tenantID });
+  return cursor.toArray();
+}
+
+export async function retrieveManySites(
+  mongo: Db,
+  tenantID: string,
+  ids: string[]
+) {
+  const cursor = collection(mongo).find({
+    id: { $in: ids },
+    tenantID,
+  });
+  const sites = await cursor.toArray();
+
+  return ids.map(id => sites.find(site => site.id === id) || null);
+}
+
+export async function retrieveSiteByOrigin(
+  mongo: Db,
+  tenantID: string,
+  origin: string
+) {
+  return collection(mongo).findOne({
+    tenantID,
+    allowedOrigins: origin,
+  });
+}
+
+async function retrieveConnection(
+  input: SiteConnectionInput,
+  query: Query<Site>
+): Promise<Readonly<Connection<Readonly<Site>>>> {
+  // Apply the pagination arguments to the query.
+  query.orderBy({ name: 1 });
+  const skip = isNumber(input.after) ? input.after : 0;
+  if (skip) {
+    query.after(skip);
+  }
+
+  // Return a connection.
+  return resolveConnection(query, input, (_, index) => index + skip + 1);
+}
+
+export async function retrieveSiteConnection(
+  mongo: Db,
+  tenantID: string,
+  input: SiteConnectionInput
+): Promise<Readonly<Connection<Readonly<Site>>>> {
+  // Create the query.
+  const query = new Query(collection(mongo)).where({ tenantID });
+
+  return retrieveConnection(input, query);
+}
+
+export type UpdateSiteInput = Partial<Omit<CreateSiteInput, "tenantID">>;
+
+export async function updateSite(
+  mongo: Db,
+  tenantID: string,
+  id: string,
+  input: UpdateSiteInput,
+  now = new Date()
+) {
+  const update = {
+    $set: {
+      ...input,
+      updatedAt: now,
+    },
+  };
+  try {
+    const result = await collection(mongo).findOneAndUpdate(
+      { id, tenantID },
+      update,
+      // False to return the updated document instead of the original
+      // document.
+      { returnOriginal: false }
+    );
+    return result.value || null;
+  } catch (err) {
+    // Evaluate the error, if it is in regards to violating the unique index,
+    // then return a duplicate Story error.
+    if (err instanceof MongoError && err.code === 11000) {
+      throw new DuplicateSiteAllowedOriginError(err, id, input.allowedOrigins);
+    }
+
+    throw err;
+  }
+}
+
+export const updateSiteCounts = (
+  mongo: Db,
+  tenantID: string,
+  id: string,
+  commentCounts: FirstDeepPartial<RelatedCommentCounts>
+) => updateRelatedCommentCounts(collection(mongo), tenantID, id, commentCounts);
diff --git a/src/core/server/models/story/counts/empty.ts b/src/core/server/models/story/counts/empty.ts
deleted file mode 100644
index 0529d67d9..000000000
--- a/src/core/server/models/story/counts/empty.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import {
-  CommentModerationCountsPerQueue,
-  CommentModerationQueueCounts,
-} from ".";
-
-export function createEmptyCommentModerationCountsPerQueue(): CommentModerationCountsPerQueue {
-  return {
-    unmoderated: 0,
-    reported: 0,
-    pending: 0,
-  };
-}
-
-export function createEmptyCommentModerationQueueCounts(): CommentModerationQueueCounts {
-  return {
-    total: 0,
-    queues: createEmptyCommentModerationCountsPerQueue(),
-  };
-}
diff --git a/src/core/server/models/story/index.ts b/src/core/server/models/story/index.ts
index 4d00117f2..fcf5c455c 100644
--- a/src/core/server/models/story/index.ts
+++ b/src/core/server/models/story/index.ts
@@ -1,7 +1,7 @@
 import { Db, MongoError } from "mongodb";
 import uuid from "uuid";
 
-import { DeepPartial, Omit } from "coral-common/types";
+import { DeepPartial, FirstDeepPartial, Omit } from "coral-common/types";
 import { dotize } from "coral-common/utils/dotize";
 import {
   DuplicateStoryIDError,
@@ -22,13 +22,12 @@ import {
   GQLStorySettings,
 } from "coral-server/graph/schema/__generated__/types";
 
-import { createEmptyCommentStatusCounts } from "../comment/helpers";
 import {
-  createEmptyCommentModerationQueueCounts,
-  StoryCommentCounts,
-} from "./counts";
+  createEmptyRelatedCommentCounts,
+  RelatedCommentCounts,
+  updateRelatedCommentCounts,
+} from "../comment/counts";
 
-export * from "./counts";
 export * from "./helpers";
 
 export type StorySettings = DeepPartial<
@@ -58,7 +57,7 @@ export interface Story extends TenantResource {
   /**
    * commentCounts stores all the comment counters.
    */
-  commentCounts: StoryCommentCounts;
+  commentCounts: RelatedCommentCounts;
 
   /**
    * settings provides a point where the settings can be overridden for a
@@ -81,17 +80,23 @@ export interface Story extends TenantResource {
    * lastCommentedAt is the last time someone commented on this story.
    */
   lastCommentedAt?: Date;
+
+  /**
+   * siteID references the site the story belongs to
+   */
+  siteID: string;
 }
 
 export interface UpsertStoryInput {
   id?: string;
   url: string;
+  siteID: string;
 }
 
 export async function upsertStory(
   mongo: Db,
   tenantID: string,
-  { id = uuid.v4(), url }: UpsertStoryInput,
+  { id = uuid.v4(), url, siteID }: UpsertStoryInput,
   now = new Date()
 ) {
   // Create the story, optionally sourcing the id from the input, additionally
@@ -100,13 +105,10 @@ export async function upsertStory(
     $setOnInsert: {
       id,
       url,
+      siteID,
       tenantID,
       createdAt: now,
-      commentCounts: {
-        action: {},
-        status: createEmptyCommentStatusCounts(),
-        moderationQueue: createEmptyCommentModerationQueueCounts(),
-      },
+      commentCounts: createEmptyRelatedCommentCounts(),
       settings: {},
     },
   };
@@ -174,10 +176,11 @@ export async function findOrCreateStory(
   mongo: Db,
   tenantID: string,
   { id, url }: FindOrCreateStoryInput,
+  siteID: string | null,
   now = new Date()
 ) {
   if (id) {
-    if (url) {
+    if (url && siteID) {
       // The URL was specified, this is an upsert operation.
       return upsertStory(
         mongo,
@@ -185,12 +188,13 @@ export async function findOrCreateStory(
         {
           id,
           url,
+          siteID,
         },
         now
       );
     }
 
-    // The URL was not specified, this is a lookup operation.
+    // The URL and siteID were not specified, this is a lookup operation.
     return retrieveStory(mongo, tenantID, id);
   }
 
@@ -200,12 +204,18 @@ export async function findOrCreateStory(
     throw new Error("cannot upsert an story without the url");
   }
 
-  return upsertStory(mongo, tenantID, { url }, now);
+  if (!siteID) {
+    throw new Error("cannot upsert story without site ID");
+  }
+
+  return upsertStory(mongo, tenantID, { url, siteID }, now);
 }
 
 export type CreateStoryInput = Partial<
   Pick<Story, "metadata" | "scrapedAt" | "closedAt">
->;
+> & {
+  siteID: string;
+};
 
 export async function createStory(
   mongo: Db,
@@ -222,11 +232,7 @@ export async function createStory(
     url,
     tenantID,
     createdAt: now,
-    commentCounts: {
-      action: {},
-      moderationQueue: createEmptyCommentModerationQueueCounts(),
-      status: createEmptyCommentStatusCounts(),
-    },
+    commentCounts: createEmptyRelatedCommentCounts(),
     settings: {},
   };
 
@@ -291,7 +297,7 @@ export async function retrieveManyStoriesByURL(
 
 export type UpdateStoryInput = Omit<
   Partial<Story>,
-  "id" | "tenantID" | "closedAt" | "createdAt"
+  "id" | "tenantID" | "closedAt" | "createdAt" | "siteID"
 >;
 
 export async function updateStory(
@@ -501,3 +507,18 @@ export async function updateStoryLastCommentedAt(
     }
   );
 }
+
+/**
+ * updateStoryCounts will update the comment counts for the story indicated.
+ *
+ * @param mongo mongodb database handle
+ * @param tenantID ID of the Tenant where the Story is on
+ * @param id the ID of the Story that we are updating counts on
+ * @param commentCounts the counts that we are updating
+ */
+export const updateStoryCounts = (
+  mongo: Db,
+  tenantID: string,
+  id: string,
+  commentCounts: FirstDeepPartial<RelatedCommentCounts>
+) => updateRelatedCommentCounts(collection(mongo), tenantID, id, commentCounts);
diff --git a/src/core/server/models/tenant/tenant.ts b/src/core/server/models/tenant/tenant.ts
index 2d9a53a09..73ed47cf1 100644
--- a/src/core/server/models/tenant/tenant.ts
+++ b/src/core/server/models/tenant/tenant.ts
@@ -39,7 +39,7 @@ export interface TenantResource {
 }
 
 export interface TenantSettings
-  extends Pick<GQLSettings, "domain" | "allowedDomains" | "organization"> {
+  extends Pick<GQLSettings, "domain" | "organization"> {
   readonly id: string;
 
   /**
@@ -65,9 +65,12 @@ export type Tenant = Settings & TenantSettings;
  */
 export type CreateTenantInput = Pick<
   Tenant,
-  "domain" | "allowedDomains" | "locale" | "organization"
+  "domain" | "locale" | "organization"
 >;
 
+export interface TenantComputedProperties {
+  multisite: boolean;
+}
 /**
  * create will create a new Tenant.
  *
diff --git a/src/core/server/models/user/user.ts b/src/core/server/models/user/user.ts
index 83df69d58..dca2d99aa 100644
--- a/src/core/server/models/user/user.ts
+++ b/src/core/server/models/user/user.ts
@@ -1,5 +1,4 @@
 import bcrypt from "bcryptjs";
-import { identity, isEmpty, pickBy } from "lodash";
 import { DateTime, DurationObject } from "luxon";
 import { Db, MongoError } from "mongodb";
 import uuid from "uuid";
@@ -45,6 +44,7 @@ import {
 import {
   CommentStatusCounts,
   createEmptyCommentStatusCounts,
+  updateRelatedCommentCounts,
 } from "../comment";
 import { getLocalProfile, hasLocalProfile } from "./helpers";
 
@@ -2462,31 +2462,9 @@ export async function deleteModeratorNote(
   return result.value;
 }
 
-export async function updateUserCommentCounts(
+export const updateUserCommentCounts = (
   mongo: Db,
   tenantID: string,
   id: string,
   commentCounts: DeepPartial<UserCommentCounts>
-) {
-  // Update all the specific comment moderation queue counts.
-  const update: DeepPartial<User> = { commentCounts };
-  const $inc = pickBy(dotize(update), identity);
-  if (isEmpty($inc)) {
-    // Nothing needs to be incremented, just return the User.
-    return retrieveUser(mongo, tenantID, id);
-  }
-
-  logger.trace({ update: { $inc } }, "incrementing user comment counts");
-
-  const result = await collection(mongo).findOneAndUpdate(
-    { id, tenantID },
-    { $inc },
-    {
-      // False to return the updated document instead of the original
-      // document.
-      returnOriginal: false,
-    }
-  );
-
-  return result.value || null;
-}
+) => updateRelatedCommentCounts(collection(mongo), tenantID, id, commentCounts);
diff --git a/src/core/server/services/comments/actions.ts b/src/core/server/services/comments/actions.ts
index 8ad550381..c9e71bddf 100644
--- a/src/core/server/services/comments/actions.ts
+++ b/src/core/server/services/comments/actions.ts
@@ -2,35 +2,33 @@ import { Db } from "mongodb";
 
 import { Omit } from "coral-common/types";
 import { CommentNotFoundError } from "coral-server/errors";
-import { GQLCOMMENT_FLAG_REPORTED_REASON } from "coral-server/graph/schema/__generated__/types";
 import { Publisher } from "coral-server/graph/subscriptions/publisher";
 import {
   ACTION_TYPE,
-  CommentAction,
   CreateActionInput,
   createActions,
   encodeActionCounts,
+  EncodedCommentActionCounts,
   invertEncodedActionCounts,
   removeAction,
   RemoveActionInput,
   retrieveUserAction,
 } from "coral-server/models/action/comment";
 import {
+  Comment,
   retrieveComment,
   updateCommentActionCounts,
 } from "coral-server/models/comment";
-import { Comment } from "coral-server/models/comment";
 import { getLatestRevision } from "coral-server/models/comment/helpers";
-import {
-  updateStoryActionCounts,
-  updateStoryCounts,
-} from "coral-server/models/story";
 import { Tenant } from "coral-server/models/tenant";
 import { User } from "coral-server/models/user";
-import { publishModerationQueueChanges } from "coral-server/services/events";
 import { AugmentedRedis } from "coral-server/services/redis";
+import {
+  publishChanges,
+  updateAllCommentCounts,
+} from "coral-server/stacks/helpers";
 
-import { calculateCountsDiff } from "./moderation/counts";
+import { GQLCOMMENT_FLAG_REPORTED_REASON } from "coral-server/graph/schema/__generated__/types";
 
 export type CreateAction = CreateActionInput;
 
@@ -54,11 +52,8 @@ export async function addCommentActionCounts(
   mongo: Db,
   tenant: Tenant,
   oldComment: Readonly<Comment>,
-  ...actions: CommentAction[]
+  action: EncodedCommentActionCounts
 ) {
-  // Compute the action counts.
-  const action = encodeActionCounts(...actions);
-
   // Grab the last revision (the most recent).
   const revision = getLatestRevision(oldComment);
 
@@ -81,9 +76,9 @@ export async function addCommentActionCounts(
 async function addCommentAction(
   mongo: Db,
   redis: AugmentedRedis,
-  publish: Publisher,
+  publisher: Publisher,
   tenant: Tenant,
-  input: Omit<CreateActionInput, "storyID">,
+  input: Omit<CreateActionInput, "storyID" | "siteID">,
   now = new Date()
 ): Promise<Readonly<Comment>> {
   const oldComment = await retrieveComment(mongo, tenant.id, input.commentID);
@@ -95,29 +90,37 @@ async function addCommentAction(
   const action: CreateAction = {
     ...input,
     storyID: oldComment.storyID,
+    siteID: oldComment.siteID,
   };
 
   // Update the actions for the comment.
   const commentActions = await addCommentActions(mongo, tenant, [action], now);
   if (commentActions.length > 0) {
+    // Compute the action counts.
+    const actionCounts = encodeActionCounts(...commentActions);
+
     // Update the comment action counts.
     const updatedComment = await addCommentActionCounts(
       mongo,
       tenant,
       oldComment,
-      ...commentActions
+      actionCounts
     );
 
-    const moderationQueue = calculateCountsDiff(oldComment, updatedComment);
-
-    // Calculate the new story counts.
-    await updateStoryCounts(mongo, redis, tenant.id, updatedComment.storyID, {
-      action: encodeActionCounts(...commentActions),
-      moderationQueue,
+    // Update the comment counts onto other documents.
+    const counts = await updateAllCommentCounts(mongo, redis, {
+      tenant,
+      actionCounts,
+      before: oldComment,
+      after: updatedComment,
     });
 
-    // Publish changes to the queue.
-    publishModerationQueueChanges(publish, moderationQueue, updatedComment);
+    // Publish changes to the event publisher.
+    await publishChanges(publisher, {
+      ...counts,
+      before: oldComment,
+      after: updatedComment,
+    });
 
     return updatedComment;
   }
@@ -128,12 +131,13 @@ async function addCommentAction(
 export async function removeCommentAction(
   mongo: Db,
   redis: AugmentedRedis,
+  publisher: Publisher,
   tenant: Tenant,
   input: Omit<RemoveActionInput, "commentRevisionID" | "reason">
 ): Promise<Readonly<Comment>> {
   // Get the Comment that we are leaving the Action on.
-  const comment = await retrieveComment(mongo, tenant.id, input.commentID);
-  if (!comment) {
+  const oldComment = await retrieveComment(mongo, tenant.id, input.commentID);
+  if (!oldComment) {
     throw new CommentNotFoundError(input.commentID);
   }
 
@@ -147,7 +151,7 @@ export async function removeCommentAction(
   );
   if (!action) {
     // The action that is trying to get removed does not exist!
-    return comment;
+    return oldComment;
   }
 
   // Grab the revision ID out of the action.
@@ -172,29 +176,31 @@ export async function removeCommentAction(
       actionCounts
     );
 
-    // Flags can't be removed, an that is the only type of operation that will
-    // affect the moderation queue counts, so we don't have to interact with
-    // updating the moderation queue counts.
-
-    // Update the Story with the updated action counts.
-    await updateStoryActionCounts(
-      mongo,
-      redis,
-      tenant.id,
-      comment.storyID,
-      actionCounts
-    );
-
     // Check to see if there was an actual comment returned.
     if (!updatedComment) {
       // TODO: (wyattjoh) return a better error.
       throw new Error("could not update comment action counts");
     }
 
+    // Update the comment counts onto other documents.
+    const counts = await updateAllCommentCounts(mongo, redis, {
+      tenant,
+      actionCounts,
+      before: oldComment,
+      after: updatedComment,
+    });
+
+    // Publish changes to the event publisher.
+    await publishChanges(publisher, {
+      ...counts,
+      before: oldComment,
+      after: updatedComment,
+    });
+
     return updatedComment;
   }
 
-  return comment;
+  return oldComment;
 }
 
 export type CreateCommentReaction = Pick<
@@ -231,11 +237,12 @@ export type RemoveCommentReaction = Pick<RemoveActionInput, "commentID">;
 export async function removeReaction(
   mongo: Db,
   redis: AugmentedRedis,
+  publisher: Publisher,
   tenant: Tenant,
   author: User,
   input: RemoveCommentReaction
 ) {
-  return removeCommentAction(mongo, redis, tenant, {
+  return removeCommentAction(mongo, redis, publisher, tenant, {
     actionType: ACTION_TYPE.REACTION,
     commentID: input.commentID,
     userID: author.id,
@@ -277,11 +284,12 @@ export type RemoveCommentDontAgree = Pick<RemoveActionInput, "commentID">;
 export async function removeDontAgree(
   mongo: Db,
   redis: AugmentedRedis,
+  publisher: Publisher,
   tenant: Tenant,
   author: User,
   input: RemoveCommentDontAgree
 ) {
-  return removeCommentAction(mongo, redis, tenant, {
+  return removeCommentAction(mongo, redis, publisher, tenant, {
     actionType: ACTION_TYPE.DONT_AGREE,
     commentID: input.commentID,
     userID: author.id,
diff --git a/src/core/server/services/comments/moderation/counts.ts b/src/core/server/services/comments/moderation/counts.ts
index d3a23a726..f058dec64 100644
--- a/src/core/server/services/comments/moderation/counts.ts
+++ b/src/core/server/services/comments/moderation/counts.ts
@@ -1,7 +1,10 @@
-import { GQLCOMMENT_STATUS } from "coral-server/graph/schema/__generated__/types";
 import { decodeActionCounts } from "coral-server/models/action/comment";
-import { Comment } from "coral-server/models/comment";
-import { CommentModerationQueueCounts } from "coral-server/models/story";
+import {
+  Comment,
+  CommentModerationQueueCounts,
+} from "coral-server/models/comment";
+
+import { GQLCOMMENT_STATUS } from "coral-server/graph/schema/__generated__/types";
 
 export const UNMODERATED_STATUSES = [
   GQLCOMMENT_STATUS.NONE,
diff --git a/src/core/server/services/comments/pipeline/pipeline.ts b/src/core/server/services/comments/pipeline/pipeline.ts
index c4e834428..91b4815bf 100644
--- a/src/core/server/services/comments/pipeline/pipeline.ts
+++ b/src/core/server/services/comments/pipeline/pipeline.ts
@@ -22,7 +22,7 @@ import { moderationPhases } from "./phases";
 
 export type ModerationAction = Omit<
   CreateActionInput,
-  "commentID" | "commentRevisionID" | "storyID"
+  "commentID" | "commentRevisionID" | "storyID" | "siteID"
 >;
 
 export interface PhaseResult {
diff --git a/src/core/server/services/events/comments.ts b/src/core/server/services/events/comments.ts
index 8ee8cc17f..46b46f3a6 100644
--- a/src/core/server/services/events/comments.ts
+++ b/src/core/server/services/events/comments.ts
@@ -1,11 +1,12 @@
 import { SUBSCRIPTION_CHANNELS } from "coral-server/graph/resolvers/Subscription/types";
+import { Publisher } from "coral-server/graph/subscriptions/publisher";
+import { Comment, hasPublishedStatus } from "coral-server/models/comment";
+import { CommentModerationQueueCounts } from "coral-server/models/comment/counts";
+
 import {
   GQLCOMMENT_STATUS,
   GQLMODERATION_QUEUE,
 } from "coral-server/graph/schema/__generated__/types";
-import { Publisher } from "coral-server/graph/subscriptions/publisher";
-import { Comment, hasPublishedStatus } from "coral-server/models/comment";
-import { CommentModerationQueueCounts } from "coral-server/models/story/counts";
 
 export function publishCommentStatusChanges(
   publish: Publisher,
diff --git a/src/core/server/services/migrate/batch.ts b/src/core/server/services/migrate/batch.ts
new file mode 100644
index 000000000..b84f38325
--- /dev/null
+++ b/src/core/server/services/migrate/batch.ts
@@ -0,0 +1,80 @@
+import { Collection, FilterQuery, UpdateQuery } from "mongodb";
+
+import { Logger } from "coral-server/logger";
+import { TenantResource } from "coral-server/models/tenant";
+
+interface UpdateOneOperation<T> {
+  updateOne: {
+    filter: FilterQuery<T>;
+    update: UpdateQuery<T>;
+  };
+}
+
+type Operation<T> = UpdateOneOperation<T>;
+
+class Batch<T extends TenantResource> {
+  private readonly logger: Logger;
+  private readonly collection: Collection<T>;
+  private readonly maxBatchSize: number;
+  private readonly tenantID: string;
+  private updates: Array<Operation<T>> = [];
+
+  constructor(
+    logger: Logger,
+    collection: Collection<T>,
+    maxBatchSize: number,
+    tenantID: string
+  ) {
+    this.logger = logger;
+    this.collection = collection;
+    this.maxBatchSize = maxBatchSize;
+    this.tenantID = tenantID;
+  }
+
+  private async execute() {
+    // Write out the updates, indicating that the writes can occur out of order.
+    const result = await this.collection.bulkWrite(this.updates, {
+      ordered: false,
+    });
+
+    this.logger.info(
+      {
+        updates: this.updates.length,
+        matchedCount: result.matchedCount,
+        modifiedCount: result.modifiedCount,
+        collection: this.collection.collectionName,
+      },
+      "executed bulk write for batch operation"
+    );
+
+    // Clear the pending updates.
+    this.updates = [];
+  }
+
+  public async add(filter: FilterQuery<T>, update: UpdateQuery<T>) {
+    // Add the update to the list of updates.
+    this.updates.push({
+      updateOne: {
+        filter: {
+          // Merge the filter in with the tenantID.
+          ...filter,
+          tenantID: this.tenantID,
+        },
+        update,
+      },
+    });
+
+    // Check to see if we need to execute this batch.
+    if (this.updates.length >= this.maxBatchSize) {
+      await this.execute();
+    }
+  }
+
+  public async finish() {
+    if (this.updates.length > 0) {
+      await this.execute();
+    }
+  }
+}
+
+export default Batch;
diff --git a/src/core/server/services/migrate/migration.ts b/src/core/server/services/migrate/migration.ts
index 4c00d8f5c..a6ccd52b6 100644
--- a/src/core/server/services/migrate/migration.ts
+++ b/src/core/server/services/migrate/migration.ts
@@ -1,9 +1,12 @@
 import Logger from "bunyan";
-import { Db } from "mongodb";
+import { Collection, Db } from "mongodb";
 
 import logger from "coral-server/logger";
+import { TenantResource } from "coral-server/models/tenant";
 import { I18n } from "coral-server/services/i18n";
 
+import Batch from "./batch";
+
 interface Migration {
   indexes?(mongo: Db): Promise<void>;
   up?(mongo: Db, tenantID: string): Promise<void>;
@@ -26,7 +29,7 @@ abstract class Migration {
   /**
    * disabled when true will not run the migration.
    */
-  public static disabled?: boolean;
+  public static readonly disabled?: boolean;
 
   constructor({ id, name, i18n }: MigrationOptions) {
     this.id = id;
@@ -44,6 +47,14 @@ abstract class Migration {
   protected log(tenantID: string) {
     return this.logger.child({ tenantID }, true);
   }
+
+  protected batch<T extends TenantResource>(
+    collection: Collection<T>,
+    tenantID: string,
+    size = 500
+  ) {
+    return new Batch(this.log(tenantID), collection, size, tenantID);
+  }
 }
 
 export default Migration;
diff --git a/src/core/server/services/migrate/migrations/1579189174931_create_sites.ts b/src/core/server/services/migrate/migrations/1579189174931_create_sites.ts
new file mode 100644
index 000000000..bde2efb0d
--- /dev/null
+++ b/src/core/server/services/migrate/migrations/1579189174931_create_sites.ts
@@ -0,0 +1,235 @@
+import { Db } from "mongodb";
+
+import { dotize } from "coral-common/utils/dotize";
+import {
+  ACTION_TYPE,
+  encodeActionCountKeys,
+  EncodedCommentActionCounts,
+  FLAG_REASON,
+  mergeCommentActionCounts,
+} from "coral-server/models/action/comment";
+import {
+  createEmptyRelatedCommentCounts,
+  mergeCommentModerationQueueCount,
+  mergeCommentStatusCount,
+} from "coral-server/models/comment";
+import {
+  createSite,
+  getURLOrigins,
+  Site,
+  updateSiteCounts,
+} from "coral-server/models/site";
+import { Tenant } from "coral-server/models/tenant";
+import Migration from "coral-server/services/migrate/migration";
+import collections from "coral-server/services/mongodb/collections";
+
+import { MigrationError } from "../error";
+
+interface OldTenant extends Tenant {
+  allowedDomains: string[];
+}
+
+export default class extends Migration {
+  private async createSite(mongo: Db, tenant: Readonly<OldTenant>) {
+    const {
+      organization: { name },
+      domain,
+      allowedDomains,
+    } = tenant;
+
+    // Convert a tenant's domains into origins that we will re-use on the site.
+    const allowedOrigins = getURLOrigins([...allowedDomains, domain]);
+
+    // Create the new site.
+    const site = await createSite(mongo, {
+      name,
+      tenantID: tenant.id,
+      allowedOrigins,
+    });
+
+    this.logger.info({ site }, "created site");
+
+    // Add the siteID to all the stories.
+    let result = await collections
+      .stories(mongo)
+      .updateMany({ tenantID: tenant.id }, { $set: { siteID: site.id } });
+
+    this.log(tenant.id).info(
+      {
+        matchedCount: result.matchedCount,
+        modifiedCount: result.modifiedCount,
+      },
+      "added siteID to stories"
+    );
+
+    // Add the siteID to all comments.
+    result = await collections
+      .comments(mongo)
+      .updateMany({ tenantID: tenant.id }, { $set: { siteID: site.id } });
+
+    this.log(tenant.id).info(
+      {
+        matchedCount: result.matchedCount,
+        modifiedCount: result.modifiedCount,
+      },
+      "added siteID to comments"
+    );
+
+    // Add the siteID to all commentActions.
+    result = await collections
+      .commentActions(mongo)
+      .updateMany({ tenantID: tenant.id }, { $set: { siteID: site.id } });
+
+    this.log(tenant.id).info(
+      {
+        matchedCount: result.matchedCount,
+        modifiedCount: result.modifiedCount,
+      },
+      "added siteID to commentActions"
+    );
+
+    return site;
+  }
+
+  private async updateStoryActionCommentCounts(mongo: Db, tenant: Tenant) {
+    // Create the batch writer.
+    const batch = this.batch(collections.stories(mongo), tenant.id);
+
+    // Recalculate the action counts for the stories.
+    const cursor = collections
+      .commentActions<{
+        _id: string;
+        actions: {
+          actionType: ACTION_TYPE;
+          reason?: FLAG_REASON;
+          sum: number;
+        }[];
+      }>(mongo)
+      .aggregate([
+        // Find all actions related to this Tenant.
+        { $match: { tenantID: tenant.id } },
+        // Group and count them to collect all the actions related to each
+        // action type, reason, and story.
+        {
+          $group: {
+            _id: {
+              storyID: "$storyID",
+              actionType: "$actionType",
+              reason: "$reason",
+            },
+            sum: { $sum: 1 },
+          },
+        },
+        // Group all the entries from storyID together now, and collect their
+        // action summaries.
+        {
+          $group: {
+            _id: "$_id.storyID",
+            actions: {
+              $push: {
+                actionType: "$_id.actionType",
+                reason: "$_id.reason",
+                sum: "$sum",
+              },
+            },
+          },
+        },
+      ]);
+
+    while (await cursor.hasNext()) {
+      const doc = await cursor.next();
+      if (!doc) {
+        break;
+      }
+
+      // Encode these actions.
+      const encodedActionCounts: EncodedCommentActionCounts = {};
+      for (const action of doc.actions) {
+        for (const key of encodeActionCountKeys(action)) {
+          if (key in encodedActionCounts) {
+            encodedActionCounts[key] += action.sum;
+          } else {
+            encodedActionCounts[key] = action.sum;
+          }
+        }
+      }
+
+      // Push the update and process it if we need to.
+      await batch.add(
+        // Find the story by ID.
+        { id: doc._id },
+        // Dotize set the action counts on the story.
+        { $set: dotize(encodedActionCounts) }
+      );
+    }
+
+    // Finish the batch.
+    await batch.finish();
+  }
+
+  private async updateCommentCounts(mongo: Db, tenant: Tenant, site: Site) {
+    // Create a cursor for going through all the stories. That way we can find
+    // all the actions that we can collect in one action.
+    const cursor = collections.stories(mongo).find({ tenantID: tenant.id });
+
+    // Begin accumulating comment counts for the site.
+    const counts = createEmptyRelatedCommentCounts();
+
+    // Walk over every story, collecting and aggregating the comment counts.
+    while (await cursor.hasNext()) {
+      // Grab the story from the cursor.
+      const story = await cursor.next();
+      if (!story) {
+        break;
+      }
+
+      // Update the action counts.
+      counts.action = mergeCommentActionCounts(
+        counts.action,
+        story.commentCounts.action
+      );
+
+      // Update the status counts.
+      counts.status = mergeCommentStatusCount(
+        counts.status,
+        story.commentCounts.status
+      );
+
+      // Update the moderation queue counts.
+      counts.moderationQueue = mergeCommentModerationQueueCount(
+        counts.moderationQueue,
+        story.commentCounts.moderationQueue
+      );
+    }
+
+    // Update the site with the new comment counts.
+    await updateSiteCounts(mongo, tenant.id, site.id, counts);
+  }
+
+  public async up(mongo: Db, tenantID: string) {
+    const tenant = await collections
+      .tenants<OldTenant>(mongo)
+      .findOne({ id: tenantID });
+    if (!tenant) {
+      throw new MigrationError(tenantID, "could not find tenant", "tenants", [
+        tenantID,
+      ]);
+    }
+
+    // Try to find any site to see if this migration is needed.
+    let site = await collections.sites(mongo).findOne({ tenantID });
+    if (site) {
+      this.log(tenantID).info({ site }, "site has already been created");
+      return;
+    }
+
+    // Create the site.
+    site = await this.createSite(mongo, tenant);
+
+    // Update the story action counts on the stories.
+    await this.updateStoryActionCommentCounts(mongo, tenant);
+
+    // Update the site comment counts from the stories.
+    await this.updateCommentCounts(mongo, tenant, site);
+  }
+}
diff --git a/src/core/server/services/migrate/migrations/1579878509162_add_indexes_to_sites.ts b/src/core/server/services/migrate/migrations/1579878509162_add_indexes_to_sites.ts
new file mode 100644
index 000000000..63cfdbe00
--- /dev/null
+++ b/src/core/server/services/migrate/migrations/1579878509162_add_indexes_to_sites.ts
@@ -0,0 +1,17 @@
+import { Db } from "mongodb";
+
+// Use the following collections reference to interact with specific
+// collections.
+import collections from "coral-server/services/mongodb/collections";
+
+import Migration from "coral-server/services/migrate/migration";
+import { createIndexFactory } from "../indexing";
+
+export default class extends Migration {
+  public async indexes(mongo: Db) {
+    const createIndex = createIndexFactory(collections.sites(mongo));
+    await createIndex({ tenantID: 1, id: 1 }, { background: true });
+    await createIndex({ tenantID: 1, allowedOrigins: 1 }, { unique: true });
+    await createIndex({ tenantID: 1, name: 1 }, { background: true });
+  }
+}
diff --git a/src/core/server/services/mongodb/collections.ts b/src/core/server/services/mongodb/collections.ts
index b07996eed..4890f2824 100644
--- a/src/core/server/services/mongodb/collections.ts
+++ b/src/core/server/services/mongodb/collections.ts
@@ -1,11 +1,11 @@
-import { createCollection } from "coral-server/models/helpers";
-
 import { CommentAction } from "coral-server/models/action/comment";
 import { CommentModerationAction } from "coral-server/models/action/moderation/comment";
 import { Comment } from "coral-server/models/comment";
+import { createCollection } from "coral-server/models/helpers";
 import { Invite } from "coral-server/models/invite";
 import { MigrationRecord } from "coral-server/models/migration";
 import { PersistedQuery } from "coral-server/models/queries";
+import { Site } from "coral-server/models/site";
 import { Story } from "coral-server/models/story";
 import { Tenant } from "coral-server/models/tenant";
 import { User } from "coral-server/models/user";
@@ -22,6 +22,8 @@ export const stories = createCollection<Story>("stories");
 
 export const commentActions = createCollection<CommentAction>("commentActions");
 
+export const sites = createCollection<Site>("sites");
+
 export const commentModerationActions = createCollection<
   CommentModerationAction
 >("commentModerationActions");
@@ -40,6 +42,7 @@ const collections = {
   commentModerationActions,
   queries,
   migrations,
+  sites,
 };
 
 export default collections;
diff --git a/src/core/server/services/sites/index.ts b/src/core/server/services/sites/index.ts
new file mode 100644
index 000000000..14f82f832
--- /dev/null
+++ b/src/core/server/services/sites/index.ts
@@ -0,0 +1,72 @@
+import { Db } from "mongodb";
+
+import { Omit } from "coral-common/types";
+import { getOrigin } from "coral-server/app/url";
+import {
+  createSite,
+  CreateSiteInput,
+  getURLOrigins,
+  retrieveSiteByOrigin,
+  updateSite,
+  UpdateSiteInput,
+} from "coral-server/models/site";
+import { Tenant } from "coral-server/models/tenant";
+
+type CreateSite = Omit<CreateSiteInput, "tenantID">;
+
+export async function findSiteByURL(mongo: Db, tenantID: string, url: string) {
+  const origin = getOrigin(url);
+  if (!origin) {
+    return null;
+  }
+
+  return retrieveSiteByOrigin(mongo, tenantID, origin);
+}
+
+function conformURLToOrigins(allowedOrigins?: string[]) {
+  if (allowedOrigins) {
+    return {
+      allowedOrigins: getURLOrigins(allowedOrigins),
+    };
+  }
+
+  return {};
+}
+
+export async function create(
+  mongo: Db,
+  tenant: Tenant,
+  input: CreateSite,
+  now = new Date()
+) {
+  // Create the new site.
+  return createSite(
+    mongo,
+    {
+      ...input,
+      ...conformURLToOrigins(input.allowedOrigins),
+      tenantID: tenant.id,
+    },
+    now
+  );
+}
+
+export const update = (
+  mongo: Db,
+  tenant: Tenant,
+  id: string,
+  input: UpdateSiteInput,
+  now = new Date()
+) => {
+  // Update the site.
+  return updateSite(
+    mongo,
+    tenant.id,
+    id,
+    {
+      ...input,
+      ...conformURLToOrigins(input.allowedOrigins),
+    },
+    now
+  );
+};
diff --git a/src/core/server/services/sites/url.spec.ts b/src/core/server/services/sites/url.spec.ts
new file mode 100644
index 000000000..bf0ffacb5
--- /dev/null
+++ b/src/core/server/services/sites/url.spec.ts
@@ -0,0 +1,82 @@
+import { Site } from "coral-server/models/site";
+
+import { isURLPermitted } from "./url";
+
+type PartialSite = Pick<Site, "allowedOrigins">;
+
+function createSite(input: Partial<PartialSite> = {}): PartialSite {
+  if (!input.allowedOrigins) {
+    input.allowedOrigins = [];
+  }
+
+  return input as PartialSite;
+}
+
+it("denies when the site has no specified domains", () => {
+  const site = { allowedOrigins: [] };
+
+  expect(isURLPermitted(site, "")).toEqual(false);
+});
+
+it("denies when site has a domain but not a valid url", () => {
+  const site = createSite({ allowedOrigins: ["https://coralproject.net"] });
+
+  expect(isURLPermitted(site, "")).toEqual(false);
+});
+
+it("denies when there are multiple sites allowedOrigins and not a valid url", () => {
+  const site = createSite({
+    allowedOrigins: [
+      "https://coralproject.net",
+      "https://news.coralproject.net",
+    ],
+  });
+
+  expect(isURLPermitted(site, "")).toEqual(false);
+});
+
+it("denies when there are multiple sites allowedOrigins and a invalid url", () => {
+  const site = createSite({
+    allowedOrigins: [
+      "https://coralproject.net",
+      "https://news.coralproject.net",
+    ],
+  });
+
+  expect(isURLPermitted(site, "https://blog.coralproject.net/a/page")).toEqual(
+    false
+  );
+});
+
+it("allows when there are multiple sites allowedOrigins and a valid url", () => {
+  const site = createSite({
+    allowedOrigins: [
+      "https://coralproject.net",
+      "https://news.coralproject.net",
+    ],
+  });
+
+  expect(isURLPermitted(site, "https://news.coralproject.net/a/page")).toEqual(
+    true
+  );
+});
+
+it("allows when there are multiple prefix allowedOrigins and a valid url", () => {
+  const site = createSite({
+    allowedOrigins: ["coralproject.net", "news.coralproject.net"],
+  });
+
+  expect(isURLPermitted(site, "http://news.coralproject.net/a/page")).toEqual(
+    true
+  );
+});
+
+it("allows when there are some prefix allowedOrigins and a valid url", () => {
+  const site = createSite({
+    allowedOrigins: ["http://coralproject.net", "news.coralproject.net"],
+  });
+
+  expect(isURLPermitted(site, "https://news.coralproject.net/a/page")).toEqual(
+    true
+  );
+});
diff --git a/src/core/server/services/tenant/url.ts b/src/core/server/services/sites/url.ts
similarity index 79%
rename from src/core/server/services/tenant/url.ts
rename to src/core/server/services/sites/url.ts
index 609b66e57..082f10797 100644
--- a/src/core/server/services/tenant/url.ts
+++ b/src/core/server/services/sites/url.ts
@@ -4,16 +4,16 @@ import {
   isURLSecure,
   prefixSchemeIfRequired,
 } from "coral-server/app/url";
-import { Tenant } from "coral-server/models/tenant";
+import { Site } from "coral-server/models/site";
 
 export function isURLPermitted(
-  tenant: Pick<Tenant, "allowedDomains">,
+  site: Pick<Site, "allowedOrigins">,
   targetURL: string,
   includeTenantDomain?: false
 ): boolean;
 
 export function isURLPermitted(
-  tenant: Pick<Tenant, "allowedDomains" | "domain">,
+  site: Pick<Site, "allowedOrigins">,
   targetURL: string,
   includeTenantDomain: true
 ): boolean;
@@ -23,13 +23,13 @@ export function isURLPermitted(
  * the Tenant's domain configuration.
  */
 export function isURLPermitted(
-  tenant: Pick<Tenant, "allowedDomains" | "domain">,
+  site: Pick<Site, "allowedOrigins">,
   targetURL: string,
   includeTenantDomain = false
 ) {
   // If there aren't any domains, then we reject it, because no url we have can
   // satisfy those requirements.
-  if (tenant.allowedDomains.length === 0 && !includeTenantDomain) {
+  if (site.allowedOrigins.length === 0 && !includeTenantDomain) {
     return false;
   }
 
@@ -47,9 +47,7 @@ export function isURLPermitted(
   const targetOrigin = getOrigin(targetURL);
 
   // Create the list of domains to check against.
-  const domains = includeTenantDomain
-    ? [tenant.domain, ...tenant.allowedDomains]
-    : tenant.allowedDomains;
+  const domains = site.allowedOrigins;
 
   // Loop over all the Tenant domains provided. Prefix the domain of each if it
   // is required with the target url scheme. Return if at least one match is
diff --git a/src/core/server/services/stories/index.ts b/src/core/server/services/stories/index.ts
index 76ebea9c7..8edbd0dd9 100644
--- a/src/core/server/services/stories/index.ts
+++ b/src/core/server/services/stories/index.ts
@@ -1,21 +1,23 @@
-import { uniq, zip } from "lodash";
+import { uniq } from "lodash";
 import { Db } from "mongodb";
 
+import isNonNullArray from "coral-common/helpers/isNonNullArray";
 import { Config } from "coral-server/config";
 import { StoryURLInvalidError } from "coral-server/errors";
 import logger from "coral-server/logger";
 import {
-  countTotalActionCounts,
   mergeCommentActionCounts,
   mergeManyStoryActions,
   removeStoryActions,
 } from "coral-server/models/action/comment";
 import {
+  calculateTotalCommentCount,
+  mergeCommentModerationQueueCount,
+  mergeCommentStatusCount,
   mergeManyCommentStories,
   removeStoryComments,
 } from "coral-server/models/comment";
 import {
-  calculateTotalCommentCount,
   closeStory,
   createStory,
   CreateStoryInput,
@@ -23,7 +25,6 @@ import {
   FindOrCreateStoryInput,
   findStory,
   FindStoryInput,
-  mergeCommentStatusCount,
   openStory,
   removeStories,
   removeStory,
@@ -31,31 +32,19 @@ import {
   retrieveStory,
   Story,
   updateStory,
-  updateStoryActionCounts,
-  updateStoryCommentStatusCount,
+  updateStoryCounts,
   UpdateStoryInput,
   updateStorySettings,
   UpdateStorySettingsInput,
 } from "coral-server/models/story";
 import { Tenant } from "coral-server/models/tenant";
 import { ScraperQueue } from "coral-server/queue/tasks/scraper";
+import { findSiteByURL } from "coral-server/services/sites";
 import { scrape } from "coral-server/services/stories/scraper";
 
-import { AugmentedRedis } from "../redis";
-import { isURLPermitted } from "../tenant/url";
-
 export type FindStory = FindStoryInput;
 
 export async function find(mongo: Db, tenant: Tenant, input: FindStory) {
-  // If the URL is provided, and the url is not on a allowed domain, then refuse
-  // to create the Asset.
-  if (input.url && !isURLPermitted(tenant, input.url)) {
-    throw new StoryURLInvalidError({
-      storyURL: input.url,
-      allowedDomains: tenant.allowedDomains,
-    });
-  }
-
   return findStory(mongo, tenant.id, input);
 }
 
@@ -68,16 +57,20 @@ export async function findOrCreate(
   scraper: ScraperQueue,
   now = new Date()
 ) {
-  // If the URL is provided, and the url is not on a allowed domain, then refuse
-  // to create the Asset.
-  if (input.url && !isURLPermitted(tenant, input.url)) {
-    throw new StoryURLInvalidError({
-      storyURL: input.url,
-      allowedDomains: tenant.allowedDomains,
-    });
+  let siteID = null;
+  if (input.url) {
+    const site = await findSiteByURL(mongo, tenant.id, input.url);
+    // If the URL is provided, and the url is not associated with a site, then refuse
+    // to create the Asset.
+    if (!site) {
+      throw new StoryURLInvalidError({
+        storyURL: input.url,
+      });
+    }
+    siteID = site.id;
   }
 
-  const story = await findOrCreateStory(mongo, tenant.id, input, now);
+  const story = await findOrCreateStory(mongo, tenant.id, input, siteID, now);
   if (!story) {
     return null;
   }
@@ -159,7 +152,10 @@ export async function remove(
   return removedStory;
 }
 
-export type CreateStory = CreateStoryInput;
+// export type CreateStory = CreateStoryInput;
+export type CreateStory = Partial<
+  Pick<Story, "metadata" | "scrapedAt" | "closedAt" | "siteID">
+>;
 
 export async function create(
   mongo: Db,
@@ -170,16 +166,17 @@ export async function create(
   { metadata, closedAt }: CreateStory,
   now = new Date()
 ) {
-  // Ensure that the given URL is allowed.
-  if (!isURLPermitted(tenant, storyURL)) {
+  const site = await findSiteByURL(mongo, tenant.id, storyURL);
+  // // If the URL is provided, and the url is not associated with a site, then refuse
+  // // to create the Asset.
+  if (!site) {
     throw new StoryURLInvalidError({
       storyURL,
-      allowedDomains: tenant.allowedDomains,
     });
   }
 
   // Construct the input payload.
-  const input: CreateStoryInput = { metadata, closedAt };
+  const input: CreateStoryInput = { metadata, closedAt, siteID: site.id };
   if (metadata) {
     input.scrapedAt = now;
   }
@@ -211,12 +208,15 @@ export async function update(
   input: UpdateStory,
   now = new Date()
 ) {
-  // Ensure that the given URL is allowed.
-  if (input.url && !isURLPermitted(tenant, input.url)) {
-    throw new StoryURLInvalidError({
-      storyURL: input.url,
-      allowedDomains: tenant.allowedDomains,
-    });
+  if (input.url) {
+    const site = await findSiteByURL(mongo, tenant.id, input.url);
+    // // If the URL is provided, and the url is not associated with a site, then refuse
+    // // to update the Asset.
+    if (!site) {
+      throw new StoryURLInvalidError({
+        storyURL: input.url,
+      });
+    }
   }
 
   return updateStory(mongo, tenant.id, storyID, input, now);
@@ -253,19 +253,12 @@ export async function close(
 
 export async function merge(
   mongo: Db,
-  redis: AugmentedRedis,
   tenant: Tenant,
   destinationID: string,
   sourceIDs: string[]
 ) {
   // Create a logger for this operation.
-  const log = logger.child(
-    {
-      destinationID,
-      sourceIDs,
-    },
-    true
-  );
+  const log = logger.child({ destinationID, sourceIDs }, true);
 
   if (sourceIDs.length === 0) {
     log.warn("cannot merge from 0 stories");
@@ -280,22 +273,13 @@ export async function merge(
 
   // Get the stories referenced.
   const stories = await retrieveManyStories(mongo, tenant.id, storyIDs);
+  if (!isNonNullArray(stories)) {
+    throw new Error("cannot find all the stories");
+  }
 
-  // Ensure that these are all defined.
-  if (
-    zip(storyIDs, stories).some(([storyID, story]) => {
-      if (!story) {
-        log.warn(
-          { storyID },
-          "story that was going to be merged was not found"
-        );
-        return true;
-      }
-
-      return false;
-    })
-  ) {
-    return null;
+  // We can only merge stories if they are all on the same site.
+  if (uniq(stories.map(({ siteID }) => siteID)).length > 1) {
+    throw new Error("cannot merge stories on different sites");
   }
 
   // Move all the comment's from the source stories over to the destination
@@ -323,40 +307,33 @@ export async function merge(
   // Merge the comment and action counts for all the source stories.
   const [, ...sourceStories] = stories;
 
-  let destinationStory = await updateStoryCommentStatusCount(
+  // Compute the new comment counts from the old stories.
+  const commentCounts = {
+    status: mergeCommentStatusCount(
+      ...sourceStories.map(s => s.commentCounts.status)
+    ),
+    moderationQueue: mergeCommentModerationQueueCount(
+      ...sourceStories.map(s => s.commentCounts.moderationQueue)
+    ),
+    action: mergeCommentActionCounts(
+      ...sourceStories.map(s => s.commentCounts.action)
+    ),
+  };
+
+  // Update the story that was the destination of the merge.
+  const destinationStory = await updateStoryCounts(
     mongo,
-    redis,
     tenant.id,
     destinationID,
-    mergeCommentStatusCount(
-      // We perform the type assertion here because above, we already verified
-      // that none of the stories are null.
-      (sourceStories as Story[]).map(({ commentCounts: { status } }) => status)
-    )
+    commentCounts
   );
-
-  const mergedActionCounts = mergeCommentActionCounts(
-    // We perform the type assertion here because above, we already verified
-    // that none of the stories are null.
-    ...(sourceStories as Story[]).map(({ commentCounts: { action } }) => action)
-  );
-  if (countTotalActionCounts(mergedActionCounts) > 0) {
-    destinationStory = await updateStoryActionCounts(
-      mongo,
-      redis,
-      tenant.id,
-      destinationID,
-      mergedActionCounts
-    );
-  }
-
   if (!destinationStory) {
     log.warn("destination story cannot be updated with new comment counts");
     return null;
   }
 
   log.debug(
-    { commentCounts: destinationStory.commentCounts.status },
+    { commentCounts: destinationStory.commentCounts },
     "updated destination story with new comment counts"
   );
 
diff --git a/src/core/server/services/tenant/url.spec.ts b/src/core/server/services/tenant/url.spec.ts
deleted file mode 100644
index cc1637fa9..000000000
--- a/src/core/server/services/tenant/url.spec.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import { Tenant } from "coral-server/models/tenant";
-import { isURLPermitted } from "coral-server/services/tenant/url";
-
-type PartialTenant = Pick<Tenant, "allowedDomains" | "domain">;
-
-function createTenant(input: Partial<PartialTenant> = {}): PartialTenant {
-  if (!input.domain) {
-    input.domain = "";
-  }
-
-  if (!input.allowedDomains) {
-    input.allowedDomains = [];
-  }
-
-  return input as PartialTenant;
-}
-
-it("denies when the tenant has no specified domains", () => {
-  const tenant = { allowedDomains: [] };
-
-  expect(isURLPermitted(tenant, "")).toEqual(false);
-});
-
-it("denies when tenant has a domain but not a valid url", () => {
-  const tenant = createTenant({ allowedDomains: ["https://coralproject.net"] });
-
-  expect(isURLPermitted(tenant, "")).toEqual(false);
-});
-
-it("denies when there are multiple tenants allowedDomains and not a valid url", () => {
-  const tenant = createTenant({
-    allowedDomains: [
-      "https://coralproject.net",
-      "https://news.coralproject.net",
-    ],
-  });
-
-  expect(isURLPermitted(tenant, "")).toEqual(false);
-});
-
-it("denies when there are multiple tenants allowedDomains and a invalid url", () => {
-  const tenant = createTenant({
-    allowedDomains: [
-      "https://coralproject.net",
-      "https://news.coralproject.net",
-    ],
-  });
-
-  expect(
-    isURLPermitted(tenant, "https://blog.coralproject.net/a/page")
-  ).toEqual(false);
-});
-
-it("allows when there are multiple tenants allowedDomains and a valid url", () => {
-  const tenant = createTenant({
-    allowedDomains: [
-      "https://coralproject.net",
-      "https://news.coralproject.net",
-    ],
-  });
-
-  expect(
-    isURLPermitted(tenant, "https://news.coralproject.net/a/page")
-  ).toEqual(true);
-});
-
-it("allows when there are multiple prefix allowedDomains and a valid url", () => {
-  const tenant = createTenant({
-    allowedDomains: ["coralproject.net", "news.coralproject.net"],
-  });
-
-  expect(isURLPermitted(tenant, "http://news.coralproject.net/a/page")).toEqual(
-    true
-  );
-});
-
-it("allows when there are some prefix allowedDomains and a valid url", () => {
-  const tenant = createTenant({
-    allowedDomains: ["http://coralproject.net", "news.coralproject.net"],
-  });
-
-  expect(
-    isURLPermitted(tenant, "https://news.coralproject.net/a/page")
-  ).toEqual(true);
-});
-
-it("allows and validates with the tenant domain", () => {
-  const tenant = createTenant({
-    domain: "coralproject.net",
-  });
-
-  expect(
-    isURLPermitted(tenant, "https://coralproject.net/admin/login", true)
-  ).toEqual(true);
-});
-
-it("denies and validates with the tenant domain", () => {
-  const tenant = createTenant({
-    domain: "coral.coralproject.net",
-  });
-
-  expect(
-    isURLPermitted(tenant, "https://coralproject.net/admin/login", true)
-  ).toEqual(false);
-});
diff --git a/src/core/server/stacks/approveComment.ts b/src/core/server/stacks/approveComment.ts
index d4dd1f16b..91e6aeea2 100644
--- a/src/core/server/stacks/approveComment.ts
+++ b/src/core/server/stacks/approveComment.ts
@@ -9,7 +9,7 @@ import { AugmentedRedis } from "coral-server/services/redis";
 
 import { GQLCOMMENT_STATUS } from "coral-server/graph/schema/__generated__/types";
 
-import { publishChanges, updateAllCounts } from "./helpers";
+import { publishChanges, updateAllCommentCounts } from "./helpers";
 
 const approveComment = async (
   mongo: Db,
@@ -36,9 +36,11 @@ const approveComment = async (
   );
 
   // Update all the comment counts on stories and users.
-  const counts = await updateAllCounts(mongo, redis, {
-    tenant,
+  const counts = await updateAllCommentCounts(mongo, redis, {
     ...result,
+    tenant,
+    // Rejecting a comment does not change the action counts.
+    actionCounts: {},
   });
 
   // Publish changes to the event publisher.
diff --git a/src/core/server/stacks/createComment.ts b/src/core/server/stacks/createComment.ts
index 3401902e2..326a436a5 100644
--- a/src/core/server/stacks/createComment.ts
+++ b/src/core/server/stacks/createComment.ts
@@ -12,6 +12,7 @@ import { Publisher } from "coral-server/graph/subscriptions/publisher";
 import logger from "coral-server/logger";
 import {
   encodeActionCounts,
+  EncodedCommentActionCounts,
   filterDuplicateActions,
 } from "coral-server/models/action/comment";
 import {
@@ -47,11 +48,11 @@ import { AugmentedRedis } from "coral-server/services/redis";
 import { updateUserLastCommentID } from "coral-server/services/users";
 import { Request } from "coral-server/types/express";
 
-import { publishChanges, updateAllCounts } from "./helpers";
+import { publishChanges, updateAllCommentCounts } from "./helpers";
 
 export type CreateComment = Omit<
   CreateCommentInput,
-  "status" | "metadata" | "ancestorIDs" | "actionCounts" | "tags"
+  "status" | "metadata" | "ancestorIDs" | "actionCounts" | "tags" | "siteID"
 >;
 
 export default async function create(
@@ -151,14 +152,11 @@ export default async function create(
   // for the first time to ensure that the data is there for when the next flag
   // is added, that it can already know that the comment is already in the
   // queue.
-  let actionCounts = {};
+  let actionCounts: EncodedCommentActionCounts = {};
   if (actions.length > 0) {
     // Determine the unique actions, we will use this to compute the comment
     // action counts. This should match what is added below.
-    const deDuplicatedActions = filterDuplicateActions(actions);
-
-    // Encode the action counts.
-    actionCounts = encodeActionCounts(...deDuplicatedActions);
+    actionCounts = encodeActionCounts(...filterDuplicateActions(actions));
   }
 
   // Create the comment!
@@ -167,6 +165,7 @@ export default async function create(
     tenant.id,
     {
       ...input,
+      siteID: story.siteID,
       tags,
       body,
       status,
@@ -177,6 +176,7 @@ export default async function create(
     now
   );
 
+  // Updating some associated data.
   await Promise.all([
     updateUserLastCommentID(redis, tenant, author, comment.id),
     updateStoryLastCommentedAt(mongo, tenant.id, story.id, now),
@@ -207,7 +207,7 @@ export default async function create(
   if (actions.length > 0) {
     // Actually add the actions to the database. This will not interact with the
     // counts at all.
-    const upsertedActions = await addCommentActions(
+    await addCommentActions(
       mongo,
       tenant,
       actions.map(
@@ -218,17 +218,17 @@ export default async function create(
 
           // Store the Story ID on the action.
           storyID: story.id,
+          siteID: story.siteID,
         })
       ),
       now
     );
-
-    log.trace({ actions: upsertedActions.length }, "added actions to comment");
   }
 
   // Update all the comment counts on stories and users.
-  const counts = await updateAllCounts(mongo, redis, {
+  const counts = await updateAllCommentCounts(mongo, redis, {
     tenant,
+    actionCounts,
     after: comment,
   });
 
@@ -236,7 +236,6 @@ export default async function create(
   await publishChanges(publisher, {
     ...counts,
     after: comment,
-    moderatorID: null,
   });
 
   // If this is a reply, publish it.
diff --git a/src/core/server/stacks/editComment.ts b/src/core/server/stacks/editComment.ts
index 765f21132..b4e471f8b 100644
--- a/src/core/server/stacks/editComment.ts
+++ b/src/core/server/stacks/editComment.ts
@@ -8,6 +8,7 @@ import { Publisher } from "coral-server/graph/subscriptions/publisher";
 import logger from "coral-server/logger";
 import {
   encodeActionCounts,
+  EncodedCommentActionCounts,
   filterDuplicateActions,
 } from "coral-server/models/action/comment";
 import { createCommentModerationAction } from "coral-server/models/action/moderation/comment";
@@ -28,7 +29,7 @@ import { processForModeration } from "coral-server/services/comments/pipeline";
 import { AugmentedRedis } from "coral-server/services/redis";
 import { Request } from "coral-server/types/express";
 
-import { publishChanges, updateAllCounts } from "./helpers";
+import { publishChanges, updateAllCommentCounts } from "./helpers";
 
 /**
  * getLastCommentEditableUntilDate will return the `createdAt` date that will
@@ -116,18 +117,13 @@ export default async function edit(
     now,
   });
 
-  let actionCounts = {};
+  let actionCounts: EncodedCommentActionCounts = {};
   if (actions.length > 0) {
     // Encode the new action counts that are going to be added to the new
     // revision.
     actionCounts = encodeActionCounts(...filterDuplicateActions(actions));
   }
 
-  log.trace(
-    { predictedActionCounts: actionCounts },
-    "associating action counts with comment"
-  );
-
   // Perform the edit.
   const result = await editComment(
     mongo,
@@ -149,9 +145,10 @@ export default async function edit(
 
   log = log.child({ revisionID: result.revision.id }, true);
 
+  // If there were actions to insert, then insert them into the commentActions
+  // collection.
   if (actions.length > 0) {
-    // Insert and handle creating the actions.
-    const upsertedActions = await addCommentActions(
+    await addCommentActions(
       mongo,
       tenant,
       actions.map(
@@ -160,22 +157,15 @@ export default async function edit(
           commentID: result.after.id,
           commentRevisionID: result.revision.id,
           storyID: story.id,
+          siteID: story.siteID,
         })
       ),
       now
     );
-
-    log.trace(
-      {
-        actualActionCounts: encodeActionCounts(...upsertedActions),
-        actions: upsertedActions.length,
-      },
-      "added actions to comment"
-    );
   }
 
   // If the comment status changed as a result of a pipeline operation, create a
-  // moderation action.
+  // moderation action (but don't associate it with a moderator).
   if (result.before.status !== result.after.status) {
     await createCommentModerationAction(
       mongo,
@@ -191,8 +181,9 @@ export default async function edit(
   }
 
   // Update all the comment counts on stories and users.
-  const counts = await updateAllCounts(mongo, redis, {
+  const counts = await updateAllCommentCounts(mongo, redis, {
     tenant,
+    actionCounts,
     ...result,
   });
 
@@ -200,7 +191,6 @@ export default async function edit(
   await publishChanges(publisher, {
     ...result,
     ...counts,
-    moderatorID: null,
   });
 
   // Return the resulting comment.
diff --git a/src/core/server/stacks/helpers/index.ts b/src/core/server/stacks/helpers/index.ts
index 97c4e8d71..24be18cf4 100644
--- a/src/core/server/stacks/helpers/index.ts
+++ b/src/core/server/stacks/helpers/index.ts
@@ -1,2 +1,2 @@
 export { default as publishChanges } from "./publishChanges";
-export { default as updateAllCounts } from "./updateAllCounts";
+export { default as updateAllCommentCounts } from "./updateAllCommentCounts";
diff --git a/src/core/server/stacks/helpers/publishChanges.ts b/src/core/server/stacks/helpers/publishChanges.ts
index 7fb87dc34..2461615ce 100644
--- a/src/core/server/stacks/helpers/publishChanges.ts
+++ b/src/core/server/stacks/helpers/publishChanges.ts
@@ -1,10 +1,10 @@
 import { Publisher } from "coral-server/graph/subscriptions/publisher";
 import {
   Comment,
+  CommentModerationQueueCounts,
   hasModeratorStatus,
   hasPublishedStatus,
 } from "coral-server/models/comment";
-import { CommentModerationQueueCounts } from "coral-server/models/story";
 import {
   publishCommentReleased,
   publishCommentStatusChanges,
@@ -15,7 +15,7 @@ interface PublishChangesInput {
   before?: Readonly<Comment>;
   after: Readonly<Comment>;
   moderationQueue: CommentModerationQueueCounts;
-  moderatorID: string | null;
+  moderatorID?: string;
 }
 
 export default async function publishChanges(
@@ -33,7 +33,7 @@ export default async function publishChanges(
       input.before.status,
       input.after.status,
       input.after.id,
-      input.moderatorID
+      input.moderatorID || null
     );
 
     if (hasModeratorStatus(input.before) && hasPublishedStatus(input.after)) {
diff --git a/src/core/server/stacks/helpers/updateAllCounts.ts b/src/core/server/stacks/helpers/updateAllCommentCounts.ts
similarity index 55%
rename from src/core/server/stacks/helpers/updateAllCounts.ts
rename to src/core/server/stacks/helpers/updateAllCommentCounts.ts
index 803f4cfd8..9663b34f6 100644
--- a/src/core/server/stacks/helpers/updateAllCounts.ts
+++ b/src/core/server/stacks/helpers/updateAllCommentCounts.ts
@@ -1,10 +1,14 @@
 import { Db } from "mongodb";
 
-import { Comment, CommentStatusCounts } from "coral-server/models/comment";
+import { EncodedCommentActionCounts } from "coral-server/models/action/comment";
 import {
+  Comment,
   CommentModerationQueueCounts,
-  updateStoryCounts,
-} from "coral-server/models/story";
+  CommentStatusCounts,
+  updateSharedCommentCounts,
+} from "coral-server/models/comment";
+import { updateSiteCounts } from "coral-server/models/site";
+import { updateStoryCounts } from "coral-server/models/story";
 import { Tenant } from "coral-server/models/tenant";
 import { updateUserCommentCounts } from "coral-server/models/user";
 import {
@@ -13,14 +17,25 @@ import {
 } from "coral-server/services/comments/moderation";
 import { AugmentedRedis } from "coral-server/services/redis";
 
-interface UpdateAllCountsInput {
+interface UpdateAllCommentCountsInput {
   tenant: Readonly<Tenant>;
-  before?: Readonly<Comment>;
   after: Readonly<Comment>;
+
+  /**
+   * actionCounts when provided will increment the related entries for an
+   * operation that creates actions.
+   */
+  actionCounts: Readonly<EncodedCommentActionCounts>;
+
+  /**
+   * before when provided is used when a comment has been changed. A comment
+   * that has just been created should not provide before.
+   */
+  before?: Readonly<Comment>;
 }
 
 function calculateModerationQueue(
-  input: UpdateAllCountsInput
+  input: UpdateAllCommentCountsInput
 ): CommentModerationQueueCounts {
   if (input.before) {
     return calculateCountsDiff(input.before, input.after);
@@ -30,7 +45,7 @@ function calculateModerationQueue(
 }
 
 function calculateStatus(
-  input: UpdateAllCountsInput
+  input: UpdateAllCommentCountsInput
 ): Partial<CommentStatusCounts> {
   if (input.before) {
     if (input.before.status !== input.after.status) {
@@ -48,10 +63,10 @@ function calculateStatus(
   };
 }
 
-export default async function updateAllCounts(
+export default async function updateAllCommentCounts(
   mongo: Db,
   redis: AugmentedRedis,
-  input: UpdateAllCountsInput
+  input: UpdateAllCommentCountsInput
 ) {
   // Compute the queue difference as a result of the old status and the new
   // status and the action counts.
@@ -63,23 +78,38 @@ export default async function updateAllCounts(
   // Pull out some params from the input for easier usage.
   const {
     tenant,
-    after: { storyID, authorID },
+    actionCounts: action,
+    after: { storyID, authorID, siteID },
   } = input;
 
-  // Update the story comment counts.
-  await updateStoryCounts(mongo, redis, tenant.id, storyID, {
+  // Update the story, site, and user comment counts.
+  await updateStoryCounts(mongo, tenant.id, storyID, {
+    action,
+    status,
+    moderationQueue,
+  });
+
+  await updateSiteCounts(mongo, tenant.id, siteID, {
+    action,
     status,
     moderationQueue,
   });
 
   if (authorID) {
-    // Update the user comment counts.
     await updateUserCommentCounts(mongo, tenant.id, authorID, {
       status,
     });
   }
 
+  // Update the shared counts.
+  await updateSharedCommentCounts(redis, tenant.id, {
+    action,
+    status,
+    moderationQueue,
+  });
+
   return {
+    action,
     status,
     moderationQueue,
   };
diff --git a/src/core/server/stacks/rejectComment.ts b/src/core/server/stacks/rejectComment.ts
index 84e246797..0a1d16611 100644
--- a/src/core/server/stacks/rejectComment.ts
+++ b/src/core/server/stacks/rejectComment.ts
@@ -14,7 +14,7 @@ import {
   GQLTAG,
 } from "coral-server/graph/schema/__generated__/types";
 
-import { publishChanges, updateAllCounts } from "./helpers";
+import { publishChanges, updateAllCommentCounts } from "./helpers";
 
 const rejectComment = async (
   mongo: Db,
@@ -41,9 +41,11 @@ const rejectComment = async (
   );
 
   // Update all the comment counts on stories and users.
-  const counts = await updateAllCounts(mongo, redis, {
-    tenant,
+  const counts = await updateAllCommentCounts(mongo, redis, {
     ...result,
+    tenant,
+    // Rejecting a comment does not change the action counts.
+    actionCounts: {},
   });
 
   // Publish changes to the event publisher.
diff --git a/src/locales/en-US/admin.ftl b/src/locales/en-US/admin.ftl
index d21390449..bee9b1707 100644
--- a/src/locales/en-US/admin.ftl
+++ b/src/locales/en-US/admin.ftl
@@ -164,8 +164,12 @@ configure-general-closedStreamMessage-explanation = Write a message to appear wh
 
 ### Organization
 configure-organization-name = Organization name
+configure-organization-sites = Sites
 configure-organization-nameExplanation =
   Your organization name will appear on emails sent by { -product-name } to your community and organization members.
+configure-organization-sites-explanation =
+  Add a new site to your organization or edit an existing site's details.
+configure-organization-sites-add-site = <icon>add</icon> Add site
 configure-organization-email = Organization email
 configure-organization-emailExplanation =
   This email address will be used as in emails and across the platform
@@ -176,6 +180,35 @@ configure-organization-url = Organization URL
 configure-organization-urlExplanation =
   Your organization url will appear on emails sent by { -product-name } to your community and organization members.
 
+### Sites
+configure-sites-site-details = Details <icon>keyboard_arrow_right</icon>
+configure-sites-add-new-site = Add a new site to { $site }
+configure-sites-add-success = { $site } has been added to { $org }
+configure-sites-edit-success = Changes to { $site } have been saved.
+configure-sites-site-form-name = Site name
+configure-sites-site-form-name-explanation = Site name will appear on emails sent by Coral to your community and organization members.
+configure-sites-site-form-url = Site URL
+configure-sites-site-form-url-explanation = This url will appear on emails sent by Coral to your community members.
+configure-sites-site-form-email = Site email address
+configure-sites-site-form-url-explanation = This email address is for community members to contact you with questions or if they need help. e.g. comments@yoursite.com
+configure-sites-site-form-domains = Site permitted domains
+configure-sites-site-form-domains-explanation = Domains where your Coral comment streams are allowed to be embedded (ex. http://localhost:3000, https://staging.domain.com, https://domain.com).
+configure-sites-site-form-submit = <icon>add</icon> Add site
+configure-sites-site-form-cancel = Cancel
+configure-sites-site-form-save = Save changes
+configure-sites-site-edit = Edit { $site } details
+configure-sites-site-form-embed-code = Embed code
+sites-emptyMessage = We could not find any sites matching your criteria.
+sites-selector-allSites = All sites
+sites-filter-sites-allSites = All sites
+
+site-selector-all-sites = All sites
+stories-filter-sites-allSites = All sites
+stories-filter-statuses = Status
+stories-column-site = Site
+site-table-siteName = Site name
+stories-filter-sites = Site
+
 ### Email
 
 configure-email = Email settings
diff --git a/src/locales/en-US/install.ftl b/src/locales/en-US/install.ftl
index e4cd2f8ef..5d5be28e0 100644
--- a/src/locales/en-US/install.ftl
+++ b/src/locales/en-US/install.ftl
@@ -8,56 +8,74 @@ install-header-title = { -product-name } Installation Wizard
 install-initialStep-theRemainder = The remainder of the installation wizard will take about 10 minutes. Once you are finished, you will have your own instance of { -product-name }.
 install-initialStep-getStarted = Get Started
 
-install-selectLanguage-stepTitleSelect = Select Language
-install-selectLanguage-selectLanguage = Select language for Coral
+install-selectLanguage-stepTitleSelect = Select language
+install-selectLanguage-selectLanguage = Select a language for Coral
 install-selectLanguage-description =
   Choose the language to be used during the installation process.
   This will also be the default language for your Coral community.
 install-selectLanguage-language = Language
 
-install-addOrganization-stepTitle = Add Organization Details
-install-addOrganization-title = Add Organization
-install-addOrganization-description = Please tell us the name of your organization. This will appear in emails when inviting new team members.
-install-addOrganization-orgName = Organization Name
+install-addOrganization-stepTitle = Organization and site details
+install-addOrganization-title = Add Organization and site details
+install-addOrganization-description =
+  Please provide your organization name and information for your site. If your organization has multiple sites, you can add them after this installer is completed from the Coral Admin.
+install-addOrganization-orgName = Organization name
 install-addOrganization-orgNameTextField =
-   .placeholder = Organization Name
-install-addOrganization-orgEmail = Organization Contact Email
+   .placeholder = Organization name
+install-addSite-siteName = Site name
+install-addSite-siteNameTextField =
+   .placeholder = Site name
+install-addSite-siteNameDescription =
+  Site name will appear on emails sent by Coral to your community and organization members.
+install-addOrganization-orgEmail = Organization contact email
 install-addOrganization-orgEmailTextField =
-  .placeholder = Organization Contact Email
+  .placeholder = Organization contact email
+install-addSite-siteEmail = Contact email address
+install-addSite-siteEmailTextField =
+  .placeholder = Contact email
+install-addSite-siteEmailDescription =
+  This email address is for community members to contact you with questions or if they need help. e.g. comments@yoursite.com
 install-addOrganization-orgURL = Organization URL
 install-addOrganization-orgURLTextField =
   .placeholder = Organization URL
+install-addSite-siteURL = Organization URL
+install-addSite-siteURLTextField =
+  .placeholder = Organization URL
+install-addSite-siteURLDescription =
+  This url will appear on emails sent by Coral to your community members.
 install-addOrganization-orgURLDescription = Be sure to include <strong>http://</strong> or <strong>https://</strong> in your URL
 
-install-createYourAccount-stepTitle = Create Admin Account
-install-createYourAccount-title = Create an Administrator Account
-install-createYourAccount-email = Email
+install-createYourAccount-stepTitle = Create admin account
+install-createYourAccount-title = Create an admin account
+install-createYourAccount-email = Email address
 install-createYourAccount-emailTextField =
   .placeholder = Email
 install-createYourAccount-username = Username
 install-createYourAccount-usernameTextField =
   .placeholder = Username
-install-createYourAccount-usernameDescription = An identifier displayed on your comments. You may use “_” and “.”
+install-createYourAccount-usernameDescription = An identifier displayed on your comments. You may use “_” and “.” Spaces not permitted
 install-createYourAccount-password = Password
 install-createYourAccount-passwordTextField =
   .placeholder = Password
 install-createYourAccount-passwordDescription = Must be at least 8 characters
-install-createYourAccount-confirmPassword = Confirm Password
+install-createYourAccount-confirmPassword = Confirm password
 install-createYourAccount-confirmPasswordTextField =
-  .placeholder = Confirm Password
+  .placeholder = Confirm password
 
-install-permittedDomains-stepTitle = Add Permitted Domains
-install-permittedDomains-title = Permitted Domains
+install-permittedDomains-stepTitle = Permitted domains
+install-permittedDomains-title = Site permitted Domains
 install-permittedDomains-description-with-scheme =
-  Enter the domains you would like to permit for { -product-name }, e.g.
-  your local, staging and production environments including the
-  scheme (ex. http://localhost:3000, https://staging.domain.com,
+  Domains where your { -product-name } comment streams are allowed to be embedded
+  (ex. http://localhost:3000, https://staging.domain.com,
   https://domain.com).
-install-permittedDomains-permittedDomains = Permitted Domains
+install-permittedDomains-permittedDomains = Permitted domains
 install-permittedDomains-permittedDomainsTextField =
   .placeholder = Domains
-install-permittedDomains-permittedDomainsDescription = Insert domains separated by comma
+install-permittedDomains-permittedDomainsDescription = Enter domains separated by comma
 
-install-finalStep-description = Thanks for installing { -product-name }! We sent an email to verify your email address. While you finish setting up the account, you can start engaging with your readers now.
+install-finalStep-stepTitle = Complete
+install-finalStep-title = Installation complete
+install-finalStep-description =
+  Continue to the { -product-name } Admin to complete the setup of your organization and site.
 install-finalStep-goToTheDocs = Go to the Docs
 install-finalStep-goToAdmin = Go to Admin
diff --git a/src/locales/pt-BR/install.ftl b/src/locales/pt-BR/install.ftl
index 91d5bcc7a..49a5d78dd 100644
--- a/src/locales/pt-BR/install.ftl
+++ b/src/locales/pt-BR/install.ftl
@@ -48,7 +48,7 @@ install-createYourAccount-confirmPasswordTextField =
 
 install-permittedDomains-stepTitle = Adicionar domínios permitidos
 install-permittedDomains-title =  Domínios Permitidos
-install-permittedDomains-description-with-schema =
+install-allowedOrigins-description-with-schema =
    Digite os domínios que você deseja permitir para { -product-name }, por exemplo
    seus ambientes locais, de preparação e produção, incluindo o
    protocolo (por exemplo, http: // localhost: 3000, https://staging.domain.com,