diff --git a/.dockerignore b/.dockerignore
index 0a64dffc37..8635e7473a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -12,6 +12,9 @@ coverage
 node_modules
 **/node_modules
 
+# don't include utilities
+utilities/
+
 # don't include any logs
 npm-debug.log*
 **/npm-debug.log*
diff --git a/client/package-lock.json b/client/package-lock.json
index a10e0a3546..3398417764 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.6.4",
+  "version": "8.6.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@coralproject/talk",
-      "version": "8.6.4",
+      "version": "8.6.5",
       "license": "Apache-2.0",
       "dependencies": {
         "@ampproject/toolbox-cache-url": "^2.9.0",
diff --git a/client/package.json b/client/package.json
index a14be8691f..21c91034a7 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.6.4",
+  "version": "8.6.5",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [
diff --git a/client/src/core/client/admin/components/AutoLoadMore.tsx b/client/src/core/client/admin/components/AutoLoadMore.tsx
index c2f44a6b7d..6cfda21f86 100644
--- a/client/src/core/client/admin/components/AutoLoadMore.tsx
+++ b/client/src/core/client/admin/components/AutoLoadMore.tsx
@@ -1,7 +1,7 @@
 import React, { FunctionComponent, useEffect } from "react";
 
 import { useInView } from "coral-framework/lib/intersection";
-import { BaseButton, Spinner } from "coral-ui/components/v2";
+import { Button, Spinner } from "coral-ui/components/v2";
 
 interface Props {
   disableLoadMore?: boolean;
@@ -27,9 +27,9 @@ const AutoLoadMoresContainer: FunctionComponent<Props> = ({
   // button here to make it testable.
   if (process.env.NODE_ENV === "test") {
     return (
-      <BaseButton onClick={onLoadMore} disabled={disableLoadMore}>
+      <Button onClick={onLoadMore} disabled={disableLoadMore} variant="text">
         Load More
-      </BaseButton>
+      </Button>
     );
   }
   return (
diff --git a/client/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css b/client/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css
index f85e92e2fb..dba57f16de 100644
--- a/client/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css
+++ b/client/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.css
@@ -10,8 +10,8 @@
 
 .wrapper {
   overflow: hidden;
-  /* adjust for button line-height being > 1 */
-  margin-top: -2px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 
 .button {
@@ -19,19 +19,39 @@
   border-width: 0;
   width: calc(20 * var(--mini-unit));
   margin-right: calc(var(--spacing-1) / 2);
+  padding-left: var(--spacing-1);
   font-size: var(--font-size-3);
+  font-family: var(--font-family-primary);
+  font-weight: var(--font-weight-primary-bold);
   line-height: 1.2;
-  justify-content: space-between;
+  justify-content: flex-start;
+  align-items: center;
   background: var(--palette-background-input);
 }
 
+.filterInput {
+  resize: none;
+  height: 100%;
+  width: auto;
+  overflow: hidden;
+  margin-left: var(--spacing-1);
+  margin-right: var(--spacing-1);
+}
+
+.filterInput > textarea {
+  resize: none;
+  overflow: hidden;
+  sizing: border-box;
+  color: var(--palette-grey-400);
+}
+
 .buttonIconLeft {
   width: 20px;
-  margin-right: calc(var(--spacing-1) / 2);
 }
 
 .buttonIconRight {
-  align-self: baseline;
+  margin-left: auto;
+  margin-right: var(--spacing-1);
   width: 16px;
 }
 
@@ -40,8 +60,3 @@
   /* adjust for button line-height being > 1 */
   margin-top: -2px;
 }
-
-.buttonText {
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
diff --git a/client/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.tsx b/client/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.tsx
index 118851c8f1..9f08ca2de3 100644
--- a/client/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.tsx
+++ b/client/src/core/client/admin/components/PaginatedSelect/PaginatedSelect.tsx
@@ -1,8 +1,16 @@
+import { Localized } from "@fluent/react/compat";
 import cn from "classnames";
 import { noop } from "lodash";
-import React, { ComponentType, FunctionComponent } from "react";
+import React, {
+  ComponentType,
+  FunctionComponent,
+  useCallback,
+  useEffect,
+  useRef,
+} from "react";
 
 import AutoLoadMore from "coral-admin/components/AutoLoadMore";
+import { useToggleState } from "coral-framework/hooks";
 import { IntersectionProvider } from "coral-framework/lib/intersection";
 import {
   ArrowsDownIcon,
@@ -10,18 +18,20 @@ import {
   ButtonSvgIcon,
 } from "coral-ui/components/icons";
 import {
-  Button,
   ClickOutside,
   Dropdown,
   Flex,
   Popover,
   Spinner,
 } from "coral-ui/components/v2";
+import { TextArea } from "coral-ui/components/v3";
 
 import styles from "./PaginatedSelect.css";
 
 interface Props {
   onLoadMore?: () => void;
+  onFilter?: (filter: string) => void;
+  label: string;
   Icon?: ComponentType;
   hasMore?: boolean;
   disableLoadMore?: boolean;
@@ -33,6 +43,7 @@ interface Props {
 
 const PaginatedSelect: FunctionComponent<Props> = ({
   onLoadMore = noop,
+  onFilter,
   disableLoadMore = false,
   hasMore = false,
   loading = false,
@@ -40,14 +51,34 @@ const PaginatedSelect: FunctionComponent<Props> = ({
   Icon,
   selected,
   className,
+  label,
 }) => {
+  const filterRef = useRef<HTMLTextAreaElement>(null);
+
+  const [isPopoverVisible, setIsPopoverVisible, togglePopoverVisible] =
+    useToggleState(false);
+
+  useEffect(() => {
+    if (isPopoverVisible && filterRef.current) {
+      filterRef.current.focus();
+    }
+  }, [isPopoverVisible]);
+
+  const handleButtonBlur = useCallback(() => {
+    if (!onFilter) {
+      return;
+    }
+    setIsPopoverVisible(false);
+  }, [onFilter, setIsPopoverVisible]);
+
   return (
-    <Popover
-      id=""
-      placement="bottom-end"
-      modifiers={{ arrow: { enabled: false }, offset: { offset: "0, 4" } }}
-      body={({ toggleVisibility }) => (
-        <ClickOutside onClickOutside={toggleVisibility}>
+    <ClickOutside onClickOutside={() => setIsPopoverVisible(false)}>
+      <Popover
+        id=""
+        placement="bottom-end"
+        modifiers={{ arrow: { enabled: false }, offset: { offset: "0, 4" } }}
+        visible={isPopoverVisible}
+        body={
           <IntersectionProvider>
             <Dropdown className={styles.dropdown}>
               {children}
@@ -66,42 +97,64 @@ const PaginatedSelect: FunctionComponent<Props> = ({
               )}
             </Dropdown>
           </IntersectionProvider>
-        </ClickOutside>
-      )}
-    >
-      {({ toggleVisibility, ref, visible }) => (
-        <Button
-          className={cn(styles.button, className)}
-          variant="flat"
-          adornmentLeft
-          color="mono"
-          onClick={toggleVisibility}
-          ref={ref}
-          uppercase={false}
-        >
-          {Icon && (
-            <ButtonSvgIcon className={styles.buttonIconLeft} Icon={Icon} />
-          )}
-          <Flex alignItems="center" className={styles.wrapper}>
-            {selected}
+        }
+      >
+        {({ ref }) => (
+          <Flex
+            className={cn(styles.button, className)}
+            onClick={() => setIsPopoverVisible(true)}
+            ref={ref}
+            justifyContent="space-between"
+            aria-label={label}
+          >
+            {Icon && (
+              <ButtonSvgIcon className={styles.buttonIconLeft} Icon={Icon} />
+            )}
+            {isPopoverVisible && !!onFilter ? (
+              <Localized
+                id="admin-paginatedSelect-filter"
+                attrs={{ "aria-label": true }}
+              >
+                <TextArea
+                  className={styles.filterInput}
+                  onKeyDown={(e) => {
+                    // We don't want blank lines to be added in input
+                    if (e.key === "Enter") {
+                      e.preventDefault();
+                    }
+                  }}
+                  onChange={(e) => onFilter(e.target.value)}
+                  ref={filterRef}
+                  aria-label="Filter results"
+                />
+              </Localized>
+            ) : (
+              <Flex
+                alignItems="center"
+                aria-roledescription="button"
+                className={styles.wrapper}
+                tabIndex={0}
+                onFocus={() => setIsPopoverVisible(true)}
+                onBlur={handleButtonBlur}
+              >
+                {selected}
+              </Flex>
+            )}
+            {
+              <ButtonSvgIcon
+                className={styles.buttonIconRight}
+                Icon={isPopoverVisible ? ArrowsUpIcon : ArrowsDownIcon}
+                size="xs"
+                onClick={(e) => {
+                  e.stopPropagation();
+                  togglePopoverVisible();
+                }}
+              />
+            }
           </Flex>
-          {!visible && (
-            <ButtonSvgIcon
-              className={styles.buttonIconRight}
-              Icon={ArrowsDownIcon}
-              size="xs"
-            />
-          )}
-          {visible && (
-            <ButtonSvgIcon
-              className={styles.buttonIconRight}
-              Icon={ArrowsUpIcon}
-              size="xs"
-            />
-          )}
-        </Button>
-      )}
-    </Popover>
+        )}
+      </Popover>
+    </ClickOutside>
   );
 };
 
diff --git a/client/src/core/client/admin/routes/Moderate/SectionSelector/SectionSelector.tsx b/client/src/core/client/admin/routes/Moderate/SectionSelector/SectionSelector.tsx
index 5362d7a4aa..281d8ecaea 100644
--- a/client/src/core/client/admin/routes/Moderate/SectionSelector/SectionSelector.tsx
+++ b/client/src/core/client/admin/routes/Moderate/SectionSelector/SectionSelector.tsx
@@ -48,6 +48,7 @@ const SectionSelector: FunctionComponent<Props> = ({
       disableLoadMore
       className={styles.button}
       selected={<SelectedSection section={section} />}
+      label="Select section"
     >
       <SectionSelectorSection
         active={!section}
diff --git a/client/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelector.tsx b/client/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelector.tsx
index 2914fe48d1..f4505177ef 100644
--- a/client/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelector.tsx
+++ b/client/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelector.tsx
@@ -5,12 +5,12 @@ import PaginatedSelect from "coral-admin/components/PaginatedSelect";
 import { getModerationLink, QUEUE_NAME } from "coral-framework/helpers";
 import { PropTypesOf } from "coral-framework/types";
 import { AppWindowIcon } from "coral-ui/components/icons";
+import { Divider } from "coral-ui/components/v2";
 
+import styles from "./SiteSelector.css";
 import SiteSelectorCurrentSiteQuery from "./SiteSelectorCurrentSiteQuery";
 import SiteSelectorSite from "./SiteSelectorSite";
 
-import styles from "./SiteSelector.css";
-
 interface Props {
   scoped: boolean;
   sites: ReadonlyArray<
@@ -18,6 +18,7 @@ interface Props {
   >;
   queueName: QUEUE_NAME | undefined;
   onLoadMore: () => void;
+  onFilter: (filter: string) => void;
   hasMore: boolean;
   disableLoadMore: boolean;
   loading: boolean;
@@ -33,15 +34,18 @@ const SiteSelector: FunctionComponent<Props> = ({
   disableLoadMore,
   hasMore,
   siteID,
+  onFilter,
 }) => {
   return (
     <PaginatedSelect
+      label="Select site"
       Icon={AppWindowIcon}
       loading={loading}
       onLoadMore={onLoadMore}
       disableLoadMore={disableLoadMore}
       hasMore={hasMore}
       className={styles.button}
+      onFilter={onFilter}
       selected={
         <>
           {siteID && <SiteSelectorCurrentSiteQuery siteID={siteID} />}
@@ -55,11 +59,14 @@ const SiteSelector: FunctionComponent<Props> = ({
     >
       <>
         {!scoped && (
-          <SiteSelectorSite
-            link={getModerationLink({ queue: queueName })}
-            site={null}
-            active={!siteID}
-          />
+          <>
+            <SiteSelectorSite
+              link={getModerationLink({ queue: queueName })}
+              site={null}
+              active={!siteID}
+            />
+            <Divider spacing={1} horizontalSpacing={4} />
+          </>
         )}
         {sites.map((s) => (
           <SiteSelectorSite
diff --git a/client/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorContainer.tsx b/client/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorContainer.tsx
index 5055d64425..c2327f8d02 100644
--- a/client/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorContainer.tsx
+++ b/client/src/core/client/admin/routes/Moderate/SiteSelector/SiteSelectorContainer.tsx
@@ -1,11 +1,14 @@
-import React, { useMemo } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import { graphql, RelayPaginationProp } from "react-relay";
 
 import { QUEUE_NAME } from "coral-framework/helpers";
+import { useCoralContext } from "coral-framework/lib/bootstrap";
 import {
   useLoadMore,
+  useRefetch,
   withPaginationContainer,
 } from "coral-framework/lib/relay";
+import { QueryError } from "coral-ui/components/v3";
 
 import { SiteSelectorContainer_query } from "coral-admin/__generated__/SiteSelectorContainer_query.graphql";
 import { SiteSelectorContainer_viewer } from "coral-admin/__generated__/SiteSelectorContainer_viewer.graphql";
@@ -22,7 +25,37 @@ interface Props {
 }
 
 const SiteSelectorContainer: React.FunctionComponent<Props> = (props) => {
+  const context = useCoralContext();
   const [loadMore, isLoadingMore] = useLoadMore(props.relay, 10);
+  // Buffering in the sense that we gather changes and then "flush"
+  // them 1 second after the last change is received
+  const [filterBuffer, setFilterBuffer] = useState<string | null>(null);
+  const [searchFilter, setSearchFilter] = useState<string | null>(null);
+  const [searchTimeout, setSearchTimeout] = useState<number | undefined>();
+
+  const [, isRefetching, refetchError] = useRefetch(props.relay, 10, {
+    searchFilter: searchFilter || null,
+  });
+
+  useEffect(() => {
+    if (filterBuffer === searchFilter) {
+      return;
+    }
+
+    if (searchTimeout) {
+      context.window.clearTimeout(searchTimeout);
+    }
+
+    const newTimeout = context.window.setTimeout(
+      () => setSearchFilter(filterBuffer),
+      1000
+    );
+
+    setSearchTimeout(newTimeout);
+
+    return () => context.window.clearTimeout(searchTimeout);
+  }, [filterBuffer, context.window]);
+  // marcushaddon: omitting searchFilter from dependency array to avoid an infinite update loop
 
   const { sites, scoped } = useMemo(() => {
     // If the viewer is moderation scoped, then only provide those sites.
@@ -46,12 +79,17 @@ const SiteSelectorContainer: React.FunctionComponent<Props> = (props) => {
     return { scoped: false, sites: [] };
   }, [props.query, props.viewer]);
 
+  if (refetchError) {
+    return <QueryError error={refetchError} />;
+  }
+
   return (
     <SiteSelector
-      loading={!props.query}
+      loading={!props.query || isRefetching}
       scoped={scoped}
       sites={sites}
       onLoadMore={loadMore}
+      onFilter={setFilterBuffer}
       hasMore={props.relay.hasMore()}
       disableLoadMore={isLoadingMore}
       queueName={props.queueName}
@@ -73,8 +111,9 @@ const enhanced = withPaginationContainer<
       @argumentDefinitions(
         count: { type: "Int", defaultValue: 10 }
         cursor: { type: "Cursor" }
+        searchFilter: { type: "String" }
       ) {
-        sites(first: $count, after: $cursor)
+        sites(first: $count, after: $cursor, query: $searchFilter)
           @connection(key: "SitesConfig_sites") {
           edges {
             node {
@@ -105,6 +144,7 @@ const enhanced = withPaginationContainer<
       return {
         count,
         cursor,
+        searchFilter: fragmentVariables.searchFilter,
       };
     },
     query: graphql`
@@ -113,9 +153,14 @@ const enhanced = withPaginationContainer<
       query SiteSelectorContainerPaginationQuery(
         $count: Int!
         $cursor: Cursor
+        $searchFilter: String
       ) {
         ...SiteSelectorContainer_query
-          @arguments(count: $count, cursor: $cursor)
+          @arguments(
+            count: $count
+            cursor: $cursor
+            searchFilter: $searchFilter
+          )
       }
     `,
   }
diff --git a/client/src/core/client/admin/test/moderate/regularQueue.spec.tsx b/client/src/core/client/admin/test/moderate/regularQueue.spec.tsx
index a0f6c65c73..b9a46ab361 100644
--- a/client/src/core/client/admin/test/moderate/regularQueue.spec.tsx
+++ b/client/src/core/client/admin/test/moderate/regularQueue.spec.tsx
@@ -17,6 +17,7 @@ import {
   MutationToApproveCommentResolver,
   MutationToBanUserResolver,
   MutationToRejectCommentResolver,
+  QueryToSitesResolver,
 } from "coral-framework/schema";
 import {
   createMutationResolverStub,
@@ -33,8 +34,10 @@ import {
   emptyRejectedComments,
   reportedComments,
   settings,
+  settingsWithMultisite,
   site,
   siteConnection,
+  sites,
   users,
 } from "../fixtures";
 
@@ -825,6 +828,132 @@ it("rejects comment in reported queue", async () => {
   expect(within(reportedCount).getByText("1")).toBeVisible();
 });
 
+it("enables filtering sites by text search", async () => {
+  const commentsResoverStub =
+    createQueryResolverStub<ModerationQueueToCommentsResolver>(
+      ({ variables, callCount }) => {
+        switch (callCount) {
+          case 0:
+            expectAndFail(variables).toEqual({
+              first: 5,
+              orderBy: "CREATED_AT_DESC",
+            });
+            return {
+              edges: [
+                {
+                  node: reportedComments[0],
+                  cursor: reportedComments[0].createdAt,
+                },
+                {
+                  node: reportedComments[1],
+                  cursor: reportedComments[1].createdAt,
+                },
+              ],
+              pageInfo: {
+                endCursor: reportedComments[1].createdAt,
+                hasNextPage: true,
+              },
+            };
+          default:
+            expectAndFail(variables).toEqual({
+              first: 10,
+              query: "second",
+              orderBy: "CREATED_AT_DESC",
+            });
+            return {
+              pageInfo: {
+                endCursor: reportedComments[2].createdAt,
+                hasNextPage: false,
+              },
+            };
+        }
+      }
+    ) as any;
+  const moderationQueuesStub = pureMerge(emptyModerationQueues, {
+    reported: {
+      count: 2,
+      comments: commentsResoverStub,
+    },
+  });
+
+  const sitesResolverStub = createQueryResolverStub<QueryToSitesResolver>(
+    ({ variables, callCount }) => {
+      switch (callCount) {
+        case 0:
+          return siteConnection;
+        default:
+          expectAndFail(variables).toEqual({
+            first: 10,
+            after: null,
+            query: "third",
+          });
+
+          return {
+            edges: [
+              {
+                cursor: "1",
+                node: {
+                  ...sites[0],
+                  id: "site-3",
+                  name: "Third Site",
+                },
+              },
+            ],
+            pageInfo: {
+              hasNextPage: false,
+            },
+          };
+      }
+    }
+  );
+
+  await act(async () => {
+    await createTestRenderer({
+      resolvers: createResolversStub<GQLResolver>({
+        Query: {
+          moderationQueues: () => moderationQueuesStub,
+          sites: sitesResolverStub,
+          settings: () => settingsWithMultisite,
+        },
+      }),
+    });
+  });
+
+  const searchBarContainer = await screen.findByTestId(
+    "moderate-searchBar-container"
+  );
+
+  const siteSelector = await within(searchBarContainer).findByLabelText(
+    "Select site",
+    { exact: false }
+  );
+  expect(siteSelector).toBeInTheDocument();
+
+  userEvent.click(siteSelector);
+
+  expect(
+    await within(siteSelector).findByLabelText("Filter results")
+  ).toBeVisible();
+
+  const dropDown = screen.getByRole("dialog");
+  expect(dropDown).toBeVisible();
+
+  const textInput = await within(siteSelector).findByLabelText(
+    "Filter results"
+  );
+  expect(textInput).toHaveFocus();
+
+  await act(async () => {
+    userEvent.type(textInput, "third");
+    await new Promise((res) => setTimeout(res, 3000));
+  });
+
+  expect(within(dropDown).queryByText("Test Site")).toBeNull();
+
+  const filteredResult = within(dropDown).queryByText("Third Site");
+  expect(filteredResult).toBeInTheDocument();
+});
+
 it("doesnt show comments from banned users whose commens have been rejected", async () => {
   const { context } = await createTestRenderer({
     resolvers: createResolversStub<GQLResolver>({
@@ -960,9 +1089,7 @@ it("requires moderation reason when DSA features enabled", async () => {
   const rejectButton = within(modCard).getByLabelText("Reject");
   expect(rejectButton).toBeVisible();
   // click it
-  act(() => {
-    userEvent.click(rejectButton);
-  });
+  fireEvent.click(rejectButton);
 
   const reasonModalID = `moderation-reason-modal-${comment.id}`;
 
@@ -984,7 +1111,5 @@ it("requires moderation reason when DSA features enabled", async () => {
 
   expect(submitReasonButton).toBeEnabled();
 
-  await act(async () => {
-    fireEvent.click(submitReasonButton);
-  });
+  fireEvent.click(submitReasonButton);
 });
diff --git a/client/src/core/client/framework/lib/relay/useRefetch.ts b/client/src/core/client/framework/lib/relay/useRefetch.ts
index 05ac80bfa3..0cbb046fef 100644
--- a/client/src/core/client/framework/lib/relay/useRefetch.ts
+++ b/client/src/core/client/framework/lib/relay/useRefetch.ts
@@ -16,9 +16,10 @@ export default function useRefetch<V = Variables>(
   relay: RelayPaginationProp,
   totalCount: number,
   variables: Omit<V, "count" | "cursor">
-): [RefetchFunction, IsRefetching] {
+): [RefetchFunction, IsRefetching, Error | undefined] {
   const [manualRefetchCount, setManualRefetchCount] = useState(0);
   const [refetching, setRefetching] = useState(false);
+  const [err, setErr] = useState<Error | undefined>();
   useEffectWhenChanged(() => {
     setRefetching(true);
     const disposable = relay.refetchConnection(
@@ -26,6 +27,7 @@ export default function useRefetch<V = Variables>(
       (error) => {
         setRefetching(false);
         if (error) {
+          setErr(error);
           // eslint-disable-next-line no-console
           console.error(error);
         }
@@ -45,5 +47,5 @@ export default function useRefetch<V = Variables>(
       return a;
     }, []),
   ]);
-  return [() => setManualRefetchCount(manualRefetchCount + 1), refetching];
+  return [() => setManualRefetchCount(manualRefetchCount + 1), refetching, err];
 }
diff --git a/client/src/core/client/oembed/commentEmbed.html b/client/src/core/client/oembed/commentEmbed.html
index eeda75a468..04f7a8760f 100644
--- a/client/src/core/client/oembed/commentEmbed.html
+++ b/client/src/core/client/oembed/commentEmbed.html
@@ -95,5 +95,6 @@ <h1>Comment Embed</h1>
           shadowRoot.appendChild(iframeHeightScript);
         };
       </script> -->
+
   </body>
 </html>
diff --git a/client/src/core/client/ui/components/v2/Divider/Divider.css b/client/src/core/client/ui/components/v2/Divider/Divider.css
index b17373e3c5..ff8bd90b67 100644
--- a/client/src/core/client/ui/components/v2/Divider/Divider.css
+++ b/client/src/core/client/ui/components/v2/Divider/Divider.css
@@ -7,17 +7,41 @@ $divider-border-color: var(--palette-grey-300);
 }
 
 .spacing1 {
-  margin: var(--spacing-1) 0;
+  margin-top: var(--spacing-1);
+  margin-bottom: var(--spacing-1);
 }
 
 .spacing2 {
-  margin: var(--spacing-2) 0;
+  margin-top: var(--spacing-2);
+  margin-bottom: var(--spacing-2);
 }
 
 .spacing3 {
-  margin: var(--spacing-3) 0;
+  margin-top: var(--spacing-3);
+  margin-bottom: var(--spacing-3);
 }
 
 .spacing4 {
-  margin: var(--spacing-4) 0;
+  margin-top: var(--spacing-4);
+  margin-bottom: var(--spacing-4);
+}
+
+.horizontallySpaced1 {
+  margin-left: var(--spacing-1);
+  margin-right: var(--spacing-1);
+}
+
+.horizontallySpaced2 {
+  margin-left: var(--spacing-2);
+  margin-right: var(--spacing-2);
+}
+
+.horizontallySpaced3 {
+  margin-left: var(--spacing-3);
+  margin-right: var(--spacing-3);
+}
+
+.horizontallySpaced4 {
+  margin-left: var(--spacing-4);
+  margin-right: var(--spacing-4);
 }
diff --git a/client/src/core/client/ui/components/v2/Divider/Divider.tsx b/client/src/core/client/ui/components/v2/Divider/Divider.tsx
index 7ab35c851a..b576bb81c1 100644
--- a/client/src/core/client/ui/components/v2/Divider/Divider.tsx
+++ b/client/src/core/client/ui/components/v2/Divider/Divider.tsx
@@ -5,9 +5,13 @@ import styles from "./Divider.css";
 
 interface Props {
   spacing?: 1 | 2 | 3 | 4;
+  horizontalSpacing?: 1 | 2 | 3 | 4;
 }
 
-const Divider: FunctionComponent<Props> = ({ spacing = 3 }) => {
+const Divider: FunctionComponent<Props> = ({
+  spacing = 3,
+  horizontalSpacing = 0,
+}) => {
   return (
     <hr
       className={cn(styles.root, {
@@ -15,6 +19,14 @@ const Divider: FunctionComponent<Props> = ({ spacing = 3 }) => {
         [styles.spacing2]: spacing && spacing === 2,
         [styles.spacing3]: spacing && spacing === 3,
         [styles.spacing4]: spacing && spacing === 4,
+        [styles.horizontallySpaced1]:
+          horizontalSpacing && horizontalSpacing === 1,
+        [styles.horizontallySpaced2]:
+          horizontalSpacing && horizontalSpacing === 2,
+        [styles.horizontallySpaced3]:
+          horizontalSpacing && horizontalSpacing === 3,
+        [styles.horizontallySpaced4]:
+          horizontalSpacing && horizontalSpacing === 4,
       })}
     />
   );
diff --git a/client/src/core/client/ui/components/v3/TextArea/TextArea.tsx b/client/src/core/client/ui/components/v3/TextArea/TextArea.tsx
index f11a838f66..9359f46aa2 100644
--- a/client/src/core/client/ui/components/v3/TextArea/TextArea.tsx
+++ b/client/src/core/client/ui/components/v3/TextArea/TextArea.tsx
@@ -4,9 +4,10 @@ import React, {
   EventHandler,
   FunctionComponent,
   KeyboardEvent,
+  Ref,
 } from "react";
 
-import { withStyles } from "coral-ui/hocs";
+import { withForwardRef, withStyles } from "coral-ui/hocs";
 
 import styles from "./TextArea.css";
 
@@ -24,6 +25,7 @@ export interface TextAreaProps {
   onChange?: EventHandler<ChangeEvent<HTMLTextAreaElement>>;
   onKeyPress?: EventHandler<KeyboardEvent>;
   onKeyDown?: EventHandler<KeyboardEvent>;
+  forwardRef?: Ref<HTMLTextAreaElement>;
 }
 
 const TextArea: FunctionComponent<TextAreaProps> = ({
@@ -33,6 +35,7 @@ const TextArea: FunctionComponent<TextAreaProps> = ({
   color,
   className,
   classes,
+  forwardRef,
   ...rest
 }) => {
   const rootClassName = cn(classes.root, className);
@@ -50,6 +53,7 @@ const TextArea: FunctionComponent<TextAreaProps> = ({
         name={name}
         value={value}
         placeholder={placeholder}
+        ref={forwardRef}
         {...rest}
       ></textarea>
     </div>
@@ -61,5 +65,5 @@ TextArea.defaultProps = {
   placeholder: "",
 } as Partial<TextAreaProps>;
 
-const enhanced = withStyles(styles)(TextArea);
+const enhanced = withForwardRef(withStyles(styles)(TextArea));
 export default enhanced;
diff --git a/common/package-lock.json b/common/package-lock.json
index c145b0c349..56d1732976 100644
--- a/common/package-lock.json
+++ b/common/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "common",
-  "version": "8.6.4",
+  "version": "8.6.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "common",
-      "version": "8.6.4",
+      "version": "8.6.5",
       "license": "ISC",
       "dependencies": {
         "coral-config": "../config/dist",
diff --git a/common/package.json b/common/package.json
index 946862ee4c..26d9e08d1f 100644
--- a/common/package.json
+++ b/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "8.6.4",
+  "version": "8.6.5",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/config/package-lock.json b/config/package-lock.json
index fa6e8e4f8e..e495633c70 100644
--- a/config/package-lock.json
+++ b/config/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "common",
-  "version": "8.6.4",
+  "version": "8.6.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "common",
-      "version": "8.6.4",
+      "version": "8.6.5",
       "license": "ISC",
       "dependencies": {
         "typescript": "^3.9.5"
diff --git a/config/package.json b/config/package.json
index 06ec1340e4..efb5c02649 100644
--- a/config/package.json
+++ b/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "8.6.4",
+  "version": "8.6.5",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/locales/en-US/admin.ftl b/locales/en-US/admin.ftl
index e2c5bff43f..36dc9c55cb 100644
--- a/locales/en-US/admin.ftl
+++ b/locales/en-US/admin.ftl
@@ -40,6 +40,10 @@ comments-reacted =
     *[other] {$reaction} ({$count}) comment by {$username}
   }
 
+## components
+admin-paginatedSelect-filter =
+  .aria-label = Filter results
+
 ## User Statuses
 userStatus-active = Active
 userStatus-banned = Banned
diff --git a/server/package-lock.json b/server/package-lock.json
index be5c317d1f..95646ccf5c 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.6.4",
+  "version": "8.6.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@coralproject/talk",
-      "version": "8.6.4",
+      "version": "8.6.5",
       "license": "Apache-2.0",
       "dependencies": {
         "@ampproject/toolbox-cache-url": "^2.9.0",
diff --git a/server/package.json b/server/package.json
index 8d00b2db9a..ebed5404ea 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.6.4",
+  "version": "8.6.5",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [
diff --git a/server/src/core/server/models/tenant/helpers.ts b/server/src/core/server/models/tenant/helpers.ts
index e8063d8d96..4d482a1c2d 100644
--- a/server/src/core/server/models/tenant/helpers.ts
+++ b/server/src/core/server/models/tenant/helpers.ts
@@ -10,29 +10,39 @@ import { AuthIntegrations } from "../settings";
 import { LEGACY_FEATURE_FLAGS, Tenant } from "./tenant";
 
 export const getDefaultReactionConfiguration = (
-  bundle: FluentBundle
-): Tenant["reaction"] => ({
-  // By default, the standard reaction style will use the Respect with the
-  // handshake.
-  label: translate(bundle, "Respect", "reaction-labelRespect"),
-  labelActive: translate(bundle, "Respected", "reaction-labelActiveRespected"),
-  sortLabel: translate(
-    bundle,
-    "Most Respected",
-    "reaction-sortLabelMostRespected"
-  ),
-  icon: "thumb_up",
-});
+  bundle?: FluentBundle
+): Tenant["reaction"] => {
+  return {
+    // By default, the standard reaction style will use the Respect with the
+    // handshake.
+    label: bundle
+      ? translate(bundle, "Respect", "reaction-labelRespect")
+      : "Respect",
+    labelActive: bundle
+      ? translate(bundle, "Respected", "reaction-labelActiveRespected")
+      : "Respected",
+    sortLabel: bundle
+      ? translate(bundle, "Most Respected", "reaction-sortLabelMostRespected")
+      : "Most Respected",
+    icon: "thumb_up",
+  };
+};
 
 export const getDefaultBadgeConfiguration = (
-  bundle: FluentBundle
-): Tenant["badges"] => ({
-  label: translate(bundle, "Staff", "staff-label"),
-  adminLabel: translate(bundle, "Staff", "staff-label"),
-  staffLabel: translate(bundle, "Staff", "staff-label"),
-  moderatorLabel: translate(bundle, "Staff", "staff-label"),
-  memberLabel: translate(bundle, "Member", "member-label"),
-});
+  bundle?: FluentBundle
+): Tenant["badges"] => {
+  return {
+    label: bundle ? translate(bundle, "Staff", "staff-label") : "Staff",
+    adminLabel: bundle ? translate(bundle, "Staff", "staff-label") : "Staff",
+    staffLabel: bundle ? translate(bundle, "Staff", "staff-label") : "Staff",
+    moderatorLabel: bundle
+      ? translate(bundle, "Staff", "staff-label")
+      : "Staff",
+    memberLabel: bundle
+      ? translate(bundle, "Member", "member-label")
+      : "Member",
+  };
+};
 
 /**
  * hasFeatureFlag will check to see if the Tenant has a particular feature flag
diff --git a/server/src/core/server/models/tenant/tenant.ts b/server/src/core/server/models/tenant/tenant.ts
index 8191e47795..1706454d53 100644
--- a/server/src/core/server/models/tenant/tenant.ts
+++ b/server/src/core/server/models/tenant/tenant.ts
@@ -13,6 +13,7 @@ import {
   DuplicateFlairBadgeError,
 } from "coral-server/errors";
 import {
+  BadgeConfiguration,
   defaultRTEConfiguration,
   generateSigningSecret,
   Settings,
@@ -26,6 +27,7 @@ import {
   GQLDSA_METHOD_OF_REDRESS,
   GQLFEATURE_FLAG,
   GQLMODERATION_MODE,
+  GQLReactionConfiguration,
   GQLSettings,
   GQLWEBHOOK_EVENT_NAME,
 } from "coral-server/graph/schema/__generated__/types";
@@ -137,22 +139,13 @@ export type CreateTenantInput = Pick<
 export interface TenantComputedProperties {
   multisite: boolean;
 }
-/**
- * create will create a new Tenant.
- *
- * @param mongo the MongoDB connection used to create the tenant.
- * @param i18n i18n instance
- * @param input the customizable parts of the Tenant available during creation
- */
-export async function createTenant(
-  mongo: MongoContext,
-  i18n: I18n,
+
+export const combineTenantDefaultsAndInput = (
   input: CreateTenantInput,
+  reaction: GQLReactionConfiguration,
+  badges: BadgeConfiguration,
   now = new Date()
-) {
-  // Get the tenant's bundle.
-  const bundle = i18n.getBundle(input.locale);
-
+) => {
   const defaults: Sub<Tenant, CreateTenantInput> = {
     // Create a new ID.
     id: uuid(),
@@ -259,8 +252,8 @@ export async function createTenant(
         sendFeedback: false,
       },
     },
-    reaction: getDefaultReactionConfiguration(bundle),
-    badges: getDefaultBadgeConfiguration(bundle),
+    reaction,
+    badges,
     stories: {
       scraping: {
         enabled: true,
@@ -314,6 +307,29 @@ export async function createTenant(
     ...input,
   };
 
+  return tenant;
+};
+
+/**
+ * create will create a new Tenant.
+ *
+ * @param mongo the MongoDB connection used to create the tenant.
+ * @param i18n i18n instance
+ * @param input the customizable parts of the Tenant available during creation
+ */
+export async function createTenant(
+  mongo: MongoContext,
+  i18n: I18n,
+  input: CreateTenantInput,
+  now = new Date()
+) {
+  // Get the tenant's bundle.
+  const bundle = i18n.getBundle(input.locale);
+  const reaction = getDefaultReactionConfiguration(bundle);
+  const badges = getDefaultBadgeConfiguration(bundle);
+
+  const tenant = combineTenantDefaultsAndInput(input, reaction, badges, now);
+
   // Insert the Tenant into the database.
   await mongo.tenants().insertOne(tenant);
 
diff --git a/server/src/core/server/models/user/user.ts b/server/src/core/server/models/user/user.ts
index 188fb9ac60..398821c7e3 100644
--- a/server/src/core/server/models/user/user.ts
+++ b/server/src/core/server/models/user/user.ts
@@ -626,7 +626,7 @@ export interface User extends TenantResource {
   premoderatedBecauseOfEmailAt?: Date;
 }
 
-function hashPassword(password: string): Promise<string> {
+export function hashPassword(password: string): Promise<string> {
   return bcrypt.hash(password, 10);
 }
 
@@ -650,7 +650,7 @@ export interface FindOrCreateUserInput {
  * @param input the input for creating a User
  * @param now the current date
  */
-async function findOrCreateUserInput(
+export async function findOrCreateUserInput(
   tenantID: string,
   { id = uuid(), profile, email, ...input }: FindOrCreateUserInput,
   now: Date
diff --git a/server/src/core/server/services/sites/index.ts b/server/src/core/server/services/sites/index.ts
index 62009ededc..d687846d38 100644
--- a/server/src/core/server/services/sites/index.ts
+++ b/server/src/core/server/services/sites/index.ts
@@ -25,7 +25,7 @@ export async function findSiteByURL(
   return retrieveSiteByOrigin(mongo, tenantID, origin);
 }
 
-function conformURLToOrigins(allowedOrigins?: string[]) {
+export function conformURLToOrigins(allowedOrigins?: string[]) {
   if (allowedOrigins) {
     return {
       allowedOrigins: getURLOrigins(allowedOrigins),
diff --git a/utilities/tenant/.gitignore b/utilities/tenant/.gitignore
new file mode 100644
index 0000000000..04c01ba7ba
--- /dev/null
+++ b/utilities/tenant/.gitignore
@@ -0,0 +1,2 @@
+node_modules/
+dist/
\ No newline at end of file
diff --git a/utilities/tenant/README.md b/utilities/tenant/README.md
new file mode 100644
index 0000000000..0e34a9f9d0
--- /dev/null
+++ b/utilities/tenant/README.md
@@ -0,0 +1,27 @@
+# utilities/tenant
+
+This script includes helpful tools for handling and processing tenants with Coral.
+
+# Getting started
+
+Before you can use the tenant scripts, you must first perform a build of Coral. At the root of the repo, perform a build:
+
+```
+sh npm-i.sh
+sh scripts/build-development.sh
+```
+
+Then navigate into this tenant utilities folder and install the dependencies:
+
+```
+cd utilities/tenant
+npm i
+```
+
+# `createTenant` command
+
+```
+npm run start -- --mongoURI mongodb://localhost:27017 --mongoDBName coral createTenant
+```
+
+The above command will take a `mongoURI` and `mongoDBName` and then prompt you with details so it can create a brand new tenant on that mongo cluster for that dbName.
\ No newline at end of file
diff --git a/utilities/tenant/package-lock.json b/utilities/tenant/package-lock.json
new file mode 100644
index 0000000000..48fc5a468f
--- /dev/null
+++ b/utilities/tenant/package-lock.json
@@ -0,0 +1,454 @@
+{
+  "name": "tenant",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "tenant",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "coral-common": "../../common/dist",
+        "coral-server": "../../server/dist",
+        "mongodb": "^3.5.9",
+        "uuid": "^9.0.1"
+      },
+      "devDependencies": {
+        "@types/mongodb": "^3.1.22",
+        "@types/node": "^12.12.34",
+        "@types/uuid": "^9.0.7",
+        "typescript": "^5.2.2"
+      }
+    },
+    "../../common/dist": {},
+    "../../server/dist": {},
+    "node_modules/@types/bson": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@types/bson/-/bson-4.2.0.tgz",
+      "integrity": "sha512-ELCPqAdroMdcuxqwMgUpifQyRoTpyYCNr1V9xKyF40VsBobsj+BbWNRvwGchMgBPGqkw655ypkjj2MEF5ywVwg==",
+      "deprecated": "This is a stub types definition. bson provides its own type definitions, so you do not need this installed.",
+      "dev": true,
+      "dependencies": {
+        "bson": "*"
+      }
+    },
+    "node_modules/@types/mongodb": {
+      "version": "3.1.22",
+      "resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.1.22.tgz",
+      "integrity": "sha512-hvNR0txBlJJAy1eZOeIDshW4dnQaC694COou4eHHaMdIcteCfoCQATD7sYNlXxNxfTc1iIbHUi7A8CAhQe08uA==",
+      "dev": true,
+      "dependencies": {
+        "@types/bson": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "12.20.55",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz",
+      "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==",
+      "dev": true
+    },
+    "node_modules/@types/uuid": {
+      "version": "9.0.7",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.7.tgz",
+      "integrity": "sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==",
+      "dev": true
+    },
+    "node_modules/bl": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz",
+      "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==",
+      "dependencies": {
+        "readable-stream": "^2.3.5",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/bson": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.6.tgz",
+      "integrity": "sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==",
+      "engines": {
+        "node": ">=0.6.19"
+      }
+    },
+    "node_modules/coral-common": {
+      "resolved": "../../common/dist",
+      "link": true
+    },
+    "node_modules/coral-server": {
+      "resolved": "../../server/dist",
+      "link": true
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+    },
+    "node_modules/denque": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz",
+      "integrity": "sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+    },
+    "node_modules/memory-pager": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
+      "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
+      "optional": true
+    },
+    "node_modules/mongodb": {
+      "version": "3.5.9",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.9.tgz",
+      "integrity": "sha512-vXHBY1CsGYcEPoVWhwgxIBeWqP3dSu9RuRDsoLRPTITrcrgm1f0Ubu1xqF9ozMwv53agmEiZm0YGo+7WL3Nbug==",
+      "dependencies": {
+        "bl": "^2.2.0",
+        "bson": "^1.1.4",
+        "denque": "^1.4.1",
+        "require_optional": "^1.0.1",
+        "safe-buffer": "^5.1.2"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "optionalDependencies": {
+        "saslprep": "^1.0.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
+    "node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/readable-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/require_optional": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
+      "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
+      "dependencies": {
+        "resolve-from": "^2.0.0",
+        "semver": "^5.1.0"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
+      "integrity": "sha512-qpFcKaXsq8+oRoLilkwyc7zHGF5i9Q2/25NIgLQQ/+VVv9rU4qvr6nXVAw1DsnXJyQkZsR4Ytfbtg5ehfcUssQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/saslprep": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz",
+      "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==",
+      "optional": true,
+      "dependencies": {
+        "sparse-bitfield": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/sparse-bitfield": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
+      "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==",
+      "optional": true,
+      "dependencies": {
+        "memory-pager": "^1.0.2"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/typescript": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
+      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    }
+  },
+  "dependencies": {
+    "@types/bson": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@types/bson/-/bson-4.2.0.tgz",
+      "integrity": "sha512-ELCPqAdroMdcuxqwMgUpifQyRoTpyYCNr1V9xKyF40VsBobsj+BbWNRvwGchMgBPGqkw655ypkjj2MEF5ywVwg==",
+      "dev": true,
+      "requires": {
+        "bson": "*"
+      }
+    },
+    "@types/mongodb": {
+      "version": "3.1.22",
+      "resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.1.22.tgz",
+      "integrity": "sha512-hvNR0txBlJJAy1eZOeIDshW4dnQaC694COou4eHHaMdIcteCfoCQATD7sYNlXxNxfTc1iIbHUi7A8CAhQe08uA==",
+      "dev": true,
+      "requires": {
+        "@types/bson": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/node": {
+      "version": "12.20.55",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz",
+      "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==",
+      "dev": true
+    },
+    "@types/uuid": {
+      "version": "9.0.7",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.7.tgz",
+      "integrity": "sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g==",
+      "dev": true
+    },
+    "bl": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz",
+      "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==",
+      "requires": {
+        "readable-stream": "^2.3.5",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "bson": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.6.tgz",
+      "integrity": "sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg=="
+    },
+    "coral-common": {
+      "version": "file:../../common/dist"
+    },
+    "coral-server": {
+      "version": "file:../../server/dist"
+    },
+    "core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+    },
+    "denque": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz",
+      "integrity": "sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw=="
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+    },
+    "memory-pager": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
+      "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
+      "optional": true
+    },
+    "mongodb": {
+      "version": "3.5.9",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.9.tgz",
+      "integrity": "sha512-vXHBY1CsGYcEPoVWhwgxIBeWqP3dSu9RuRDsoLRPTITrcrgm1f0Ubu1xqF9ozMwv53agmEiZm0YGo+7WL3Nbug==",
+      "requires": {
+        "bl": "^2.2.0",
+        "bson": "^1.1.4",
+        "denque": "^1.4.1",
+        "require_optional": "^1.0.1",
+        "safe-buffer": "^5.1.2",
+        "saslprep": "^1.0.0"
+      }
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
+    "readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        }
+      }
+    },
+    "require_optional": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
+      "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
+      "requires": {
+        "resolve-from": "^2.0.0",
+        "semver": "^5.1.0"
+      }
+    },
+    "resolve-from": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
+      "integrity": "sha512-qpFcKaXsq8+oRoLilkwyc7zHGF5i9Q2/25NIgLQQ/+VVv9rU4qvr6nXVAw1DsnXJyQkZsR4Ytfbtg5ehfcUssQ=="
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+    },
+    "saslprep": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz",
+      "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==",
+      "optional": true,
+      "requires": {
+        "sparse-bitfield": "^3.0.3"
+      }
+    },
+    "semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
+    },
+    "sparse-bitfield": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
+      "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==",
+      "optional": true,
+      "requires": {
+        "memory-pager": "^1.0.2"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        }
+      }
+    },
+    "typescript": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
+      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
+      "dev": true
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="
+    }
+  }
+}
diff --git a/utilities/tenant/package.json b/utilities/tenant/package.json
new file mode 100644
index 0000000000..030ee3e68a
--- /dev/null
+++ b/utilities/tenant/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "tenant",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "init": "tsc --init",
+    "build": "tsc --project tsconfig.json",
+    "start": "npm run build && node dist/main.js"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/mongodb": "^3.1.22",
+    "@types/node": "^12.12.34",
+    "@types/uuid": "^9.0.7",
+    "typescript": "^5.2.2"
+  },
+  "dependencies": {
+    "coral-common": "../../common/dist",
+    "coral-server": "../../server/dist",
+    "mongodb": "^3.5.9",
+    "uuid": "^9.0.1"
+  }
+}
diff --git a/utilities/tenant/src/args.ts b/utilities/tenant/src/args.ts
new file mode 100644
index 0000000000..a70c430044
--- /dev/null
+++ b/utilities/tenant/src/args.ts
@@ -0,0 +1,181 @@
+export enum ArgumentValueType {
+  Boolean = "boolean",
+  Integer = "integer",
+  String = "string",
+  Command = "command",
+}
+
+export interface ArgumentDefinition {
+  fullName: string;
+  shortName: string;
+  valueType: ArgumentValueType;
+}
+
+interface Result {
+  ok: boolean;
+  errors: Error[];
+  args: ArgumentResult<any>[];
+}
+
+interface ArgumentResult<T> {
+  definition: ArgumentDefinition;
+  value: T;
+}
+
+interface ParseResult<T> {
+  ok: boolean;
+  value: ArgumentResult<T>;
+  err?: Error;
+}
+
+export const parseBool = (value: string) => {
+  const lower = value.toLowerCase();
+  if (
+    lower === "true" ||
+    lower === "t" ||
+    lower === "1" ||
+    lower === "yes" ||
+    lower === "y"
+  ) {
+    return true;
+  } else {
+    return false;
+  }
+};
+
+const parseArgument = (value: string, definition: ArgumentDefinition) => {
+  const { valueType: type } = definition;
+
+  if (type === ArgumentValueType.Boolean) {
+    try {
+      const v = parseBool(value);
+      const r: ParseResult<boolean> = {
+        ok: true,
+        value: {
+          definition,
+          value: v,
+        },
+      };
+      return r;
+    } catch {
+      const r: ParseResult<boolean> = {
+        ok: false,
+        value: {
+          definition,
+          value: false,
+        },
+        err: new Error(`unable to parse ${value}`),
+      };
+      return r;
+    }
+  }
+  if (type === ArgumentValueType.Integer) {
+    try {
+      const v = parseInt(value);
+      const r: ParseResult<number> = {
+        ok: true,
+        value: {
+          definition,
+          value: v,
+        },
+      };
+      return r;
+    } catch {
+      const r: ParseResult<number> = {
+        ok: false,
+        value: {
+          definition,
+          value: 0,
+        },
+        err: new Error(`unable to parse ${value}`),
+      };
+      return r;
+    }
+  }
+  if (type === ArgumentValueType.String) {
+    try {
+      const r: ParseResult<string> = {
+        ok: true,
+        value: {
+          definition,
+          value,
+        },
+      };
+      return r;
+    } catch {
+      const r: ParseResult<string> = {
+        ok: false,
+        value: {
+          definition,
+          value: "",
+        },
+        err: new Error(`unable to parse ${value}`),
+      };
+      return r;
+    }
+  }
+};
+
+export const getArgs = (argv: string[], definition: ArgumentDefinition[]) => {
+  const result: Result = {
+    ok: true,
+    errors: [],
+    args: [],
+  };
+
+  for (let a = 0; a < argv.length; a++) {
+    const arg = argv[a];
+    const lowerArg = arg.toLowerCase();
+
+    for (const def of definition) {
+      const lowerFullName = def.fullName.toLowerCase().trim();
+
+      const matchShort = arg.trim() === def.shortName.trim();
+      const matchFull = lowerArg.startsWith(lowerFullName);
+      const isMatch = matchShort || matchFull;
+
+      if (!isMatch) {
+        continue;
+      }
+
+      if (def.valueType === ArgumentValueType.Command) {
+        result.args.push({
+          definition: def,
+          value: def.valueType.toString(),
+        });
+      } else {
+        if (argv.length >= a + 2) {
+          const value = argv[a + 1];
+
+          const parseResult = parseArgument(value, def);
+          if (!parseResult) {
+            result.ok = false;
+            result.errors.push(
+              new Error(`unable to parse value for ${arg} with input ${value}`)
+            );
+            continue;
+          }
+
+          if (!parseResult.ok) {
+            result.ok = false;
+
+            result.errors.push(
+              new Error(`unable to parse value for ${arg} with input ${value}`)
+            );
+            if (parseResult.err) {
+              result.errors.push(parseResult.err);
+            }
+            continue;
+          }
+
+          result.args.push(parseResult.value);
+        } else {
+          result.ok = false;
+          result.errors.push(new Error(`unable to find value for ${arg}`));
+        }
+      }
+    }
+  }
+
+  return result;
+};
diff --git a/utilities/tenant/src/createTenant.ts b/utilities/tenant/src/createTenant.ts
new file mode 100644
index 0000000000..0989b08319
--- /dev/null
+++ b/utilities/tenant/src/createTenant.ts
@@ -0,0 +1,153 @@
+import { Db } from "mongodb";
+import { v4 as uuid } from "uuid";
+
+import { CreateSiteInput, CreateTenantInput, CreateUserInput, GQLUSER_ROLE } from "./createTenant/models";
+import { Prompt } from "./prompt";
+import { parseBool } from "./args";
+
+const {
+  createEmptyRelatedCommentCounts,
+} = require("coral-server/core/server/models/comment");
+const {
+  getDefaultBadgeConfiguration,
+  getDefaultReactionConfiguration,
+} = require("coral-server/core/server/models/tenant");
+const {
+  combineTenantDefaultsAndInput,
+} = require("coral-server/core/server/models/tenant/tenant");
+const {
+  conformURLToOrigins,
+} = require("coral-server/core/server/services/sites");
+const {
+  findOrCreateUserInput,
+} = require("coral-server/core/server/models/user/user");
+
+export const create = async (db: Db) => {
+  const tenants = db.collection("tenants");
+  const sites = db.collection("sites");
+  const users = db.collection("users");
+
+  const prompt = new Prompt();
+
+  const createTenantInput: CreateTenantInput = {
+    domain: "",
+    organization: {
+      name: "",
+      contactEmail: "",
+      url: "",
+    },
+    locale: "en-US",
+  };
+
+  createTenantInput.domain = await prompt.ask(
+    "what domain would you like to use for the tenant?"
+  );
+
+  createTenantInput.organization.name = await prompt.ask(
+    "what is the name of the organization for this tenant?"
+  );
+
+  createTenantInput.organization.contactEmail = await prompt.ask(
+    "what is the contact email for the organization?"
+  );
+
+  createTenantInput.organization.url = await prompt.ask(
+    "what is the url for the organization?"
+  );
+
+  const now = new Date();
+
+  const createSiteInput: CreateSiteInput = {
+    name: "",
+    allowedOrigins: [],
+  };
+
+  createSiteInput.name = await prompt.ask(
+    "what is the name of the site for the organization?"
+  );
+
+  const rawOrigins = await prompt.ask(
+    "please enter the allowed origins for the site (comma separated):"
+  );
+  createSiteInput.allowedOrigins = rawOrigins.split(",").map((o) => o.trim());
+
+  const userInput: CreateUserInput = {
+    id: uuid(),
+    username: "",
+    email: "",
+    emailVerified: true,
+    role: GQLUSER_ROLE.ADMIN,
+    profile: {
+      type: "local",
+      id: "",
+      password: "",
+      passwordID: "",
+    }
+  }
+
+  userInput.username = await prompt.ask(
+    "what is the username for the admin user?"
+  );
+
+  userInput.email = await prompt.ask(
+    "what is the email for the admin user?"
+  );
+  userInput.profile.id = userInput.email.toLowerCase();
+
+  const password = await prompt.ask(
+    "what is the password for the admin user?"
+  );
+  userInput.profile.password = password;
+  userInput.profile.passwordID = uuid();
+
+  const newTenant = createTenantModel(createTenantInput, now);
+  const newSite = createSiteModel(newTenant, createSiteInput, now);
+  const newUser = await findOrCreateUserInput(newTenant.id, userInput, now);
+
+  console.log("-- Tenant to be created:")
+  console.log(newTenant);
+  console.log("\n");
+
+  console.log("-- Site to be created:")
+  console.log(newSite);
+  console.log("\n");
+
+  console.log("-- Admin user to be created:")
+  console.log(newUser);
+  console.log("\n");
+
+  const proceedResponse = await prompt.ask(
+    "Are the above details correct? Shall we proceed with tenant creation?"
+  );
+
+  if (parseBool(proceedResponse)) {
+    await tenants.insertOne(newTenant);
+    await sites.insertOne(newSite);
+    await users.insertOne(newUser);
+  }
+};
+
+const createTenantModel = (input: CreateTenantInput, now: Date) => {
+  const reaction = getDefaultReactionConfiguration();
+  const badge = getDefaultBadgeConfiguration();
+  const model = combineTenantDefaultsAndInput(input, reaction, badge);
+
+  return model;
+};
+
+const createSiteModel = (tenant: any, input: CreateSiteInput, now: Date) => {
+  const createInput = {
+    ...input,
+    ...conformURLToOrigins(input.allowedOrigins),
+    tenantID: tenant.id,
+  };
+
+  const site = {
+    ...createInput,
+    id: uuid(),
+    commentCounts: createEmptyRelatedCommentCounts(),
+    createdAt: now,
+  };
+
+  return site;
+};
diff --git a/utilities/tenant/src/createTenant/models.ts b/utilities/tenant/src/createTenant/models.ts
new file mode 100644
index 0000000000..01e97760bd
--- /dev/null
+++ b/utilities/tenant/src/createTenant/models.ts
@@ -0,0 +1,45 @@
+import { LanguageCode } from "coral-common/common/lib/helpers/i18n/locales";
+
+export type CreateTenantInput = {
+  domain: string;
+  organization: {
+    name: string;
+    contactEmail: string;
+    url: string;
+  };
+  locale: LanguageCode;
+};
+
+export type CreateSiteInput = {
+  name: string;
+  allowedOrigins: string[];
+};
+
+export enum GQLUSER_ROLE {
+  COMMENTER = 'COMMENTER',
+  MEMBER = 'MEMBER',
+  STAFF = 'STAFF',
+  MODERATOR = 'MODERATOR',
+  ADMIN = 'ADMIN'
+}
+
+export interface LocalProfile {
+  type: "local";
+  id: string;
+  password: string;
+  passwordID: string;
+  resetID?: string;
+}
+
+export type CreateUserInput = {
+  id?: string;
+  username?: string;
+  avatar?: string;
+  email?: string;
+  badges?: string[];
+  ssoURL?: string;
+  emailVerified?: boolean;
+  duplicateEmail?: string;
+  role: GQLUSER_ROLE;
+  profile: LocalProfile;
+};
diff --git a/utilities/tenant/src/main.ts b/utilities/tenant/src/main.ts
new file mode 100644
index 0000000000..87830dd6d7
--- /dev/null
+++ b/utilities/tenant/src/main.ts
@@ -0,0 +1,50 @@
+import { argv } from "process";
+import { ArgumentDefinition, ArgumentValueType, getArgs } from "./args";
+import { createMongo } from "./mongo";
+import { create as createTenant } from "./createTenant";
+
+const argumentDefinitions: ArgumentDefinition[] = [
+  {
+    shortName: "-M",
+    fullName: "--mongoURI",
+    valueType: ArgumentValueType.String
+  },
+  {
+    shortName: "-DB",
+    fullName: "--mongoDBName",
+    valueType: ArgumentValueType.String
+  },
+  {
+    shortName: "ct",
+    fullName: "createTenant",
+    valueType: ArgumentValueType.Command
+  }
+];
+
+const run = async () => {
+  const result = getArgs(argv, argumentDefinitions);
+  
+  const mongoURIItem = result.args.find((a) => a.definition.fullName === "--mongoURI");
+  const mongoDBNameItem = result.args.find((a) => a.definition.fullName === "--mongoDBName");
+
+  if (!mongoURIItem || !mongoDBNameItem) {
+    console.log("mongoURI and mongoDBName are required arguments");
+    process.exit();
+  }
+
+  const { db } = await createMongo(mongoURIItem.value, mongoDBNameItem.value);
+
+  const command = result.args.find((a) => a.definition.valueType === ArgumentValueType.Command);
+  if (!command) {
+    console.log("no command found, exiting...");
+    process.exit();
+  }
+
+  if (command.definition.fullName === "createTenant") {
+    await createTenant(db);
+  }
+
+  process.exit();
+}
+
+void run();
\ No newline at end of file
diff --git a/utilities/tenant/src/mongo.ts b/utilities/tenant/src/mongo.ts
new file mode 100644
index 0000000000..d4894216ef
--- /dev/null
+++ b/utilities/tenant/src/mongo.ts
@@ -0,0 +1,21 @@
+import { Db, MongoClient } from "mongodb";
+
+export interface MongoContext {
+  db: Db;
+  client: MongoClient;
+}
+
+export const createMongo = async (
+  uri: string,
+  dbName: string
+): Promise<MongoContext> => {
+  const client = new MongoClient(uri);
+  await client.connect();
+
+  const db = client.db(dbName);
+
+  return {
+    db,
+    client,
+  };
+};
diff --git a/utilities/tenant/src/prompt.ts b/utilities/tenant/src/prompt.ts
new file mode 100644
index 0000000000..09a1ad94a0
--- /dev/null
+++ b/utilities/tenant/src/prompt.ts
@@ -0,0 +1,35 @@
+import { createInterface, Interface } from "readline";
+
+export class Prompt {
+  public async ask(text: string): Promise<string> {
+    let haveAnswer = false;
+    let answer: string = "";
+
+    while (!haveAnswer) {
+      answer = await this.performAsk(text);
+
+      const trimmedAnswer = answer.trim();
+      if (trimmedAnswer === "") {
+        console.log(`invalid input, please try again.`);
+      } else {
+        haveAnswer = true;
+      }
+    }
+
+    return answer;
+  }
+
+  private async performAsk(text: string) {
+    const rl = createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+    return new Promise<string>((resolve) => {
+      rl.question(`${text}\n`, (value) => {
+        rl.close();
+        resolve(value);
+      });
+    });
+  }
+}
\ No newline at end of file
diff --git a/utilities/tenant/tsconfig.json b/utilities/tenant/tsconfig.json
new file mode 100644
index 0000000000..7a72057333
--- /dev/null
+++ b/utilities/tenant/tsconfig.json
@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "target": "es2018",
+    "module": "commonjs",
+    "esModuleInterop": true,
+    "allowJs": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "outDir": "./dist",
+  },
+  "include": [
+    "./src/**/.*.js",
+    "./src/**/*.ts",
+  ],
+  "exclude": ["node_modules"]
+}