diff --git a/app/client/main-app.js b/app/client/main-app.js
index 9ea74a4..daf6531 100644
--- a/app/client/main-app.js
+++ b/app/client/main-app.js
@@ -1,6 +1,6 @@
 'use strict'
 
-import clientMain from '../../node_modules/civil-server/dist/client/main'
+import { clientMain } from 'civil-client'
 import App from '../components/app'
 
 // this is the entry point for the client App running on the browser
diff --git a/app/web-components/cc-wrapper/ending.jsx b/app/web-components/cc-wrapper/ending.jsx
index ba09ce9..67eff61 100644
--- a/app/web-components/cc-wrapper/ending.jsx
+++ b/app/web-components/cc-wrapper/ending.jsx
@@ -1,7 +1,7 @@
 'use strict;'
 import React, { useState } from 'react'
 import { createUseStyles } from 'react-jss'
-import AuthForm from '../../../node_modules/civil-server/dist/components/auth-form' // pull components for the client out from the repo, so that server side stuff is not pulled into the client
+import { AuthForm } from 'civil-client' // pull components for the client out from the repo, so that server side stuff is not pulled into the client
 import createParticipant from '../../components/lib/create-participant'
 import SurveyForm from './survey-form'
 import Input from '../../components/lib/input'
diff --git a/app/web-components/undebate.jsx b/app/web-components/undebate.jsx
index 2d60074..faa7203 100644
--- a/app/web-components/undebate.jsx
+++ b/app/web-components/undebate.jsx
@@ -6,7 +6,7 @@ import cx from 'classnames'
 import Join from '../components/join'
 import Input from '../components/lib/input'
 import SocialShareBtn from '../components/lib/socialShareBtn'
-import AuthForm from '../../node_modules/civil-server/dist/components/auth-form' // pull components for the client out from the repo, so that server side stuff is not pulled into the client path is relative to app not root
+import { AuthForm } from 'civil-client' // pull components for the client out from the repo, so that server side stuff is not pulled into the client path is relative to app not root
 import TimeFormat from 'hh-mm-ss'
 import cloneDeep from 'lodash/cloneDeep'
 import getYouTubeID from 'get-youtube-id'
diff --git a/package-lock.json b/package-lock.json
index d63af76..230624e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,8 @@
         "babel-loader": "^8.2.2",
         "body-parser": "^1.19.0",
         "circular-dependency-plugin": "^5.2.2",
-        "civil-server": "github:EnCiv/civil-server#v0.0.10",
+        "civil-client": "github:EnCiv/civil-client",
+        "civil-server": "github:EnCiv/civil-server#civ-client",
         "classnames": "^2.3.1",
         "cloudinary": "^1.25.1",
         "color": "^3.1.3",
@@ -7075,9 +7076,43 @@
       "integrity": "sha512-ODYONMMNb3p658Zv+Pp+/XPa5s6q7afhz3Tzyvo+VRh9WIrJ64J76ZC4GQxnlye/NesTn09jvOiuE8+xxfpwhQ==",
       "dev": true
     },
+    "node_modules/civil-client": {
+      "version": "0.0.0",
+      "resolved": "git+ssh://git@github.com/EnCiv/civil-client.git#740f0d510a2da7615f56b254c183f1d7146e49ea",
+      "hasInstallScript": true,
+      "license": "SEE LICENSE IN LICENSE.txt",
+      "dependencies": {
+        "@babel/core": "^7.12.10",
+        "@babel/plugin-proposal-class-properties": "^7.12.1",
+        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+        "@babel/plugin-transform-react-inline-elements": "^7.12.1",
+        "@babel/plugin-transform-regenerator": "^7.12.1",
+        "@babel/plugin-transform-runtime": "^7.12.10",
+        "@babel/preset-env": "^7.12.11",
+        "@babel/preset-react": "^7.12.10",
+        "@babel/runtime": "^7.12.5",
+        "babel-loader": "^8.2.2",
+        "body-parser": "^1.19.0",
+        "classnames": "^2.2.6",
+        "core-js": "^3.2.0",
+        "is-email": "^1.0.0",
+        "log4js": "git+https://github.com/ddfridley/log4js-node.git#onbrowser",
+        "log4js-extend": "^0.2.1",
+        "react": "^16.13.1",
+        "react-dom": "^16.13.1",
+        "react-hot-loader": "^4.12.10",
+        "react-jss": "^10.1.1",
+        "regenerator-runtime": "^0.13.3",
+        "superagent": "^5.1.0"
+      },
+      "engines": {
+        "node": ">10.x.x",
+        "npm": ">6.x.x"
+      }
+    },
     "node_modules/civil-server": {
       "version": "0.0.0",
-      "resolved": "git+ssh://git@github.com/EnCiv/civil-server.git#75c07204283127fa93f64490cd1251857b695565",
+      "resolved": "git+ssh://git@github.com/EnCiv/civil-server.git#37dc3de8adfafce2a246c2007ec393ebd05471e3",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
@@ -7095,6 +7130,7 @@
         "babel-loader": "^8.2.2",
         "bcrypt": "^5.0.0",
         "body-parser": "^1.19.0",
+        "civil-client": "github:EnCiv/civil-client",
         "classnames": "^2.2.6",
         "cloudinary": "^1.14.0",
         "compression": "^1.7.4",
@@ -28875,9 +28911,37 @@
       "integrity": "sha512-ODYONMMNb3p658Zv+Pp+/XPa5s6q7afhz3Tzyvo+VRh9WIrJ64J76ZC4GQxnlye/NesTn09jvOiuE8+xxfpwhQ==",
       "dev": true
     },
+    "civil-client": {
+      "version": "git+ssh://git@github.com/EnCiv/civil-client.git#740f0d510a2da7615f56b254c183f1d7146e49ea",
+      "from": "civil-client@github:EnCiv/civil-client",
+      "requires": {
+        "@babel/core": "^7.12.10",
+        "@babel/plugin-proposal-class-properties": "^7.12.1",
+        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+        "@babel/plugin-transform-react-inline-elements": "^7.12.1",
+        "@babel/plugin-transform-regenerator": "^7.12.1",
+        "@babel/plugin-transform-runtime": "^7.12.10",
+        "@babel/preset-env": "^7.12.11",
+        "@babel/preset-react": "^7.12.10",
+        "@babel/runtime": "^7.12.5",
+        "babel-loader": "^8.2.2",
+        "body-parser": "^1.19.0",
+        "classnames": "^2.2.6",
+        "core-js": "^3.2.0",
+        "is-email": "^1.0.0",
+        "log4js": "git+https://github.com/ddfridley/log4js-node.git#onbrowser",
+        "log4js-extend": "^0.2.1",
+        "react": "^16.13.1",
+        "react-dom": "^16.13.1",
+        "react-hot-loader": "^4.12.10",
+        "react-jss": "^10.1.1",
+        "regenerator-runtime": "^0.13.3",
+        "superagent": "^5.1.0"
+      }
+    },
     "civil-server": {
-      "version": "git+ssh://git@github.com/EnCiv/civil-server.git#75c07204283127fa93f64490cd1251857b695565",
-      "from": "civil-server@github:EnCiv/civil-server#v0.0.10",
+      "version": "git+ssh://git@github.com/EnCiv/civil-server.git#37dc3de8adfafce2a246c2007ec393ebd05471e3",
+      "from": "civil-server@github:EnCiv/civil-server#civ-client",
       "requires": {
         "@babel/core": "^7.12.10",
         "@babel/plugin-proposal-class-properties": "^7.12.1",
@@ -28893,6 +28957,7 @@
         "babel-loader": "^8.2.2",
         "bcrypt": "^5.0.0",
         "body-parser": "^1.19.0",
+        "civil-client": "github:EnCiv/civil-client",
         "classnames": "^2.2.6",
         "cloudinary": "^1.14.0",
         "compression": "^1.7.4",
diff --git a/package.json b/package.json
index 99f826e..baf46e6 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,8 @@
     "babel-loader": "^8.2.2",
     "body-parser": "^1.19.0",
     "circular-dependency-plugin": "^5.2.2",
-    "civil-server": "github:EnCiv/civil-server#v0.0.10",
+    "civil-client": "github:EnCiv/civil-client",
+    "civil-server": "github:EnCiv/civil-server#civ-client",
     "classnames": "^2.3.1",
     "cloudinary": "^1.25.1",
     "color": "^3.1.3",