diff --git a/.env b/.env
deleted file mode 100644
index a2801f4359..0000000000
--- a/.env
+++ /dev/null
@@ -1 +0,0 @@
-COMPOSE_PROJECT_NAME=doenet
\ No newline at end of file
diff --git a/client/package-lock.json b/client/package-lock.json
index ffea519239..3b237ae9c0 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -14,13 +14,14 @@
         "@fontsource/jost": "^5.0.18",
         "@fortawesome/free-solid-svg-icons": "^6.6.0",
         "@fortawesome/react-fontawesome": "^0.2.2",
-        "axios": "^1.7.2",
+        "axios": "^1.7.3",
         "better-react-mathjax": "^2.0.3",
         "browser-image-resizer": "^2.4.1",
         "copy-to-clipboard": "^3.3.3",
         "cssesc": "^3.0.0",
+        "hi-base32": "^0.5.1",
         "js-cookie": "^3.0.5",
-        "luxon": "^3.4.4",
+        "luxon": "^3.5.0",
         "math-expressions": "^2.0.0-alpha64",
         "nanoid": "^5.0.7",
         "papaparse": "^5.4.1",
@@ -30,8 +31,9 @@
         "react-dropzone": "^14.2.3",
         "react-icons": "4.8.0",
         "react-qrcode-logo": "^3.0.0",
-        "react-router": "^6.25.1",
-        "react-router-dom": "^6.25.1",
+        "react-router": "^6.26.0",
+        "react-router-dom": "^6.26.0",
+        "react-select": "^5.8.0",
         "recharts": "^2.12.7",
         "styled-components": "5.3.11",
         "swiper": "^9.4.1"
@@ -64,7 +66,7 @@
         "rollup": "^2.71.1",
         "rollup-plugin-polyfill-node": "^0.13.0",
         "rollup-plugin-terser": "^7.0.2",
-        "vite": "^5.3.5",
+        "vite": "^5.4.0",
         "vite-plugin-mpa": "^1.2.0",
         "vite-plugin-static-copy": "^1.0.6"
       },
@@ -1851,7 +1853,6 @@
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.12.0.tgz",
       "integrity": "sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw==",
-      "peer": true,
       "dependencies": {
         "@babel/helper-module-imports": "^7.16.7",
         "@babel/runtime": "^7.18.3",
@@ -1869,14 +1870,12 @@
     "node_modules/@emotion/babel-plugin/node_modules/convert-source-map": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "peer": true
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
     },
     "node_modules/@emotion/cache": {
       "version": "11.13.0",
       "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.0.tgz",
       "integrity": "sha512-hPV345J/tH0Cwk2wnU/3PBzORQ9HeX+kQSbwI+jslzpRCHE6fSGTohswksA/Ensr8znPzwfzKZCmAM9Lmlhp7g==",
-      "peer": true,
       "dependencies": {
         "@emotion/memoize": "^0.9.0",
         "@emotion/sheet": "^1.4.0",
@@ -1888,8 +1887,7 @@
     "node_modules/@emotion/hash": {
       "version": "0.9.2",
       "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz",
-      "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==",
-      "peer": true
+      "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g=="
     },
     "node_modules/@emotion/is-prop-valid": {
       "version": "1.3.0",
@@ -1908,7 +1906,6 @@
       "version": "11.13.0",
       "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.13.0.tgz",
       "integrity": "sha512-WkL+bw1REC2VNV1goQyfxjx1GYJkcc23CRQkXX+vZNLINyfI7o+uUn/rTGPt/xJ3bJHd5GcljgnxHf4wRw5VWQ==",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.12.0",
@@ -1932,7 +1929,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.0.tgz",
       "integrity": "sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA==",
-      "peer": true,
       "dependencies": {
         "@emotion/hash": "^0.9.2",
         "@emotion/memoize": "^0.9.0",
@@ -1944,8 +1940,7 @@
     "node_modules/@emotion/sheet": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz",
-      "integrity": "sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==",
-      "peer": true
+      "integrity": "sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg=="
     },
     "node_modules/@emotion/styled": {
       "version": "11.13.0",
@@ -1978,14 +1973,12 @@
     "node_modules/@emotion/unitless": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.9.0.tgz",
-      "integrity": "sha512-TP6GgNZtmtFaFcsOgExdnfxLLpRDla4Q66tnenA9CktvVSdNKDvMVuUah4QvWPIpNjrWsGg3qeGo9a43QooGZQ==",
-      "peer": true
+      "integrity": "sha512-TP6GgNZtmtFaFcsOgExdnfxLLpRDla4Q66tnenA9CktvVSdNKDvMVuUah4QvWPIpNjrWsGg3qeGo9a43QooGZQ=="
     },
     "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz",
       "integrity": "sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==",
-      "peer": true,
       "peerDependencies": {
         "react": ">=16.8.0"
       }
@@ -1993,14 +1986,12 @@
     "node_modules/@emotion/utils": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.0.tgz",
-      "integrity": "sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ==",
-      "peer": true
+      "integrity": "sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ=="
     },
     "node_modules/@emotion/weak-memoize": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz",
-      "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==",
-      "peer": true
+      "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg=="
     },
     "node_modules/@esbuild-plugins/node-globals-polyfill": {
       "version": "0.2.3",
@@ -2486,6 +2477,28 @@
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
+    "node_modules/@floating-ui/core": {
+      "version": "1.6.5",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.5.tgz",
+      "integrity": "sha512-8GrTWmoFhm5BsMZOTHeGD2/0FLKLQQHvO/ZmQga4tKempYRLz8aqJGqXVuQgisnMObq2YZ2SgkwctN1LOOxcqA==",
+      "dependencies": {
+        "@floating-ui/utils": "^0.2.5"
+      }
+    },
+    "node_modules/@floating-ui/dom": {
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.8.tgz",
+      "integrity": "sha512-kx62rP19VZ767Q653wsP1XZCGIirkE09E0QUGNYTM/ttbbQHqcGPdSfWFxUyyNLc/W6aoJRBajOSXhP6GXjC0Q==",
+      "dependencies": {
+        "@floating-ui/core": "^1.6.0",
+        "@floating-ui/utils": "^0.2.5"
+      }
+    },
+    "node_modules/@floating-ui/utils": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.5.tgz",
+      "integrity": "sha512-sTcG+QZ6fdEUObICavU+aB3Mp8HY4n14wYHdxK4fXjPmv3PXZZeY5RaguJmGyeH/CJQhX3fqKUtS4qc1LoHwhQ=="
+    },
     "node_modules/@fontsource/jost": {
       "version": "5.0.18",
       "resolved": "https://registry.npmjs.org/@fontsource/jost/-/jost-5.0.18.tgz",
@@ -2870,9 +2883,9 @@
       }
     },
     "node_modules/@remix-run/router": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.18.0.tgz",
-      "integrity": "sha512-L3jkqmqoSVBVKHfpGZmLrex0lxR5SucGA0sUfFzGctehw+S/ggL9L/0NnC5mw6P8HUWpFZ3nQw3cRApjjWx9Sw==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.19.0.tgz",
+      "integrity": "sha512-zDICCLKEwbVYTS6TjYaWtHXxkdoUvD/QXvyVZjGCsWz5vyH7aFeONlPffPdW+Y/t6KT0MgXb2Mfjun9YpWN1dA==",
       "engines": {
         "node": ">=14.0.0"
       }
@@ -3674,8 +3687,7 @@
     "node_modules/@types/parse-json": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
-      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
-      "peer": true
+      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="
     },
     "node_modules/@types/parse5": {
       "version": "6.0.3",
@@ -3686,8 +3698,7 @@
     "node_modules/@types/prop-types": {
       "version": "15.7.12",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz",
-      "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==",
-      "devOptional": true
+      "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q=="
     },
     "node_modules/@types/qs": {
       "version": "6.9.15",
@@ -3705,7 +3716,6 @@
       "version": "18.3.3",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz",
       "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==",
-      "devOptional": true,
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -3720,6 +3730,14 @@
         "@types/react": "*"
       }
     },
+    "node_modules/@types/react-transition-group": {
+      "version": "4.4.10",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz",
+      "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==",
+      "dependencies": {
+        "@types/react": "*"
+      }
+    },
     "node_modules/@types/resolve": {
       "version": "1.17.1",
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
@@ -4993,9 +5011,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
-      "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.3.tgz",
+      "integrity": "sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -5021,7 +5039,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
       "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "cosmiconfig": "^7.0.0",
@@ -6430,7 +6447,6 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
       "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
-      "peer": true,
       "dependencies": {
         "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.2.1",
@@ -9164,8 +9180,7 @@
     "node_modules/find-root": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-      "peer": true
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
     },
     "node_modules/find-up": {
       "version": "5.0.0",
@@ -9861,6 +9876,11 @@
         "he": "bin/he"
       }
     },
+    "node_modules/hi-base32": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/hi-base32/-/hi-base32-0.5.1.tgz",
+      "integrity": "sha512-EmBBpvdYh/4XxsnUybsPag6VikPYnN30td+vQk+GI3qpahVEG9+gTkG0aXVxTjBqQ5T6ijbWIu77O+C5WFWsnA=="
+    },
     "node_modules/hoist-non-react-statics": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
@@ -11560,9 +11580,9 @@
       }
     },
     "node_modules/luxon": {
-      "version": "3.4.4",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz",
-      "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz",
+      "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==",
       "engines": {
         "node": ">=12"
       }
@@ -11693,6 +11713,11 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/memoize-one": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
+      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
+    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -12758,9 +12783,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
-      "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
+      "version": "8.4.41",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
+      "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
       "dev": true,
       "funding": [
         {
@@ -13310,11 +13335,11 @@
       }
     },
     "node_modules/react-router": {
-      "version": "6.25.1",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.25.1.tgz",
-      "integrity": "sha512-u8ELFr5Z6g02nUtpPAggP73Jigj1mRePSwhS/2nkTrlPU5yEkH1vYzWNyvSnSzeeE2DNqWdH+P8OhIh9wuXhTw==",
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.26.0.tgz",
+      "integrity": "sha512-wVQq0/iFYd3iZ9H2l3N3k4PL8EEHcb0XlU2Na8nEwmiXgIUElEH6gaJDtUQxJ+JFzmIXaQjfdpcGWaM6IoQGxg==",
       "dependencies": {
-        "@remix-run/router": "1.18.0"
+        "@remix-run/router": "1.19.0"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -13324,12 +13349,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "6.25.1",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.25.1.tgz",
-      "integrity": "sha512-0tUDpbFvk35iv+N89dWNrJp+afLgd+y4VtorJZuOCXK0kkCWjEvb3vTJM++SYvMEpbVwXKf3FjeVveVEb6JpDQ==",
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.26.0.tgz",
+      "integrity": "sha512-RRGUIiDtLrkX3uYcFiCIxKFWMcWQGMojpYZfcstc63A1+sSnVgILGIm9gNUA6na3Fm1QuPGSBQH2EMbAZOnMsQ==",
       "dependencies": {
-        "@remix-run/router": "1.18.0",
-        "react-router": "6.25.1"
+        "@remix-run/router": "1.19.0",
+        "react-router": "6.26.0"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -13339,6 +13364,26 @@
         "react-dom": ">=16.8"
       }
     },
+    "node_modules/react-select": {
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.0.tgz",
+      "integrity": "sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.0",
+        "@emotion/cache": "^11.4.0",
+        "@emotion/react": "^11.8.1",
+        "@floating-ui/dom": "^1.0.1",
+        "@types/react-transition-group": "^4.4.0",
+        "memoize-one": "^6.0.0",
+        "prop-types": "^15.6.0",
+        "react-transition-group": "^4.3.0",
+        "use-isomorphic-layout-effect": "^1.1.2"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/react-smooth": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.1.tgz",
@@ -14803,8 +14848,7 @@
     "node_modules/stylis": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
-      "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==",
-      "peer": true
+      "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw=="
     },
     "node_modules/supports-color": {
       "version": "5.5.0",
@@ -15480,6 +15524,19 @@
         }
       }
     },
+    "node_modules/use-isomorphic-layout-effect": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
+      "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/use-sidecar": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz",
@@ -15578,13 +15635,13 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.5.tgz",
-      "integrity": "sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.0.tgz",
+      "integrity": "sha512-5xokfMX0PIiwCMCMb9ZJcMyh5wbBun0zUzKib+L65vAZ8GY9ePZMXxFrHbr/Kyll2+LSCY7xtERPpxkBDKngwg==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.21.3",
-        "postcss": "^8.4.39",
+        "postcss": "^8.4.40",
         "rollup": "^4.13.0"
       },
       "bin": {
@@ -15604,6 +15661,7 @@
         "less": "*",
         "lightningcss": "^1.21.0",
         "sass": "*",
+        "sass-embedded": "*",
         "stylus": "*",
         "sugarss": "*",
         "terser": "^5.4.0"
@@ -15621,6 +15679,9 @@
         "sass": {
           "optional": true
         },
+        "sass-embedded": {
+          "optional": true
+        },
         "stylus": {
           "optional": true
         },
@@ -16219,7 +16280,6 @@
       "version": "1.10.2",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "peer": true,
       "engines": {
         "node": ">= 6"
       }
diff --git a/client/package.json b/client/package.json
index 5ef0b34c5c..f3e9efdff7 100644
--- a/client/package.json
+++ b/client/package.json
@@ -35,13 +35,14 @@
     "@fontsource/jost": "^5.0.18",
     "@fortawesome/free-solid-svg-icons": "^6.6.0",
     "@fortawesome/react-fontawesome": "^0.2.2",
-    "axios": "^1.7.2",
+    "axios": "^1.7.3",
     "better-react-mathjax": "^2.0.3",
     "browser-image-resizer": "^2.4.1",
     "copy-to-clipboard": "^3.3.3",
     "cssesc": "^3.0.0",
+    "hi-base32": "^0.5.1",
     "js-cookie": "^3.0.5",
-    "luxon": "^3.4.4",
+    "luxon": "^3.5.0",
     "math-expressions": "^2.0.0-alpha64",
     "nanoid": "^5.0.7",
     "papaparse": "^5.4.1",
@@ -51,8 +52,9 @@
     "react-dropzone": "^14.2.3",
     "react-icons": "4.8.0",
     "react-qrcode-logo": "^3.0.0",
-    "react-router": "^6.25.1",
-    "react-router-dom": "^6.25.1",
+    "react-router": "^6.26.0",
+    "react-router-dom": "^6.26.0",
+    "react-select": "^5.8.0",
     "recharts": "^2.12.7",
     "styled-components": "5.3.11",
     "swiper": "^9.4.1"
@@ -85,7 +87,7 @@
     "rollup": "^2.71.1",
     "rollup-plugin-polyfill-node": "^0.13.0",
     "rollup-plugin-terser": "^7.0.2",
-    "vite": "^5.3.5",
+    "vite": "^5.4.0",
     "vite-plugin-mpa": "^1.2.0",
     "vite-plugin-static-copy": "^1.0.6"
   },
diff --git a/client/src/Tools/_framework/Paths/Activities.tsx b/client/src/Tools/_framework/Paths/Activities.tsx
index 4bbdc94a00..6354d378f4 100644
--- a/client/src/Tools/_framework/Paths/Activities.tsx
+++ b/client/src/Tools/_framework/Paths/Activities.tsx
@@ -16,6 +16,8 @@ import {
   Input,
   Spacer,
   Show,
+  Hide,
+  Spinner,
 } from "@chakra-ui/react";
 import React, { useEffect, useRef, useState } from "react";
 import {
@@ -28,20 +30,30 @@ import {
 } from "react-router-dom";
 
 import { RiEmotionSadLine } from "react-icons/ri";
-import ContentCard from "../../../Widgets/ContentCard";
+import ContentCard, { contentCardActions } from "../../../Widgets/ContentCard";
 import axios from "axios";
-import MoveContentToFolder from "../ToolPanels/MoveContentToFolder";
-import { ContentSettingsDrawer } from "../ToolPanels/ContentSettingsDrawer";
+import MoveContentToFolder, {
+  moveContentActions,
+} from "../ToolPanels/MoveContentToFolder";
+import {
+  contentSettingsActions,
+  ContentSettingsDrawer,
+} from "../ToolPanels/ContentSettingsDrawer";
+import {
+  assignmentSettingsActions,
+  AssignmentSettingsDrawer,
+} from "../ToolPanels/AssignmentSettingsDrawer";
 import {
   AssignmentStatus,
   ContentStructure,
   DoenetmlVersion,
   License,
   LicenseCode,
+  UserInfo,
 } from "./ActivityEditor";
 import { DateTime } from "luxon";
 import { MdClose, MdOutlineSearch } from "react-icons/md";
-import { AssignmentSettingsDrawer } from "../ToolPanels/AssignmentSettingsDrawer";
+import { ShareDrawer, shareDrawerActions } from "../ToolPanels/ShareDrawer";
 
 // what is a better solution than this?
 let folderJustCreated = -1; // if a folder was just created, set autoFocusName true for the card with the matching id
@@ -50,35 +62,31 @@ export async function action({ request, params }) {
   const formData = await request.formData();
   let formObj = Object.fromEntries(formData);
 
-  if (formObj._action == "update general") {
-    //Don't let name be blank
-    let name = formObj?.name?.trim();
-    if (name == "") {
-      name = "Untitled";
-    }
+  let resultCS = await contentSettingsActions({ formObj });
+  if (resultCS) {
+    return resultCS;
+  }
 
-    let learningOutcomes;
-    if (formObj.learningOutcomes) {
-      learningOutcomes = JSON.parse(formObj.learningOutcomes);
-    }
+  let resultSD = await shareDrawerActions({ formObj });
+  if (resultSD) {
+    return resultSD;
+  }
+  let resultAS = await assignmentSettingsActions({ formObj });
+  if (resultAS) {
+    return resultAS;
+  }
 
-    await axios.post("/api/updateContentSettings", {
-      name,
-      imagePath: formObj.imagePath,
-      id: formObj.id,
-      learningOutcomes,
-    });
+  let resultCC = await contentCardActions({ formObj });
+  if (resultCC) {
+    return resultCC;
+  }
 
-    if (formObj.doenetmlVersionId) {
-      // TODO: handle other updates to just a document
-      await axios.post("/api/updateDocumentSettings", {
-        docId: formObj.docId,
-        doenetmlVersionId: formObj.doenetmlVersionId,
-      });
-    }
+  let resultMC = await moveContentActions({ formObj });
+  if (resultMC) {
+    return resultMC;
+  }
 
-    return true;
-  } else if (formObj?._action == "Add Activity") {
+  if (formObj?._action == "Add Activity") {
     //Create an activity and redirect to the editor for it
     let { data } = await axios.post(
       `/api/createActivity/${params.folderId ?? ""}`,
@@ -120,80 +128,6 @@ export async function action({ request, params }) {
       desiredPosition: formObj.desiredPosition,
     });
     return true;
-  } else if (formObj._action == "update title") {
-    //Don't let name be blank
-    let name = formObj?.cardTitle?.trim();
-    if (name == "") {
-      name = "Untitled " + (formObj.isFolder ? "Folder" : "Activity");
-    }
-    await axios.post(`/api/updateContentName`, {
-      id: Number(formObj.id),
-      name,
-    });
-    return true;
-  } else if (formObj._action == "open assignment") {
-    let closeAt: DateTime;
-    if (formObj.duration === "custom") {
-      closeAt = DateTime.fromISO(formObj.customCloseAt);
-    } else {
-      closeAt = DateTime.fromSeconds(
-        Math.round(DateTime.now().toSeconds() / 60) * 60,
-      ).plus(JSON.parse(formObj.duration));
-    }
-    await axios.post("/api/openAssignmentWithCode", {
-      activityId: Number(formObj.activityId),
-      closeAt,
-    });
-    return true;
-  } else if (formObj._action == "update assignment close time") {
-    const closeAt = DateTime.fromISO(formObj.closeAt);
-    await axios.post("/api/updateAssignmentSettings", {
-      activityId: Number(formObj.activityId),
-      closeAt,
-    });
-    return true;
-  } else if (formObj._action == "close assignment") {
-    await axios.post("/api/closeAssignmentWithCode", {
-      activityId: Number(formObj.activityId),
-    });
-    return true;
-  } else if (formObj._action == "unassign activity") {
-    try {
-      await axios.post("/api/unassignActivity", {
-        activityId: Number(formObj.activityId),
-      });
-    } catch (e) {
-      alert("Unable to unassign activity");
-    }
-    return true;
-  } else if (formObj._action == "make content public") {
-    if (formObj.isFolder === "true") {
-      await axios.post("/api/makeFolderPublic", {
-        id: Number(formObj.id),
-        licenseCode: formObj.licenseCode,
-      });
-    } else {
-      await axios.post("/api/makeActivityPublic", {
-        id: Number(formObj.id),
-        licenseCode: formObj.licenseCode,
-      });
-    }
-    return true;
-  } else if (formObj._action == "make content private") {
-    if (formObj.isFolder === "true") {
-      await axios.post("/api/makeFolderPrivate", {
-        id: Number(formObj.id),
-      });
-    } else {
-      await axios.post("/api/makeActivityPrivate", {
-        id: Number(formObj.id),
-      });
-    }
-    return true;
-  } else if (formObj._action == "go to data") {
-    return redirect(`/assignmentData/${formObj.activityId}`);
-  } else if (formObj?._action == "noop") {
-    return true;
   }
 
   throw Error(`Action "${formObj?._action}" not defined or not handled.`);
@@ -217,7 +151,7 @@ export async function loader({ params, request }) {
 
     if (data.notMe) {
       return redirect(
-        `/publicActivities/${params.userId}${params.folderId ? "/" + params.folderId : ""}`,
+        `/sharedActivities/${params.userId}${params.folderId ? "/" + params.folderId : ""}`,
       );
     }
   }
@@ -260,6 +194,12 @@ export function Activities() {
     onClose: settingsOnClose,
   } = useDisclosure();
 
+  const {
+    isOpen: sharingIsOpen,
+    onOpen: sharingOnOpen,
+    onClose: sharingOnClose,
+  } = useDisclosure();
+
   const {
     isOpen: assignmentSettingsAreOpen,
     onOpen: assignmentSettingsOnOpen,
@@ -270,6 +210,8 @@ export function Activities() {
   const folderSettingsRef = useRef(null);
   const finalFocusRef = useRef(null);
 
+  const [haveContentSpinner, setHaveContentSpinner] = useState(false);
+
   const [searchOpen, setSearchOpen] = useState(false);
   const [searchString, setSearchString] = useState(query ?? "");
   const searchRef = useRef<HTMLInputElement>(null);
@@ -282,13 +224,25 @@ export function Activities() {
     }
   }, [searchOpen]);
 
+  useEffect(() => {
+    setHaveContentSpinner(false);
+  }, [content]);
+
   const navigate = useNavigate();
 
   const [moveToFolderContent, setMoveToFolderContent] = useState<{
     id: number;
     isPublic: boolean;
+    isShared: boolean;
+    sharedWith: UserInfo[];
     licenseCode: LicenseCode | null;
-  }>({ id: -1, isPublic: false, licenseCode: null });
+  }>({
+    id: -1,
+    isPublic: false,
+    isShared: false,
+    sharedWith: [],
+    licenseCode: null,
+  });
 
   const {
     isOpen: moveToFolderIsOpen,
@@ -296,9 +250,8 @@ export function Activities() {
     onClose: moveToFolderOnClose,
   } = useDisclosure();
 
-  const [displaySettingsTab, setSettingsDisplayTab] = useState<
-    "general" | "share"
-  >("general");
+  const [displaySettingsTab, setSettingsDisplayTab] =
+    useState<"general">("general");
 
   useEffect(() => {
     document.title = `Activities - Doenet`;
@@ -313,6 +266,8 @@ export function Activities() {
     assignmentStatus,
     isFolder,
     isPublic,
+    isShared,
+    sharedWith,
     licenseCode,
     parentFolderId,
   }: {
@@ -322,6 +277,8 @@ export function Activities() {
     assignmentStatus: AssignmentStatus;
     isFolder?: boolean;
     isPublic: boolean;
+    isShared: boolean;
+    sharedWith: UserInfo[];
     licenseCode: LicenseCode | null;
     parentFolderId: number | null;
   }) {
@@ -382,7 +339,13 @@ export function Activities() {
           <MenuItem
             data-test="Move to Folder"
             onClick={() => {
-              setMoveToFolderContent({ id, isPublic, licenseCode });
+              setMoveToFolderContent({
+                id,
+                isPublic,
+                isShared,
+                sharedWith,
+                licenseCode,
+              });
               moveToFolderOnOpen();
             }}
           >
@@ -417,8 +380,7 @@ export function Activities() {
           data-test="Share Menu Item"
           onClick={() => {
             setSettingsContentId(id);
-            setSettingsDisplayTab("share");
-            settingsOnOpen();
+            sharingOnOpen();
           }}
         >
           Share
@@ -481,12 +443,23 @@ export function Activities() {
         id={settingsContentId}
         contentData={contentData}
         allDoenetmlVersions={allDoenetmlVersions}
-        allLicenses={allLicenses}
         finalFocusRef={finalFocusRef}
         fetcher={fetcher}
         displayTab={displaySettingsTab}
       />
     ) : null;
+
+  let shareDrawer =
+    contentData && settingsContentId ? (
+      <ShareDrawer
+        isOpen={sharingIsOpen}
+        onClose={sharingOnClose}
+        contentData={contentData}
+        allLicenses={allLicenses}
+        finalFocusRef={finalFocusRef}
+        fetcher={fetcher}
+      />
+    ) : null;
   let assignmentDrawer =
     contentData && settingsContentId ? (
       <AssignmentSettingsDrawer
@@ -501,6 +474,7 @@ export function Activities() {
   return (
     <>
       {settingsDrawer}
+      {shareDrawer}
       {assignmentDrawer}
 
       <MoveContentToFolder
@@ -508,6 +482,8 @@ export function Activities() {
         onClose={moveToFolderOnClose}
         id={moveToFolderContent.id}
         isPublic={moveToFolderContent.isPublic}
+        isShared={moveToFolderContent.isShared}
+        sharedWith={moveToFolderContent.sharedWith}
         licenseCode={moveToFolderContent.licenseCode}
         userId={userId}
         currentParentId={folderId}
@@ -586,11 +562,12 @@ export function Activities() {
               margin="3px"
               hidden={searchOpen || haveQuery}
             >
-              New
+              {haveContentSpinner ? <Spinner size="sm" /> : "New"}
             </MenuButton>
             <MenuList>
               <MenuItem
                 onClick={async () => {
+                  setHaveContentSpinner(true);
                   //Create an activity and redirect to the editor for it
                   // let { data } = await axios.post("/api/createActivity");
                   // let { activityId } = data;
@@ -610,6 +587,7 @@ export function Activities() {
               </MenuItem>
               <MenuItem
                 onClick={() => {
+                  setHaveContentSpinner(true);
                   fetcher.submit({ _action: "Add Folder" }, { method: "post" });
                 }}
               >
@@ -625,8 +603,7 @@ export function Activities() {
               ref={folderSettingsRef}
               onClick={() => {
                 setSettingsContentId(folderId);
-                setSettingsDisplayTab("share");
-                settingsOnOpen();
+                sharingOnOpen();
               }}
               hidden={searchOpen || haveQuery}
             >
@@ -660,7 +637,7 @@ export function Activities() {
                   ? folder.parentFolder.name
                   : `My Activities`}
               </Show>
-              <Show below="sm">&lt; Back</Show>
+              <Hide above="sm">&lt; Back</Hide>
             </Text>
           </Link>
         </Box>
@@ -738,6 +715,8 @@ export function Activities() {
                       assignmentStatus: activity.assignmentStatus,
                       isFolder: activity.isFolder,
                       isPublic: activity.isPublic,
+                      isShared: activity.isShared,
+                      sharedWith: activity.sharedWith,
                       licenseCode: activity.license?.code ?? null,
                       parentFolderId: activity.parentFolder?.id ?? null,
                     })}
diff --git a/client/src/Tools/_framework/Paths/ActivityEditor.tsx b/client/src/Tools/_framework/Paths/ActivityEditor.tsx
index 2f73fd55e9..46142a7136 100644
--- a/client/src/Tools/_framework/Paths/ActivityEditor.tsx
+++ b/client/src/Tools/_framework/Paths/ActivityEditor.tsx
@@ -26,16 +26,25 @@ import {
   MdModeEditOutline,
   MdOutlineAssignment,
   MdOutlineEditOff,
+  MdOutlineGroup,
 } from "react-icons/md";
 import { FaCog } from "react-icons/fa";
 import { useFetcher } from "react-router-dom";
 import axios from "axios";
 import { useLocation, useNavigate } from "react-router";
-import { ContentSettingsDrawer } from "../ToolPanels/ContentSettingsDrawer";
+import {
+  contentSettingsActions,
+  ContentSettingsDrawer,
+} from "../ToolPanels/ContentSettingsDrawer";
 import { DateTime } from "luxon";
 import { InfoIcon } from "@chakra-ui/icons";
 import { AssignmentInvitation } from "../ToolPanels/AssignmentInvitation";
-import { AssignmentSettingsDrawer } from "../ToolPanels/AssignmentSettingsDrawer";
+import {
+  assignmentSettingsActions,
+  AssignmentSettingsDrawer,
+} from "../ToolPanels/AssignmentSettingsDrawer";
+import { ShareDrawer } from "../ToolPanels/ShareDrawer";
+import { sharingActions } from "../ToolPanels/ShareSettings";
 
 export type DoenetmlVersion = {
   id: number;
@@ -69,9 +78,29 @@ export type License = {
 
 export type AssignmentStatus = "Unassigned" | "Closed" | "Open";
 
+export type UserInfo = {
+  userId: number;
+  firstNames: string | null;
+  lastNames: string;
+  email: string;
+};
+
+export type ContentClassification = {
+  id: number;
+  code: string;
+  grade: string | null;
+  category: string;
+  description: string;
+  system: {
+    id: number;
+    name: string;
+  };
+};
+
 export type ContentStructure = {
   id: number;
   ownerId: number;
+  owner?: UserInfo;
   name: string;
   imagePath: string | null;
   assignmentStatus: AssignmentStatus;
@@ -79,7 +108,10 @@ export type ContentStructure = {
   classCode: string | null;
   codeValidUntil: string | null;
   isPublic: boolean;
+  isShared: boolean;
+  sharedWith: UserInfo[];
   license: License | null;
+  classifications: ContentClassification[];
   documents: {
     id: number;
     versionNum?: number;
@@ -92,6 +124,8 @@ export type ContentStructure = {
     id: number;
     name: string;
     isPublic: boolean;
+    isShared: boolean;
+    sharedWith: UserInfo[];
   } | null;
 };
 
@@ -113,105 +147,19 @@ export async function action({ params, request }) {
     return true;
   }
 
-  if (formObj._action == "update general") {
-    let learningOutcomes;
-    if (formObj.learningOutcomes) {
-      learningOutcomes = JSON.parse(formObj.learningOutcomes);
-    }
-
-    await axios.post("/api/updateContentSettings", {
-      name,
-      imagePath: formObj.imagePath,
-      id: Number(params.activityId),
-      learningOutcomes,
-    });
-
-    if (formObj.doenetmlVersionId) {
-      // TODO: handle other updates to just a document
-      await axios.post("/api/updateDocumentSettings", {
-        docId: formObj.docId,
-        doenetmlVersionId: formObj.doenetmlVersionId,
-      });
-    }
-    return true;
-  }
-  if (formObj._action == "update description") {
-    await axios.get("/api/updateFileDescription", {
-      params: {
-        activityId: Number(params.activityId),
-        cid: formObj.cid,
-        description: formObj.description,
-      },
-    });
-    return true;
-  }
-  if (formObj._action == "remove file") {
-    let resp = await axios.get("/api/deleteFile", {
-      params: { activityId: Number(params.activityId), cid: formObj.cid },
-    });
-
-    return {
-      _action: formObj._action,
-      fileRemovedCid: formObj.cid,
-      success: resp.data.success,
-    };
-  }
-
-  if (formObj._action == "open assignment") {
-    let closeAt: DateTime;
-    if (formObj.duration === "custom") {
-      closeAt = DateTime.fromISO(formObj.customCloseAt);
-    } else {
-      closeAt = DateTime.fromSeconds(
-        Math.round(DateTime.now().toSeconds() / 60) * 60,
-      ).plus(JSON.parse(formObj.duration));
-    }
-    await axios.post("/api/openAssignmentWithCode", {
-      activityId: Number(params.activityId),
-      closeAt,
-    });
-    return true;
-  }
-
-  if (formObj._action == "update assignment close time") {
-    const closeAt = DateTime.fromISO(formObj.closeAt);
-    await axios.post("/api/updateAssignmentSettings", {
-      activityId: Number(params.activityId),
-      closeAt,
-    });
-    return true;
-  }
-
-  if (formObj._action == "close assignment") {
-    await axios.post("/api/closeAssignmentWithCode", {
-      activityId: Number(params.activityId),
-    });
-    return true;
+  let resultCS = await contentSettingsActions({ formObj });
+  if (resultCS) {
+    return resultCS;
   }
 
-  if (formObj._action == "unassign activity") {
-    try {
-      await axios.post("/api/unassignActivity", {
-        activityId: Number(formObj.activityId),
-      });
-    } catch (e) {
-      alert("Unable to unassign activity");
-    }
-    return true;
+  let resultSA = await sharingActions({ formObj });
+  if (resultSA) {
+    return resultSA;
   }
 
-  if (formObj._action == "make content public") {
-    await axios.post("/api/makeContentPublic", {
-      id: Number(formObj.id),
-      licenseCode: formObj.licenseCode,
-    });
-    return true;
-  }
-  if (formObj._action == "make content private") {
-    await axios.post("/api/makeContentPrivate", {
-      id: Number(formObj.id),
-    });
-    return true;
+  let resultAS = await assignmentSettingsActions({ formObj });
+  if (resultAS) {
+    return resultAS;
   }
 
   if (formObj._action == "go to data") {
@@ -331,7 +279,7 @@ function EditableName({ dataTest }) {
         <EditablePreview data-test="Editable Preview" noOfLines={1} />
       </Tooltip>
       <EditableInput
-        width={{ base: "200px", sm: "300px", md: "400px" }}
+        width={{ base: "100%", md: "350px", lg: "450px" }}
         data-test="Editable Input"
       />
     </Editable>
@@ -365,6 +313,12 @@ export function ActivityEditor() {
     onClose: settingsOnClose,
   } = useDisclosure();
 
+  const {
+    isOpen: sharingIsOpen,
+    onOpen: sharingOnOpen,
+    onClose: sharingOnClose,
+  } = useDisclosure();
+
   const {
     isOpen: assignmentSettingsAreOpen,
     onOpen: assignmentSettingsOnOpen,
@@ -377,7 +331,6 @@ export function ActivityEditor() {
     onClose: invitationOnClose,
   } = useDisclosure();
 
-  const initializeEditorDoenetML = useRef(doenetML);
   const textEditorDoenetML = useRef(doenetML);
   const savedDoenetML = useRef(doenetML);
 
@@ -487,9 +440,17 @@ export function ActivityEditor() {
         id={activityId}
         contentData={activityData}
         allDoenetmlVersions={allDoenetmlVersions}
-        allLicenses={allLicenses}
         displayTab={displaySettingsTab}
       />
+      <ShareDrawer
+        isOpen={sharingIsOpen}
+        onClose={sharingOnClose}
+        finalFocusRef={controlsBtnRef}
+        fetcher={fetcher}
+        contentData={activityData}
+        allLicenses={allLicenses}
+        currentDoenetML={textEditorDoenetML}
+      />
       <AssignmentSettingsDrawer
         isOpen={assignmentSettingsAreOpen}
         onClose={assignmentSettingsOnClose}
@@ -523,14 +484,15 @@ export function ActivityEditor() {
           <Grid
             templateAreas={`"leftControls label rightControls"`}
             templateColumns={{
-              base: "1fr 200px 1fr",
-              sm: "1fr 300px 1fr",
-              md: "1fr 400px 1fr",
+              base: "82px calc(100% - 197px) 115px",
+              sm: "87px calc(100% - 217px) 120px",
+              md: "1fr 350px 1fr",
+              lg: "1fr 450px 1fr",
             }}
             width="100%"
           >
             <GridItem area="leftControls">
-              <HStack ml="10px" mt="4px">
+              <HStack ml={{ base: "5px", sm: "10px" }} mt="4px">
                 <ButtonGroup size="sm" isAttached variant="outline">
                   <Tooltip hasArrow label="View Activity">
                     <Button
@@ -554,8 +516,6 @@ export function ActivityEditor() {
                       pr={{ base: "0px", md: "10px" }}
                       leftIcon={editIcon}
                       onClick={() => {
-                        initializeEditorDoenetML.current =
-                          textEditorDoenetML.current;
                         setMode("Edit");
                       }}
                     >
@@ -573,7 +533,7 @@ export function ActivityEditor() {
               display="flex"
               justifyContent="flex-end"
             >
-              <HStack mr="10px">
+              <HStack mr={{ base: "5px", sm: "10px" }}>
                 <ButtonGroup size="sm" isAttached variant="outline">
                   <Tooltip
                     hasArrow
@@ -597,6 +557,25 @@ export function ActivityEditor() {
                     </Button>
                   </Tooltip>
 
+                  <Tooltip
+                    hasArrow
+                    label="Open Sharing Controls"
+                    placement="bottom-end"
+                  >
+                    <Button
+                      data-test="Sharing Button"
+                      size="sm"
+                      pr={{ base: "0px", md: "10px" }}
+                      leftIcon={<MdOutlineGroup />}
+                      onClick={() => {
+                        sharingOnOpen();
+                      }}
+                      ref={controlsBtnRef}
+                    >
+                      <Show above="md">Share</Show>
+                    </Button>
+                  </Tooltip>
+
                   <Tooltip
                     hasArrow
                     label="Open Settings"
diff --git a/client/src/Tools/_framework/Paths/ActivityViewer.tsx b/client/src/Tools/_framework/Paths/ActivityViewer.tsx
index 9ce48dc3cd..fe9b0b3c24 100644
--- a/client/src/Tools/_framework/Paths/ActivityViewer.tsx
+++ b/client/src/Tools/_framework/Paths/ActivityViewer.tsx
@@ -25,10 +25,96 @@ import {
 import axios from "axios";
 import ContributorsMenu from "../ToolPanels/ContributorsMenu";
 import { Link } from "react-router-dom";
-import { ContentStructure, DoenetmlVersion, License } from "./ActivityEditor";
-import { DisplayLicenseItem } from "../ToolPanels/SharingControls";
+import {
+  ContentStructure,
+  DoenetmlVersion,
+  License,
+  UserInfo,
+} from "./ActivityEditor";
+import { DisplayLicenseItem } from "../ToolPanels/ShareSettings";
 import { CopyActivityAndReportFinish } from "../ToolPanels/CopyActivityAndReportFinish";
 import { User } from "./SiteHeader";
+import { createFullName } from "../../../_utils/names";
+import { DateTime } from "luxon";
+import { cidFromText } from "../../../_utils/cid";
+
+export type DocHistoryItem = {
+  docId: number;
+  prevDocId: number;
+  prevDocVersionNum: number;
+  withLicenseCode: string | null;
+  timestampDoc: DateTime;
+  timestampPrevDoc: DateTime;
+  prevActivityId: number;
+  prevActivityName: string;
+  prevOwner: UserInfo;
+  prevChanged: boolean;
+  prevCid: string;
+};
+
+export type DocRemixItem = {
+  docId: number;
+  prevDocId: number;
+  prevDocVersionNum: number;
+  withLicenseCode: string | null;
+  isDirect: boolean;
+  timestampDoc: DateTime;
+  timestampPrevDoc: DateTime;
+  activityId: number;
+  activityName: string;
+  owner: UserInfo;
+};
+
+export async function processContributorHistory(hist: {
+  contributorHistory: any[];
+}) {
+  let historyItems: DocHistoryItem[] = [];
+
+  for (let ch of hist.contributorHistory) {
+    const { prevDoc, ...historyItem } = ch;
+    let prevActivity = prevDoc.document.activity;
+    let prevCid = prevDoc.cid;
+    let prevDocCurrentCid = await cidFromText(prevDoc.document.source);
+
+    historyItems.push({
+      ...historyItem,
+      timestampDoc: DateTime.fromISO(ch.timestampDoc),
+      timestampPrevDoc: DateTime.fromISO(ch.timestampPrevDoc),
+      prevActivityId: prevActivity.id,
+      prevActivityName: prevActivity.name,
+      prevOwner: prevActivity.owner,
+      prevChanged: prevDocCurrentCid !== prevCid,
+      prevCid,
+    });
+  }
+
+  return historyItems;
+}
+
+export function processRemixes(remixes: {
+  documentVersions: { contributorHistory: any[] }[];
+}): DocRemixItem[] {
+  let items = remixes.documentVersions
+    .flatMap((dv) =>
+      dv.contributorHistory.map((ch) => {
+        const { document, ...item } = ch;
+        const activity = document.activity;
+        const remixItem: DocRemixItem = {
+          ...item,
+          isDirect: ch.timestampDoc === ch.timestampPrevDoc,
+          timestampDoc: DateTime.fromISO(ch.timestampDoc),
+          timestampPrevDoc: DateTime.fromISO(ch.timestampPrevDoc),
+          activityId: activity.id,
+          activityName: activity.name,
+          owner: activity.owner,
+        };
+        return remixItem;
+      }),
+    )
+    .sort((a, b) => (a.isDirect === b.isDirect ? 0 : a.isDirect ? -1 : 1));
+
+  return items;
+}
 
 export async function loader({ params }) {
   try {
@@ -50,17 +136,20 @@ export async function loader({ params }) {
     const doenetmlVersion: DoenetmlVersion =
       activityData.activity.documents[0].doenetmlVersion;
 
+    const contributorHistory = await processContributorHistory(
+      activityData.docHistories[0],
+    );
+
     return {
       activityId,
       doenetML,
       activity: activityData.activity,
-      owner: activityData.owner,
       docId,
-      contributorHistory: activityData.doc.contributorHistory,
+      contributorHistory,
       doenetmlVersion,
     };
   } catch (e) {
-    if (e.response.status === 404) {
+    if (e.response?.status === 404) {
       throw Error("Activity not found");
     } else {
       throw e;
@@ -73,7 +162,6 @@ export function ActivityViewer() {
     activityId,
     doenetML,
     activity,
-    owner,
     docId,
     contributorHistory,
     doenetmlVersion,
@@ -81,14 +169,8 @@ export function ActivityViewer() {
     activityId: number;
     doenetML: string;
     activity: ContentStructure;
-    owner: {
-      userId: number;
-      email: string;
-      firstNames: string | null;
-      lastNames: string;
-    };
     docId: number;
-    contributorHistory: any;
+    contributorHistory: DocHistoryItem[];
     doenetmlVersion: DoenetmlVersion;
   };
 
@@ -164,7 +246,7 @@ export function ActivityViewer() {
                     </Flex>
                     <Flex mt="10px" width="100%">
                       <ContributorsMenu
-                        owner={owner}
+                        activity={activity}
                         contributorHistory={contributorHistory}
                       />
                       <Spacer />
@@ -259,8 +341,8 @@ export function ActivityViewer() {
                     activity.license.isComposition ? (
                       <>
                         <p>
-                          <strong>{activity.name}</strong> by {owner.firstNames}{" "}
-                          {owner.lastNames} is shared publicly with these
+                          <strong>{activity.name}</strong> by{" "}
+                          {createFullName(activity.owner!)} is shared with these
                           licenses:
                         </p>
                         <List spacing="20px" marginTop="10px">
@@ -279,8 +361,8 @@ export function ActivityViewer() {
                     ) : (
                       <>
                         <p>
-                          <strong>{activity.name}</strong> by {owner.firstNames}{" "}
-                          {owner.lastNames} is shared publicly using the
+                          <strong>{activity.name}</strong> by{" "}
+                          {createFullName(activity.owner!)} is shared using the
                           license:
                         </p>
                         <List marginTop="10px">
@@ -290,9 +372,9 @@ export function ActivityViewer() {
                     )
                   ) : (
                     <p>
-                      <strong>{activity.name}</strong> by {owner.firstNames}{" "}
-                      {owner.lastNames} is shared publicly, but a license was
-                      not specified. Contact the author to determine in what
+                      <strong>{activity.name}</strong> by{" "}
+                      {createFullName(activity.owner!)} is shared, but a license
+                      was not specified. Contact the author to determine in what
                       ways you can reuse this activity.
                     </p>
                   )}
@@ -335,7 +417,10 @@ function DisplaySmallLicenseBadge({
   let imageURL = licenseItem.smallImageURL ?? licenseItem.imageURL;
   if (imageURL) {
     badge = (
-      <Tooltip label={licenseItem.name} placement="bottom-end">
+      <Tooltip
+        label={`Shared with ${licenseItem.name} license`}
+        placement="bottom-end"
+      >
         <Image
           src={imageURL}
           alt={`Badge for license: ${licenseItem.name}`}
diff --git a/client/src/Tools/_framework/Paths/ChangeName.tsx b/client/src/Tools/_framework/Paths/ChangeName.tsx
index a2976a8823..17a8592686 100644
--- a/client/src/Tools/_framework/Paths/ChangeName.tsx
+++ b/client/src/Tools/_framework/Paths/ChangeName.tsx
@@ -6,6 +6,7 @@ import {
   FormLabel,
   Heading,
   Input,
+  Spinner,
 } from "@chakra-ui/react";
 import React, { useEffect, useState } from "react";
 import {
@@ -16,6 +17,7 @@ import {
 } from "react-router-dom";
 import axios from "axios";
 import { User } from "./SiteHeader";
+import { createFullName } from "../../../_utils/names";
 
 export async function action({
   params,
@@ -65,28 +67,72 @@ export function ChangeName({
   const [firstNames, setFirstNames] = useState(user?.firstNames ?? "");
   const [lastNames, setLastNames] = useState(user?.lastNames ?? "");
   const [submitted, setSubmitted] = useState(false);
+  const [statusText, setStatusText] = useState("");
 
   useEffect(() => {
-    if (
-      redirectTo &&
-      submitted &&
-      user?.firstNames === firstNames &&
-      user.lastNames === lastNames
-    ) {
-      navigate(redirectTo);
+    if (submitted && user !== undefined) {
+      setStatusText(`Name changed to ${createFullName(user)}`);
+      if (
+        redirectTo &&
+        user.firstNames === firstNames &&
+        user.lastNames === lastNames
+      ) {
+        navigate(redirectTo);
+      } else {
+        setSubmitted(false);
+      }
     }
-  }, [submitted, redirectTo, user]);
+  }, [user]);
+
+  if (!user) {
+    return (
+      <Box margin="20px">
+        <Box
+          border="solid 1px lightgray"
+          borderRadius="5px"
+          padding="5px 10px"
+          marginTop="10px"
+          backgroundColor="orange.100"
+        >
+          Cannot change name; no user logged in.
+        </Box>
+        <Button
+          colorScheme="blue"
+          mr="12px"
+          mt="8px"
+          size="xs"
+          onClick={() => {
+            navigate("/");
+          }}
+        >
+          Go to home
+        </Button>
+      </Box>
+    );
+  }
 
   return (
     <Box margin="20px">
       <Heading size="lg">Enter your name</Heading>
+      {statusText !== "" ? (
+        <Box
+          border="solid 1px lightgray"
+          borderRadius="5px"
+          padding="5px 10px"
+          marginTop="10px"
+          backgroundColor="orange.100"
+        >
+          {statusText}
+        </Box>
+      ) : null}
+
       <Form
         method="post"
         onSubmit={() => {
           setSubmitted(true);
         }}
       >
-        <Flex width="400px">
+        <Flex width="400px" maxWidth="100%">
           <FormControl>
             <FormLabel mt="16px">First name(s):</FormLabel>
             <Input
@@ -94,6 +140,7 @@ export function ChangeName({
               name="firstNames"
               size="sm"
               width={40}
+              marginRight="5px"
               value={firstNames ?? ""}
               onChange={(e) => {
                 setFirstNames(e.target.value);
@@ -114,22 +161,30 @@ export function ChangeName({
             />
           </FormControl>
         </Flex>
-        <Button type="submit" colorScheme="blue" mt="8px" mr="12px" size="xs">
-          Submit
-        </Button>
-        {!redirectTo && !hideHomeButton ? (
+        <Flex marginTop="8px">
           <Button
+            type="submit"
             colorScheme="blue"
-            mt="8px"
             mr="12px"
             size="xs"
-            onClick={() => {
-              navigate("/");
-            }}
+            isDisabled={submitted}
           >
-            Go to home
+            Submit
           </Button>
-        ) : null}
+          {!redirectTo && !hideHomeButton ? (
+            <Button
+              colorScheme="blue"
+              mr="12px"
+              size="xs"
+              onClick={() => {
+                navigate("/");
+              }}
+            >
+              Go to home
+            </Button>
+          ) : null}
+          <Spinner hidden={!submitted} />
+        </Flex>
         <input type="hidden" name="_action" value="change user name" />
       </Form>
     </Box>
diff --git a/client/src/Tools/_framework/Paths/Community.tsx b/client/src/Tools/_framework/Paths/Community.tsx
index e7f0bf263b..509d7e7ef3 100644
--- a/client/src/Tools/_framework/Paths/Community.tsx
+++ b/client/src/Tools/_framework/Paths/Community.tsx
@@ -35,6 +35,16 @@ import { RiEmotionSadLine } from "react-icons/ri";
 import ContentCard from "../../../Widgets/ContentCard";
 import AuthorCard from "../../../Widgets/AuthorCard";
 import { createFullName } from "../../../_utils/names";
+import { ContentStructure } from "./ActivityEditor";
+
+type SearchMatch =
+  | (ContentStructure & { type: "content" })
+  | {
+      type: "author";
+      userId: number;
+      firstNames: string | null;
+      lastNames: string;
+    };
 
 export async function action({ request }) {
   const formData = await request.formData();
@@ -116,7 +126,7 @@ export async function loader({ request }) {
   if (q) {
     //Show search results
     const { data: searchData } = await axios.get(
-      `/api/searchPublicContent?q=${q}`,
+      `/api/searchSharedContent?q=${q}`,
     );
 
     const {
@@ -373,7 +383,14 @@ export function Community() {
     useLoaderData() as {
       carouselData: any;
       q: string;
-      searchResults: any;
+      searchResults: {
+        content: ContentStructure[];
+        users: {
+          userId: number;
+          firstNames: string | null;
+          lastNames: string;
+        }[];
+      };
       carouselGroups: any;
       isAdmin: boolean;
     };
@@ -385,15 +402,15 @@ export function Community() {
   }, []);
 
   if (searchResults) {
-    let contentMatches = searchResults.content.map((c) => ({
+    let contentMatches: SearchMatch[] = searchResults.content.map((c) => ({
       type: "content",
       ...c,
     }));
-    let authorMatches = searchResults.users.map((u) => ({
+    let authorMatches: SearchMatch[] = searchResults.users.map((u) => ({
       type: "author",
       ...u,
     }));
-    let allMatches = [...contentMatches, ...authorMatches];
+    let allMatches: SearchMatch[] = [...contentMatches, ...authorMatches];
     const tabs = [
       {
         label: "All Matches",
@@ -409,11 +426,14 @@ export function Community() {
       },
     ];
 
-    function displayCard(itemObj) {
-      if (itemObj?.type == "content") {
+    function displayCard(itemObj: SearchMatch) {
+      if (itemObj.type == "content") {
         const { id, imagePath, name, owner, isFolder } = itemObj;
+        if (!owner) {
+          return null;
+        }
         if (isFolder) {
-          const cardLink = `/publicActivities/${owner.userId}/${id}`;
+          const cardLink = `/sharedActivities/${owner.userId}/${id}`;
 
           return (
             <ContentCard
@@ -462,7 +482,7 @@ export function Community() {
           );
         }
       } else if (itemObj?.type == "author") {
-        const cardLink = `/publicActivities/${itemObj.userId}`;
+        const cardLink = `/sharedActivities/${itemObj.userId}`;
 
         return (
           <AuthorCard
diff --git a/client/src/Tools/_framework/Paths/ConfirmSignIn.tsx b/client/src/Tools/_framework/Paths/ConfirmSignIn.tsx
index c6801759ff..7ad80d7340 100644
--- a/client/src/Tools/_framework/Paths/ConfirmSignIn.tsx
+++ b/client/src/Tools/_framework/Paths/ConfirmSignIn.tsx
@@ -9,6 +9,7 @@ import {
   HStack,
   Image,
   Show,
+  Spinner,
 } from "@chakra-ui/react";
 import { useNavigate } from "react-router";
 import { action as changeNameAction } from "./ChangeName";
@@ -92,7 +93,7 @@ export function ConfirmSignIn() {
   } else {
     content = (
       <Heading fontSize="large" marginBottom="20px" textAlign="center">
-        Verifying sign up/log in...
+        <Spinner size="sm" marginRight="10px" /> Verifying sign up/log in...
       </Heading>
     );
   }
diff --git a/client/src/Tools/_framework/Paths/Home.tsx b/client/src/Tools/_framework/Paths/Home.tsx
index 29ef4cc1f1..0b1f775761 100644
--- a/client/src/Tools/_framework/Paths/Home.tsx
+++ b/client/src/Tools/_framework/Paths/Home.tsx
@@ -20,6 +20,7 @@ import {
   HStack,
   Show,
   SimpleGrid,
+  Hide,
 } from "@chakra-ui/react";
 import { HiOutlineMail } from "react-icons/hi";
 import { BsGithub, BsDiscord } from "react-icons/bs";
@@ -198,7 +199,7 @@ export function Home() {
             </GridItem>
           </Grid>
         </Show>
-        <Show below="sm">
+        <Hide above="sm">
           <SimpleGrid columns={[1, 1, 2, 2, 2]} spacing="10px">
             <Suspense fallback={"Loading..."}>
               {/* Does this lazy loading do anything? */}
@@ -208,7 +209,7 @@ export function Home() {
             </Suspense>
             {heroTextAndActions()}
           </SimpleGrid>
-        </Show>
+        </Hide>
       </Flex>
       <Center w="100%" bg={grayColor} pl="10px" pr="10px">
         <VStack maxWidth="900px" w="100%" spacing={4} marginBottom={"30px"}>
diff --git a/client/src/Tools/_framework/Paths/Library.jsx b/client/src/Tools/_framework/Paths/Library.jsx
index 3ec1514d0c..4d49ffea23 100644
--- a/client/src/Tools/_framework/Paths/Library.jsx
+++ b/client/src/Tools/_framework/Paths/Library.jsx
@@ -66,7 +66,7 @@ export async function loader() {
   };
 }
 
-const PublicActivitiesSection = styled.div`
+const SharedActivitiesSection = styled.div`
   grid-row: 2/3;
   display: flex;
   flex-direction: column;
@@ -349,7 +349,7 @@ export function Library() {
             </Box>
           </Box>
         </Box>
-        <PublicActivitiesSection>
+        <SharedActivitiesSection>
           {libraryData.length < 1 ? (
             <Text fontSize="28px">
               No Matching Library Activities Found
@@ -377,7 +377,7 @@ export function Library() {
               })}
             </SimpleGrid>
           )}
-        </PublicActivitiesSection>
+        </SharedActivitiesSection>
       </ActivitiesGrid>
     </>
   );
diff --git a/client/src/Tools/_framework/Paths/PublicEditor.tsx b/client/src/Tools/_framework/Paths/PublicEditor.tsx
index ff8f9d165d..e30a185ae7 100644
--- a/client/src/Tools/_framework/Paths/PublicEditor.tsx
+++ b/client/src/Tools/_framework/Paths/PublicEditor.tsx
@@ -29,7 +29,7 @@ export async function loader({ params, request }) {
     };
   }
   const { data: activityData } = await axios.get(
-    `/api/getPublicEditorData/${params.activityId}`,
+    `/api/getSharedEditorData/${params.activityId}`,
   );
 
   let docId = Number(params.docId);
diff --git a/client/src/Tools/_framework/Paths/PublicActivities.tsx b/client/src/Tools/_framework/Paths/SharedActivities.tsx
similarity index 85%
rename from client/src/Tools/_framework/Paths/PublicActivities.tsx
rename to client/src/Tools/_framework/Paths/SharedActivities.tsx
index b921db0760..5abc9ee11e 100644
--- a/client/src/Tools/_framework/Paths/PublicActivities.tsx
+++ b/client/src/Tools/_framework/Paths/SharedActivities.tsx
@@ -17,12 +17,12 @@ import ContentCard from "../../../Widgets/ContentCard";
 import axios from "axios";
 import { createFullName } from "../../../_utils/names";
 import { ContentStructure } from "./ActivityEditor";
-import { DisplayLicenseItem } from "../ToolPanels/SharingControls";
+import { DisplayLicenseItem } from "../ToolPanels/ShareSettings";
 import { SmallLicenseBadges } from "./ActivityViewer";
 
 export async function loader({ params }) {
   const { data } = await axios.get(
-    `/api/getPublicFolderContent/${params.ownerId}/${params.folderId ?? ""}`,
+    `/api/getSharedFolderContent/${params.ownerId}/${params.folderId ?? ""}`,
   );
 
   return {
@@ -33,7 +33,7 @@ export async function loader({ params }) {
   };
 }
 
-export function PublicActivities() {
+export function SharedActivities() {
   let { content, ownerId, owner, folder } = useLoaderData() as {
     content: ContentStructure[];
     ownerId: number;
@@ -47,7 +47,7 @@ export function PublicActivities() {
   useEffect(() => {
     document.title = folder
       ? `Folder ${folder.name}`
-      : `Public Activities of ${createFullName(owner)} - Doenet`;
+      : `Shared Activities of ${createFullName(owner)} - Doenet`;
   }, [folder]);
 
   const fetcher = useFetcher();
@@ -55,7 +55,7 @@ export function PublicActivities() {
   let headingText = folder ? (
     <>Folder: {folder.name}</>
   ) : (
-    `Public Activities of ${createFullName(owner)}`
+    `Shared Activities of ${createFullName(owner)}`
   );
 
   return (
@@ -85,7 +85,7 @@ export function PublicActivities() {
           alignItems="center"
         >
           <Link
-            to={`/publicActivities/${ownerId}${folder.parentFolder ? "/" + folder.parentFolder.id : ""}`}
+            to={`/sharedActivities/${ownerId}${folder.parentFolder ? "/" + folder.parentFolder.id : ""}`}
             style={{
               color: "var(--mainBlue)",
             }}
@@ -94,7 +94,7 @@ export function PublicActivities() {
             &lt; Back to{" "}
             {folder.parentFolder
               ? folder.parentFolder.name
-              : `Public Activities of ${createFullName(owner)}`}
+              : `Shared Activities of ${createFullName(owner)}`}
           </Link>
           <Spacer />
           {folder.license ? (
@@ -103,7 +103,7 @@ export function PublicActivities() {
         </Flex>
       ) : null}
       <Flex
-        data-test="Public Activities"
+        data-test="Shared Activities"
         padding="10px"
         width="100%"
         margin="0px"
@@ -140,7 +140,7 @@ export function PublicActivities() {
                     showAssignmentStatus={false}
                     cardLink={
                       item.isFolder
-                        ? `/publicActivities/${item.ownerId}/${item.id}`
+                        ? `/sharedActivities/${item.ownerId}/${item.id}`
                         : `/activityViewer/${item.id}`
                     }
                   />
@@ -163,7 +163,7 @@ export function PublicActivities() {
               <>
                 <p>
                   <strong>{folder.name}</strong> by {owner.firstNames}{" "}
-                  {owner.lastNames} is shared publicly with these licenses:
+                  {owner.lastNames} is shared with these licenses:
                 </p>
                 <List spacing="20px" marginTop="10px">
                   {folder.license.composedOf.map((comp) => (
@@ -178,7 +178,7 @@ export function PublicActivities() {
               <>
                 <p>
                   <strong>{folder.name}</strong> by {owner.firstNames}{" "}
-                  {owner.lastNames} is shared publicly using the license:
+                  {owner.lastNames} is shared using the license:
                 </p>
                 <List marginTop="10px">
                   <DisplayLicenseItem licenseItem={folder.license} />
@@ -188,9 +188,9 @@ export function PublicActivities() {
           ) : (
             <p>
               <strong>{folder.name}</strong> by {owner.firstNames}{" "}
-              {owner.lastNames} is shared publicly, but a license was not
-              specified. Contact the author to determine in what ways you can
-              reuse this activity.
+              {owner.lastNames} is shared, but a license was not specified.
+              Contact the author to determine in what ways you can reuse this
+              activity.
             </p>
           )
         ) : null}
diff --git a/client/src/Tools/_framework/Paths/SiteHeader.tsx b/client/src/Tools/_framework/Paths/SiteHeader.tsx
index 3776f6c48c..54dcd8f903 100644
--- a/client/src/Tools/_framework/Paths/SiteHeader.tsx
+++ b/client/src/Tools/_framework/Paths/SiteHeader.tsx
@@ -17,6 +17,9 @@ import {
   VStack,
   Show,
   useBreakpointValue,
+  SkipNavLink,
+  SkipNavContent,
+  Hide,
 } from "@chakra-ui/react";
 import { HiOutlineMail } from "react-icons/hi";
 import { BsGithub, BsDiscord } from "react-icons/bs";
@@ -128,6 +131,7 @@ export function SiteHeader() {
 
   return (
     <>
+      <SkipNavLink zIndex="2000">Skip to content</SkipNavLink>
       <Grid
         templateAreas={`"siteHeader"
         "main"`}
@@ -148,7 +152,7 @@ export function SiteHeader() {
             height="40px"
             position="fixed"
             top="0"
-            zIndex="1200"
+            zIndex="1000"
             borderBottom="1px solid var(--mainGray)"
             // paddingBottom="2px"
             width="100%"
@@ -277,7 +281,7 @@ export function SiteHeader() {
                     </NavLinkTab>
                   </Center>
                 )}
-                <Show below="md">
+                <Hide above="md">
                   <Center h="40px" mr="10px">
                     <Menu autoSelect={false}>
                       <MenuButton
@@ -324,12 +328,13 @@ export function SiteHeader() {
                       </MenuList>
                     </Menu>
                   </Center>
-                </Show>
+                </Hide>
               </Flex>
             </GridItem>
           </Grid>
         </GridItem>
         <GridItem area="main" as="main" margin="0" overflowY="auto">
+          <SkipNavContent />
           <Outlet context={user} />
         </GridItem>
       </Grid>
diff --git a/client/src/Tools/_framework/ToolPanels/AssignActivityControls.tsx b/client/src/Tools/_framework/ToolPanels/AssignActivityControls.tsx
index 86c2956194..8ec8434cd4 100644
--- a/client/src/Tools/_framework/ToolPanels/AssignActivityControls.tsx
+++ b/client/src/Tools/_framework/ToolPanels/AssignActivityControls.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { FetcherWithComponents } from "react-router-dom";
+import { FetcherWithComponents, redirect } from "react-router-dom";
 import {
   Box,
   Heading,
@@ -17,6 +17,50 @@ import { DateTime } from "luxon";
 import { ContentStructure } from "../Paths/ActivityEditor";
 import { AssignmentInvitation } from "./AssignmentInvitation";
 import { MdOutlineContentCopy } from "react-icons/md";
+import axios from "axios";
+
+export async function assignActivityActions({ formObj }: { [k: string]: any }) {
+  if (formObj._action == "open assignment") {
+    let closeAt: DateTime;
+    if (formObj.duration === "custom") {
+      closeAt = DateTime.fromISO(formObj.customCloseAt);
+    } else {
+      closeAt = DateTime.fromSeconds(
+        Math.round(DateTime.now().toSeconds() / 60) * 60,
+      ).plus(JSON.parse(formObj.duration));
+    }
+    await axios.post("/api/openAssignmentWithCode", {
+      activityId: Number(formObj.activityId),
+      closeAt,
+    });
+    return true;
+  } else if (formObj._action == "update assignment close time") {
+    const closeAt = DateTime.fromISO(formObj.closeAt);
+    await axios.post("/api/updateAssignmentSettings", {
+      activityId: Number(formObj.activityId),
+      closeAt,
+    });
+    return true;
+  } else if (formObj._action == "close assignment") {
+    await axios.post("/api/closeAssignmentWithCode", {
+      activityId: Number(formObj.activityId),
+    });
+    return true;
+  } else if (formObj._action == "unassign activity") {
+    try {
+      await axios.post("/api/unassignActivity", {
+        activityId: Number(formObj.activityId),
+      });
+    } catch (e) {
+      alert("Unable to unassign activity");
+    }
+    return true;
+  } else if (formObj._action == "go to data") {
+    return redirect(`/assignmentData/${formObj.activityId}`);
+  }
+
+  return null;
+}
 
 export function AssignActivityControls({
   fetcher,
diff --git a/client/src/Tools/_framework/ToolPanels/AssignmentSettingsDrawer.tsx b/client/src/Tools/_framework/ToolPanels/AssignmentSettingsDrawer.tsx
index 03be94fe98..bcaef888f9 100644
--- a/client/src/Tools/_framework/ToolPanels/AssignmentSettingsDrawer.tsx
+++ b/client/src/Tools/_framework/ToolPanels/AssignmentSettingsDrawer.tsx
@@ -17,7 +17,23 @@ import {
 } from "@chakra-ui/react";
 import { FetcherWithComponents } from "react-router-dom";
 import { ContentStructure } from "../Paths/ActivityEditor";
-import { AssignActivityControls } from "./AssignActivityControls";
+import {
+  assignActivityActions,
+  AssignActivityControls,
+} from "./AssignActivityControls";
+
+export async function assignmentSettingsActions({
+  formObj,
+}: {
+  [k: string]: any;
+}) {
+  let result = await assignActivityActions({ formObj });
+  if (result) {
+    return result;
+  }
+
+  return null;
+}
 
 export function AssignmentSettingsDrawer({
   isOpen,
diff --git a/client/src/Tools/_framework/ToolPanels/ContentSettingsDrawer.tsx b/client/src/Tools/_framework/ToolPanels/ContentSettingsDrawer.tsx
index a9cd47ddec..c6883955ac 100644
--- a/client/src/Tools/_framework/ToolPanels/ContentSettingsDrawer.tsx
+++ b/client/src/Tools/_framework/ToolPanels/ContentSettingsDrawer.tsx
@@ -16,14 +16,33 @@ import {
   Tooltip,
 } from "@chakra-ui/react";
 import { FetcherWithComponents } from "react-router-dom";
-import { GeneralContentControls } from "./GeneralContentControls";
-import { SupportFilesControls } from "./SupportFilesControls";
 import {
-  ContentStructure,
-  DoenetmlVersion,
-  License,
-} from "../Paths/ActivityEditor";
-import { SharingControls } from "./SharingControls";
+  generalContentActions,
+  GeneralContentControls,
+} from "./GeneralContentControls";
+import {
+  supportFilesActions,
+  SupportFilesControls,
+} from "./SupportFilesControls";
+import { ContentStructure, DoenetmlVersion } from "../Paths/ActivityEditor";
+
+export async function contentSettingsActions({
+  formObj,
+}: {
+  [k: string]: any;
+}) {
+  let result2 = await generalContentActions({ formObj });
+  if (result2) {
+    return result2;
+  }
+
+  let result3 = await supportFilesActions({ formObj });
+  if (result3) {
+    return result3;
+  }
+
+  return null;
+}
 
 export function ContentSettingsDrawer({
   isOpen,
@@ -32,7 +51,6 @@ export function ContentSettingsDrawer({
   id,
   contentData,
   allDoenetmlVersions,
-  allLicenses,
   supportingFileData,
   fetcher,
   displayTab = "general",
@@ -43,13 +61,12 @@ export function ContentSettingsDrawer({
   id: number;
   contentData: ContentStructure;
   allDoenetmlVersions: DoenetmlVersion[];
-  allLicenses: License[];
   supportingFileData?: any;
   fetcher: FetcherWithComponents<any>;
-  displayTab?: "general" | "share" | "files";
+  displayTab?: "general" | "files";
 }) {
   const haveSupportingFiles = Boolean(supportingFileData);
-  const numTabs = haveSupportingFiles ? 3 : 2;
+  const numTabs = haveSupportingFiles ? 4 : 3;
 
   let initialTabIndex: number;
   switch (displayTab) {
@@ -57,12 +74,8 @@ export function ContentSettingsDrawer({
       initialTabIndex = 0;
       break;
     }
-    case "share": {
-      initialTabIndex = 1;
-      break;
-    }
     case "files": {
-      initialTabIndex = haveSupportingFiles ? 2 : 1;
+      initialTabIndex = haveSupportingFiles ? 1 : 0;
       break;
     }
   }
@@ -98,7 +111,6 @@ export function ContentSettingsDrawer({
           <Tabs index={tabIndex} onChange={(index) => setTabIndex(index)}>
             <TabList>
               <Tab data-test="General Tab">General</Tab>
-              <Tab data-test="Share Tab">Share</Tab>
               {haveSupportingFiles ? (
                 <Tab data-test="Files Tab">Support Files</Tab>
               ) : null}
@@ -113,13 +125,6 @@ export function ContentSettingsDrawer({
                     allDoenetmlVersions={allDoenetmlVersions}
                   />
                 </TabPanel>
-                <TabPanel>
-                  <SharingControls
-                    fetcher={fetcher}
-                    contentData={contentData}
-                    allLicenses={allLicenses}
-                  />
-                </TabPanel>
                 {haveSupportingFiles ? (
                   <TabPanel>
                     <SupportFilesControls
diff --git a/client/src/Tools/_framework/ToolPanels/ContributorsMenu.jsx b/client/src/Tools/_framework/ToolPanels/ContributorsMenu.jsx
deleted file mode 100644
index f80300c7a9..0000000000
--- a/client/src/Tools/_framework/ToolPanels/ContributorsMenu.jsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import React from "react";
-import { ChevronDownIcon } from "@chakra-ui/icons";
-import {
-  Menu,
-  MenuButton,
-  MenuItem,
-  MenuList,
-  Avatar,
-  Flex,
-  AvatarGroup,
-  Text,
-} from "@chakra-ui/react";
-import { Link } from "react-router-dom";
-import { createFullName } from "../../../_utils/names";
-
-export default function ContributorsMenu({ contributorHistory, owner }) {
-  let byLine = `by ${createFullName(owner)}`;
-
-  let recentByLine = "";
-  if (contributorHistory.length > 0) {
-    let prevActivity = contributorHistory[0].prevDoc.document.activity;
-    recentByLine = `remixed from ${prevActivity.name} by ${createFullName(prevActivity.owner)}`;
-  }
-
-  const avatars = [
-    <Avatar
-      key={`avatarauthor`}
-      m={0}
-      border="0"
-      size="sm"
-      name={createFullName(owner)}
-      mr="4px"
-    />,
-  ];
-
-  avatars.push(
-    ...contributorHistory.map((contrib_hist, i) => (
-      <Avatar
-        key={`avatar${i}`}
-        m={0}
-        border="0"
-        size="sm"
-        name={createFullName(contrib_hist.prevDoc.document.activity.owner)}
-        mr="4px"
-      />
-    )),
-  );
-
-  return (
-    <Flex>
-      <Menu>
-        <MenuButton as="button" data-test="contributors menu">
-          <Flex>
-            <AvatarGroup size="sm" max={2}>
-              {avatars}
-            </AvatarGroup>
-            <Flex ml="4px" mt="10px">
-              <ChevronDownIcon />
-            </Flex>
-          </Flex>
-        </MenuButton>
-        <MenuList maxHeight="40vh" overflowY="auto">
-          <MenuItem
-            key={"miauthor"}
-            data-test={"contributors menu item author"}
-            as={Link}
-            to={`/publicActivities/${owner.userId}`}
-          >
-            {avatars[0]} <Text ml="4px">{createFullName(owner)}</Text>
-          </MenuItem>
-          {contributorHistory.map((contrib_hist, i) => {
-            let prevActivity = contrib_hist.prevDoc.document.activity;
-            let label = `${prevActivity.name} by ${createFullName(prevActivity.owner)}`;
-            const href = `/activityViewer/${prevActivity.id}`;
-
-            return (
-              <MenuItem
-                key={`mi${i}`}
-                as={Link}
-                to={href}
-                data-test={`contributors menu item ${i}`}
-              >
-                {avatars[i + 1]} <Text ml="4px">{label}</Text>
-              </MenuItem>
-            );
-          })}
-        </MenuList>
-      </Menu>
-      <Flex flexDirection="column" pt="10px" data-test="info on contributors">
-        <Text fontSize="14px" ml="4px" lineHeight="1">
-          {byLine}
-        </Text>
-        <Text fontSize="12px" ml="4px" mt="0px">
-          {recentByLine}
-          {contributorHistory.length > 2 && ", ..."}
-        </Text>
-      </Flex>
-    </Flex>
-  );
-}
diff --git a/client/src/Tools/_framework/ToolPanels/ContributorsMenu.tsx b/client/src/Tools/_framework/ToolPanels/ContributorsMenu.tsx
new file mode 100644
index 0000000000..d82e6fe91d
--- /dev/null
+++ b/client/src/Tools/_framework/ToolPanels/ContributorsMenu.tsx
@@ -0,0 +1,180 @@
+import React from "react";
+import { ChevronDownIcon } from "@chakra-ui/icons";
+import {
+  Menu,
+  MenuButton,
+  MenuItem,
+  MenuList,
+  Avatar,
+  Flex,
+  AvatarGroup,
+  Text,
+  Link as ChakraLink,
+  Tooltip,
+} from "@chakra-ui/react";
+import { Link as ReactRouterLink } from "react-router-dom";
+import { createFullName } from "../../../_utils/names";
+import { ContentStructure, UserInfo } from "../Paths/ActivityEditor";
+import { DocHistoryItem } from "../Paths/ActivityViewer";
+
+export default function ContributorsMenu({
+  contributorHistory,
+  activity,
+}: {
+  contributorHistory: DocHistoryItem[];
+  activity: ContentStructure;
+}) {
+  if (!activity.owner) {
+    return null;
+  }
+
+  let byLine = (
+    <>
+      by{" "}
+      <Tooltip
+        label={`Go to ${createFullName(activity.owner)}'s shared activities`}
+        openDelay={1000}
+      >
+        <ChakraLink
+          as={ReactRouterLink}
+          to={`/sharedActivities/${activity.owner.userId}`}
+          aria-label={`Go to ${createFullName(activity.owner)}'s shared activities`}
+        >
+          {createFullName(activity.owner)}
+        </ChakraLink>
+      </Tooltip>
+    </>
+  );
+
+  let recentByLine: React.JSX.Element | null = null;
+  if (contributorHistory.length > 0) {
+    recentByLine = (
+      <>
+        remixed from{" "}
+        <Tooltip
+          label={`Go to ${contributorHistory[0].prevActivityName}`}
+          openDelay={1000}
+        >
+          <ChakraLink
+            as={ReactRouterLink}
+            to={`/activityViewer/${contributorHistory[0].prevActivityId}`}
+            aria-label={`Go to ${contributorHistory[0].prevActivityName}`}
+          >
+            {contributorHistory[0].prevActivityName} by
+            {createFullName(contributorHistory[0].prevOwner)}
+          </ChakraLink>
+        </Tooltip>
+      </>
+    );
+  }
+
+  const avatars = [
+    <Avatar
+      key={`avatarauthor`}
+      margin="6px 12px"
+      border="0"
+      size="sm"
+      name={createFullName(activity.owner)}
+    />,
+  ];
+
+  avatars.push(
+    ...contributorHistory.map((contrib_hist, i) => (
+      <Avatar
+        key={`avatar${i}`}
+        margin="6px 12px"
+        border="0"
+        size="sm"
+        name={createFullName(contrib_hist.prevOwner)}
+      />
+    )),
+  );
+
+  return (
+    <Flex>
+      <Menu>
+        <MenuButton as="button" data-test="contributors menu">
+          <Flex>
+            <AvatarGroup size="sm" max={2}>
+              {avatars}
+            </AvatarGroup>
+            <Flex ml="4px" mt="10px">
+              <ChevronDownIcon />
+            </Flex>
+          </Flex>
+        </MenuButton>
+        <MenuList maxHeight="40vh" overflowY="auto">
+          <MenuItem
+            key={"miauthor"}
+            data-test={"contributors menu item author"}
+            padding="0px"
+            paddingRight="12px"
+            cursor="default"
+          >
+            <Tooltip
+              label={`Go to ${createFullName(activity.owner)}'s shared activities`}
+              openDelay={1000}
+            >
+              <ChakraLink
+                as={ReactRouterLink}
+                to={`/sharedActivities/${activity.owner.userId}`}
+                aria-label={`Go to ${createFullName(activity.owner)}'s shared activities`}
+              >
+                {avatars[0]}{" "}
+              </ChakraLink>
+            </Tooltip>
+            <Text cursor="default">
+              {activity.name} by {createFullName(activity.owner)}
+            </Text>
+          </MenuItem>
+          {contributorHistory.map((contrib_hist, i) => {
+            let menuText = `${contrib_hist.prevActivityName} by ${createFullName(contrib_hist.prevOwner)}`;
+            const activityRef = `/activityViewer/${contrib_hist.prevActivityId}`;
+            const activityLabel = `Go to ${contrib_hist.prevActivityName}`;
+            const userRef = `/sharedActivities/${contrib_hist.prevOwner.userId}`;
+            const userLabel = `Go to ${createFullName(contrib_hist.prevOwner)}'s shared activities`;
+            return (
+              <MenuItem
+                key={`mi${i}`}
+                data-test={`contributors menu item ${i}`}
+                padding="0px"
+                as={ReactRouterLink}
+                to={activityRef}
+                aria-label={activityLabel}
+              >
+                <Tooltip label={userLabel} openDelay={1000}>
+                  <ChakraLink
+                    as={ReactRouterLink}
+                    to={userRef}
+                    aria-label={userLabel}
+                  >
+                    {avatars[i + 1]}{" "}
+                  </ChakraLink>
+                </Tooltip>
+
+                <Tooltip label={activityLabel} openDelay={1000}>
+                  <ChakraLink
+                    as={ReactRouterLink}
+                    to={activityRef}
+                    aria-label={activityLabel}
+                  >
+                    <Text padding="10px 0px">{menuText}</Text>
+                  </ChakraLink>
+                </Tooltip>
+              </MenuItem>
+            );
+          })}
+        </MenuList>
+      </Menu>
+      <Flex flexDirection="column" pt="10px" data-test="info on contributors">
+        <Text fontSize="14px" ml="4px" lineHeight="1">
+          {byLine}
+        </Text>
+        <Text fontSize="12px" ml="4px" mt="0px">
+          {recentByLine}
+          {contributorHistory.length > 2 && ", ..."}
+        </Text>
+      </Flex>
+    </Flex>
+  );
+}
diff --git a/client/src/Tools/_framework/ToolPanels/CopyActivityAndReportFinish.tsx b/client/src/Tools/_framework/ToolPanels/CopyActivityAndReportFinish.tsx
index 5edb1e3d60..522cc8ab66 100644
--- a/client/src/Tools/_framework/ToolPanels/CopyActivityAndReportFinish.tsx
+++ b/client/src/Tools/_framework/ToolPanels/CopyActivityAndReportFinish.tsx
@@ -8,6 +8,9 @@ import {
   ModalCloseButton,
   ModalFooter,
   Button,
+  HStack,
+  Text,
+  Spinner,
 } from "@chakra-ui/react";
 import { ContentStructure } from "../Paths/ActivityEditor";
 import axios from "axios";
@@ -73,7 +76,10 @@ export function CopyActivityAndReportFinish({
         {newActivityData !== null ? <ModalCloseButton /> : null}
         <ModalBody>
           {newActivityData === null ? (
-            `Copying...`
+            <HStack>
+              <Text>Copying...</Text>
+              <Spinner />
+            </HStack>
           ) : (
             <>
               The activity <strong>{activityData.name}</strong> has been copied
diff --git a/client/src/Tools/_framework/ToolPanels/GeneralContentControls.tsx b/client/src/Tools/_framework/ToolPanels/GeneralContentControls.tsx
index b0fff0e2c6..eb45bd62e5 100644
--- a/client/src/Tools/_framework/ToolPanels/GeneralContentControls.tsx
+++ b/client/src/Tools/_framework/ToolPanels/GeneralContentControls.tsx
@@ -15,15 +15,75 @@ import {
   Input,
   FormErrorMessage,
   Flex,
-  IconButton,
-  Center,
-  Checkbox,
   Select,
+  Heading,
+  Tag,
+  Highlight,
+  Spacer,
+  Accordion,
+  AccordionItem,
+  AccordionButton,
+  AccordionPanel,
+  AccordionIcon,
+  CloseButton,
+  HStack,
+  Tooltip,
+  Spinner,
 } from "@chakra-ui/react";
+import AsyncSelect from "react-select/async";
 import { FaFileImage } from "react-icons/fa";
 import { HiOutlineX, HiPlus } from "react-icons/hi";
 import { readAndCompressImage } from "browser-image-resizer";
-import { ContentStructure, DoenetmlVersion } from "../Paths/ActivityEditor";
+import {
+  ContentClassification,
+  ContentStructure,
+  DoenetmlVersion,
+} from "../Paths/ActivityEditor";
+
+export async function generalContentActions({ formObj }: { [k: string]: any }) {
+  if (formObj._action == "update general") {
+    let learningOutcomes;
+    if (formObj.learningOutcomes) {
+      learningOutcomes = JSON.parse(formObj.learningOutcomes);
+    }
+
+    await axios.post("/api/updateContentSettings", {
+      name,
+      imagePath: formObj.imagePath,
+      id: formObj.id,
+      learningOutcomes,
+    });
+
+    if (formObj.doenetmlVersionId) {
+      // TODO: handle other updates to just a document
+      await axios.post("/api/updateDocumentSettings", {
+        docId: formObj.docId,
+        doenetmlVersionId: formObj.doenetmlVersionId,
+      });
+    }
+    return true;
+  } else if (formObj._action == "add content classification") {
+    if (formObj.isFolder !== "true") {
+      await axios.post("/api/addClassification", {
+        activityId: Number(formObj.activityId),
+        classificationId: Number(formObj.classificationId),
+      });
+      return true;
+    }
+  } else if (formObj._action == "remove content classification") {
+    if (formObj.isFolder !== "true") {
+      await axios.post("/api/removeClassification", {
+        activityId: Number(formObj.activityId),
+        classificationId: Number(formObj.classificationId),
+      });
+      return true;
+    }
+  } else if (formObj?._action == "noop") {
+    return true;
+  }
+
+  return null;
+}
 
 export function GeneralContentControls({
   fetcher,
@@ -42,6 +102,25 @@ export function GeneralContentControls({
   let [imagePath, setImagePath] = useState(dataImagePath);
   let [alerts, setAlerts] = useState<Alert[]>([]);
 
+  let [classifySelectorInput, setClassifySelectorInput] = useState<string>("");
+  const classificationsAlreadyAdded = contentData.classifications.map(
+    (c2) => c2.id,
+  );
+
+  const getClassificationOptions = async (inputValue: string) => {
+    let results = await axios.get(
+      `/api/searchPossibleClassifications?q=${inputValue}`,
+    );
+    let classifications: ContentClassification[] = results.data;
+    let options = classifications
+      .filter((c) => !classificationsAlreadyAdded.includes(c.id))
+      .map((c) => ({
+        value: c.id,
+        label: c,
+      }));
+    return options;
+  };
+
   //   let learningOutcomesInit = activityData.learningOutcomes;
   //   if (learningOutcomesInit == null) {
   //     learningOutcomesInit = [""];
@@ -63,6 +142,13 @@ export function GeneralContentControls({
   //   let [learningOutcomes, setLearningOutcomes] = useState(learningOutcomesInit);
   let [doenetmlVersion, setDoenetmlVersion] = useState(doenetmlVersionInit);
 
+  let [classifySpinnerHidden, setClassifySpinnerHidden] = useState(true);
+  let [classifyItemRemoveSpinner, setClassifyItemRemoveSpinner] = useState(0);
+  useEffect(() => {
+    setClassifySpinnerHidden(true);
+    setClassifyItemRemoveSpinner(0);
+  }, [contentData]);
+
   let contentType = contentData.isFolder ? "Folder" : "Activity";
   let contentTypeLower = contentData.isFolder ? "folder" : "activity";
 
@@ -397,6 +483,141 @@ export function GeneralContentControls({
         <input type="hidden" name="imagePath" value={imagePath ?? undefined} />
         <input type="hidden" name="_action" value="update general" />
         <input type="hidden" name="id" value={id} />
+
+        {!contentData.isFolder ? (
+          <FormControl>
+            <Flex flexDirection="column" width="100%" rowGap={6}>
+              <FormLabel mt="16px">Content Classifications</FormLabel>
+
+              <Accordion allowMultiple>
+                {contentData.classifications.map((classification, i) => (
+                  <AccordionItem key={`classification${i}`}>
+                    <HStack>
+                      <h2>
+                        <AccordionButton>
+                          <HStack flex="1" textAlign="left" direction={"row"}>
+                            ;<Text as="b">{classification.code}</Text>
+                            <Text fontSize={"small"} pt="2px">
+                              {classification.system.name}
+                            </Text>
+                          </HStack>
+                          <AccordionIcon marginLeft="7px" />
+                        </AccordionButton>
+                      </h2>
+                      <Spacer />
+                      <Tooltip
+                        label={`Remove classification ${classification.code}`}
+                      >
+                        <CloseButton
+                          aria-label={`Remove classification ${classification.code}`}
+                          hidden={
+                            classifyItemRemoveSpinner === classification.id
+                          }
+                          onClick={() => {
+                            setClassifyItemRemoveSpinner(classification.id);
+                            fetcher.submit(
+                              {
+                                _action: "remove content classification",
+                                activityId: id,
+                                classificationId: classification.id,
+                              },
+                              { method: "post" },
+                            );
+                          }}
+                        />
+                      </Tooltip>
+                      <Spinner
+                        hidden={classifyItemRemoveSpinner !== classification.id}
+                      />
+                    </HStack>
+                    <AccordionPanel>
+                      <Text as="b">Category: </Text>
+                      <Text>{classification.category}</Text>
+                      <Text as="b">Description: </Text>
+                      <Text>{classification.description}</Text>
+                    </AccordionPanel>
+                  </AccordionItem>
+                ))}
+              </Accordion>
+
+              <HStack>
+                <Box flex={1} pr="10px">
+                  <AsyncSelect
+                    key={`addClassification_${contentData.classifications.map((c) => c.id).join(",")}`} // force this component to reload when classifications change
+                    placeholder="Add a classification"
+                    defaultOptions
+                    isClearable
+                    value={null}
+                    loadOptions={getClassificationOptions}
+                    onInputChange={(newVal) => {
+                      setClassifySelectorInput(newVal);
+                    }}
+                    onChange={(newValueLabel) => {
+                      if (newValueLabel) {
+                        setClassifySpinnerHidden(false);
+                        fetcher.submit(
+                          {
+                            _action: "add content classification",
+                            activityId: id,
+                            classificationId: newValueLabel.value,
+                          },
+                          { method: "post" },
+                        );
+                      }
+                    }}
+                    formatOptionLabel={(val) =>
+                      val ? (
+                        <Box>
+                          <Flex>
+                            <Heading size="sm">
+                              <Highlight
+                                query={classifySelectorInput.split(" ")}
+                                styles={{ fontWeight: 900 }}
+                              >
+                                {val.label.code +
+                                  (val.label.grade
+                                    ? " (" + val.label.grade + ")"
+                                    : "")}
+                              </Highlight>
+                            </Heading>
+                            <Spacer />
+                            <Tag>
+                              <Highlight
+                                query={classifySelectorInput.split(" ")}
+                                styles={{ fontWeight: "bold" }}
+                              >
+                                {val.label.system.name}
+                              </Highlight>
+                            </Tag>
+                          </Flex>
+                          <Text>
+                            <Text as="i">Category:</Text>{" "}
+                            <Highlight
+                              query={classifySelectorInput.split(" ")}
+                              styles={{ fontWeight: "bold" }}
+                            >
+                              {val.label.category}
+                            </Highlight>
+                          </Text>
+                          <Text>
+                            <Text as="i">Description: </Text>
+                            <Highlight
+                              query={classifySelectorInput.split(" ")}
+                              styles={{ fontWeight: "bold" }}
+                            >
+                              {val.label.description}
+                            </Highlight>
+                          </Text>
+                        </Box>
+                      ) : null
+                    }
+                  />
+                </Box>
+                <Spinner hidden={classifySpinnerHidden} />
+              </HStack>
+            </Flex>
+          </FormControl>
+        ) : null}
       </Form>
     </>
   );
diff --git a/client/src/Tools/_framework/ToolPanels/MoveContentToFolder.tsx b/client/src/Tools/_framework/ToolPanels/MoveContentToFolder.tsx
index a7ecaab2e0..8f9cf74ccd 100644
--- a/client/src/Tools/_framework/ToolPanels/MoveContentToFolder.tsx
+++ b/client/src/Tools/_framework/ToolPanels/MoveContentToFolder.tsx
@@ -18,9 +18,13 @@ import {
 import axios from "axios";
 import { ArrowBackIcon } from "@chakra-ui/icons";
 import { useFetcher } from "react-router-dom";
-import { ContentStructure, LicenseCode } from "../Paths/ActivityEditor";
+import {
+  ContentStructure,
+  LicenseCode,
+  UserInfo,
+} from "../Paths/ActivityEditor";
 import { MdFolder, MdOutlineInsertDriveFile } from "react-icons/md";
-import MoveToPublicAlert from "./MoveToPublicAlert";
+import MoveToSharedAlert from "./MoveToSharedAlert";
 
 type ActiveView = {
   // If folder name and id are null, the active view is the root
@@ -28,6 +32,8 @@ type ActiveView = {
   folderId: number | null;
   folderName: string | null;
   folderIsPublic: boolean;
+  folderIsShared: boolean;
+  folderSharedWith: UserInfo[];
   folderLicenseCode: LicenseCode | null;
   parentFolderId: number | null;
   contents: {
@@ -37,11 +43,27 @@ type ActiveView = {
   }[];
 };
 
+export async function moveContentActions({ formObj }: { [k: string]: any }) {
+  if (formObj?._action == "Move to folder") {
+    await axios.post(`/api/moveContent`, {
+      id: formObj.id,
+      desiredParentFolderId:
+        formObj.folderId === "null" ? null : formObj.folderId,
+      desiredPosition: formObj.desiredPosition,
+    });
+    return true;
+  }
+
+  return null;
+}
+
 export default function MoveContentToFolder({
   isOpen,
   onClose,
   id,
   isPublic,
+  isShared,
+  sharedWith,
   licenseCode,
   userId,
   currentParentId,
@@ -51,6 +73,8 @@ export default function MoveContentToFolder({
   onClose: () => void;
   id: number;
   isPublic: boolean;
+  isShared: boolean;
+  sharedWith: UserInfo[];
   licenseCode: LicenseCode | null;
   userId: number;
   currentParentId: number | null;
@@ -61,9 +85,9 @@ export default function MoveContentToFolder({
   const [contentName, setContentName] = useState<string>("");
 
   const {
-    isOpen: publicAlertIsOpen,
-    onOpen: publicAlertOnOpen,
-    onClose: publicAlertOnClose,
+    isOpen: sharedAlertIsOpen,
+    onOpen: sharedAlertOnOpen,
+    onClose: sharedAlertOnClose,
   } = useDisclosure();
 
   useEffect(() => {
@@ -76,6 +100,8 @@ export default function MoveContentToFolder({
   const [activeView, setActiveView] = useState<ActiveView>({
     folderName: null,
     folderIsPublic: false,
+    folderIsShared: false,
+    folderSharedWith: [],
     folderLicenseCode: null,
     folderId: null,
     parentFolderId: null,
@@ -93,6 +119,8 @@ export default function MoveContentToFolder({
     let folder: ContentStructure | null = data.folder;
     const folderName: string | null = folder?.name ?? null;
     const folderIsPublic: boolean = folder?.isPublic ?? false;
+    const folderIsShared: boolean = folder?.isShared ?? false;
+    const folderSharedWith: UserInfo[] = folder?.sharedWith ?? [];
     const folderLicenseCode: LicenseCode | null = folder?.license?.code ?? null;
     const parentFolderId: number | null = folder?.parentFolder?.id ?? null;
     const contentFromApi: ContentStructure[] = data.content;
@@ -119,6 +147,8 @@ export default function MoveContentToFolder({
       folderId: newActiveFolderId,
       folderName,
       folderIsPublic,
+      folderIsShared,
+      folderSharedWith,
       folderLicenseCode,
       parentFolderId,
       contents: content,
@@ -139,9 +169,9 @@ export default function MoveContentToFolder({
 
   return (
     <>
-      <MoveToPublicAlert
-        isOpen={publicAlertIsOpen}
-        onClose={publicAlertOnClose}
+      <MoveToSharedAlert
+        isOpen={sharedAlertIsOpen}
+        onClose={sharedAlertOnClose}
         performMove={performMove}
         folderName={activeView.folderName}
         contentIsPublic={isPublic}
@@ -222,10 +252,20 @@ export default function MoveContentToFolder({
               }
               onClick={() => {
                 if (
-                  activeView.folderIsPublic &&
-                  (!isPublic || licenseCode !== activeView.folderLicenseCode)
+                  (activeView.folderIsPublic &&
+                    (!isPublic ||
+                      licenseCode !== activeView.folderLicenseCode)) ||
+                  (activeView.folderIsShared &&
+                    (!isShared ||
+                      activeView.folderSharedWith.some(
+                        (folderUser) =>
+                          sharedWith.findIndex(
+                            (u) => u.userId === folderUser.userId,
+                          ) === -1,
+                      ) ||
+                      licenseCode !== activeView.folderLicenseCode))
                 ) {
-                  publicAlertOnOpen();
+                  sharedAlertOnOpen();
                 } else {
                   performMove();
                 }
@@ -244,7 +284,7 @@ export default function MoveContentToFolder({
   function performMove() {
     fetcher.submit(
       {
-        _action: "Move",
+        _action: "Move to folder",
         id,
         folderId: activeView.folderId,
         desiredPosition: activeView.contents.length, // place it as the last item
diff --git a/client/src/Tools/_framework/ToolPanels/MoveToPublicAlert.tsx b/client/src/Tools/_framework/ToolPanels/MoveToSharedAlert.tsx
similarity index 88%
rename from client/src/Tools/_framework/ToolPanels/MoveToPublicAlert.tsx
rename to client/src/Tools/_framework/ToolPanels/MoveToSharedAlert.tsx
index 7b18aa15e6..08c30564ff 100644
--- a/client/src/Tools/_framework/ToolPanels/MoveToPublicAlert.tsx
+++ b/client/src/Tools/_framework/ToolPanels/MoveToSharedAlert.tsx
@@ -13,7 +13,7 @@ import {
 } from "@chakra-ui/react";
 import { WarningIcon } from "@chakra-ui/icons";
 
-export default function MoveToPublicAlert({
+export default function MoveToSharedAlert({
   isOpen,
   onClose,
   performMove,
@@ -35,7 +35,7 @@ export default function MoveToPublicAlert({
         <ModalContent>
           <ModalHeader>
             <Heading noOfLines={1} size="lg">
-              <WarningIcon color="orange.500" /> Confirm move to public folder
+              <WarningIcon color="orange.500" /> Confirm move to shared folder
             </Heading>
           </ModalHeader>
           <ModalCloseButton />
@@ -50,13 +50,13 @@ export default function MoveToPublicAlert({
               >
                 {folderName}
               </Text>
-              is a public folder
+              is a shared folder
               {contentIsPublic ? " with a different license" : ""}.
             </p>
             <p style={{ marginTop: "10px" }}>
               {" "}
-              Moving to this folder will make the content public with the same
-              license.
+              Moving to this folder will make the share the content with the
+              same people and with the same license.
             </p>
           </ModalBody>
           <ModalFooter>
diff --git a/client/src/Tools/_framework/ToolPanels/RemixedFrom.tsx b/client/src/Tools/_framework/ToolPanels/RemixedFrom.tsx
new file mode 100644
index 0000000000..3770d6a041
--- /dev/null
+++ b/client/src/Tools/_framework/ToolPanels/RemixedFrom.tsx
@@ -0,0 +1,130 @@
+import React from "react";
+import {
+  Flex,
+  Hide,
+  Show,
+  Spinner,
+  Table,
+  TableContainer,
+  Tbody,
+  Td,
+  Text,
+  Th,
+  Thead,
+  Tr,
+  VStack,
+} from "@chakra-ui/react";
+import { createFullName } from "../../../_utils/names";
+import { DateTime } from "luxon";
+import { DocHistoryItem } from "../Paths/ActivityViewer";
+
+export async function remixedFromActions({ formObj }: { [k: string]: any }) {
+  return null;
+}
+
+export function RemixedFrom({
+  contributorHistory,
+  thisCid,
+}: {
+  contributorHistory: DocHistoryItem[] | null;
+  thisCid: string | null;
+}) {
+  if (contributorHistory === null) {
+    return (
+      <Flex>
+        <Text marginRight="5px">Loading...</Text> <Spinner size="sm" />
+      </Flex>
+    );
+  }
+
+  if (contributorHistory.length === 0) {
+    return <Text>Not remixed from other activities</Text>;
+  }
+
+  let historyTable = (
+    <TableContainer
+      maxHeight="200px"
+      overflowY="auto"
+      marginBottom="20px"
+      marginTop="20px"
+      position="relative"
+    >
+      <Table size="sm">
+        <Thead position="sticky" top={0} backgroundColor="var(--canvas)">
+          <Tr>
+            <Show above="sm">
+              <Th textTransform="none">Activity Name</Th>
+              <Th textTransform="none">Owner</Th>
+            </Show>
+            <Hide above="sm">
+              <Th>
+                <VStack alignItems="left">
+                  <Text>Activity Name</Text>
+                  <Text>Owner</Text>
+                </VStack>
+              </Th>
+            </Hide>
+            <Th textTransform="none">License</Th>
+            <Show above="sm">
+              <Th>Date copied</Th>
+            </Show>
+          </Tr>
+        </Thead>
+        <Tbody>
+          {contributorHistory.map((ch, i) => {
+            let changeText = "";
+            if (ch.prevChanged) {
+              // The previous doc changed since it was remixed.
+              // Check if this activity's doc change since then
+              let thisActivityDocChanged = thisCid !== ch.prevCid;
+              if (thisActivityDocChanged) {
+                changeText =
+                  "The original doc changed and so did this one, so would have to merge changes";
+              } else {
+                changeText =
+                  "The original doc changed but this one did not, so could just copy over changes.";
+              }
+            } else {
+              changeText = "The original doc is unchanged";
+            }
+            return (
+              <Tr key={`ch${i}`}>
+                <Show above="sm">
+                  <Td>{ch.prevActivityName}</Td>
+                  <Td>{createFullName(ch.prevOwner)}</Td>
+                </Show>
+                <Hide above="sm">
+                  <Td>
+                    <VStack alignItems="left">
+                      <Text>{ch.prevActivityName}</Text>
+                      <Text>{createFullName(ch.prevOwner)}</Text>
+                    </VStack>
+                  </Td>
+                </Hide>
+                <Td>{ch.withLicenseCode}</Td>
+                <Show above="sm">
+                  {/* Note: use timestampPrevDoc as what the timestamp from when the previous was mixed, not when this doc was created */}
+                  <Td>
+                    {ch.timestampPrevDoc.toLocaleString(DateTime.DATE_MED)}
+                  </Td>
+                </Show>
+                <Td width="100px">
+                  <Text
+                    width="100px"
+                    flexWrap="wrap"
+                    wordBreak="break-word"
+                    whiteSpace="normal"
+                  >
+                    {changeText}
+                  </Text>
+                </Td>
+              </Tr>
+            );
+          })}
+        </Tbody>
+      </Table>
+    </TableContainer>
+  );
+
+  return historyTable;
+}
diff --git a/client/src/Tools/_framework/ToolPanels/Remixes.tsx b/client/src/Tools/_framework/ToolPanels/Remixes.tsx
new file mode 100644
index 0000000000..c64f347f86
--- /dev/null
+++ b/client/src/Tools/_framework/ToolPanels/Remixes.tsx
@@ -0,0 +1,100 @@
+import React from "react";
+import { DocRemixItem } from "../Paths/ActivityViewer";
+import {
+  Flex,
+  Hide,
+  Show,
+  Spinner,
+  Table,
+  TableContainer,
+  Tbody,
+  Td,
+  Text,
+  Th,
+  Thead,
+  Tr,
+  VStack,
+} from "@chakra-ui/react";
+import { createFullName } from "../../../_utils/names";
+import { DateTime } from "luxon";
+
+export async function remixesActions({ formObj }: { [k: string]: any }) {
+  return null;
+}
+
+export function Remixes({ remixes }: { remixes: DocRemixItem[] | null }) {
+  if (remixes === null) {
+    return (
+      <Flex>
+        <Text marginRight="5px">Loading...</Text> <Spinner size="sm" />
+      </Flex>
+    );
+  }
+
+  if (remixes.length === 0) {
+    return <Text>No remixes of this activity (yet!)</Text>;
+  }
+
+  let remixTable = (
+    <TableContainer
+      maxHeight="200px"
+      overflowY="auto"
+      marginBottom="20px"
+      marginTop="20px"
+      position="relative"
+    >
+      <Table size="sm">
+        <Thead position="sticky" top={0} backgroundColor="var(--canvas)">
+          <Tr>
+            <Show above="sm">
+              <Th textTransform="none">Activity Name</Th>
+              <Th textTransform="none">Owner</Th>
+            </Show>
+            <Hide above="sm">
+              <Th>
+                <VStack alignItems="left">
+                  <Text>Activity Name</Text>
+                  <Text>Owner</Text>
+                </VStack>
+              </Th>
+            </Hide>
+            <Th textTransform="none">License</Th>
+            <Show above="sm">
+              <Th>Date copied</Th>
+            </Show>
+          </Tr>
+        </Thead>
+        <Tbody>
+          {remixes.map((ch, i) => {
+            return (
+              <Tr key={`ch${i}`}>
+                <Show above="sm">
+                  <Td>{ch.activityName}</Td>
+                  <Td>{createFullName(ch.owner)}</Td>
+                </Show>
+                <Hide above="sm">
+                  <Td>
+                    <VStack alignItems="left">
+                      <Text>{ch.activityName}</Text>
+                      <Text>{createFullName(ch.owner)}</Text>
+                    </VStack>
+                  </Td>
+                </Hide>
+                <Td>{ch.withLicenseCode}</Td>
+                <Show above="sm">
+                  {/* Note: use timestampPrevDoc as what the timestamp from when the previous was mixed, not when this doc was created */}
+                  <Td>
+                    {ch.timestampPrevDoc.toLocaleString(DateTime.DATE_MED)}
+                  </Td>
+                  <Td>{ch.isDirect.toString()}</Td>
+                </Show>
+              </Tr>
+            );
+          })}
+        </Tbody>
+      </Table>
+    </TableContainer>
+  );
+
+  return remixTable;
+}
diff --git a/client/src/Tools/_framework/ToolPanels/ShareDrawer.tsx b/client/src/Tools/_framework/ToolPanels/ShareDrawer.tsx
new file mode 100644
index 0000000000..1f7982612b
--- /dev/null
+++ b/client/src/Tools/_framework/ToolPanels/ShareDrawer.tsx
@@ -0,0 +1,183 @@
+import React, { RefObject, useEffect, useState } from "react";
+import { sharingActions, ShareSettings } from "./ShareSettings";
+import { remixedFromActions, RemixedFrom } from "./RemixedFrom";
+import { FetcherWithComponents } from "react-router-dom";
+import { ContentStructure, License } from "../Paths/ActivityEditor";
+import {
+  Box,
+  Drawer,
+  DrawerBody,
+  DrawerCloseButton,
+  DrawerContent,
+  DrawerHeader,
+  DrawerOverlay,
+  Tab,
+  TabList,
+  TabPanel,
+  TabPanels,
+  Tabs,
+  Text,
+  Tooltip,
+} from "@chakra-ui/react";
+import { Remixes } from "./Remixes";
+import {
+  DocHistoryItem,
+  DocRemixItem,
+  processContributorHistory,
+  processRemixes,
+} from "../Paths/ActivityViewer";
+import axios from "axios";
+import { cidFromText } from "../../../_utils/cid";
+
+export async function shareDrawerActions({ formObj }: { [k: string]: any }) {
+  let result1 = await sharingActions({ formObj });
+  if (result1) {
+    return result1;
+  }
+
+  let result4 = await remixedFromActions({ formObj });
+  if (result4) {
+    return result4;
+  }
+
+  return null;
+}
+
+export function ShareDrawer({
+  isOpen,
+  onClose,
+  finalFocusRef,
+  fetcher,
+  contentData,
+  allLicenses,
+  currentDoenetML,
+}: {
+  isOpen: boolean;
+  onClose: () => void;
+  finalFocusRef?: RefObject<HTMLElement>;
+  fetcher: FetcherWithComponents<any>;
+  contentData: ContentStructure;
+  allLicenses: License[];
+  currentDoenetML?: React.MutableRefObject<string>;
+}) {
+  const [contributorHistory, setContributorHistory] = useState<
+    DocHistoryItem[] | null
+  >(null);
+  const [haveChangedHistoryItem, setHaveChangedHistoryItem] = useState(false);
+  const [remixes, setRemixes] = useState<DocRemixItem[] | null>(null);
+  const [thisCid, setThisCid] = useState<string | null>(null);
+
+  useEffect(() => {
+    async function getHistoryAndRemixes() {
+      const { data } = await axios.get(
+        `/api/getContributorHistory/${contentData.id}`,
+      );
+
+      const hist = await processContributorHistory(data.docHistories[0]);
+      setContributorHistory(hist);
+
+      let haveChanged = hist.some((dhi) => dhi.prevChanged);
+
+      setHaveChangedHistoryItem(haveChanged);
+
+      const { data: data2 } = await axios.get(
+        `/api/getRemixes/${contentData.id}`,
+      );
+
+      const doc0Remixes = processRemixes(data2.docRemixes[0]);
+      setRemixes(doc0Remixes);
+    }
+
+    getHistoryAndRemixes();
+  }, [contentData]);
+
+  useEffect(() => {
+    async function getRemixes() {}
+
+    getRemixes();
+  }, [contentData.id]);
+
+  useEffect(() => {
+    async function recalculateThisCid() {
+      let cid: string | null = null;
+      if (haveChangedHistoryItem) {
+        let thisSource =
+          currentDoenetML?.current || contentData.documents[0].source;
+
+        if (thisSource === undefined) {
+          const { data: sourceData } = await axios.get(
+            `/api/getDocumentSource/${contentData.documents[0].id}`,
+          );
+
+          thisSource = sourceData.source as string;
+        }
+        cid = await cidFromText(thisSource);
+      }
+
+      setThisCid(cid);
+    }
+
+    recalculateThisCid();
+  }, [haveChangedHistoryItem, currentDoenetML?.current]);
+
+  return (
+    <Drawer
+      isOpen={isOpen}
+      placement="right"
+      onClose={onClose}
+      finalFocusRef={finalFocusRef}
+      size="lg"
+    >
+      <DrawerOverlay />
+      <DrawerContent>
+        <DrawerCloseButton data-test="Close Share Drawer Button" />
+        <DrawerHeader textAlign="center" height="70px">
+          Sharing Controls
+          <Tooltip label={contentData.name} openDelay={1000}>
+            <Text fontSize="smaller" noOfLines={1}>
+              {contentData.name}
+            </Text>
+          </Tooltip>
+        </DrawerHeader>
+
+        <DrawerBody>
+          <Tabs>
+            <TabList>
+              <Tab data-test="Share Tab">Share</Tab>
+              <Tab data-test="Remixed From Tab">
+                Remixed From{" "}
+                {contributorHistory !== null
+                  ? `(${contributorHistory.length})`
+                  : null}
+                {haveChangedHistoryItem ? "*" : null}
+              </Tab>
+              <Tab data-test="Remixes Tab">
+                Remixes {remixes !== null ? `(${remixes.length})` : null}
+              </Tab>
+            </TabList>
+            <Box overflowY="auto" height="calc(100vh - 130px)">
+              <TabPanels>
+                <TabPanel>
+                  <ShareSettings
+                    fetcher={fetcher}
+                    contentData={contentData}
+                    allLicenses={allLicenses}
+                  />
+                </TabPanel>
+                <TabPanel>
+                  <RemixedFrom
+                    contributorHistory={contributorHistory}
+                    thisCid={thisCid}
+                  />
+                </TabPanel>
+                <TabPanel>
+                  <Remixes remixes={remixes} />
+                </TabPanel>
+              </TabPanels>
+            </Box>
+          </Tabs>
+        </DrawerBody>
+      </DrawerContent>
+    </Drawer>
+  );
+}
diff --git a/client/src/Tools/_framework/ToolPanels/ShareSettings.tsx b/client/src/Tools/_framework/ToolPanels/ShareSettings.tsx
new file mode 100644
index 0000000000..8939ead8a8
--- /dev/null
+++ b/client/src/Tools/_framework/ToolPanels/ShareSettings.tsx
@@ -0,0 +1,609 @@
+import React, { useEffect, useRef, useState } from "react";
+import {
+  FetcherWithComponents,
+  Form,
+  Link,
+  useActionData,
+} from "react-router-dom";
+import {
+  Box,
+  FormLabel,
+  Select,
+  Checkbox,
+  FormControl,
+  FormErrorMessage,
+  Image,
+  Tooltip,
+  Text,
+  HStack,
+  List,
+  ListItem,
+  ListIcon,
+  Input,
+  Spinner,
+  TableContainer,
+  Table,
+  Thead,
+  Th,
+  Tbody,
+  Tr,
+  Td,
+  CloseButton,
+  Show,
+  VStack,
+  Hide,
+} from "@chakra-ui/react";
+import {
+  ContentStructure,
+  License,
+  LicenseCode,
+} from "../Paths/ActivityEditor";
+import { InfoIcon } from "@chakra-ui/icons";
+import { MdCircle } from "react-icons/md";
+import axios from "axios";
+import { createFullName } from "../../../_utils/names";
+
+export async function sharingActions({ formObj }: { [k: string]: any }) {
+  if (formObj._action == "make content public") {
+    if (formObj.isFolder === "true") {
+      await axios.post("/api/makeFolderPublic", {
+        id: Number(formObj.id),
+        licenseCode: formObj.licenseCode,
+      });
+    } else {
+      await axios.post("/api/makeActivityPublic", {
+        id: Number(formObj.id),
+        licenseCode: formObj.licenseCode,
+      });
+    }
+    return true;
+  } else if (formObj._action == "make content private") {
+    if (formObj.isFolder === "true") {
+      await axios.post("/api/makeFolderPrivate", {
+        id: Number(formObj.id),
+      });
+    } else {
+      await axios.post("/api/makeActivityPrivate", {
+        id: Number(formObj.id),
+      });
+    }
+    return true;
+  } else if (formObj._action === "share content") {
+    try {
+      if (formObj.isFolder === "true") {
+        await axios.post("/api/shareFolder", {
+          id: Number(formObj.id),
+          licenseCode: formObj.licenseCode,
+          email: formObj.email,
+        });
+      } else {
+        await axios.post("/api/shareActivity", {
+          id: Number(formObj.id),
+          licenseCode: formObj.licenseCode,
+          email: formObj.email,
+        });
+      }
+    } catch (e) {
+      if (e.response?.data === "User with email not found") {
+        return { email: formObj.email, status: "Not found" };
+      } else {
+        throw e;
+      }
+    }
+    return { status: "Added", email: formObj.email };
+  } else if (formObj._action === "unshare content") {
+    if (formObj.isFolder === "true") {
+      await axios.post("/api/unshareFolder", {
+        id: Number(formObj.id),
+        userId: formObj.userId,
+      });
+    } else {
+      await axios.post("/api/unshareActivity", {
+        id: Number(formObj.id),
+        userId: formObj.userId,
+      });
+    }
+
+    return true;
+  } else if (formObj._action == "set license") {
+    if (formObj.isFolder === "true") {
+      await axios.post("/api/setFolderLicense", {
+        id: Number(formObj.id),
+        licenseCode: formObj.licenseCode,
+      });
+    } else {
+      await axios.post("/api/setActivityLicense", {
+        id: Number(formObj.id),
+        licenseCode: formObj.licenseCode,
+      });
+    }
+    return true;
+  }
+
+  return null;
+}
+
+export function ShareSettings({
+  fetcher,
+  contentData,
+  allLicenses,
+}: {
+  fetcher: FetcherWithComponents<any>;
+  contentData: ContentStructure;
+  allLicenses: License[];
+}) {
+  let license = contentData.license;
+
+  const [selectedIsPublic, setSelectedIsPublic] = useState(
+    contentData.isPublic,
+  );
+  const [selectedLicenseCode, setSelectedLicenseCode] = useState(license?.code);
+
+  const [shareWithEmail, setShareWithEmail] = useState("");
+  const [showSpinner, setShowSpinner] = useState<{
+    type: string;
+    id?: number;
+  } | null>(null);
+
+  const [statusText, setStatusText] = useState("");
+  const nextStatusText = useRef("");
+  const [errorMessage, setErrorMessage] = useState("");
+
+  const initialActionResult = useRef(true);
+
+  useEffect(() => {
+    setSelectedLicenseCode(license?.code);
+  }, [license?.code]);
+
+  useEffect(() => {
+    setSelectedIsPublic(contentData.isPublic);
+  }, [contentData.isPublic]);
+
+  let missingLicense = selectedIsPublic && selectedLicenseCode === undefined;
+
+  let placeholder = missingLicense ? "Select license" : undefined;
+
+  let contentType = contentData.isFolder ? "Folder" : "Activity";
+  let contentTypeLower = contentData.isFolder ? "folder" : "activity";
+
+  const actionResult: any = useActionData();
+
+  useEffect(() => {
+    if (actionResult?.status === "Added") {
+      setShareWithEmail("");
+      setErrorMessage("");
+    } else if (actionResult?.status === "Not found") {
+      nextStatusText.current = "";
+      setStatusText("");
+      setShowSpinner(null);
+
+      // Need this check so don't get old error message when reopening the controls
+      if (!initialActionResult.current) {
+        setErrorMessage(`User with email ${actionResult.email} not found`);
+      }
+    } else {
+      setErrorMessage("");
+    }
+    initialActionResult.current = false;
+  }, [actionResult]);
+
+  useEffect(() => {
+    setShowSpinner(null);
+    setStatusText(nextStatusText.current);
+  }, [contentData]);
+
+  return (
+    <>
+      <Box>
+        <Box
+          marginTop="10px"
+          border="2px solid lightgray"
+          background="lightgray"
+          padding="10px"
+        >
+          {!(contentData.isPublic || contentData.isShared) ? (
+            contentData.isFolder ? (
+              <p>
+                Folder is private. However, shared items within the folder can
+                still be found.
+              </p>
+            ) : (
+              <p>Activity is private.</p>
+            )
+          ) : license === null ? (
+            <Box
+              marginTop="10px"
+              border="2px solid black"
+              background="orange.100"
+              padding="5px"
+            >
+              <InfoIcon color="orange.500" mr="2px" /> {contentType} is shared
+              without specifying a license. Please select a license below to
+              inform other how they can use your content.
+            </Box>
+          ) : (
+            <>
+              {license.isComposition ? (
+                <>
+                  <p>{contentType} is shared with these licenses:</p>
+                  <List spacing="20px" marginTop="10px">
+                    {license.composedOf.map((comp) => (
+                      <DisplayLicenseItem licenseItem={comp} key={comp.code} />
+                    ))}
+                  </List>
+                  <p style={{ marginTop: "10px" }}>
+                    (You authorize reuse under any of these licenses.)
+                  </p>
+                </>
+              ) : (
+                <>
+                  <p>{contentType} is shared using the license:</p>
+                  <List marginTop="10px">
+                    <DisplayLicenseItem licenseItem={license} />
+                  </List>
+                </>
+              )}
+            </>
+          )}
+        </Box>
+      </Box>
+
+      <Box>
+        {contentData.parentFolder?.isPublic ||
+        contentData.parentFolder?.isShared ? (
+          <p style={{ marginTop: "10px" }}>
+            This {contentTypeLower} is inside a shared folder and inherits its
+            settings.
+          </p>
+        ) : null}
+
+        {statusText !== "" ? (
+          <Box
+            border="solid 1px lightgray"
+            borderRadius="5px"
+            padding="5px 10px"
+            marginTop="10px"
+            backgroundColor="orange.100"
+          >
+            {statusText}
+          </Box>
+        ) : null}
+
+        {contentData.isShared || contentData.isPublic ? (
+          <>
+            <TableContainer
+              maxHeight="200px"
+              overflowY="auto"
+              marginBottom="20px"
+              marginTop="20px"
+              position="relative"
+            >
+              <Table size="sm">
+                <Thead
+                  position="sticky"
+                  top={0}
+                  backgroundColor="var(--canvas)"
+                >
+                  <Tr>
+                    <Th
+                      colSpan={3}
+                      textTransform="none"
+                      color="inherit"
+                      fontSize="inherit"
+                      fontWeight="inherit"
+                      fontFamily="inherit"
+                      paddingLeft="0px"
+                      fontStyle="inherit"
+                    >
+                      People with access
+                    </Th>
+                  </Tr>
+                </Thead>
+                <Tbody>
+                  {contentData.isPublic ? (
+                    <Tr>
+                      <Show above="sm">
+                        <Td>Everyone</Td>
+                        <Td>(shared publicly)</Td>
+                      </Show>
+                      <Hide above="sm">
+                        <Td>
+                          <VStack alignItems="left">
+                            <Text>Everyone</Text>
+                            <Text>(shared publicly)</Text>
+                          </VStack>
+                        </Td>
+                      </Hide>
+                      <Td>
+                        {contentData.parentFolder?.isPublic ? (
+                          <Text>(inherited)</Text>
+                        ) : (
+                          <Tooltip label={`Stop sharing publicly`}>
+                            <CloseButton
+                              type="submit"
+                              aria-label={`Stop sharing publicly`}
+                              onClick={() => {
+                                nextStatusText.current =
+                                  "Stopped sharing publicly";
+                                setShowSpinner({
+                                  type: "unshare",
+                                  id: 0,
+                                });
+                                fetcher.submit(
+                                  {
+                                    _action: "make content private",
+                                    id: contentData.id,
+                                    isFolder: Boolean(contentData.isFolder),
+                                  },
+                                  { method: "post" },
+                                );
+                              }}
+                            />
+                          </Tooltip>
+                        )}
+                      </Td>
+                      <Td width="60px">
+                        <Spinner
+                          hidden={
+                            showSpinner?.type !== "unshare" ||
+                            showSpinner.id !== 0
+                          }
+                        />
+                      </Td>
+                    </Tr>
+                  ) : null}
+                  {contentData.sharedWith.map((user) => {
+                    const sharedViaFolder =
+                      (contentData.parentFolder?.sharedWith.findIndex(
+                        (cs) => cs.userId === user.userId,
+                      ) ?? -1) !== -1;
+                    return (
+                      <Tr key={user.userId}>
+                        <Show above="sm">
+                          <Td>{createFullName(user)}</Td>
+                          <Td>{user.email}</Td>
+                        </Show>
+                        <Hide above="sm">
+                          <Td>
+                            <VStack alignItems="left">
+                              <Text>{createFullName(user)}</Text>
+                              <Text>{user.email}</Text>
+                            </VStack>
+                          </Td>
+                        </Hide>
+                        <Td>
+                          {sharedViaFolder ? (
+                            <Text>(inherited)</Text>
+                          ) : (
+                            <Form method="post">
+                              <Tooltip label={`Remove ${createFullName(user)}`}>
+                                <CloseButton
+                                  type="submit"
+                                  aria-label={`Remove ${createFullName(user)}`}
+                                  onClick={() => {
+                                    setShowSpinner({
+                                      type: "unshare",
+                                      id: user.userId,
+                                    });
+                                    nextStatusText.current = `Stopped sharing with ${createFullName(user)}`;
+                                  }}
+                                />
+                              </Tooltip>
+
+                              <Input
+                                type="hidden"
+                                name="_action"
+                                value="unshare content"
+                              />
+                              <Input
+                                type="hidden"
+                                name="id"
+                                value={contentData.id}
+                              />
+                              <Input
+                                type="hidden"
+                                name="userId"
+                                value={user.userId}
+                              />
+                              <Input
+                                type="hidden"
+                                name="email"
+                                value={user.email}
+                              />
+                              <Input
+                                type="hidden"
+                                name="isFolder"
+                                value={Boolean(contentData.isFolder).toString()}
+                              />
+                            </Form>
+                          )}
+                        </Td>
+                        <Td width="60px">
+                          <Spinner
+                            hidden={
+                              showSpinner?.type !== "unshare" ||
+                              showSpinner.id !== user.userId
+                            }
+                          />
+                        </Td>
+                      </Tr>
+                    );
+                  })}
+                </Tbody>
+              </Table>
+            </TableContainer>
+          </>
+        ) : null}
+
+        <Form
+          method="post"
+          onSubmit={() => {
+            setShowSpinner({ type: "emailShare" });
+            nextStatusText.current = `Successfully shared with ${shareWithEmail}`;
+          }}
+        >
+          <FormControl isInvalid={errorMessage !== ""} marginTop="20px">
+            <FormLabel>Add people</FormLabel>
+            <HStack>
+              <Input
+                type="email"
+                name="email"
+                placeholder="Email address"
+                value={shareWithEmail}
+                onChange={(e) => setShareWithEmail(e.target.value)}
+                width="90%"
+              />
+              <Spinner hidden={showSpinner?.type !== "emailShare"} />
+            </HStack>
+            <Input type="hidden" name="_action" value="share content" />
+            <Input type="hidden" name="id" value={contentData.id} />
+            <Input
+              type="hidden"
+              name="isFolder"
+              value={Boolean(contentData.isFolder).toString()}
+            />
+            <Input
+              type="hidden"
+              name="licenseCode"
+              value={selectedLicenseCode ?? "CCDUAL"}
+            />
+            {errorMessage !== "" ? (
+              <FormErrorMessage>{errorMessage}</FormErrorMessage>
+            ) : null}
+          </FormControl>
+        </Form>
+
+        {contentData.parentFolder?.isPublic ? null : (
+          <>
+            <HStack gap={5}>
+              <Checkbox
+                marginTop="20px"
+                isChecked={selectedIsPublic}
+                onChange={() => {
+                  setShowSpinner({ type: "public" });
+                  if (contentData.isPublic) {
+                    nextStatusText.current = "Stopped sharing publicly";
+                    fetcher.submit(
+                      {
+                        _action: "make content private",
+                        id: contentData.id,
+                        isFolder: Boolean(contentData.isFolder),
+                      },
+                      { method: "post" },
+                    );
+                    setSelectedIsPublic(false);
+                  } else {
+                    nextStatusText.current = "Successfully shared publicly";
+                    fetcher.submit(
+                      {
+                        _action: "make content public",
+                        id: contentData.id,
+                        licenseCode: selectedLicenseCode ?? "CCDUAL",
+                        isFolder: Boolean(contentData.isFolder),
+                      },
+                      { method: "post" },
+                    );
+                    setSelectedIsPublic(true);
+                  }
+                }}
+              >
+                Share publicly
+              </Checkbox>
+              <Spinner
+                hidden={showSpinner?.type !== "public"}
+                marginTop="20px"
+              />
+            </HStack>
+          </>
+        )}
+
+        {contentData.parentFolder?.isPublic ||
+        contentData.parentFolder?.isShared ? null : (
+          <FormControl isInvalid={missingLicense}>
+            <FormLabel mt="20px">Change license</FormLabel>
+            <HStack gap={5}>
+              <Select
+                width="90%"
+                placeholder={placeholder}
+                value={selectedLicenseCode}
+                onChange={(e) => {
+                  setShowSpinner({ type: "license" });
+                  setStatusText("");
+                  nextStatusText.current = "Successfully changed license.";
+                  let newLicenseCode = e.target.value as LicenseCode;
+                  setSelectedLicenseCode(newLicenseCode);
+                  fetcher.submit(
+                    {
+                      _action: "set license",
+                      id: contentData.id,
+                      licenseCode: newLicenseCode,
+                      isFolder: Boolean(contentData.isFolder),
+                    },
+                    { method: "post" },
+                  );
+                }}
+              >
+                {allLicenses.map((license) => (
+                  <option value={license.code} key={license.code}>
+                    {license.name}
+                  </option>
+                ))}
+              </Select>
+              <Spinner hidden={showSpinner?.type !== "license"} />
+            </HStack>
+            <FormErrorMessage>
+              A license is required to make public.
+            </FormErrorMessage>
+          </FormControl>
+        )}
+      </Box>
+    </>
+  );
+}
+
+export function DisplayLicenseItem({
+  licenseItem,
+}: {
+  licenseItem: {
+    name: string;
+    description: string;
+    imageURL: string | null;
+    licenseURL: string | null;
+  };
+}) {
+  let image: React.JSX.Element | null = null;
+  if (licenseItem.imageURL) {
+    image = (
+      <Image
+        src={licenseItem.imageURL}
+        alt={`Badge for license: ${licenseItem.name}`}
+        width="100px"
+      />
+    );
+  }
+
+  let item = (
+    <Tooltip label={licenseItem.description}>
+      <HStack>
+        {image}
+        <Text>{licenseItem.name}</Text>
+      </HStack>
+    </Tooltip>
+  );
+  if (licenseItem.licenseURL) {
+    item = (
+      <Link to={licenseItem.licenseURL} target="_blank">
+        {item}
+      </Link>
+    );
+  }
+
+  return (
+    <ListItem>
+      <HStack>
+        <ListIcon as={MdCircle} margin="0px" />
+        {item}
+      </HStack>
+    </ListItem>
+  );
+}
diff --git a/client/src/Tools/_framework/ToolPanels/SharingControls.tsx b/client/src/Tools/_framework/ToolPanels/SharingControls.tsx
deleted file mode 100644
index d19e1e6bd9..0000000000
--- a/client/src/Tools/_framework/ToolPanels/SharingControls.tsx
+++ /dev/null
@@ -1,245 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { FetcherWithComponents, Link } from "react-router-dom";
-import {
-  Box,
-  Heading,
-  FormLabel,
-  Select,
-  Checkbox,
-  FormControl,
-  FormErrorMessage,
-  Image,
-  Tooltip,
-  Text,
-  HStack,
-  List,
-  ListItem,
-  ListIcon,
-} from "@chakra-ui/react";
-import {
-  ContentStructure,
-  License,
-  LicenseCode,
-} from "../Paths/ActivityEditor";
-import { InfoIcon } from "@chakra-ui/icons";
-import { MdCircle } from "react-icons/md";
-
-export function SharingControls({
-  fetcher,
-  contentData,
-  allLicenses,
-}: {
-  fetcher: FetcherWithComponents<any>;
-  contentData: ContentStructure;
-  allLicenses: License[];
-}) {
-  let license = contentData.license;
-
-  const [selectedIsPublic, setSelectedIsPublic] = useState(
-    contentData.isPublic,
-  );
-  const [selectedLicenseCode, setSelectedLicenseCode] = useState(license?.code);
-
-  useEffect(() => {
-    setSelectedLicenseCode(license?.code);
-  }, [license?.code]);
-
-  useEffect(() => {
-    setSelectedIsPublic(contentData.isPublic);
-  }, [contentData.isPublic]);
-
-  let missingLicense = selectedIsPublic && selectedLicenseCode === undefined;
-
-  let placeholder = missingLicense ? "Select license" : undefined;
-
-  let contentType = contentData.isFolder ? "Folder" : "Activity";
-  let contentTypeLower = contentData.isFolder ? "folder" : "activity";
-
-  return (
-    <>
-      <Box>
-        <Box
-          marginTop="10px"
-          border="2px solid lightgray"
-          background="lightgray"
-          padding="10px"
-        >
-          {!contentData.isPublic ? (
-            contentData.isFolder ? (
-              <p>
-                Folder is private. However, public items within the folder can
-                still be found.
-              </p>
-            ) : (
-              <p>Activity is private.</p>
-            )
-          ) : license === null ? (
-            <Box
-              marginTop="10px"
-              border="2px solid black"
-              background="orange.100"
-              padding="5px"
-            >
-              <InfoIcon color="orange.500" mr="2px" /> {contentType} is publicly
-              shared without specifying a license. Please select a license below
-              to inform other how they can use your content.
-            </Box>
-          ) : (
-            <>
-              {license.isComposition ? (
-                <>
-                  <p>{contentType} is shared publicly with these licenses:</p>
-                  <List spacing="20px" marginTop="10px">
-                    {license.composedOf.map((comp) => (
-                      <DisplayLicenseItem licenseItem={comp} key={comp.code} />
-                    ))}
-                  </List>
-                  <p style={{ marginTop: "10px" }}>
-                    (You authorize reuse under any of these licenses.)
-                  </p>
-                </>
-              ) : (
-                <>
-                  <p>{contentType} is shared publicly using the license:</p>
-                  <List marginTop="10px">
-                    <DisplayLicenseItem licenseItem={license} />
-                  </List>
-                </>
-              )}
-            </>
-          )}
-        </Box>
-      </Box>
-
-      {contentData.parentFolder?.isPublic ? (
-        <Box>
-          <Heading size="md" marginTop="10px">
-            Sharing publicly
-          </Heading>
-          <p style={{ marginTop: "10px" }}>
-            This {contentTypeLower} is inside a public folder and is shared
-            publicly using that folder's license.
-          </p>
-        </Box>
-      ) : (
-        <Box>
-          <Heading size="md" marginTop="10px">
-            Sharing publicly
-          </Heading>
-
-          <p style={{ marginTop: "10px" }}>
-            Sharing content publicly allows others to find it and adapt it.
-          </p>
-
-          <Checkbox
-            marginTop="10px"
-            isChecked={selectedIsPublic}
-            onChange={() => {
-              if (contentData.isPublic) {
-                fetcher.submit(
-                  {
-                    _action: "make content private",
-                    id: contentData.id,
-                    isFolder: Boolean(contentData.isFolder),
-                  },
-                  { method: "post" },
-                );
-                setSelectedIsPublic(false);
-              } else {
-                fetcher.submit(
-                  {
-                    _action: "make content public",
-                    id: contentData.id,
-                    licenseCode: selectedLicenseCode ?? "CCDUAL",
-                    isFolder: Boolean(contentData.isFolder),
-                  },
-                  { method: "post" },
-                );
-                setSelectedIsPublic(true);
-              }
-            }}
-          >
-            Make public
-          </Checkbox>
-          <FormControl isInvalid={missingLicense}>
-            <FormLabel mt="16px">License</FormLabel>
-            <Select
-              placeholder={placeholder}
-              value={selectedLicenseCode}
-              disabled={!selectedIsPublic}
-              onChange={(e) => {
-                let newLicenseCode = e.target.value as LicenseCode;
-                setSelectedLicenseCode(newLicenseCode);
-                fetcher.submit(
-                  {
-                    _action: "make content public",
-                    id: contentData.id,
-                    licenseCode: newLicenseCode,
-                    isFolder: Boolean(contentData.isFolder),
-                  },
-                  { method: "post" },
-                );
-              }}
-            >
-              {allLicenses.map((license) => (
-                <option value={license.code} key={license.code}>
-                  {license.name}
-                </option>
-              ))}
-            </Select>
-            <FormErrorMessage>
-              A license is required to make public.
-            </FormErrorMessage>
-          </FormControl>
-        </Box>
-      )}
-    </>
-  );
-}
-
-export function DisplayLicenseItem({
-  licenseItem,
-}: {
-  licenseItem: {
-    name: string;
-    description: string;
-    imageURL: string | null;
-    licenseURL: string | null;
-  };
-}) {
-  let image: React.JSX.Element | null = null;
-  if (licenseItem.imageURL) {
-    image = (
-      <Image
-        src={licenseItem.imageURL}
-        alt={`Badge for license: ${licenseItem.name}`}
-        width="100px"
-      />
-    );
-  }
-
-  let item = (
-    <Tooltip label={licenseItem.description}>
-      <HStack>
-        {image}
-        <Text>{licenseItem.name}</Text>
-      </HStack>
-    </Tooltip>
-  );
-  if (licenseItem.licenseURL) {
-    item = (
-      <Link to={licenseItem.licenseURL} target="_blank">
-        {item}
-      </Link>
-    );
-  }
-
-  return (
-    <ListItem>
-      <HStack>
-        <ListIcon as={MdCircle} margin="0px" />
-        {item}
-      </HStack>
-    </ListItem>
-  );
-}
diff --git a/client/src/Tools/_framework/ToolPanels/SupportFilesControls.tsx b/client/src/Tools/_framework/ToolPanels/SupportFilesControls.tsx
index 7415ed12e9..a93a2ceb25 100644
--- a/client/src/Tools/_framework/ToolPanels/SupportFilesControls.tsx
+++ b/client/src/Tools/_framework/ToolPanels/SupportFilesControls.tsx
@@ -40,6 +40,33 @@ import { GoKebabVertical } from "react-icons/go";
 import { CopyToClipboard } from "react-copy-to-clipboard";
 import { BsClipboardPlus } from "react-icons/bs";
 
+export async function supportFilesActions({ formObj }: { [k: string]: any }) {
+  if (formObj._action == "update description") {
+    await axios.get("/api/updateFileDescription", {
+      params: {
+        activityId: formObj.activityId,
+        cid: formObj.cid,
+        description: formObj.description,
+      },
+    });
+    return true;
+  } else if (formObj._action == "remove file") {
+    let resp = await axios.get("/api/deleteFile", {
+      params: { activityId: formObj.activityId, cid: formObj.cid },
+    });
+
+    return {
+      _action: formObj._action,
+      fileRemovedCid: formObj.cid,
+      success: resp.data.success,
+    };
+  } else if (formObj?._action == "noop") {
+    return true;
+  }
+
+  return null;
+}
+
 export function SupportFilesControls({
   supportingFileData,
   activityId,
@@ -332,6 +359,7 @@ export function SupportFilesControls({
                                     {
                                       _action: "remove file",
                                       cid: file.cid,
+                                      activityId,
                                     },
                                     { method: "post" },
                                   );
@@ -365,6 +393,7 @@ export function SupportFilesControls({
                                   _action: "update description",
                                   cid: file.cid,
                                   description: e.target.value,
+                                  activityId,
                                 },
                                 { method: "post" },
                               );
@@ -377,6 +406,7 @@ export function SupportFilesControls({
                                     cid: file.cid,
                                     description: (e.target as HTMLInputElement)
                                       .value,
+                                    activityId,
                                   },
                                   { method: "post" },
                                 );
@@ -446,6 +476,7 @@ export function SupportFilesControls({
                                 _action: "update description",
                                 description: value,
                                 cid: file.cid,
+                                activityId,
                               },
                               { method: "post" },
                             );
@@ -505,6 +536,7 @@ export function SupportFilesControls({
                                   {
                                     _action: "remove file",
                                     cid: file.cid,
+                                    activityId,
                                   },
                                   { method: "post" },
                                 );
diff --git a/client/src/Widgets/ContentCard.tsx b/client/src/Widgets/ContentCard.tsx
index b309946bad..b091ebcf2d 100644
--- a/client/src/Widgets/ContentCard.tsx
+++ b/client/src/Widgets/ContentCard.tsx
@@ -17,6 +17,24 @@ import {
 import { GoKebabVertical } from "react-icons/go";
 import { Link, useFetcher } from "react-router-dom";
 import { AssignmentStatus } from "../Tools/_framework/Paths/ActivityEditor";
+import axios from "axios";
+
+export async function contentCardActions({ formObj }: { [k: string]: any }) {
+  if (formObj._action == "update title") {
+    //Don't let name be blank
+    let name = formObj?.cardTitle?.trim();
+    if (name == "") {
+      name = "Untitled " + (formObj.isFolder ? "Folder" : "Activity");
+    }
+    await axios.post(`/api/updateContentName`, {
+      id: Number(formObj.id),
+      name,
+    });
+    return true;
+  }
+
+  return null;
+}
 
 export default forwardRef(function ContentCard(
   {
diff --git a/client/src/_utils/cid.ts b/client/src/_utils/cid.ts
new file mode 100644
index 0000000000..0b6debcd2f
--- /dev/null
+++ b/client/src/_utils/cid.ts
@@ -0,0 +1,32 @@
+// Copied from doenetml utils.
+// Currently also duplicated in server.
+
+import base32 from "hi-base32";
+
+export async function cidFromText(text: string) {
+  let encoder = new TextEncoder();
+  let data = encoder.encode(text);
+
+  return await cidFromArrayBuffer(data);
+}
+
+export async function cidFromArrayBuffer(data: Uint8Array) {
+  let hashBuffer = await crypto.subtle.digest("SHA-256", data);
+
+  let cidArray = new Uint8Array(36);
+
+  // 0x01: cidV1
+  // 0x55: raw binary IPLD
+  // 0x12: code for SHA256
+  // 0x20: 32 bytes (or 256 bits)
+  cidArray.set([0x01, 0x55, 0x12, 0x20]);
+
+  cidArray.set(new Uint8Array(hashBuffer), 4);
+
+  // b: prefix for base 32
+  // base32: hi-base uses RFC 4648 encoding
+  // cid uses lowercase letter and does not include the padding at the end
+  let cid = "b" + base32.encode(cidArray).toLowerCase().replace(/=+/, "");
+
+  return cid;
+}
diff --git a/client/src/index.tsx b/client/src/index.tsx
index 7443e92358..b664eea4db 100644
--- a/client/src/index.tsx
+++ b/client/src/index.tsx
@@ -36,9 +36,9 @@ import {
   Activities,
 } from "./Tools/_framework/Paths/Activities";
 import {
-  loader as publicActivitiesLoader,
-  PublicActivities,
-} from "./Tools/_framework/Paths/PublicActivities";
+  loader as sharedActivitiesLoader,
+  SharedActivities,
+} from "./Tools/_framework/Paths/SharedActivities";
 import {
   loader as activityViewerLoader,
   ActivityViewer,
@@ -243,15 +243,15 @@ const router = createBrowserRouter([
         errorElement: <ErrorPage />,
       },
       {
-        path: "publicActivities/:ownerId",
-        loader: publicActivitiesLoader,
-        element: <PublicActivities />,
+        path: "sharedActivities/:ownerId",
+        loader: sharedActivitiesLoader,
+        element: <SharedActivities />,
         errorElement: <ErrorPage />,
       },
       {
-        path: "publicActivities/:ownerId/:folderId",
-        loader: publicActivitiesLoader,
-        element: <PublicActivities />,
+        path: "sharedActivities/:ownerId/:folderId",
+        loader: sharedActivitiesLoader,
+        element: <SharedActivities />,
         errorElement: <ErrorPage />,
       },
       {
diff --git a/server/package-lock.json b/server/package-lock.json
index 7d31c46ce9..74d8f44da4 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -9,15 +9,15 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "@aws-sdk/client-ses": "^3.624.0",
-        "@prisma/client": "^5.17.0",
+        "@aws-sdk/client-ses": "^3.629.0",
+        "@prisma/client": "^5.18.0",
         "@quixo3/prisma-session-store": "^3.1.13",
         "cookie-parser": "^1.4.6",
         "dotenv": "^16.4.5",
         "express": "^4.19.2",
         "express-session": "^1.18.0",
         "hi-base32": "^0.5.1",
-        "luxon": "^3.4.4",
+        "luxon": "^3.5.0",
         "passport": "^0.7.0",
         "passport-anonym-uuid": "^1.0.3",
         "passport-google-oauth20": "^2.0.0",
@@ -30,7 +30,7 @@
         "@types/express": "^4.17.21",
         "@types/express-session": "^1.18.0",
         "@types/luxon": "^3.4.2",
-        "@types/node": "^22.0.2",
+        "@types/node": "^22.2.0",
         "@types/passport": "^1.0.16",
         "@types/passport-google-oauth20": "^2.0.16",
         "cookie-session": "^2.1.0",
@@ -38,7 +38,7 @@
         "globals": "^15.9.0",
         "nodemon": "^3.1.4",
         "prettier": "^3.3.3",
-        "prisma": "^5.17.0",
+        "prisma": "^5.18.0",
         "ts-node": "^10.9.2",
         "typescript": "^5.5.4",
         "typescript-eslint": "^8.0.1",
@@ -50,8 +50,9 @@
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.24"
@@ -62,8 +63,9 @@
     },
     "node_modules/@ampproject/remapping/node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -71,7 +73,8 @@
     },
     "node_modules/@aws-crypto/sha256-browser": {
       "version": "5.2.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz",
+      "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
       "dependencies": {
         "@aws-crypto/sha256-js": "^5.2.0",
         "@aws-crypto/supports-web-crypto": "^5.2.0",
@@ -84,7 +87,8 @@
     },
     "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": {
       "version": "2.2.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -94,7 +98,8 @@
     },
     "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": {
       "version": "2.2.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
       "dependencies": {
         "@smithy/is-array-buffer": "^2.2.0",
         "tslib": "^2.6.2"
@@ -105,7 +110,8 @@
     },
     "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": {
       "version": "2.3.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
       "dependencies": {
         "@smithy/util-buffer-from": "^2.2.0",
         "tslib": "^2.6.2"
@@ -116,7 +122,8 @@
     },
     "node_modules/@aws-crypto/sha256-js": {
       "version": "5.2.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz",
+      "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==",
       "dependencies": {
         "@aws-crypto/util": "^5.2.0",
         "@aws-sdk/types": "^3.222.0",
@@ -128,14 +135,16 @@
     },
     "node_modules/@aws-crypto/supports-web-crypto": {
       "version": "5.2.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz",
+      "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==",
       "dependencies": {
         "tslib": "^2.6.2"
       }
     },
     "node_modules/@aws-crypto/util": {
       "version": "5.2.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
+      "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
       "dependencies": {
         "@aws-sdk/types": "^3.222.0",
         "@smithy/util-utf8": "^2.0.0",
@@ -144,7 +153,8 @@
     },
     "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": {
       "version": "2.2.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -154,7 +164,8 @@
     },
     "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": {
       "version": "2.2.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
       "dependencies": {
         "@smithy/is-array-buffer": "^2.2.0",
         "tslib": "^2.6.2"
@@ -165,7 +176,8 @@
     },
     "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": {
       "version": "2.3.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
       "dependencies": {
         "@smithy/util-buffer-from": "^2.2.0",
         "tslib": "^2.6.2"
@@ -175,15 +187,16 @@
       }
     },
     "node_modules/@aws-sdk/client-ses": {
-      "version": "3.624.0",
-      "license": "Apache-2.0",
+      "version": "3.629.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-ses/-/client-ses-3.629.0.tgz",
+      "integrity": "sha512-KreCdUAO/gIzWCgnPV1/dGUvLDDTdXI3fZzjjHUWFa1bE4wENjenNnWGw0qZgc8xB8pgiMdgPn7N+JvxJ7c/ZQ==",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/client-sso-oidc": "3.624.0",
-        "@aws-sdk/client-sts": "3.624.0",
-        "@aws-sdk/core": "3.624.0",
-        "@aws-sdk/credential-provider-node": "3.624.0",
+        "@aws-sdk/client-sso-oidc": "3.629.0",
+        "@aws-sdk/client-sts": "3.629.0",
+        "@aws-sdk/core": "3.629.0",
+        "@aws-sdk/credential-provider-node": "3.629.0",
         "@aws-sdk/middleware-host-header": "3.620.0",
         "@aws-sdk/middleware-logger": "3.609.0",
         "@aws-sdk/middleware-recursion-detection": "3.620.0",
@@ -226,12 +239,13 @@
       }
     },
     "node_modules/@aws-sdk/client-sso": {
-      "version": "3.624.0",
-      "license": "Apache-2.0",
+      "version": "3.629.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.629.0.tgz",
+      "integrity": "sha512-2w8xU4O0Grca5HmT2dXZ5fF0g39RxODtmoqHJDsK5DSt750LqDG4w3ktmBvQs3+SrpkkJOjlX5v/hb2PCxVbww==",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "3.624.0",
+        "@aws-sdk/core": "3.629.0",
         "@aws-sdk/middleware-host-header": "3.620.0",
         "@aws-sdk/middleware-logger": "3.609.0",
         "@aws-sdk/middleware-recursion-detection": "3.620.0",
@@ -273,13 +287,14 @@
       }
     },
     "node_modules/@aws-sdk/client-sso-oidc": {
-      "version": "3.624.0",
-      "license": "Apache-2.0",
+      "version": "3.629.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.629.0.tgz",
+      "integrity": "sha512-3if0LauNJPqubGYf8vnlkp+B3yAeKRuRNxfNbHlE6l510xWGcKK/ZsEmiFmfePzKKSRrDh/cxMFMScgOrXptNg==",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "3.624.0",
-        "@aws-sdk/credential-provider-node": "3.624.0",
+        "@aws-sdk/core": "3.629.0",
+        "@aws-sdk/credential-provider-node": "3.629.0",
         "@aws-sdk/middleware-host-header": "3.620.0",
         "@aws-sdk/middleware-logger": "3.609.0",
         "@aws-sdk/middleware-recursion-detection": "3.620.0",
@@ -320,18 +335,19 @@
         "node": ">=16.0.0"
       },
       "peerDependencies": {
-        "@aws-sdk/client-sts": "^3.624.0"
+        "@aws-sdk/client-sts": "^3.629.0"
       }
     },
     "node_modules/@aws-sdk/client-sts": {
-      "version": "3.624.0",
-      "license": "Apache-2.0",
+      "version": "3.629.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.629.0.tgz",
+      "integrity": "sha512-RjOs371YwnSVGxhPjuluJKaxl4gcPYTAky0nPjwBime0i9/iS9nI8R8l5j7k7ec9tpFWjBPvNnThCU07pvjdzw==",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/client-sso-oidc": "3.624.0",
-        "@aws-sdk/core": "3.624.0",
-        "@aws-sdk/credential-provider-node": "3.624.0",
+        "@aws-sdk/client-sso-oidc": "3.629.0",
+        "@aws-sdk/core": "3.629.0",
+        "@aws-sdk/credential-provider-node": "3.629.0",
         "@aws-sdk/middleware-host-header": "3.620.0",
         "@aws-sdk/middleware-logger": "3.609.0",
         "@aws-sdk/middleware-recursion-detection": "3.620.0",
@@ -373,11 +389,13 @@
       }
     },
     "node_modules/@aws-sdk/core": {
-      "version": "3.624.0",
-      "license": "Apache-2.0",
+      "version": "3.629.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.629.0.tgz",
+      "integrity": "sha512-+/ShPU/tyIBM3oY1cnjgNA/tFyHtlWq+wXF9xEKRv19NOpYbWQ+xzNwVjGq8vR07cCRqy/sDQLWPhxjtuV/FiQ==",
       "dependencies": {
         "@smithy/core": "^2.3.2",
         "@smithy/node-config-provider": "^3.1.4",
+        "@smithy/property-provider": "^3.1.3",
         "@smithy/protocol-http": "^4.1.0",
         "@smithy/signature-v4": "^4.1.0",
         "@smithy/smithy-client": "^3.1.12",
@@ -392,7 +410,8 @@
     },
     "node_modules/@aws-sdk/credential-provider-env": {
       "version": "3.620.1",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.620.1.tgz",
+      "integrity": "sha512-ExuILJ2qLW5ZO+rgkNRj0xiAipKT16Rk77buvPP8csR7kkCflT/gXTyzRe/uzIiETTxM7tr8xuO9MP/DQXqkfg==",
       "dependencies": {
         "@aws-sdk/types": "3.609.0",
         "@smithy/property-provider": "^3.1.3",
@@ -405,7 +424,8 @@
     },
     "node_modules/@aws-sdk/credential-provider-http": {
       "version": "3.622.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.622.0.tgz",
+      "integrity": "sha512-VUHbr24Oll1RK3WR8XLUugLpgK9ZuxEm/NVeVqyFts1Ck9gsKpRg1x4eH7L7tW3SJ4TDEQNMbD7/7J+eoL2svg==",
       "dependencies": {
         "@aws-sdk/types": "3.609.0",
         "@smithy/fetch-http-handler": "^3.2.4",
@@ -422,13 +442,14 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-ini": {
-      "version": "3.624.0",
-      "license": "Apache-2.0",
+      "version": "3.629.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.629.0.tgz",
+      "integrity": "sha512-r9fI7BABARvVDp77DBUImQzYdvarAIdhbvpCEZib0rlpvfWu3zxE9KZcapCAAi0MPjxeDfb7RMehFQIkAP7mYw==",
       "dependencies": {
         "@aws-sdk/credential-provider-env": "3.620.1",
         "@aws-sdk/credential-provider-http": "3.622.0",
         "@aws-sdk/credential-provider-process": "3.620.1",
-        "@aws-sdk/credential-provider-sso": "3.624.0",
+        "@aws-sdk/credential-provider-sso": "3.629.0",
         "@aws-sdk/credential-provider-web-identity": "3.621.0",
         "@aws-sdk/types": "3.609.0",
         "@smithy/credential-provider-imds": "^3.2.0",
@@ -441,18 +462,19 @@
         "node": ">=16.0.0"
       },
       "peerDependencies": {
-        "@aws-sdk/client-sts": "^3.624.0"
+        "@aws-sdk/client-sts": "^3.629.0"
       }
     },
     "node_modules/@aws-sdk/credential-provider-node": {
-      "version": "3.624.0",
-      "license": "Apache-2.0",
+      "version": "3.629.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.629.0.tgz",
+      "integrity": "sha512-868hnVOLlXOBHk91Rl0jZIRgr/M4WJCa0nOrW9A9yidsQxuZp9P0vshDmm4hMvNZadmPIfo0Rra2MpA4RELoCw==",
       "dependencies": {
         "@aws-sdk/credential-provider-env": "3.620.1",
         "@aws-sdk/credential-provider-http": "3.622.0",
-        "@aws-sdk/credential-provider-ini": "3.624.0",
+        "@aws-sdk/credential-provider-ini": "3.629.0",
         "@aws-sdk/credential-provider-process": "3.620.1",
-        "@aws-sdk/credential-provider-sso": "3.624.0",
+        "@aws-sdk/credential-provider-sso": "3.629.0",
         "@aws-sdk/credential-provider-web-identity": "3.621.0",
         "@aws-sdk/types": "3.609.0",
         "@smithy/credential-provider-imds": "^3.2.0",
@@ -467,7 +489,8 @@
     },
     "node_modules/@aws-sdk/credential-provider-process": {
       "version": "3.620.1",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.620.1.tgz",
+      "integrity": "sha512-hWqFMidqLAkaV9G460+1at6qa9vySbjQKKc04p59OT7lZ5cO5VH5S4aI05e+m4j364MBROjjk2ugNvfNf/8ILg==",
       "dependencies": {
         "@aws-sdk/types": "3.609.0",
         "@smithy/property-provider": "^3.1.3",
@@ -480,10 +503,11 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-sso": {
-      "version": "3.624.0",
-      "license": "Apache-2.0",
+      "version": "3.629.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.629.0.tgz",
+      "integrity": "sha512-Lf4XOuj6jamxgGZGrVojERh5S+NS2t2S4CUOnAu6tJ5U0GPlpjhINUKlcVxJBpsIXudMGW1nkumAd3+kazCPig==",
       "dependencies": {
-        "@aws-sdk/client-sso": "3.624.0",
+        "@aws-sdk/client-sso": "3.629.0",
         "@aws-sdk/token-providers": "3.614.0",
         "@aws-sdk/types": "3.609.0",
         "@smithy/property-provider": "^3.1.3",
@@ -497,7 +521,8 @@
     },
     "node_modules/@aws-sdk/credential-provider-web-identity": {
       "version": "3.621.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.621.0.tgz",
+      "integrity": "sha512-w7ASSyfNvcx7+bYGep3VBgC3K6vEdLmlpjT7nSIHxxQf+WSdvy+HynwJosrpZax0sK5q0D1Jpn/5q+r5lwwW6w==",
       "dependencies": {
         "@aws-sdk/types": "3.609.0",
         "@smithy/property-provider": "^3.1.3",
@@ -513,7 +538,8 @@
     },
     "node_modules/@aws-sdk/middleware-host-header": {
       "version": "3.620.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.620.0.tgz",
+      "integrity": "sha512-VMtPEZwqYrII/oUkffYsNWY9PZ9xpNJpMgmyU0rlDQ25O1c0Hk3fJmZRe6pEkAJ0omD7kLrqGl1DUjQVxpd/Rg==",
       "dependencies": {
         "@aws-sdk/types": "3.609.0",
         "@smithy/protocol-http": "^4.1.0",
@@ -526,7 +552,8 @@
     },
     "node_modules/@aws-sdk/middleware-logger": {
       "version": "3.609.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.609.0.tgz",
+      "integrity": "sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ==",
       "dependencies": {
         "@aws-sdk/types": "3.609.0",
         "@smithy/types": "^3.3.0",
@@ -538,7 +565,8 @@
     },
     "node_modules/@aws-sdk/middleware-recursion-detection": {
       "version": "3.620.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.620.0.tgz",
+      "integrity": "sha512-nh91S7aGK3e/o1ck64sA/CyoFw+gAYj2BDOnoNa6ouyCrVJED96ZXWbhye/fz9SgmNUZR2g7GdVpiLpMKZoI5w==",
       "dependencies": {
         "@aws-sdk/types": "3.609.0",
         "@smithy/protocol-http": "^4.1.0",
@@ -551,7 +579,8 @@
     },
     "node_modules/@aws-sdk/middleware-user-agent": {
       "version": "3.620.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.620.0.tgz",
+      "integrity": "sha512-bvS6etn+KsuL32ubY5D3xNof1qkenpbJXf/ugGXbg0n98DvDFQ/F+SMLxHgbnER5dsKYchNnhmtI6/FC3HFu/A==",
       "dependencies": {
         "@aws-sdk/types": "3.609.0",
         "@aws-sdk/util-endpoints": "3.614.0",
@@ -565,7 +594,8 @@
     },
     "node_modules/@aws-sdk/region-config-resolver": {
       "version": "3.614.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.614.0.tgz",
+      "integrity": "sha512-vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g==",
       "dependencies": {
         "@aws-sdk/types": "3.609.0",
         "@smithy/node-config-provider": "^3.1.4",
@@ -580,7 +610,8 @@
     },
     "node_modules/@aws-sdk/token-providers": {
       "version": "3.614.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.614.0.tgz",
+      "integrity": "sha512-okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw==",
       "dependencies": {
         "@aws-sdk/types": "3.609.0",
         "@smithy/property-provider": "^3.1.3",
@@ -597,7 +628,8 @@
     },
     "node_modules/@aws-sdk/types": {
       "version": "3.609.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz",
+      "integrity": "sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==",
       "dependencies": {
         "@smithy/types": "^3.3.0",
         "tslib": "^2.6.2"
@@ -608,7 +640,8 @@
     },
     "node_modules/@aws-sdk/util-endpoints": {
       "version": "3.614.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.614.0.tgz",
+      "integrity": "sha512-wK2cdrXHH4oz4IomV/yrGkftU9A+ITB6nFL+rxxyO78is2ifHJpFdV4aqk4LSkXYPi6CXWNru/Dqc7yiKXgJPw==",
       "dependencies": {
         "@aws-sdk/types": "3.609.0",
         "@smithy/types": "^3.3.0",
@@ -621,7 +654,8 @@
     },
     "node_modules/@aws-sdk/util-locate-window": {
       "version": "3.568.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz",
+      "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig==",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -631,7 +665,8 @@
     },
     "node_modules/@aws-sdk/util-user-agent-browser": {
       "version": "3.609.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.609.0.tgz",
+      "integrity": "sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA==",
       "dependencies": {
         "@aws-sdk/types": "3.609.0",
         "@smithy/types": "^3.3.0",
@@ -641,7 +676,8 @@
     },
     "node_modules/@aws-sdk/util-user-agent-node": {
       "version": "3.614.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.614.0.tgz",
+      "integrity": "sha512-15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA==",
       "dependencies": {
         "@aws-sdk/types": "3.609.0",
         "@smithy/node-config-provider": "^3.1.4",
@@ -662,7 +698,9 @@
     },
     "node_modules/@babel/polyfill": {
       "version": "7.12.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz",
+      "integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==",
+      "deprecated": "🚨 This package has been deprecated in favor of separate inclusion of a polyfill and regenerator-runtime (when needed). See the @babel/polyfill docs (https://babeljs.io/docs/en/babel-polyfill) for more information.",
       "dependencies": {
         "core-js": "^2.6.5",
         "regenerator-runtime": "^0.13.4"
@@ -670,7 +708,8 @@
     },
     "node_modules/@babel/runtime": {
       "version": "7.25.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz",
+      "integrity": "sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -680,12 +719,14 @@
     },
     "node_modules/@babel/runtime/node_modules/regenerator-runtime": {
       "version": "0.14.1",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
     },
     "node_modules/@cspotcode/source-map-support": {
       "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "0.3.9"
       },
@@ -695,11 +736,12 @@
     },
     "node_modules/@esbuild/win32-x64": {
       "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -885,8 +927,9 @@
     },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -898,8 +941,9 @@
     },
     "node_modules/@jridgewell/gen-mapping/node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -907,29 +951,33 @@
     },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/set-array": {
       "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.5.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.0.3",
         "@jridgewell/sourcemap-codec": "^1.4.10"
@@ -937,7 +985,8 @@
     },
     "node_modules/@noble/hashes": {
       "version": "1.4.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
+      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
       "engines": {
         "node": ">= 16"
       },
@@ -982,15 +1031,17 @@
     },
     "node_modules/@paralleldrive/cuid2": {
       "version": "2.2.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.2.2.tgz",
+      "integrity": "sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA==",
       "dependencies": {
         "@noble/hashes": "^1.1.5"
       }
     },
     "node_modules/@prisma/client": {
       "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.18.0.tgz",
+      "integrity": "sha512-BWivkLh+af1kqC89zCJYkHsRcyWsM8/JHpsDMM76DjP3ZdEquJhXa4IeX+HkWPnwJ5FanxEJFZZDTWiDs/Kvyw==",
       "hasInstallScript": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=16.13"
       },
@@ -1005,14 +1056,16 @@
     },
     "node_modules/@prisma/debug": {
       "version": "5.18.0",
-      "devOptional": true,
-      "license": "Apache-2.0"
+      "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.18.0.tgz",
+      "integrity": "sha512-f+ZvpTLidSo3LMJxQPVgAxdAjzv5OpzAo/eF8qZqbwvgi2F5cTOI9XCpdRzJYA0iGfajjwjOKKrVq64vkxEfUw==",
+      "devOptional": true
     },
     "node_modules/@prisma/engines": {
       "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.18.0.tgz",
+      "integrity": "sha512-ofmpGLeJ2q2P0wa/XaEgTnX/IsLnvSp/gZts0zjgLNdBhfuj2lowOOPmDcfKljLQUXMvAek3lw5T01kHmCG8rg==",
       "devOptional": true,
       "hasInstallScript": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@prisma/debug": "5.18.0",
         "@prisma/engines-version": "5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169",
@@ -1022,13 +1075,15 @@
     },
     "node_modules/@prisma/engines-version": {
       "version": "5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169",
-      "devOptional": true,
-      "license": "Apache-2.0"
+      "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169.tgz",
+      "integrity": "sha512-a/+LpJj8vYU3nmtkg+N3X51ddbt35yYrRe8wqHTJtYQt7l1f8kjIBcCs6sHJvodW/EK5XGvboOiwm47fmNrbgg==",
+      "devOptional": true
     },
     "node_modules/@prisma/fetch-engine": {
       "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.18.0.tgz",
+      "integrity": "sha512-I/3u0x2n31rGaAuBRx2YK4eB7R/1zCuayo2DGwSpGyrJWsZesrV7QVw7ND0/Suxeo/vLkJ5OwuBqHoCxvTHpOg==",
       "devOptional": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@prisma/debug": "5.18.0",
         "@prisma/engines-version": "5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169",
@@ -1037,15 +1092,17 @@
     },
     "node_modules/@prisma/get-platform": {
       "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.18.0.tgz",
+      "integrity": "sha512-Tk+m7+uhqcKDgnMnFN0lRiH7Ewea0OEsZZs9pqXa7i3+7svS3FSCqDBCaM9x5fmhhkufiG0BtunJVDka+46DlA==",
       "devOptional": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@prisma/debug": "5.18.0"
       }
     },
     "node_modules/@quixo3/prisma-session-store": {
       "version": "3.1.13",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@quixo3/prisma-session-store/-/prisma-session-store-3.1.13.tgz",
+      "integrity": "sha512-EAuOvYAaAsQ0OqxkdJG/Qs3cxlT4VV8SFHjtsA3G01uB1b6r7xftX3oeg7mcG0HN/DI1qOqwvy3YFoJ38ls0iA==",
       "dependencies": {
         "@paralleldrive/cuid2": "^2.2.0",
         "ts-dedent": "^2.2.0",
@@ -1073,11 +1130,12 @@
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
       "version": "4.20.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.20.0.tgz",
+      "integrity": "sha512-aJ1EJSuTdGnM6qbVC4B5DSmozPTqIag9fSzXRNNo+humQLG89XpPgdt16Ia56ORD7s+H8Pmyx44uczDQ0yDzpg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -1085,7 +1143,8 @@
     },
     "node_modules/@smithy/abort-controller": {
       "version": "3.1.1",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.1.tgz",
+      "integrity": "sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==",
       "dependencies": {
         "@smithy/types": "^3.3.0",
         "tslib": "^2.6.2"
@@ -1096,7 +1155,8 @@
     },
     "node_modules/@smithy/config-resolver": {
       "version": "3.0.5",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.5.tgz",
+      "integrity": "sha512-SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA==",
       "dependencies": {
         "@smithy/node-config-provider": "^3.1.4",
         "@smithy/types": "^3.3.0",
@@ -1110,7 +1170,8 @@
     },
     "node_modules/@smithy/core": {
       "version": "2.3.2",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-2.3.2.tgz",
+      "integrity": "sha512-in5wwt6chDBcUv1Lw1+QzZxN9fBffi+qOixfb65yK4sDuKG7zAUO9HAFqmVzsZM3N+3tTyvZjtnDXePpvp007Q==",
       "dependencies": {
         "@smithy/middleware-endpoint": "^3.1.0",
         "@smithy/middleware-retry": "^3.0.14",
@@ -1127,7 +1188,8 @@
     },
     "node_modules/@smithy/credential-provider-imds": {
       "version": "3.2.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.0.tgz",
+      "integrity": "sha512-0SCIzgd8LYZ9EJxUjLXBmEKSZR/P/w6l7Rz/pab9culE/RWuqelAKGJvn5qUOl8BgX8Yj5HWM50A5hiB/RzsgA==",
       "dependencies": {
         "@smithy/node-config-provider": "^3.1.4",
         "@smithy/property-provider": "^3.1.3",
@@ -1141,7 +1203,8 @@
     },
     "node_modules/@smithy/fetch-http-handler": {
       "version": "3.2.4",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.4.tgz",
+      "integrity": "sha512-kBprh5Gs5h7ug4nBWZi1FZthdqSM+T7zMmsZxx0IBvWUn7dK3diz2SHn7Bs4dQGFDk8plDv375gzenDoNwrXjg==",
       "dependencies": {
         "@smithy/protocol-http": "^4.1.0",
         "@smithy/querystring-builder": "^3.0.3",
@@ -1152,7 +1215,8 @@
     },
     "node_modules/@smithy/hash-node": {
       "version": "3.0.3",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.3.tgz",
+      "integrity": "sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==",
       "dependencies": {
         "@smithy/types": "^3.3.0",
         "@smithy/util-buffer-from": "^3.0.0",
@@ -1165,7 +1229,8 @@
     },
     "node_modules/@smithy/invalid-dependency": {
       "version": "3.0.3",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.3.tgz",
+      "integrity": "sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==",
       "dependencies": {
         "@smithy/types": "^3.3.0",
         "tslib": "^2.6.2"
@@ -1173,7 +1238,8 @@
     },
     "node_modules/@smithy/is-array-buffer": {
       "version": "3.0.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+      "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -1183,7 +1249,8 @@
     },
     "node_modules/@smithy/middleware-content-length": {
       "version": "3.0.5",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.5.tgz",
+      "integrity": "sha512-ILEzC2eyxx6ncej3zZSwMpB5RJ0zuqH7eMptxC4KN3f+v9bqT8ohssKbhNR78k/2tWW+KS5Spw+tbPF4Ejyqvw==",
       "dependencies": {
         "@smithy/protocol-http": "^4.1.0",
         "@smithy/types": "^3.3.0",
@@ -1195,7 +1262,8 @@
     },
     "node_modules/@smithy/middleware-endpoint": {
       "version": "3.1.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.0.tgz",
+      "integrity": "sha512-5y5aiKCEwg9TDPB4yFE7H6tYvGFf1OJHNczeY10/EFF8Ir8jZbNntQJxMWNfeQjC1mxPsaQ6mR9cvQbf+0YeMw==",
       "dependencies": {
         "@smithy/middleware-serde": "^3.0.3",
         "@smithy/node-config-provider": "^3.1.4",
@@ -1211,7 +1279,8 @@
     },
     "node_modules/@smithy/middleware-retry": {
       "version": "3.0.14",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.14.tgz",
+      "integrity": "sha512-7ZaWZJOjUxa5hgmuMspyt8v/zVsh0GXYuF7OvCmdcbVa/xbnKQoYC+uYKunAqRGTkxjOyuOCw9rmFUFOqqC0eQ==",
       "dependencies": {
         "@smithy/node-config-provider": "^3.1.4",
         "@smithy/protocol-http": "^4.1.0",
@@ -1229,7 +1298,8 @@
     },
     "node_modules/@smithy/middleware-serde": {
       "version": "3.0.3",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.3.tgz",
+      "integrity": "sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==",
       "dependencies": {
         "@smithy/types": "^3.3.0",
         "tslib": "^2.6.2"
@@ -1240,7 +1310,8 @@
     },
     "node_modules/@smithy/middleware-stack": {
       "version": "3.0.3",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.3.tgz",
+      "integrity": "sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==",
       "dependencies": {
         "@smithy/types": "^3.3.0",
         "tslib": "^2.6.2"
@@ -1251,7 +1322,8 @@
     },
     "node_modules/@smithy/node-config-provider": {
       "version": "3.1.4",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.4.tgz",
+      "integrity": "sha512-YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ==",
       "dependencies": {
         "@smithy/property-provider": "^3.1.3",
         "@smithy/shared-ini-file-loader": "^3.1.4",
@@ -1264,7 +1336,8 @@
     },
     "node_modules/@smithy/node-http-handler": {
       "version": "3.1.4",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.1.4.tgz",
+      "integrity": "sha512-+UmxgixgOr/yLsUxcEKGH0fMNVteJFGkmRltYFHnBMlogyFdpzn2CwqWmxOrfJELhV34v0WSlaqG1UtE1uXlJg==",
       "dependencies": {
         "@smithy/abort-controller": "^3.1.1",
         "@smithy/protocol-http": "^4.1.0",
@@ -1278,7 +1351,8 @@
     },
     "node_modules/@smithy/property-provider": {
       "version": "3.1.3",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.3.tgz",
+      "integrity": "sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==",
       "dependencies": {
         "@smithy/types": "^3.3.0",
         "tslib": "^2.6.2"
@@ -1289,7 +1363,8 @@
     },
     "node_modules/@smithy/protocol-http": {
       "version": "4.1.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.0.tgz",
+      "integrity": "sha512-dPVoHYQ2wcHooGXg3LQisa1hH0e4y0pAddPMeeUPipI1tEOqL6A4N0/G7abeq+K8wrwSgjk4C0wnD1XZpJm5aA==",
       "dependencies": {
         "@smithy/types": "^3.3.0",
         "tslib": "^2.6.2"
@@ -1300,7 +1375,8 @@
     },
     "node_modules/@smithy/querystring-builder": {
       "version": "3.0.3",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.3.tgz",
+      "integrity": "sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==",
       "dependencies": {
         "@smithy/types": "^3.3.0",
         "@smithy/util-uri-escape": "^3.0.0",
@@ -1312,7 +1388,8 @@
     },
     "node_modules/@smithy/querystring-parser": {
       "version": "3.0.3",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.3.tgz",
+      "integrity": "sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==",
       "dependencies": {
         "@smithy/types": "^3.3.0",
         "tslib": "^2.6.2"
@@ -1323,7 +1400,8 @@
     },
     "node_modules/@smithy/service-error-classification": {
       "version": "3.0.3",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.3.tgz",
+      "integrity": "sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==",
       "dependencies": {
         "@smithy/types": "^3.3.0"
       },
@@ -1333,7 +1411,8 @@
     },
     "node_modules/@smithy/shared-ini-file-loader": {
       "version": "3.1.4",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.4.tgz",
+      "integrity": "sha512-qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ==",
       "dependencies": {
         "@smithy/types": "^3.3.0",
         "tslib": "^2.6.2"
@@ -1344,7 +1423,8 @@
     },
     "node_modules/@smithy/signature-v4": {
       "version": "4.1.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.1.0.tgz",
+      "integrity": "sha512-aRryp2XNZeRcOtuJoxjydO6QTaVhxx/vjaR+gx7ZjaFgrgPRyZ3HCTbfwqYj6ZWEBHkCSUfcaymKPURaByukag==",
       "dependencies": {
         "@smithy/is-array-buffer": "^3.0.0",
         "@smithy/protocol-http": "^4.1.0",
@@ -1361,7 +1441,8 @@
     },
     "node_modules/@smithy/smithy-client": {
       "version": "3.1.12",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.1.12.tgz",
+      "integrity": "sha512-wtm8JtsycthkHy1YA4zjIh2thJgIQ9vGkoR639DBx5lLlLNU0v4GARpQZkr2WjXue74nZ7MiTSWfVrLkyD8RkA==",
       "dependencies": {
         "@smithy/middleware-endpoint": "^3.1.0",
         "@smithy/middleware-stack": "^3.0.3",
@@ -1376,7 +1457,8 @@
     },
     "node_modules/@smithy/types": {
       "version": "3.3.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.3.0.tgz",
+      "integrity": "sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -1386,7 +1468,8 @@
     },
     "node_modules/@smithy/url-parser": {
       "version": "3.0.3",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.3.tgz",
+      "integrity": "sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==",
       "dependencies": {
         "@smithy/querystring-parser": "^3.0.3",
         "@smithy/types": "^3.3.0",
@@ -1395,7 +1478,8 @@
     },
     "node_modules/@smithy/util-base64": {
       "version": "3.0.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-3.0.0.tgz",
+      "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==",
       "dependencies": {
         "@smithy/util-buffer-from": "^3.0.0",
         "@smithy/util-utf8": "^3.0.0",
@@ -1407,14 +1491,16 @@
     },
     "node_modules/@smithy/util-body-length-browser": {
       "version": "3.0.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-3.0.0.tgz",
+      "integrity": "sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==",
       "dependencies": {
         "tslib": "^2.6.2"
       }
     },
     "node_modules/@smithy/util-body-length-node": {
       "version": "3.0.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-3.0.0.tgz",
+      "integrity": "sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -1424,7 +1510,8 @@
     },
     "node_modules/@smithy/util-buffer-from": {
       "version": "3.0.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+      "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
       "dependencies": {
         "@smithy/is-array-buffer": "^3.0.0",
         "tslib": "^2.6.2"
@@ -1435,7 +1522,8 @@
     },
     "node_modules/@smithy/util-config-provider": {
       "version": "3.0.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-3.0.0.tgz",
+      "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -1445,7 +1533,8 @@
     },
     "node_modules/@smithy/util-defaults-mode-browser": {
       "version": "3.0.14",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.14.tgz",
+      "integrity": "sha512-0iwTgKKmAIf+vFLV8fji21Jb2px11ktKVxbX6LIDPAUJyWQqGqBVfwba7xwa1f2FZUoolYQgLvxQEpJycXuQ5w==",
       "dependencies": {
         "@smithy/property-provider": "^3.1.3",
         "@smithy/smithy-client": "^3.1.12",
@@ -1459,7 +1548,8 @@
     },
     "node_modules/@smithy/util-defaults-mode-node": {
       "version": "3.0.14",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.14.tgz",
+      "integrity": "sha512-e9uQarJKfXApkTMMruIdxHprhcXivH1flYCe8JRDTzkkLx8dA3V5J8GZlST9yfDiRWkJpZJlUXGN9Rc9Ade3OQ==",
       "dependencies": {
         "@smithy/config-resolver": "^3.0.5",
         "@smithy/credential-provider-imds": "^3.2.0",
@@ -1475,7 +1565,8 @@
     },
     "node_modules/@smithy/util-endpoints": {
       "version": "2.0.5",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.0.5.tgz",
+      "integrity": "sha512-ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg==",
       "dependencies": {
         "@smithy/node-config-provider": "^3.1.4",
         "@smithy/types": "^3.3.0",
@@ -1487,7 +1578,8 @@
     },
     "node_modules/@smithy/util-hex-encoding": {
       "version": "3.0.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz",
+      "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -1497,7 +1589,8 @@
     },
     "node_modules/@smithy/util-middleware": {
       "version": "3.0.3",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.3.tgz",
+      "integrity": "sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==",
       "dependencies": {
         "@smithy/types": "^3.3.0",
         "tslib": "^2.6.2"
@@ -1508,7 +1601,8 @@
     },
     "node_modules/@smithy/util-retry": {
       "version": "3.0.3",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.3.tgz",
+      "integrity": "sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==",
       "dependencies": {
         "@smithy/service-error-classification": "^3.0.3",
         "@smithy/types": "^3.3.0",
@@ -1520,7 +1614,8 @@
     },
     "node_modules/@smithy/util-stream": {
       "version": "3.1.3",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.3.tgz",
+      "integrity": "sha512-FIv/bRhIlAxC0U7xM1BCnF2aDRPq0UaelqBHkM2lsCp26mcBbgI0tCVTv+jGdsQLUmAMybua/bjDsSu8RQHbmw==",
       "dependencies": {
         "@smithy/fetch-http-handler": "^3.2.4",
         "@smithy/node-http-handler": "^3.1.4",
@@ -1537,7 +1632,8 @@
     },
     "node_modules/@smithy/util-uri-escape": {
       "version": "3.0.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz",
+      "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -1547,7 +1643,8 @@
     },
     "node_modules/@smithy/util-utf8": {
       "version": "3.0.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+      "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
       "dependencies": {
         "@smithy/util-buffer-from": "^3.0.0",
         "tslib": "^2.6.2"
@@ -1558,7 +1655,8 @@
     },
     "node_modules/@smithy/util-waiter": {
       "version": "3.1.2",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.1.2.tgz",
+      "integrity": "sha512-4pP0EV3iTsexDx+8PPGAKCQpd/6hsQBaQhqWzU4hqKPHN5epPsxKbvUTIiYIHTxaKt6/kEaqPBpu/ufvfbrRzw==",
       "dependencies": {
         "@smithy/abort-controller": "^3.1.1",
         "@smithy/types": "^3.3.0",
@@ -1570,28 +1668,33 @@
     },
     "node_modules/@tsconfig/node10": {
       "version": "1.0.11",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
+      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
+      "dev": true
     },
     "node_modules/@tsconfig/node12": {
       "version": "1.0.11",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true
     },
     "node_modules/@tsconfig/node14": {
       "version": "1.0.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true
     },
     "node_modules/@tsconfig/node16": {
       "version": "1.0.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+      "dev": true
     },
     "node_modules/@types/body-parser": {
       "version": "1.19.5",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
+      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/connect": "*",
         "@types/node": "*"
@@ -1599,24 +1702,27 @@
     },
     "node_modules/@types/connect": {
       "version": "3.4.38",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/cookie-parser": {
       "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/@types/cookie-parser/-/cookie-parser-1.4.7.tgz",
+      "integrity": "sha512-Fvuyi354Z+uayxzIGCwYTayFKocfV7TuDYZClCdIP9ckhvAu/ixDtCB6qx2TT0FKjPLf1f3P/J1rgf6lPs64mw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/express": "*"
       }
     },
     "node_modules/@types/cookie-session": {
       "version": "2.0.49",
+      "resolved": "https://registry.npmjs.org/@types/cookie-session/-/cookie-session-2.0.49.tgz",
+      "integrity": "sha512-4E/bBjlqLhU5l4iGPR+NkVJH593hpNsT4dC3DJDr+ODm6Qpe13kZQVkezRIb+TYDXaBMemS3yLQ+0leba3jlkQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/express": "*",
         "@types/keygrip": "*"
@@ -1624,13 +1730,15 @@
     },
     "node_modules/@types/estree": {
       "version": "1.0.5",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true
     },
     "node_modules/@types/express": {
       "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/body-parser": "*",
         "@types/express-serve-static-core": "^4.17.33",
@@ -1640,8 +1748,9 @@
     },
     "node_modules/@types/express-serve-static-core": {
       "version": "4.19.5",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz",
+      "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@types/qs": "*",
@@ -1651,60 +1760,69 @@
     },
     "node_modules/@types/express-session": {
       "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/@types/express-session/-/express-session-1.18.0.tgz",
+      "integrity": "sha512-27JdDRgor6PoYlURY+Y5kCakqp5ulC0kmf7y+QwaY+hv9jEFuQOThgkjyA53RP3jmKuBsH5GR6qEfFmvb8mwOA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/express": "*"
       }
     },
     "node_modules/@types/http-errors": {
       "version": "2.0.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
+      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
+      "dev": true
     },
     "node_modules/@types/keygrip": {
       "version": "1.0.6",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.6.tgz",
+      "integrity": "sha512-lZuNAY9xeJt7Bx4t4dx0rYCDqGPW8RXhQZK1td7d4H6E9zYbLoOtjBvfwdTKpsyxQI/2jv+armjX/RW+ZNpXOQ==",
+      "dev": true
     },
     "node_modules/@types/luxon": {
       "version": "3.4.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz",
+      "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==",
+      "dev": true
     },
     "node_modules/@types/mime": {
       "version": "1.3.5",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
+      "dev": true
     },
     "node_modules/@types/node": {
       "version": "22.2.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.2.0.tgz",
+      "integrity": "sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "undici-types": "~6.13.0"
       }
     },
     "node_modules/@types/oauth": {
       "version": "0.9.5",
+      "resolved": "https://registry.npmjs.org/@types/oauth/-/oauth-0.9.5.tgz",
+      "integrity": "sha512-+oQ3C2Zx6ambINOcdIARF5Z3Tu3x//HipE889/fqo3sgpQZbe9c6ExdQFtN6qlhpR7p83lTZfPJt0tCAW29dog==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/passport": {
       "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/@types/passport/-/passport-1.0.16.tgz",
+      "integrity": "sha512-FD0qD5hbPWQzaM0wHUnJ/T0BBCJBxCeemtnCwc/ThhTg3x9jfrAcRUmj5Dopza+MfFS9acTe3wk7rcVnRIp/0A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/express": "*"
       }
     },
     "node_modules/@types/passport-google-oauth20": {
       "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/@types/passport-google-oauth20/-/passport-google-oauth20-2.0.16.tgz",
+      "integrity": "sha512-ayXK2CJ7uVieqhYOc6k/pIr5pcQxOLB6kBev+QUGS7oEZeTgIs1odDobXRqgfBPvXzl0wXCQHftV5220czZCPA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/express": "*",
         "@types/passport": "*",
@@ -1713,8 +1831,9 @@
     },
     "node_modules/@types/passport-oauth2": {
       "version": "1.4.17",
+      "resolved": "https://registry.npmjs.org/@types/passport-oauth2/-/passport-oauth2-1.4.17.tgz",
+      "integrity": "sha512-ODiAHvso6JcWJ6ZkHHroVp05EHGhqQN533PtFNBkg8Fy5mERDqsr030AX81M0D69ZcaMvhF92SRckEk2B0HYYg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/express": "*",
         "@types/oauth": "*",
@@ -1723,18 +1842,21 @@
     },
     "node_modules/@types/qs": {
       "version": "6.9.15",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz",
+      "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==",
+      "dev": true
     },
     "node_modules/@types/range-parser": {
       "version": "1.2.7",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
+      "dev": true
     },
     "node_modules/@types/send": {
       "version": "0.17.4",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/mime": "^1",
         "@types/node": "*"
@@ -1742,8 +1864,9 @@
     },
     "node_modules/@types/serve-static": {
       "version": "1.15.7",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
+      "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/http-errors": "*",
         "@types/node": "*",
@@ -1751,16 +1874,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.0.1.tgz",
-      "integrity": "sha512-5g3Y7GDFsJAnY4Yhvk8sZtFfV6YNF2caLzjrRPUBzewjPCaj0yokePB4LJSobyCzGMzjZZYFbwuzbfDHlimXbQ==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.1.0.tgz",
+      "integrity": "sha512-LlNBaHFCEBPHyD4pZXb35mzjGkuGKXU5eeCA1SxvHfiRES0E82dOounfVpL4DCqYvJEKab0bZIA0gCRpdLKkCw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.0.1",
-        "@typescript-eslint/type-utils": "8.0.1",
-        "@typescript-eslint/utils": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1",
+        "@typescript-eslint/scope-manager": "8.1.0",
+        "@typescript-eslint/type-utils": "8.1.0",
+        "@typescript-eslint/utils": "8.1.0",
+        "@typescript-eslint/visitor-keys": "8.1.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -1784,15 +1907,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.0.1.tgz",
-      "integrity": "sha512-5IgYJ9EO/12pOUwiBKFkpU7rS3IU21mtXzB81TNwq2xEybcmAZrE9qwDtsb5uQd9aVO9o0fdabFyAmKveXyujg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.1.0.tgz",
+      "integrity": "sha512-U7iTAtGgJk6DPX9wIWPPOlt1gO57097G06gIcl0N0EEnNw8RGD62c+2/DiP/zL7KrkqnnqF7gtFGR7YgzPllTA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.0.1",
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/typescript-estree": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1",
+        "@typescript-eslint/scope-manager": "8.1.0",
+        "@typescript-eslint/types": "8.1.0",
+        "@typescript-eslint/typescript-estree": "8.1.0",
+        "@typescript-eslint/visitor-keys": "8.1.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1835,13 +1958,13 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.0.1.tgz",
-      "integrity": "sha512-NpixInP5dm7uukMiRyiHjRKkom5RIFA4dfiHvalanD2cF0CLUuQqxfg8PtEUo9yqJI2bBhF+pcSafqnG3UBnRQ==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.1.0.tgz",
+      "integrity": "sha512-DsuOZQji687sQUjm4N6c9xABJa7fjvfIdjqpSIIVOgaENf2jFXiM9hIBZOL3hb6DHK9Nvd2d7zZnoMLf9e0OtQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1"
+        "@typescript-eslint/types": "8.1.0",
+        "@typescript-eslint/visitor-keys": "8.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1852,13 +1975,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.0.1.tgz",
-      "integrity": "sha512-+/UT25MWvXeDX9YaHv1IS6KI1fiuTto43WprE7pgSMswHbn1Jm9GEM4Txp+X74ifOWV8emu2AWcbLhpJAvD5Ng==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.1.0.tgz",
+      "integrity": "sha512-oLYvTxljVvsMnldfl6jIKxTaU7ok7km0KDrwOt1RHYu6nxlhN3TIx8k5Q52L6wR33nOwDgM7VwW1fT1qMNfFIA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.0.1",
-        "@typescript-eslint/utils": "8.0.1",
+        "@typescript-eslint/typescript-estree": "8.1.0",
+        "@typescript-eslint/utils": "8.1.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -1899,9 +2022,9 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.0.1.tgz",
-      "integrity": "sha512-PpqTVT3yCA/bIgJ12czBuE3iBlM3g4inRSC5J0QOdQFAn07TYrYEQBBKgXH1lQpglup+Zy6c1fxuwTk4MTNKIw==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.1.0.tgz",
+      "integrity": "sha512-q2/Bxa0gMOu/2/AKALI0tCKbG2zppccnRIRCW6BaaTlRVaPKft4oVYPp7WOPpcnsgbr0qROAVCVKCvIQ0tbWog==",
       "dev": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1912,13 +2035,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.0.1.tgz",
-      "integrity": "sha512-8V9hriRvZQXPWU3bbiUV4Epo7EvgM6RTs+sUmxp5G//dBGy402S7Fx0W0QkB2fb4obCF8SInoUzvTYtc3bkb5w==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.1.0.tgz",
+      "integrity": "sha512-NTHhmufocEkMiAord/g++gWKb0Fr34e9AExBRdqgWdVBaKoei2dIyYKD9Q0jBnvfbEA5zaf8plUFMUH6kQ0vGg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1",
+        "@typescript-eslint/types": "8.1.0",
+        "@typescript-eslint/visitor-keys": "8.1.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -1987,15 +2110,15 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.0.1.tgz",
-      "integrity": "sha512-CBFR0G0sCt0+fzfnKaciu9IBsKvEKYwN9UZ+eeogK1fYHg4Qxk1yf/wLQkLXlq8wbU2dFlgAesxt8Gi76E8RTA==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.1.0.tgz",
+      "integrity": "sha512-ypRueFNKTIFwqPeJBfeIpxZ895PQhNyH4YID6js0UoBImWYoSjBsahUn9KMiJXh94uOjVBgHD9AmkyPsPnFwJA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.0.1",
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/typescript-estree": "8.0.1"
+        "@typescript-eslint/scope-manager": "8.1.0",
+        "@typescript-eslint/types": "8.1.0",
+        "@typescript-eslint/typescript-estree": "8.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2009,12 +2132,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.0.1.tgz",
-      "integrity": "sha512-W5E+o0UfUcK5EgchLZsyVWqARmsM7v54/qEq6PY3YI5arkgmCzHiuk0zKSJJbm71V0xdRna4BGomkCTXz2/LkQ==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.1.0.tgz",
+      "integrity": "sha512-ba0lNI19awqZ5ZNKh6wCModMwoZs457StTebQ0q1NP58zSi2F6MOZRXwfKZy+jB78JNJ/WH8GSh2IQNzXX8Nag==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
+        "@typescript-eslint/types": "8.1.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -2039,8 +2162,9 @@
     },
     "node_modules/@vitest/expect": {
       "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.0.5.tgz",
+      "integrity": "sha512-yHZtwuP7JZivj65Gxoi8upUN2OzHTi3zVfjwdpu2WrvCZPLwsJ2Ey5ILIPccoW23dd/zQBlJ4/dhi7DWNyXCpA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@vitest/spy": "2.0.5",
         "@vitest/utils": "2.0.5",
@@ -2053,8 +2177,9 @@
     },
     "node_modules/@vitest/pretty-format": {
       "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.0.5.tgz",
+      "integrity": "sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "tinyrainbow": "^1.2.0"
       },
@@ -2064,8 +2189,9 @@
     },
     "node_modules/@vitest/runner": {
       "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.0.5.tgz",
+      "integrity": "sha512-TfRfZa6Bkk9ky4tW0z20WKXFEwwvWhRY+84CnSEtq4+3ZvDlJyY32oNTJtM7AW9ihW90tX/1Q78cb6FjoAs+ig==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@vitest/utils": "2.0.5",
         "pathe": "^1.1.2"
@@ -2076,8 +2202,9 @@
     },
     "node_modules/@vitest/snapshot": {
       "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.5.tgz",
+      "integrity": "sha512-SgCPUeDFLaM0mIUHfaArq8fD2WbaXG/zVXjRupthYfYGzc8ztbFbu6dUNOblBG7XLMR1kEhS/DNnfCZ2IhdDew==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@vitest/pretty-format": "2.0.5",
         "magic-string": "^0.30.10",
@@ -2089,8 +2216,9 @@
     },
     "node_modules/@vitest/spy": {
       "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.0.5.tgz",
+      "integrity": "sha512-c/jdthAhvJdpfVuaexSrnawxZz6pywlTPe84LUB2m/4t3rl2fTo9NFGBG4oWgaD+FTgDDV8hJ/nibT7IfH3JfA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "tinyspy": "^3.0.0"
       },
@@ -2100,8 +2228,9 @@
     },
     "node_modules/@vitest/utils": {
       "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.0.5.tgz",
+      "integrity": "sha512-d8HKbqIcya+GR67mkZbrzhS5kKhtp8dQLcmRZLGTscGVg7yImT82cIrhtn2L8+VujWcy6KZweApgNmPsTAO/UQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@vitest/pretty-format": "2.0.5",
         "estree-walker": "^3.0.3",
@@ -2114,7 +2243,8 @@
     },
     "node_modules/accepts": {
       "version": "1.3.8",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dependencies": {
         "mime-types": "~2.1.34",
         "negotiator": "0.6.3"
@@ -2125,8 +2255,9 @@
     },
     "node_modules/acorn": {
       "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2145,8 +2276,9 @@
     },
     "node_modules/acorn-walk": {
       "version": "8.3.3",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
+      "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "acorn": "^8.11.0"
       },
@@ -2196,8 +2328,9 @@
     },
     "node_modules/anymatch": {
       "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -2208,8 +2341,9 @@
     },
     "node_modules/arg": {
       "version": "4.1.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
     },
     "node_modules/argparse": {
       "version": "2.0.1",
@@ -2219,7 +2353,8 @@
     },
     "node_modules/array-flatten": {
       "version": "1.1.1",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "node_modules/array-union": {
       "version": "2.1.0",
@@ -2232,28 +2367,32 @@
     },
     "node_modules/assertion-error": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
     },
     "node_modules/base64url": {
       "version": "3.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
+      "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/binary-extensions": {
       "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -2263,7 +2402,8 @@
     },
     "node_modules/body-parser": {
       "version": "1.20.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
       "dependencies": {
         "bytes": "3.1.2",
         "content-type": "~1.0.5",
@@ -2285,23 +2425,27 @@
     },
     "node_modules/body-parser/node_modules/debug": {
       "version": "2.6.9",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/body-parser/node_modules/ms": {
       "version": "2.0.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/bowser": {
       "version": "2.11.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz",
+      "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA=="
     },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -2309,8 +2453,9 @@
     },
     "node_modules/braces": {
       "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -2320,26 +2465,30 @@
     },
     "node_modules/buffer-equal-constant-time": {
       "version": "1.0.1",
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
     },
     "node_modules/bytes": {
       "version": "3.1.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/cac": {
       "version": "6.7.14",
+      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
+      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/call-bind": {
       "version": "1.0.7",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -2365,8 +2514,9 @@
     },
     "node_modules/chai": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz",
+      "integrity": "sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "assertion-error": "^2.0.1",
         "check-error": "^2.1.1",
@@ -2394,39 +2544,20 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/chalk/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/chalk/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/check-error": {
       "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
+      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 16"
       }
     },
     "node_modules/chokidar": {
       "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -2446,6 +2577,18 @@
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/chokidar/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -2466,12 +2609,14 @@
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
     },
     "node_modules/content-disposition": {
       "version": "0.5.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dependencies": {
         "safe-buffer": "5.2.1"
       },
@@ -2481,21 +2626,24 @@
     },
     "node_modules/content-type": {
       "version": "1.0.5",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/cookie": {
       "version": "0.4.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
+      "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/cookie-parser": {
       "version": "1.4.6",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz",
+      "integrity": "sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==",
       "dependencies": {
         "cookie": "0.4.1",
         "cookie-signature": "1.0.6"
@@ -2506,8 +2654,9 @@
     },
     "node_modules/cookie-session": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cookie-session/-/cookie-session-2.1.0.tgz",
+      "integrity": "sha512-u73BDmR8QLGcs+Lprs0cfbcAPKl2HnPcjpwRXT41sEV4DRJ2+W0vJEEZkG31ofkx+HZflA70siRIjiTdIodmOQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cookies": "0.9.1",
         "debug": "3.2.7",
@@ -2520,12 +2669,14 @@
     },
     "node_modules/cookie-signature": {
       "version": "1.0.6",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
     "node_modules/cookies": {
       "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.9.1.tgz",
+      "integrity": "sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "depd": "~2.0.0",
         "keygrip": "~1.1.0"
@@ -2536,18 +2687,22 @@
     },
     "node_modules/core-js": {
       "version": "2.6.12",
-      "hasInstallScript": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "hasInstallScript": true
     },
     "node_modules/create-require": {
       "version": "1.1.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
     },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -2559,16 +2714,18 @@
     },
     "node_modules/debug": {
       "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/deep-eql": {
       "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
+      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -2581,7 +2738,8 @@
     },
     "node_modules/define-data-property": {
       "version": "1.1.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -2596,14 +2754,16 @@
     },
     "node_modules/depd": {
       "version": "2.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/destroy": {
       "version": "1.2.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "engines": {
         "node": ">= 0.8",
         "npm": "1.2.8000 || >= 1.4.16"
@@ -2611,8 +2771,9 @@
     },
     "node_modules/diff": {
       "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
       }
@@ -2631,7 +2792,8 @@
     },
     "node_modules/dotenv": {
       "version": "16.4.5",
-      "license": "BSD-2-Clause",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+      "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
       "engines": {
         "node": ">=12"
       },
@@ -2641,25 +2803,29 @@
     },
     "node_modules/ecdsa-sig-formatter": {
       "version": "1.0.11",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
     },
     "node_modules/ee-first": {
       "version": "1.1.1",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/es-define-property": {
       "version": "1.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
       "dependencies": {
         "get-intrinsic": "^1.2.4"
       },
@@ -2669,16 +2835,18 @@
     },
     "node_modules/es-errors": {
       "version": "1.3.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/esbuild": {
       "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -2713,7 +2881,8 @@
     },
     "node_modules/escape-html": {
       "version": "1.0.3",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
@@ -2831,18 +3000,6 @@
         }
       }
     },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/eslint/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -2901,8 +3058,9 @@
     },
     "node_modules/estree-walker": {
       "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0"
       }
@@ -2918,15 +3076,17 @@
     },
     "node_modules/etag": {
       "version": "1.8.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/execa": {
       "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
+      "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^8.0.1",
@@ -2947,7 +3107,8 @@
     },
     "node_modules/express": {
       "version": "4.19.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -2987,7 +3148,8 @@
     },
     "node_modules/express-session": {
       "version": "1.18.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.0.tgz",
+      "integrity": "sha512-m93QLWr0ju+rOwApSsyso838LQwgfs44QtOP/WBiwtAgPIo/SAh1a5c6nn2BR6mFNZehTpqKDESzP+fRHVbxwQ==",
       "dependencies": {
         "cookie": "0.6.0",
         "cookie-signature": "1.0.7",
@@ -3004,43 +3166,50 @@
     },
     "node_modules/express-session/node_modules/cookie": {
       "version": "0.6.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/express-session/node_modules/cookie-signature": {
       "version": "1.0.7",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz",
+      "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA=="
     },
     "node_modules/express-session/node_modules/debug": {
       "version": "2.6.9",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/express-session/node_modules/ms": {
       "version": "2.0.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/express/node_modules/cookie": {
       "version": "0.6.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/express/node_modules/debug": {
       "version": "2.6.9",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
@@ -3064,6 +3233,18 @@
         "node": ">=8.6.0"
       }
     },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -3078,6 +3259,8 @@
     },
     "node_modules/fast-xml-parser": {
       "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz",
+      "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==",
       "funding": [
         {
           "type": "github",
@@ -3088,7 +3271,6 @@
           "url": "https://paypal.me/naturalintelligence"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "strnum": "^1.0.5"
       },
@@ -3119,8 +3301,9 @@
     },
     "node_modules/fill-range": {
       "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -3130,7 +3313,8 @@
     },
     "node_modules/finalhandler": {
       "version": "1.2.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
@@ -3146,14 +3330,16 @@
     },
     "node_modules/finalhandler/node_modules/debug": {
       "version": "2.6.9",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/find-up": {
       "version": "5.0.0",
@@ -3192,36 +3378,41 @@
     },
     "node_modules/forwarded": {
       "version": "0.2.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/fresh": {
       "version": "0.5.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/function-bind": {
       "version": "1.1.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/get-func-name": {
       "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/get-intrinsic": {
       "version": "1.2.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dependencies": {
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
@@ -3238,8 +3429,9 @@
     },
     "node_modules/get-stream": {
       "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
+      "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=16"
       },
@@ -3248,14 +3440,15 @@
       }
     },
     "node_modules/glob-parent": {
-      "version": "5.1.2",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "is-glob": "^4.0.3"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=10.13.0"
       }
     },
     "node_modules/globals": {
@@ -3292,7 +3485,8 @@
     },
     "node_modules/gopd": {
       "version": "1.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "dependencies": {
         "get-intrinsic": "^1.1.3"
       },
@@ -3307,16 +3501,18 @@
       "dev": true
     },
     "node_modules/has-flag": {
-      "version": "3.0.0",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/has-property-descriptors": {
       "version": "1.0.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dependencies": {
         "es-define-property": "^1.0.0"
       },
@@ -3326,7 +3522,8 @@
     },
     "node_modules/has-proto": {
       "version": "1.0.3",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -3336,7 +3533,8 @@
     },
     "node_modules/has-symbols": {
       "version": "1.0.3",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -3346,7 +3544,8 @@
     },
     "node_modules/hasown": {
       "version": "2.0.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -3356,11 +3555,13 @@
     },
     "node_modules/hi-base32": {
       "version": "0.5.1",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/hi-base32/-/hi-base32-0.5.1.tgz",
+      "integrity": "sha512-EmBBpvdYh/4XxsnUybsPag6VikPYnN30td+vQk+GI3qpahVEG9+gTkG0aXVxTjBqQ5T6ijbWIu77O+C5WFWsnA=="
     },
     "node_modules/http-errors": {
       "version": "2.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dependencies": {
         "depd": "2.0.0",
         "inherits": "2.0.4",
@@ -3374,15 +3575,17 @@
     },
     "node_modules/human-signals": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
+      "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=16.17.0"
       }
     },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -3391,9 +3594,9 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -3401,8 +3604,9 @@
     },
     "node_modules/ignore-by-default": {
       "version": "1.0.1",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
+      "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==",
+      "dev": true
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
@@ -3431,19 +3635,22 @@
     },
     "node_modules/inherits": {
       "version": "2.0.4",
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/ipaddr.js": {
       "version": "1.9.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
       "engines": {
         "node": ">= 0.10"
       }
     },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -3453,16 +3660,18 @@
     },
     "node_modules/is-extglob": {
       "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-glob": {
       "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -3472,8 +3681,9 @@
     },
     "node_modules/is-number": {
       "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -3489,8 +3699,9 @@
     },
     "node_modules/is-stream": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
@@ -3500,8 +3711,9 @@
     },
     "node_modules/isexe": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
@@ -3535,7 +3747,8 @@
     },
     "node_modules/jsonwebtoken": {
       "version": "9.0.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
+      "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==",
       "dependencies": {
         "jws": "^3.2.2",
         "lodash.includes": "^4.3.0",
@@ -3555,7 +3768,8 @@
     },
     "node_modules/jwa": {
       "version": "1.4.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
       "dependencies": {
         "buffer-equal-constant-time": "1.0.1",
         "ecdsa-sig-formatter": "1.0.11",
@@ -3564,7 +3778,8 @@
     },
     "node_modules/jws": {
       "version": "3.2.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
       "dependencies": {
         "jwa": "^1.4.1",
         "safe-buffer": "^5.0.1"
@@ -3572,8 +3787,9 @@
     },
     "node_modules/keygrip": {
       "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
+      "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "tsscmp": "1.0.6"
       },
@@ -3620,27 +3836,33 @@
     },
     "node_modules/lodash.includes": {
       "version": "4.3.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="
     },
     "node_modules/lodash.isboolean": {
       "version": "3.0.3",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="
     },
     "node_modules/lodash.isinteger": {
       "version": "4.0.4",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="
     },
     "node_modules/lodash.isnumber": {
       "version": "3.0.3",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="
     },
     "node_modules/lodash.isplainobject": {
       "version": "4.0.6",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="
     },
     "node_modules/lodash.isstring": {
       "version": "4.0.1",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
@@ -3650,51 +3872,59 @@
     },
     "node_modules/lodash.once": {
       "version": "4.1.1",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
     },
     "node_modules/loupe": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.1.tgz",
+      "integrity": "sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "get-func-name": "^2.0.1"
       }
     },
     "node_modules/luxon": {
       "version": "3.5.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz",
+      "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/magic-string": {
       "version": "0.30.11",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
+      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
     "node_modules/make-error": {
       "version": "1.3.6",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
     },
     "node_modules/media-typer": {
       "version": "0.3.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
     },
     "node_modules/merge2": {
       "version": "1.4.1",
@@ -3707,7 +3937,8 @@
     },
     "node_modules/methods": {
       "version": "1.1.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -3727,7 +3958,8 @@
     },
     "node_modules/mime": {
       "version": "1.6.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
       "bin": {
         "mime": "cli.js"
       },
@@ -3737,14 +3969,16 @@
     },
     "node_modules/mime-db": {
       "version": "1.52.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
       "version": "2.1.35",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -3754,8 +3988,9 @@
     },
     "node_modules/mimic-fn": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -3765,8 +4000,9 @@
     },
     "node_modules/minimatch": {
       "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -3776,10 +4012,13 @@
     },
     "node_modules/ms": {
       "version": "2.1.3",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/nanoid": {
       "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
       "dev": true,
       "funding": [
         {
@@ -3787,7 +4026,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -3803,21 +4041,26 @@
     },
     "node_modules/negotiator": {
       "version": "0.6.3",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/node-uuid": {
       "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+      "integrity": "sha512-TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA==",
+      "deprecated": "Use uuid module instead",
       "bin": {
         "uuid": "bin/uuid"
       }
     },
     "node_modules/nodemon": {
       "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.4.tgz",
+      "integrity": "sha512-wjPBbFhtpJwmIeY2yP7QF+UKzPfltVGtfce1g/bB15/8vCGZj8uxD62b/b9M9/WVgme0NZudpownKN+c0plXlQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "chokidar": "^3.5.2",
         "debug": "^4",
@@ -3843,8 +4086,9 @@
     },
     "node_modules/nodemon/node_modules/debug": {
       "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -3857,23 +4101,47 @@
         }
       }
     },
+    "node_modules/nodemon/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/nodemon/node_modules/ms": {
       "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/nodemon/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
-      "license": "MIT"
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/npm-run-path": {
       "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "path-key": "^4.0.0"
       },
@@ -3886,8 +4154,9 @@
     },
     "node_modules/npm-run-path/node_modules/path-key": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -3897,11 +4166,13 @@
     },
     "node_modules/oauth": {
       "version": "0.10.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/oauth/-/oauth-0.10.0.tgz",
+      "integrity": "sha512-1orQ9MT1vHFGQxhuy7E/0gECD3fd2fCC+PIX+/jgmU/gI3EpRocXtmtvxCO5x3WZ443FLTLFWNDjl5MPJf9u+Q=="
     },
     "node_modules/object-inspect": {
       "version": "1.13.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -3911,7 +4182,8 @@
     },
     "node_modules/on-finished": {
       "version": "2.4.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -3921,15 +4193,17 @@
     },
     "node_modules/on-headers": {
       "version": "1.0.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/onetime": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^4.0.0"
       },
@@ -4001,14 +4275,16 @@
     },
     "node_modules/parseurl": {
       "version": "1.3.3",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/passport": {
       "version": "0.7.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/passport/-/passport-0.7.0.tgz",
+      "integrity": "sha512-cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==",
       "dependencies": {
         "passport-strategy": "1.x.x",
         "pause": "0.0.1",
@@ -4024,6 +4300,8 @@
     },
     "node_modules/passport-anonym-uuid": {
       "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/passport-anonym-uuid/-/passport-anonym-uuid-1.0.3.tgz",
+      "integrity": "sha512-bsu59r5hyU0zwqJ3EMdbN0O7O4oZmcjFNhVKXF2PAgPlm1TTJUizJnrkErj4mjOM/mtNE4FwbW4TusrXZJ4lLQ==",
       "dependencies": {
         "node-uuid": "^1.4.7",
         "passport-strategy": "1.x.x"
@@ -4034,7 +4312,8 @@
     },
     "node_modules/passport-google-oauth20": {
       "version": "2.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-2.0.0.tgz",
+      "integrity": "sha512-KSk6IJ15RoxuGq7D1UKK/8qKhNfzbLeLrG3gkLZ7p4A6DBCcv7xpyQwuXtWdpyR0+E0mwkpjY1VfPOhxQrKzdQ==",
       "dependencies": {
         "passport-oauth2": "1.x.x"
       },
@@ -4044,7 +4323,8 @@
     },
     "node_modules/passport-magic-link": {
       "version": "2.1.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/passport-magic-link/-/passport-magic-link-2.1.1.tgz",
+      "integrity": "sha512-6aeWKgxloQAyDJuupkuzs89DTNXQ0UGLJ6FWTHSxXCCrd7lQUEVoZNLGYZT72vMvs6oFESn1t5kO4iRGDGflhw==",
       "dependencies": {
         "@babel/polyfill": "^7.0.0",
         "@babel/runtime": "^7.3.1",
@@ -4054,7 +4334,8 @@
     },
     "node_modules/passport-oauth2": {
       "version": "1.8.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.8.0.tgz",
+      "integrity": "sha512-cjsQbOrXIDE4P8nNb3FQRCCmJJ/utnFKEz2NX209f7KOHPoX18gF7gBzBbLLsj2/je4KrgiwLLGjf0lm9rtTBA==",
       "dependencies": {
         "base64url": "3.x.x",
         "oauth": "0.10.x",
@@ -4072,6 +4353,8 @@
     },
     "node_modules/passport-strategy": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz",
+      "integrity": "sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==",
       "engines": {
         "node": ">= 0.4.0"
       }
@@ -4087,15 +4370,17 @@
     },
     "node_modules/path-key": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/path-to-regexp": {
       "version": "0.1.7",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
     "node_modules/path-type": {
       "version": "4.0.0",
@@ -4108,29 +4393,35 @@
     },
     "node_modules/pathe": {
       "version": "1.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+      "dev": true
     },
     "node_modules/pathval": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
+      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 14.16"
       }
     },
     "node_modules/pause": {
-      "version": "0.0.1"
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
+      "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="
     },
     "node_modules/picocolors": {
       "version": "1.0.1",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "dev": true
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -4140,6 +4431,8 @@
     },
     "node_modules/postcss": {
       "version": "8.4.41",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
+      "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
       "dev": true,
       "funding": [
         {
@@ -4155,7 +4448,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.7",
         "picocolors": "^1.0.1",
@@ -4176,8 +4468,9 @@
     },
     "node_modules/prettier": {
       "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -4190,9 +4483,10 @@
     },
     "node_modules/prisma": {
       "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.18.0.tgz",
+      "integrity": "sha512-+TrSIxZsh64OPOmaSgVPH7ALL9dfU0jceYaMJXsNrTkFHO7/3RANi5K2ZiPB1De9+KDxCWn7jvRq8y8pvk+o9g==",
       "devOptional": true,
       "hasInstallScript": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@prisma/engines": "5.18.0"
       },
@@ -4205,7 +4499,8 @@
     },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dependencies": {
         "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
@@ -4216,8 +4511,9 @@
     },
     "node_modules/pstree.remy": {
       "version": "1.1.8",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
+      "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
+      "dev": true
     },
     "node_modules/punycode": {
       "version": "2.3.1",
@@ -4230,7 +4526,8 @@
     },
     "node_modules/qs": {
       "version": "6.11.0",
-      "license": "BSD-3-Clause",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dependencies": {
         "side-channel": "^1.0.4"
       },
@@ -4263,21 +4560,24 @@
     },
     "node_modules/random-bytes": {
       "version": "1.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
+      "integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/range-parser": {
       "version": "1.2.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/raw-body": {
       "version": "2.5.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -4290,8 +4590,9 @@
     },
     "node_modules/readdirp": {
       "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -4301,7 +4602,8 @@
     },
     "node_modules/regenerator-runtime": {
       "version": "0.13.11",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
     },
     "node_modules/resolve-from": {
       "version": "4.0.0",
@@ -4324,8 +4626,9 @@
     },
     "node_modules/rollup": {
       "version": "4.20.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.20.0.tgz",
+      "integrity": "sha512-6rbWBChcnSGzIlXeIdNIZTopKYad8ZG8ajhl78lGRLsI2rX8IkaotQhVas2Ma+GPxJav19wrSzvRvuiv0YKzWw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/estree": "1.0.5"
       },
@@ -4381,6 +4684,8 @@
     },
     "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",
@@ -4394,16 +4699,17 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/semver": {
       "version": "7.6.3",
-      "license": "ISC",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -4413,7 +4719,8 @@
     },
     "node_modules/send": {
       "version": "0.18.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -4435,18 +4742,21 @@
     },
     "node_modules/send/node_modules/debug": {
       "version": "2.6.9",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/serve-static": {
       "version": "1.15.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
@@ -4459,7 +4769,8 @@
     },
     "node_modules/set-function-length": {
       "version": "1.2.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -4474,12 +4785,14 @@
     },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -4489,15 +4802,17 @@
     },
     "node_modules/shebang-regex": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/side-channel": {
       "version": "1.0.6",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
       "dependencies": {
         "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
@@ -4513,13 +4828,15 @@
     },
     "node_modules/siginfo": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
+      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
+      "dev": true
     },
     "node_modules/signal-exit": {
       "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=14"
       },
@@ -4529,8 +4846,9 @@
     },
     "node_modules/simple-update-notifier": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
+      "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "semver": "^7.5.3"
       },
@@ -4549,28 +4867,32 @@
     },
     "node_modules/source-map-js": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/stackback": {
       "version": "0.0.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
+      "dev": true
     },
     "node_modules/statuses": {
       "version": "2.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/std-env": {
       "version": "3.7.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz",
+      "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==",
+      "dev": true
     },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
@@ -4586,8 +4908,9 @@
     },
     "node_modules/strip-final-newline": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -4609,17 +4932,19 @@
     },
     "node_modules/strnum": {
       "version": "1.0.5",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="
     },
     "node_modules/supports-color": {
-      "version": "5.5.0",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/text-table": {
@@ -4630,37 +4955,42 @@
     },
     "node_modules/tinybench": {
       "version": "2.9.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
+      "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
+      "dev": true
     },
     "node_modules/tinypool": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.0.tgz",
+      "integrity": "sha512-KIKExllK7jp3uvrNtvRBYBWBOAXSX8ZvoaD8T+7KB/QHIuoJW3Pmr60zucywjAlMb5TeXUkcs/MWeWLu0qvuAQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^18.0.0 || >=20.0.0"
       }
     },
     "node_modules/tinyrainbow": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz",
+      "integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/tinyspy": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.0.tgz",
+      "integrity": "sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -4670,15 +5000,17 @@
     },
     "node_modules/toidentifier": {
       "version": "1.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "engines": {
         "node": ">=0.6"
       }
     },
     "node_modules/touch": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz",
+      "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "nodetouch": "bin/nodetouch.js"
       }
@@ -4697,15 +5029,17 @@
     },
     "node_modules/ts-dedent": {
       "version": "2.2.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz",
+      "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==",
       "engines": {
         "node": ">=6.10"
       }
     },
     "node_modules/ts-node": {
       "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -4746,12 +5080,14 @@
     },
     "node_modules/tslib": {
       "version": "2.6.3",
-      "license": "0BSD"
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
     },
     "node_modules/tsscmp": {
       "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
+      "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.6.x"
       }
@@ -4770,7 +5106,8 @@
     },
     "node_modules/type-fest": {
       "version": "2.19.0",
-      "license": "(MIT OR CC0-1.0)",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
       "engines": {
         "node": ">=12.20"
       },
@@ -4780,7 +5117,8 @@
     },
     "node_modules/type-is": {
       "version": "1.6.18",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "dependencies": {
         "media-typer": "0.3.0",
         "mime-types": "~2.1.24"
@@ -4791,8 +5129,9 @@
     },
     "node_modules/typescript": {
       "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
       "dev": true,
-      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -4802,14 +5141,14 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.0.1.tgz",
-      "integrity": "sha512-V3Y+MdfhawxEjE16dWpb7/IOgeXnLwAEEkS7v8oDqNcR1oYlqWhGH/iHqHdKVdpWme1VPZ0SoywXAkCqawj2eQ==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.1.0.tgz",
+      "integrity": "sha512-prB2U3jXPJLpo1iVLN338Lvolh6OrcCZO+9Yv6AR+tvegPPptYCDBIHiEEUdqRi8gAv2bXNKfMUrgAd2ejn/ow==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.0.1",
-        "@typescript-eslint/parser": "8.0.1",
-        "@typescript-eslint/utils": "8.0.1"
+        "@typescript-eslint/eslint-plugin": "8.1.0",
+        "@typescript-eslint/parser": "8.1.0",
+        "@typescript-eslint/utils": "8.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4826,7 +5165,8 @@
     },
     "node_modules/uid-safe": {
       "version": "2.1.5",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
+      "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
       "dependencies": {
         "random-bytes": "~1.0.0"
       },
@@ -4836,21 +5176,25 @@
     },
     "node_modules/uid2": {
       "version": "0.0.4",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.4.tgz",
+      "integrity": "sha512-IevTus0SbGwQzYh3+fRsAMTVVPOoIVufzacXcHPmdlle1jUpq7BRL+mw3dgeLanvGZdwwbWhRV6XrcFNdBmjWA=="
     },
     "node_modules/undefsafe": {
       "version": "2.0.5",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
+      "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
+      "dev": true
     },
     "node_modules/undici-types": {
       "version": "6.13.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.13.0.tgz",
+      "integrity": "sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==",
+      "dev": true
     },
     "node_modules/unpipe": {
       "version": "1.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -4866,38 +5210,43 @@
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
       "engines": {
         "node": ">= 0.4.0"
       }
     },
     "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"
       ],
-      "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/v8-compile-cache-lib": {
       "version": "3.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "dev": true
     },
     "node_modules/vary": {
       "version": "1.1.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/vite": {
       "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.0.tgz",
+      "integrity": "sha512-5xokfMX0PIiwCMCMb9ZJcMyh5wbBun0zUzKib+L65vAZ8GY9ePZMXxFrHbr/Kyll2+LSCY7xtERPpxkBDKngwg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "esbuild": "^0.21.3",
         "postcss": "^8.4.40",
@@ -4954,8 +5303,9 @@
     },
     "node_modules/vite-node": {
       "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.0.5.tgz",
+      "integrity": "sha512-LdsW4pxj0Ot69FAoXZ1yTnA9bjGohr2yNBU7QKRxpz8ITSkhuDl6h3zS/tvgz4qrNjeRnvrWeXQ8ZF7Um4W00Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cac": "^6.7.14",
         "debug": "^4.3.5",
@@ -4975,8 +5325,9 @@
     },
     "node_modules/vite-node/node_modules/debug": {
       "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -4991,13 +5342,15 @@
     },
     "node_modules/vite-node/node_modules/ms": {
       "version": "2.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/vitest": {
       "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.0.5.tgz",
+      "integrity": "sha512-8GUxONfauuIdeSl5f9GTgVEpg5BTOlplET4WEDaeY2QBiN8wSm68vxN/tb5z405OwppfoCavnwXafiaYBC/xOA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.3.0",
         "@vitest/expect": "2.0.5",
@@ -5059,8 +5412,9 @@
     },
     "node_modules/vitest/node_modules/debug": {
       "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -5075,13 +5429,15 @@
     },
     "node_modules/vitest/node_modules/ms": {
       "version": "2.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/which": {
       "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -5094,8 +5450,9 @@
     },
     "node_modules/why-is-node-running": {
       "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
+      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "siginfo": "^2.0.0",
         "stackback": "0.0.2"
@@ -5118,8 +5475,9 @@
     },
     "node_modules/yn": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
diff --git a/server/package.json b/server/package.json
index 16d909e37a..412a625887 100644
--- a/server/package.json
+++ b/server/package.json
@@ -16,15 +16,15 @@
     "seed": "ts-node --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"
   },
   "dependencies": {
-    "@aws-sdk/client-ses": "^3.624.0",
-    "@prisma/client": "^5.17.0",
+    "@aws-sdk/client-ses": "^3.629.0",
+    "@prisma/client": "^5.18.0",
     "@quixo3/prisma-session-store": "^3.1.13",
     "cookie-parser": "^1.4.6",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",
     "express-session": "^1.18.0",
     "hi-base32": "^0.5.1",
-    "luxon": "^3.4.4",
+    "luxon": "^3.5.0",
     "passport": "^0.7.0",
     "passport-anonym-uuid": "^1.0.3",
     "passport-google-oauth20": "^2.0.0",
@@ -37,7 +37,7 @@
     "@types/express": "^4.17.21",
     "@types/express-session": "^1.18.0",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^22.0.2",
+    "@types/node": "^22.2.0",
     "@types/passport": "^1.0.16",
     "@types/passport-google-oauth20": "^2.0.16",
     "cookie-session": "^2.1.0",
@@ -45,7 +45,7 @@
     "globals": "^15.9.0",
     "nodemon": "^3.1.4",
     "prettier": "^3.3.3",
-    "prisma": "^5.17.0",
+    "prisma": "^5.18.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4",
     "typescript-eslint": "^8.0.1",
diff --git a/server/prisma/migrations/20240806193656_sharing/migration.sql b/server/prisma/migrations/20240806193656_sharing/migration.sql
new file mode 100644
index 0000000000..d80b010675
--- /dev/null
+++ b/server/prisma/migrations/20240806193656_sharing/migration.sql
@@ -0,0 +1,23 @@
+-- AlterTable
+ALTER TABLE `content` MODIFY `licenseCode` VARCHAR(10) NULL DEFAULT 'CCDUAL';
+
+-- AlterTable
+ALTER TABLE `contributorHistory` ADD COLUMN `withLicenseCode` VARCHAR(10) NULL;
+
+-- CreateTable
+CREATE TABLE `contentShares` (
+    `contentId` INTEGER NOT NULL,
+    `userId` INTEGER NOT NULL,
+
+    INDEX `contentShares_userId_idx`(`userId`),
+    PRIMARY KEY (`contentId`, `userId`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- AddForeignKey
+ALTER TABLE `contributorHistory` ADD CONSTRAINT `contributorHistory_withLicenseCode_fkey` FOREIGN KEY (`withLicenseCode`) REFERENCES `licenses`(`code`) ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+-- AddForeignKey
+ALTER TABLE `contentShares` ADD CONSTRAINT `contentShares_contentId_fkey` FOREIGN KEY (`contentId`) REFERENCES `content`(`id`) ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+-- AddForeignKey
+ALTER TABLE `contentShares` ADD CONSTRAINT `contentShares_userId_fkey` FOREIGN KEY (`userId`) REFERENCES `users`(`userId`) ON DELETE NO ACTION ON UPDATE NO ACTION;
diff --git a/server/prisma/migrations/20240807221303_remix_timestamps/migration.sql b/server/prisma/migrations/20240807221303_remix_timestamps/migration.sql
new file mode 100644
index 0000000000..82128a07d9
--- /dev/null
+++ b/server/prisma/migrations/20240807221303_remix_timestamps/migration.sql
@@ -0,0 +1,10 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `timestamp` on the `contributorHistory` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE `contributorHistory` DROP COLUMN `timestamp`,
+    ADD COLUMN `timestampDoc` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+    ADD COLUMN `timestampPrevDoc` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3);
diff --git a/server/prisma/migrations/20240810204144_content_classification/migration.sql b/server/prisma/migrations/20240810204144_content_classification/migration.sql
new file mode 100644
index 0000000000..ad6461b7a1
--- /dev/null
+++ b/server/prisma/migrations/20240810204144_content_classification/migration.sql
@@ -0,0 +1,38 @@
+-- CreateTable
+CREATE TABLE `contentClassifications` (
+    `contentId` INTEGER NOT NULL,
+    `classificationId` INTEGER NOT NULL,
+
+    PRIMARY KEY (`contentId`, `classificationId`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- CreateTable
+CREATE TABLE `classifications` (
+    `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `code` VARCHAR(191) NOT NULL,
+    `systemId` INTEGER NOT NULL,
+    `category` TINYTEXT NOT NULL,
+    `description` TEXT NOT NULL,
+    `grade` VARCHAR(191) NULL,
+
+    UNIQUE INDEX `classifications_code_systemId_key`(`code`, `systemId`),
+    PRIMARY KEY (`id`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- CreateTable
+CREATE TABLE `classificationSystems` (
+    `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `name` VARCHAR(191) NOT NULL,
+
+    UNIQUE INDEX `classificationSystems_name_key`(`name`),
+    PRIMARY KEY (`id`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- AddForeignKey
+ALTER TABLE `contentClassifications` ADD CONSTRAINT `contentClassifications_contentId_fkey` FOREIGN KEY (`contentId`) REFERENCES `content`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `contentClassifications` ADD CONSTRAINT `contentClassifications_classificationId_fkey` FOREIGN KEY (`classificationId`) REFERENCES `classifications`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `classifications` ADD CONSTRAINT `classifications_systemId_fkey` FOREIGN KEY (`systemId`) REFERENCES `classificationSystems`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/server/prisma/migrations/20240812042023_increase_classification_category/migration.sql b/server/prisma/migrations/20240812042023_increase_classification_category/migration.sql
new file mode 100644
index 0000000000..18f838d1ad
--- /dev/null
+++ b/server/prisma/migrations/20240812042023_increase_classification_category/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE `classifications` MODIFY `category` TEXT NOT NULL;
diff --git a/server/prisma/migrations/20240812180723_full_text_search_indices/migration.sql b/server/prisma/migrations/20240812180723_full_text_search_indices/migration.sql
new file mode 100644
index 0000000000..35f8cd85d8
--- /dev/null
+++ b/server/prisma/migrations/20240812180723_full_text_search_indices/migration.sql
@@ -0,0 +1,11 @@
+-- CreateIndex
+CREATE FULLTEXT INDEX `classifications_code_category_description_idx` ON `classifications`(`code`, `category`, `description`);
+
+-- CreateIndex
+CREATE FULLTEXT INDEX `content_name_idx` ON `content`(`name`);
+
+-- CreateIndex
+CREATE FULLTEXT INDEX `documents_source_idx` ON `documents`(`source`);
+
+-- CreateIndex
+CREATE FULLTEXT INDEX `users_firstNames_lastNames_idx` ON `users`(`firstNames`, `lastNames`);
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index 43a5a8f666..b13fa395ec 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -1,5 +1,6 @@
 generator client {
-  provider = "prisma-client-js"
+  provider        = "prisma-client-js"
+  previewFeatures = ["fullTextIndex"]
 }
 
 datasource db {
@@ -15,32 +16,35 @@ model Session {
 }
 
 model content {
-  id               Int                @id @unique() @default(autoincrement())
+  id               Int                      @id @unique() @default(autoincrement())
   ownerId          Int
   isFolder         Boolean
   parentFolderId   Int?
   name             String
-  createdAt        DateTime           @default(now())
-  lastEdited       DateTime           @default(now())
+  createdAt        DateTime                 @default(now())
+  lastEdited       DateTime                 @default(now())
   imagePath        String?
-  isAssigned       Boolean            @default(false)
-  classCode        String?            @db.VarChar(45)
+  isAssigned       Boolean                  @default(false)
+  classCode        String?                  @db.VarChar(45)
   codeValidUntil   DateTime?
-  isPublic         Boolean            @default(false)
-  isDeleted        Boolean            @default(false)
+  isPublic         Boolean                  @default(false)
+  isDeleted        Boolean                  @default(false)
   sortIndex        BigInt
-  licenseCode      String?            @db.VarChar(10)
-  owner            users              @relation(fields: [ownerId], references: [userId], onDelete: NoAction, onUpdate: NoAction)
-  parentFolder     content?           @relation("folderStructure", fields: [parentFolderId], references: [id], onDelete: NoAction, onUpdate: NoAction)
-  subFolders       content[]          @relation("folderStructure")
+  licenseCode      String?                  @default("CCDUAL") @db.VarChar(10)
+  owner            users                    @relation(fields: [ownerId], references: [userId], onDelete: NoAction, onUpdate: NoAction)
+  parentFolder     content?                 @relation("folderStructure", fields: [parentFolderId], references: [id], onDelete: NoAction, onUpdate: NoAction)
+  subFolders       content[]                @relation("folderStructure")
   documents        documents[]
-  license          licenses?          @relation(fields: [licenseCode], references: [code], onDelete: NoAction, onUpdate: NoAction)
+  license          licenses?                @relation(fields: [licenseCode], references: [code], onDelete: NoAction, onUpdate: NoAction)
   assignmentScores assignmentScores[]
   promotedContent  promotedContent[]
+  sharedWith       contentShares[]
+  classifications  contentClassifications[]
 
   @@index([ownerId, parentFolderId, sortIndex])
   @@index([classCode])
   @@index([parentFolderId, isFolder])
+  @@fulltext([name])
 }
 
 model documents {
@@ -60,6 +64,7 @@ model documents {
   contributorHistory contributorHistory[]
 
   @@unique([id, assignedVersionNum]) // needed for the 1-1 relation "assignedVersion" with documentVersions
+  @@fulltext([source])
 }
 
 model documentVersions {
@@ -82,16 +87,17 @@ model documentVersions {
 }
 
 model licenses {
-  code          String                @id @db.VarChar(10)
-  name          String
-  description   String                @db.Text
-  imageURL      String?
-  smallImageURL String?
-  licenseURL    String?
-  composedOf    licenseCompositions[] @relation("composeOf")
-  includedIn    licenseCompositions[] @relation("includedIn")
-  content       content[]
-  sortIndex     Int
+  code               String                @id @db.VarChar(10)
+  name               String
+  description        String                @db.Text
+  imageURL           String?
+  smallImageURL      String?
+  licenseURL         String?
+  composedOf         licenseCompositions[] @relation("composeOf")
+  includedIn         licenseCompositions[] @relation("includedIn")
+  content            content[]
+  sortIndex          Int
+  contributorHistory contributorHistory[]
 }
 
 model licenseCompositions {
@@ -107,14 +113,27 @@ model contributorHistory {
   docId             Int
   prevDocId         Int
   prevDocVersionNum Int
-  timestamp         DateTime         @default(now())
+  withLicenseCode   String?          @db.VarChar(10)
+  timestampDoc      DateTime         @default(now())
+  timestampPrevDoc  DateTime         @default(now())
   document          documents        @relation(fields: [docId], references: [id], onDelete: NoAction, onUpdate: NoAction)
   prevDoc           documentVersions @relation(fields: [prevDocId, prevDocVersionNum], references: [docId, versionNum], onDelete: NoAction, onUpdate: NoAction)
+  withLicense       licenses?        @relation(fields: [withLicenseCode], references: [code], onDelete: NoAction, onUpdate: NoAction)
 
   @@id([docId, prevDocId])
   @@index([prevDocId, prevDocVersionNum])
 }
 
+model contentShares {
+  contentId Int
+  userId    Int
+  content   content @relation(fields: [contentId], references: [id], onDelete: NoAction, onUpdate: NoAction)
+  user      users   @relation(fields: [userId], references: [userId], onDelete: NoAction, onUpdate: NoAction)
+
+  @@id([contentId, userId])
+  @@index([userId])
+}
+
 model doenetmlVersions {
   id                 Int                @id @unique @default(autoincrement())
   displayedVersion   String             @unique
@@ -191,6 +210,9 @@ model users {
   assignmentScores           assignmentScores[]
   documentState              documentState[]
   documentSubmittedResponses documentSubmittedResponses[]
+  sharedWithMe               contentShares[]
+
+  @@fulltext([firstNames, lastNames])
 }
 
 model promotedContentGroups {
@@ -211,3 +233,32 @@ model promotedContent {
 
   @@id([activityId, promotedGroupId])
 }
+
+model contentClassifications {
+  contentId        Int
+  classificationId Int
+  content          content         @relation(fields: [contentId], references: [id])
+  classification   classifications @relation(fields: [classificationId], references: [id])
+
+  @@id([contentId, classificationId])
+}
+
+model classifications {
+  id                     Int                      @id @default(autoincrement())
+  code                   String
+  systemId               Int
+  category               String                   @db.Text
+  description            String                   @db.Text
+  grade                  String?
+  system                 classificationSystems    @relation(fields: [systemId], references: [id])
+  contentClassifications contentClassifications[]
+
+  @@unique([code, systemId])
+  @@fulltext([code, category, description])
+}
+
+model classificationSystems {
+  id              Int               @id @default(autoincrement())
+  name            String            @unique
+  classifications classifications[]
+}
diff --git a/server/prisma/seed.ts b/server/prisma/seed.ts
index 4e1e4988cf..cdba9d3586 100644
--- a/server/prisma/seed.ts
+++ b/server/prisma/seed.ts
@@ -80,6 +80,140 @@ async function main() {
     },
   });
 
+  const { id: commonCoreId } = await prisma.classificationSystems.upsert({
+    where: { name: "Common Core" },
+    update: { name: "Common Core" },
+    create: { name: "Common Core" },
+  });
+  const classification1 = await prisma.classifications.upsert({
+    where: {
+      code_systemId: {
+        code: "K.CC.1",
+        systemId: commonCoreId,
+      },
+    },
+    update: {
+      code: "K.CC.1",
+      grade: "Kindergarten",
+      category:
+        "Counting and Cardinality: Know number names and the count sequence.",
+      description: "Count to 100 by ones and by tens.",
+      systemId: commonCoreId,
+    },
+    create: {
+      code: "K.CC.1",
+      grade: "Kindergarten",
+      category:
+        "Counting and Cardinality: Know number names and the count sequence.",
+      description: "Count to 100 by ones and by tens.",
+      systemId: commonCoreId,
+    },
+  });
+
+  const classification2 = await prisma.classifications.upsert({
+    where: {
+      code_systemId: { code: "K.OA.1", systemId: commonCoreId },
+    },
+    update: {
+      code: "K.OA.1",
+      grade: "Kindergarten",
+      category:
+        "Operations and Algebraic Thinking: Understand addition as putting together and adding to, and understand subtraction as taking apart and taking from.",
+      description:
+        "Represent addition and subtraction with objects, fingers, mental images, drawings (Drawings need not show details, but should show the mathematics in the problem.(This applies wherever drawings are mentioned in the Standards.)), sounds (e.g., claps), acting out situations, verbal explanations, expressions, or equations.",
+      systemId: commonCoreId,
+    },
+    create: {
+      code: "K.OA.1",
+      grade: "Kindergarten",
+      category:
+        "Operations and Algebraic Thinking: Understand addition as putting together and adding to, and understand subtraction as taking apart and taking from.",
+      description:
+        "Represent addition and subtraction with objects, fingers, mental images, drawings (Drawings need not show details, but should show the mathematics in the problem.(This applies wherever drawings are mentioned in the Standards.)), sounds (e.g., claps), acting out situations, verbal explanations, expressions, or equations.",
+      systemId: commonCoreId,
+    },
+  });
+
+  const classification3 = await prisma.classifications.upsert({
+    where: {
+      code_systemId: { code: "A.SSE.3 c.", systemId: commonCoreId },
+    },
+    update: {
+      code: "A.SSE.3 c.",
+      grade: "HS",
+      category:
+        "Seeing Structure in Expressions: Write expressions in equivalent forms to solve problems.",
+      description:
+        "Use the properties of exponents to transform expressions for exponential functions.  For example the expression 1.15t can be rewritten as (1.151/12)12t ≈1.01212t to reveal the approximate equivalent monthly interest rate if the annual rate is 15%.",
+      systemId: commonCoreId,
+    },
+    create: {
+      code: "A.SSE.3 c.",
+      grade: "HS",
+      category:
+        "Seeing Structure in Expressions: Write expressions in equivalent forms to solve problems.",
+      description:
+        "Use the properties of exponents to transform expressions for exponential functions.  For example the expression 1.15t can be rewritten as (1.151/12)12t ≈1.01212t to reveal the approximate equivalent monthly interest rate if the annual rate is 15%.",
+      systemId: commonCoreId,
+    },
+  });
+
+  const { id: minnesotaMathId } = await prisma.classificationSystems.upsert({
+    where: { name: "Minnesota Academic Standards in Math" },
+    update: { name: "Minnesota Academic Standards in Math" },
+    create: { name: "Minnesota Academic Standards in Math" },
+  });
+
+  const minnesotaClassification1 = await prisma.classifications.upsert({
+    where: {
+      code_systemId: {
+        code: "8.2.1.5",
+        systemId: minnesotaMathId,
+      },
+    },
+    update: {
+      code: "8.2.1.5",
+      category:
+        "Understand the concept of function in real-world and mathematical situations, and distinguish between linear and nonlinear functions.",
+      description:
+        "Understand that a geometric sequence is a non-linear function that can be expressed in the form f(x) = ab^x, where x = 0, 1, 2, 3,….",
+      systemId: minnesotaMathId,
+    },
+    create: {
+      code: "8.2.1.5",
+      category:
+        "Understand the concept of function in real-world and mathematical situations, and distinguish between linear and nonlinear functions.",
+      description:
+        "Understand that a geometric sequence is a non-linear function that can be expressed in the form f(x) = ab^x, where x = 0, 1, 2, 3,….",
+      systemId: minnesotaMathId,
+    },
+  });
+
+  const minnesotaClassification2 = await prisma.classifications.upsert({
+    where: {
+      code_systemId: {
+        code: "9.4.3.9",
+        systemId: minnesotaMathId,
+      },
+    },
+    update: {
+      code: "9.4.3.9",
+      category:
+        "Calculate probabilities and apply probability concepts to solve real-world and mathematical problems.",
+      description:
+        "Use the relationship between conditional probabilities and relative frequencies in contingency tables.",
+      systemId: minnesotaMathId,
+    },
+    create: {
+      code: "9.4.3.9",
+      category:
+        "Calculate probabilities and apply probability concepts to solve real-world and mathematical problems.",
+      description:
+        "Use the relationship between conditional probabilities and relative frequencies in contingency tables.",
+      systemId: minnesotaMathId,
+    },
+  });
+
   await prisma.licenses.upsert({
     where: { code: "CCBYSA" },
     update: {
diff --git a/server/src/index.ts b/server/src/index.ts
index a3a24edf79..b695a6c223 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -20,9 +20,8 @@ import {
   getIsAdmin,
   getUserInfo,
   updateDoc,
-  searchPublicContent,
+  searchSharedContent,
   updateContent,
-  getDoc,
   assignActivity,
   listUserAssigned,
   getAssignmentDataFromCode,
@@ -52,19 +51,32 @@ import {
   moveContent,
   getMyFolderContent,
   getAssignedScores,
-  getPublicFolderContent,
-  searchUsersWithPublicContent,
-  getPublicEditorData,
+  addClassification,
+  removeClassification,
+  getClassifications,
+  searchPossibleClassifications,
+  getSharedFolderContent,
+  searchUsersWithSharedContent,
+  getSharedEditorData,
   unassignActivity,
   updateAssignmentSettings,
   getAllLicenses,
   makeActivityPrivate,
   makeActivityPublic,
-  LicenseCode,
   makeFolderPublic,
   makeFolderPrivate,
+  shareActivityWithEmail,
+  unshareActivity,
+  shareFolderWithEmail,
+  unshareFolder,
+  LicenseCode,
+  setActivityLicense,
+  setFolderLicense,
   searchMyFolderContent,
   upgradeAnonymousUser,
+  getActivityContributorHistory,
+  getActivityRemixes,
+  getDocumentSource,
 } from "./model";
 import session from "express-session";
 import { PrismaSessionStore } from "@quixo3/prisma-session-store";
@@ -138,6 +150,14 @@ passport.use(
     async (user, token) => {
       const confirmURL = `${process.env.CONFIRM_SIGNIN_URL}?token=${token}`;
 
+      if (
+        process.env.CONSOLE_LOG_EMAIL &&
+        process.env.CONSOLE_LOG_EMAIL.toLocaleLowerCase() !== "false"
+      ) {
+        console.log(`Confirm email link: ${confirmURL}`);
+        return;
+      }
+
       let email_html: string = "";
 
       try {
@@ -175,8 +195,8 @@ passport.use(
       const sendEmail = async () => {
         try {
           const command = new SendEmailCommand(params);
-          const response = await client.send(command);
-          console.log("Email sent successfully", response);
+          await client.send(command);
+          console.log("Email sent successfully");
         } catch (error) {
           console.error("Error sending email", error);
         }
@@ -535,6 +555,84 @@ app.post(
   },
 );
 
+app.post(
+  "/api/setActivityLicense",
+  async (req: Request, res: Response, next: NextFunction) => {
+    const loggedInUserId = Number(req.user?.userId ?? 0);
+    const body = req.body;
+    const id = Number(body.id);
+
+    let licenseCode: LicenseCode;
+
+    let requestedCode: string = body.licenseCode;
+    switch (requestedCode) {
+      case "CCDUAL":
+      case "CCBYSA":
+      case "CCBYNCSA": {
+        licenseCode = requestedCode;
+        break;
+      }
+      default: {
+        return res.status(400).send("Invalid license code");
+      }
+    }
+
+    try {
+      let data = await setActivityLicense({
+        id,
+        ownerId: loggedInUserId,
+        licenseCode,
+      });
+      res.send(data);
+    } catch (e) {
+      if (e instanceof Prisma.PrismaClientKnownRequestError) {
+        res.sendStatus(403);
+      } else {
+        next(e);
+      }
+    }
+  },
+);
+
+app.post(
+  "/api/setFolderLicense",
+  async (req: Request, res: Response, next: NextFunction) => {
+    const loggedInUserId = Number(req.user?.userId ?? 0);
+    const body = req.body;
+    const id = Number(body.id);
+
+    let licenseCode: LicenseCode;
+
+    let requestedCode: string = body.licenseCode;
+    switch (requestedCode) {
+      case "CCDUAL":
+      case "CCBYSA":
+      case "CCBYNCSA": {
+        licenseCode = requestedCode;
+        break;
+      }
+      default: {
+        return res.status(400).send("Invalid license code");
+      }
+    }
+
+    try {
+      let data = await setFolderLicense({
+        id,
+        ownerId: loggedInUserId,
+        licenseCode,
+      });
+      res.send(data);
+    } catch (e) {
+      if (e instanceof Prisma.PrismaClientKnownRequestError) {
+        res.sendStatus(403);
+      } else {
+        next(e);
+      }
+    }
+  },
+);
+
 app.post(
   "/api/makeActivityPublic",
   async (req: Request, res: Response, next: NextFunction) => {
@@ -651,6 +749,142 @@ app.post(
   },
 );
 
+app.post(
+  "/api/shareActivity",
+  async (req: Request, res: Response, next: NextFunction) => {
+    const loggedInUserId = Number(req.user?.userId ?? 0);
+    const body = req.body;
+    const id = Number(body.id);
+    const email: string = body.email;
+
+    let licenseCode: LicenseCode;
+
+    let requestedCode: string = body.licenseCode;
+    switch (requestedCode) {
+      case "CCDUAL":
+      case "CCBYSA":
+      case "CCBYNCSA": {
+        licenseCode = requestedCode;
+        break;
+      }
+      default: {
+        return res.status(400).send("Invalid license code");
+      }
+    }
+
+    try {
+      let data = await shareActivityWithEmail({
+        id,
+        ownerId: loggedInUserId,
+        licenseCode,
+        email,
+      });
+      res.send(data);
+    } catch (e) {
+      console.log("error", e);
+      if ((e as any).message === "User with email not found") {
+        res.status(404).send("User with email not found");
+      } else if (e instanceof Prisma.PrismaClientKnownRequestError) {
+        res.sendStatus(403);
+      } else {
+        next(e);
+      }
+    }
+  },
+);
+
+app.post(
+  "/api/unshareActivity",
+  async (req: Request, res: Response, next: NextFunction) => {
+    const loggedInUserId = Number(req.user?.userId ?? 0);
+    const body = req.body;
+    const id = Number(body.id);
+    const userId = Number(body.userId);
+    try {
+      let data = await unshareActivity({
+        id,
+        ownerId: loggedInUserId,
+        users: [userId],
+      });
+      res.send(data);
+    } catch (e) {
+      if (e instanceof Prisma.PrismaClientKnownRequestError) {
+        res.sendStatus(403);
+      } else {
+        next(e);
+      }
+    }
+  },
+);
+
+app.post(
+  "/api/shareFolder",
+  async (req: Request, res: Response, next: NextFunction) => {
+    const loggedInUserId = Number(req.user?.userId ?? 0);
+    const body = req.body;
+    const id = Number(body.id);
+    const email: string = body.email;
+
+    let licenseCode: LicenseCode;
+
+    let requestedCode: string = body.licenseCode;
+    switch (requestedCode) {
+      case "CCDUAL":
+      case "CCBYSA":
+      case "CCBYNCSA": {
+        licenseCode = requestedCode;
+        break;
+      }
+      default: {
+        return res.status(400).send("Invalid license code");
+      }
+    }
+
+    try {
+      let data = await shareFolderWithEmail({
+        id,
+        ownerId: loggedInUserId,
+        licenseCode,
+        email,
+      });
+      res.send(data);
+    } catch (e) {
+      console.log("error", e);
+      if ((e as any).message === "User with email not found") {
+        res.status(404).send("User with email not found");
+      } else if (e instanceof Prisma.PrismaClientKnownRequestError) {
+        res.sendStatus(403);
+      } else {
+        next(e);
+      }
+    }
+  },
+);
+
+app.post(
+  "/api/unshareFolder",
+  async (req: Request, res: Response, next: NextFunction) => {
+    const loggedInUserId = Number(req.user?.userId ?? 0);
+    const body = req.body;
+    const id = Number(body.id);
+    const userId = Number(body.userId);
+    try {
+      let data = await unshareFolder({
+        id,
+        ownerId: loggedInUserId,
+        users: [userId],
+      });
+      res.send(data);
+    } catch (e) {
+      if (e instanceof Prisma.PrismaClientKnownRequestError) {
+        res.sendStatus(403);
+      } else {
+        next(e);
+      }
+    }
+  },
+);
+
 app.get(
   "/api/loadSupportingFileInfo/:activityId",
   (req: Request, res: Response) => {
@@ -672,11 +906,12 @@ app.get(
   },
 );
 
-app.get("/api/searchPublicContent", async (req: Request, res: Response) => {
+app.get("/api/searchSharedContent", async (req: Request, res: Response) => {
   const query = req.query.q as string;
+  const loggedInUserId = Number(req.user?.userId ?? 0);
   res.send({
-    users: await searchUsersWithPublicContent(query),
-    content: await searchPublicContent(query),
+    users: await searchUsersWithSharedContent(query, loggedInUserId),
+    content: await searchSharedContent(query, loggedInUserId),
   });
 });
 
@@ -899,11 +1134,12 @@ app.get(
 );
 
 app.get(
-  "/api/getPublicEditorData/:activityId",
+  "/api/getSharedEditorData/:activityId",
   async (req: Request, res: Response, next: NextFunction) => {
     const activityId = Number(req.params.activityId);
+    const loggedInUserId = Number(req.user?.userId ?? 0);
     try {
-      const editorData = await getPublicEditorData(activityId);
+      const editorData = await getSharedEditorData(activityId, loggedInUserId);
       res.send(editorData);
     } catch (e) {
       if (
@@ -918,6 +1154,27 @@ app.get(
   },
 );
 
+app.get(
+  "/api/getDocumentSource/:docId",
+  async (req: Request, res: Response, next: NextFunction) => {
+    const docId = Number(req.params.docId);
+    const loggedInUserId = Number(req.user?.userId ?? 0);
+    try {
+      const sourceData = await getDocumentSource(docId, loggedInUserId);
+      res.send(sourceData);
+    } catch (e) {
+      if (
+        e instanceof Prisma.PrismaClientKnownRequestError &&
+        e.code === "P2001"
+      ) {
+        res.sendStatus(404);
+      } else {
+        next(e);
+      }
+    }
+  },
+);
+
 app.get("/api/getAllDoenetmlVersions", async (req: Request, res: Response) => {
   const allDoenetmlVersions = await getAllDoenetmlVersions();
   res.send(allDoenetmlVersions);
@@ -950,6 +1207,50 @@ app.get(
   },
 );
 
+app.get(
+  "/api/getContributorHistory/:activityId",
+  async (req: Request, res: Response, next: NextFunction) => {
+    const loggedInUserId = Number(req.user?.userId ?? 0);
+    const activityId = Number(req.params.activityId);
+
+    try {
+      const data = await getActivityContributorHistory({
+        activityId,
+        loggedInUserId,
+      });
+      res.send(data);
+    } catch (e) {
+      if (e instanceof Prisma.PrismaClientKnownRequestError) {
+        res.sendStatus(404);
+      } else {
+        next(e);
+      }
+    }
+  },
+);
+
+app.get(
+  "/api/getRemixes/:activityId",
+  async (req: Request, res: Response, next: NextFunction) => {
+    const loggedInUserId = Number(req.user?.userId ?? 0);
+    const activityId = Number(req.params.activityId);
+
+    try {
+      const data = await getActivityRemixes({
+        activityId,
+        loggedInUserId,
+      });
+      res.send(data);
+    } catch (e) {
+      if (e instanceof Prisma.PrismaClientKnownRequestError) {
+        res.sendStatus(404);
+      } else {
+        next(e);
+      }
+    }
+  },
+);
+
 app.get(
   "/api/getAssignmentDataFromCode/:code",
   async (req: Request, res: Response, next: NextFunction) => {
@@ -1597,7 +1898,10 @@ app.get(
       const allLicenses = await getAllLicenses();
       res.send({ allDoenetmlVersions, allLicenses, ...contentData });
     } catch (e) {
-      if (e instanceof Prisma.PrismaClientKnownRequestError) {
+      if (
+        e instanceof Prisma.PrismaClientKnownRequestError &&
+        e.code === "P2001"
+      ) {
         res.sendStatus(404);
       } else {
         next(e);
@@ -1638,14 +1942,16 @@ app.get(
 );
 
 app.get(
-  "/api/getPublicFolderContent/:ownerId",
+  "/api/getSharedFolderContent/:ownerId",
   async (req: Request, res: Response, next: NextFunction) => {
     const ownerId = Number(req.params.ownerId);
+    const loggedInUserId = Number(req.user?.userId ?? 0);
     try {
       // send 0 as the logged in content to make sure get only public content
-      const contentData = await getPublicFolderContent({
+      const contentData = await getSharedFolderContent({
         ownerId,
         folderId: null,
+        loggedInUserId,
       });
       res.send(contentData);
     } catch (e) {
@@ -1659,15 +1965,17 @@ app.get(
 );
 
 app.get(
-  "/api/getPublicFolderContent/:ownerId/:folderId",
+  "/api/getSharedFolderContent/:ownerId/:folderId",
   async (req: Request, res: Response, next: NextFunction) => {
     const ownerId = Number(req.params.ownerId);
     const folderId = Number(req.params.folderId);
+    const loggedInUserId = Number(req.user?.userId ?? 0);
     try {
       // send 0 as the logged in content to make sure get only public content
-      const contentData = await getPublicFolderContent({
+      const contentData = await getSharedFolderContent({
         ownerId,
         folderId,
+        loggedInUserId,
       });
       res.send(contentData);
     } catch (e) {
@@ -1680,6 +1988,97 @@ app.get(
   },
 );
 
+app.post(
+  "/api/addClassification",
+  async (req: Request, res: Response, next: NextFunction) => {
+    const { classificationId, activityId } = req.body;
+    const loggedInUserId = Number(req.user?.userId ?? 0);
+    try {
+      await addClassification(activityId, classificationId, loggedInUserId);
+      res.send({});
+    } catch (e) {
+      if (e instanceof Prisma.PrismaClientKnownRequestError) {
+        // The .code property can be accessed in a type-safe manner
+        if (e.code === "P2002") {
+          res
+            .status(400)
+            .send("This activity already has that classification.");
+          return;
+        } else if (e.code === "P2003") {
+          res.status(400).send("That classification does not exist.");
+          return;
+        }
+      } else if (e instanceof InvalidRequestError) {
+        res.status(e.errorCode).send(e.message);
+        return;
+      }
+      next(e);
+    }
+  },
+);
+
+app.post(
+  "/api/removeClassification",
+  async (req: Request, res: Response, next: NextFunction) => {
+    try {
+      const classificationId = Number(req.body.classificationId);
+      const activityId = Number(req.body.activityId);
+      const loggedInUserId = Number(req.user?.userId ?? 0);
+
+      await removeClassification(activityId, classificationId, loggedInUserId);
+      res.send({});
+    } catch (e) {
+      if (e instanceof Prisma.PrismaClientKnownRequestError) {
+        if (e.code === "P2025") {
+          res.status(400).send("That classification does not exist.");
+          return;
+        }
+      } else if (e instanceof InvalidRequestError) {
+        res.status(e.errorCode).send(e.message);
+        return;
+      }
+      next(e);
+    }
+  },
+);
+
+app.get(
+  "/api/getClassifications",
+  async (req: Request, res: Response, next: NextFunction) => {
+    try {
+      const { activityId } = req.body;
+      const loggedInUserId = Number(req.user?.userId ?? 0);
+      const classifications = await getClassifications(
+        activityId,
+        loggedInUserId,
+      );
+      res.send(classifications);
+    } catch (e) {
+      if (e instanceof InvalidRequestError) {
+        res.status(e.errorCode).send(e.message);
+        return;
+      }
+      next(e);
+    }
+  },
+);
+app.get(
+  "/api/searchPossibleClassifications",
+  async (req: Request, res: Response, next: NextFunction) => {
+    try {
+      const query = req.query.q as string;
+      const searchResults = await searchPossibleClassifications(query);
+      res.send(searchResults);
+    } catch (e) {
+      if (e instanceof InvalidRequestError) {
+        res.status(e.errorCode).send(e.message);
+        return;
+      }
+      next(e);
+    }
+  },
+);
+
 // handle every other route with index.html, which will contain
 // a script tag to your application's JavaScript file(s).
 app.get("*", function (request, response) {
diff --git a/server/src/model.test.ts b/server/src/model.test.ts
index ef00271d45..946af73e53 100644
--- a/server/src/model.test.ts
+++ b/server/src/model.test.ts
@@ -10,7 +10,7 @@ import {
   getActivityViewerData,
   getMyFolderContent,
   updateDoc,
-  searchPublicContent,
+  searchSharedContent,
   updateContent,
   getActivity,
   assignActivity,
@@ -44,9 +44,13 @@ import {
   moveContent,
   deleteFolder,
   getAssignedScores,
-  getPublicFolderContent,
-  getPublicEditorData,
-  searchUsersWithPublicContent,
+  searchPossibleClassifications,
+  addClassification,
+  getClassifications,
+  removeClassification,
+  getSharedFolderContent,
+  getSharedEditorData,
+  searchUsersWithSharedContent,
   ContentStructure,
   updateAssignmentSettings,
   getLicense,
@@ -57,6 +61,16 @@ import {
   makeFolderPrivate,
   searchMyFolderContent,
   upgradeAnonymousUser,
+  shareActivity,
+  shareFolder,
+  unshareActivity,
+  unshareFolder,
+  shareFolderWithEmail,
+  shareActivityWithEmail,
+  getDocumentContributorHistories,
+  getDocumentRemixes,
+  getDocumentDirectRemixes,
+  getDocumentSource,
 } from "./model";
 import { DateTime } from "luxon";
 
@@ -139,10 +153,13 @@ test("New activity starts out private, then delete it", async () => {
     ownerId: userId,
     imagePath: "/activity_default.jpg",
     isPublic: false,
+    isShared: false,
+    sharedWith: [],
     assignmentStatus: "Unassigned",
     classCode: null,
     codeValidUntil: null,
     license: null,
+    classifications: [],
     documents: [
       {
         id: docId,
@@ -184,7 +201,7 @@ test("New activity starts out private, then delete it", async () => {
   expect(dataAfterDelete.content.length).toBe(0);
 });
 
-test("getMyFolderContent returns both public and private content, getPublicFolderContent returns only public", async () => {
+test("getMyFolderContent returns both public and private content, getSharedFolderContent returns only public", async () => {
   const owner = await createTestUser();
   const ownerId = owner.userId;
 
@@ -312,9 +329,10 @@ test("getMyFolderContent returns both public and private content, getPublicFolde
   // public folder content of base directory
   // also includes orphaned public content,
   // i.e., public content inside a private folder
-  let publicContent = await getPublicFolderContent({
+  let publicContent = await getSharedFolderContent({
     ownerId,
     folderId: null,
+    loggedInUserId: userId,
   });
   expect(publicContent.folder).eq(null);
   expect(publicContent.content.length).eq(4);
@@ -351,6 +369,8 @@ test("getMyFolderContent returns both public and private content, getPublicFolde
         parentFolder: {
           id: publicFolder1Id,
           isPublic: true,
+          isShared: false,
+          sharedWith: [],
           name: ownerContent.folder?.name,
         },
       }),
@@ -360,6 +380,8 @@ test("getMyFolderContent returns both public and private content, getPublicFolde
         parentFolder: {
           id: publicFolder1Id,
           isPublic: true,
+          isShared: false,
+          sharedWith: [],
           name: ownerContent.folder?.name,
         },
       }),
@@ -369,6 +391,8 @@ test("getMyFolderContent returns both public and private content, getPublicFolde
         parentFolder: {
           id: publicFolder1Id,
           isPublic: true,
+          isShared: false,
+          sharedWith: [],
           name: ownerContent.folder?.name,
         },
       }),
@@ -378,15 +402,18 @@ test("getMyFolderContent returns both public and private content, getPublicFolde
         parentFolder: {
           id: publicFolder1Id,
           isPublic: true,
+          isShared: false,
+          sharedWith: [],
           name: ownerContent.folder?.name,
         },
       }),
     ]),
   });
 
-  publicContent = await getPublicFolderContent({
+  publicContent = await getSharedFolderContent({
     ownerId,
     folderId: publicFolder1Id,
+    loggedInUserId: userId,
   });
   expect(publicContent.content.length).eq(2);
   expect(publicContent.folder?.id).eq(publicFolder1Id);
@@ -425,6 +452,8 @@ test("getMyFolderContent returns both public and private content, getPublicFolde
         parentFolder: {
           id: privateFolder1Id,
           isPublic: false,
+          isShared: false,
+          sharedWith: [],
           name: ownerContent.folder?.name,
         },
       }),
@@ -434,6 +463,8 @@ test("getMyFolderContent returns both public and private content, getPublicFolde
         parentFolder: {
           id: privateFolder1Id,
           isPublic: false,
+          isShared: false,
+          sharedWith: [],
           name: ownerContent.folder?.name,
         },
       }),
@@ -443,6 +474,8 @@ test("getMyFolderContent returns both public and private content, getPublicFolde
         parentFolder: {
           id: privateFolder1Id,
           isPublic: false,
+          isShared: false,
+          sharedWith: [],
           name: ownerContent.folder?.name,
         },
       }),
@@ -452,6 +485,8 @@ test("getMyFolderContent returns both public and private content, getPublicFolde
         parentFolder: {
           id: privateFolder1Id,
           isPublic: false,
+          isShared: false,
+          sharedWith: [],
           name: ownerContent.folder?.name,
         },
       }),
@@ -459,9 +494,10 @@ test("getMyFolderContent returns both public and private content, getPublicFolde
   });
 
   await expect(
-    getPublicFolderContent({
+    getSharedFolderContent({
       ownerId,
       folderId: privateFolder1Id,
+      loggedInUserId: userId,
     }),
   ).rejects.toThrow("No content found");
 
@@ -481,9 +517,10 @@ test("getMyFolderContent returns both public and private content, getPublicFolde
   expect(ownerContent.folder?.parentFolder?.id).eq(privateFolder1Id);
   expect(ownerContent.content.length).eq(0);
 
-  publicContent = await getPublicFolderContent({
+  publicContent = await getSharedFolderContent({
     ownerId,
     folderId: publicFolder3Id,
+    loggedInUserId: userId,
   });
   expect(publicContent.folder?.id).eq(publicFolder3Id);
   expect(publicContent.folder?.parentFolder).eq(null);
@@ -498,6 +535,459 @@ test("getMyFolderContent returns both public and private content, getPublicFolde
   ).rejects.toThrow("No content found");
 });
 
+test(
+  "getMyFolderContent returns both public and private content, getSharedFolderContent returns only shared",
+  { timeout: 30000 },
+  async () => {
+    const owner = await createTestUser();
+    const ownerId = owner.userId;
+
+    let user1 = await createTestUser();
+    const user1Id = user1.userId;
+    user1 = await updateUser({
+      userId: user1Id,
+      firstNames: "Zoe",
+      lastNames: "Zaborowski",
+    });
+    const {
+      isAdmin: _isAdmin1,
+      isAnonymous: _isAnonymous1,
+      ...userFields1
+    } = user1;
+    let user2 = await createTestUser();
+    const user2Id = user2.userId;
+    user2 = await updateUser({
+      userId: user2Id,
+      firstNames: "Arya",
+      lastNames: "Abbas",
+    });
+    const {
+      isAdmin: _isAdmin2,
+      isAnonymous: _isAnonymous2,
+      ...userFields2
+    } = user2;
+    const user3 = await createTestUser();
+    const user3Id = user3.userId;
+
+    const { activityId: sharedActivity1Id } = await createActivity(
+      ownerId,
+      null,
+    );
+    const { activityId: privateActivity1Id } = await createActivity(
+      ownerId,
+      null,
+    );
+
+    const { folderId: sharedFolder1Id } = await createFolder(ownerId, null);
+    const { folderId: privateFolder1Id } = await createFolder(ownerId, null);
+
+    const { activityId: sharedActivity2Id } = await createActivity(
+      ownerId,
+      sharedFolder1Id,
+    );
+    const { activityId: privateActivity2Id } = await createActivity(
+      ownerId,
+      sharedFolder1Id,
+    );
+    const { folderId: sharedFolder2Id } = await createFolder(
+      ownerId,
+      sharedFolder1Id,
+    );
+    const { folderId: privateFolder2Id } = await createFolder(
+      ownerId,
+      sharedFolder1Id,
+    );
+
+    const { activityId: sharedActivity3Id } = await createActivity(
+      ownerId,
+      privateFolder1Id,
+    );
+    const { activityId: privateActivity3Id } = await createActivity(
+      ownerId,
+      privateFolder1Id,
+    );
+    const { folderId: sharedFolder3Id } = await createFolder(
+      ownerId,
+      privateFolder1Id,
+    );
+    const { folderId: privateFolder3Id } = await createFolder(
+      ownerId,
+      privateFolder1Id,
+    );
+
+    // Share
+
+    // share activity 1
+    await shareActivityWithEmail({
+      id: sharedActivity1Id,
+      licenseCode: "CCDUAL",
+      ownerId,
+      email: user1.email,
+    });
+    await shareActivityWithEmail({
+      id: sharedActivity1Id,
+      licenseCode: "CCDUAL",
+      ownerId,
+      email: user2.email,
+    });
+
+    // sure folder 1 and all items in folder 1
+    await shareFolder({
+      id: sharedFolder1Id,
+      licenseCode: "CCDUAL",
+      ownerId,
+      users: [user1Id, user2Id],
+    });
+
+    // private activity 2 is in shared folder 1,
+    // so we need to undo the fact that it was shared
+    await unshareActivity({
+      id: privateActivity2Id,
+      ownerId,
+      users: [user1Id, user2Id],
+    });
+
+    // private folder 2 is in shared folder 1,
+    // so we need to undo the fact that it was shared
+    await unshareFolder({
+      id: privateFolder2Id,
+      ownerId,
+      users: [user1Id, user2Id],
+    });
+
+    // shared content inside private folder 1
+    // has to be shared explicitly
+    await shareActivity({
+      id: sharedActivity3Id,
+      licenseCode: "CCDUAL",
+      ownerId,
+      users: [user1Id, user2Id],
+    });
+    await shareFolderWithEmail({
+      id: sharedFolder3Id,
+      licenseCode: "CCDUAL",
+      ownerId,
+      email: user2.email,
+    });
+    await shareFolderWithEmail({
+      id: sharedFolder3Id,
+      licenseCode: "CCDUAL",
+      ownerId,
+      email: user1.email,
+    });
+
+    let ownerContent = await getMyFolderContent({
+      loggedInUserId: ownerId,
+      folderId: null,
+    });
+    expect(ownerContent.folder).eq(null);
+    expect(ownerContent.content.length).eq(4);
+    expect(ownerContent).toMatchObject({
+      content: expect.arrayContaining([
+        expect.objectContaining({
+          id: sharedActivity1Id,
+          isShared: true,
+          parentFolder: null,
+        }),
+        expect.objectContaining({
+          id: privateActivity1Id,
+          isShared: false,
+          parentFolder: null,
+        }),
+        expect.objectContaining({
+          id: sharedFolder1Id,
+          isShared: true,
+          parentFolder: null,
+        }),
+        expect.objectContaining({
+          id: privateFolder1Id,
+          isShared: false,
+          parentFolder: null,
+        }),
+      ]),
+    });
+
+    // shared folder content of base directory
+    // also includes orphaned shared content,
+    // i.e., shared content inside a private folder
+    let sharedContent = await getSharedFolderContent({
+      ownerId,
+      folderId: null,
+      loggedInUserId: user1Id,
+    });
+    expect(sharedContent.folder).eq(null);
+    expect(sharedContent.content.length).eq(4);
+
+    expect(sharedContent).toMatchObject({
+      content: expect.arrayContaining([
+        expect.objectContaining({
+          id: sharedActivity1Id,
+        }),
+        expect.objectContaining({
+          id: sharedFolder1Id,
+        }),
+        expect.objectContaining({
+          id: sharedActivity3Id,
+        }),
+        expect.objectContaining({
+          id: sharedFolder3Id,
+        }),
+      ]),
+    });
+
+    // also shared with user 2
+    sharedContent = await getSharedFolderContent({
+      ownerId,
+      folderId: null,
+      loggedInUserId: user2Id,
+    });
+    expect(sharedContent.folder).eq(null);
+    expect(sharedContent.content.length).eq(4);
+
+    expect(sharedContent).toMatchObject({
+      content: expect.arrayContaining([
+        expect.objectContaining({
+          id: sharedActivity1Id,
+        }),
+        expect.objectContaining({
+          id: sharedFolder1Id,
+        }),
+        expect.objectContaining({
+          id: sharedActivity3Id,
+        }),
+        expect.objectContaining({
+          id: sharedFolder3Id,
+        }),
+      ]),
+    });
+
+    // not shared with user 3
+    sharedContent = await getSharedFolderContent({
+      ownerId,
+      folderId: null,
+      loggedInUserId: user3Id,
+    });
+    expect(sharedContent.folder).eq(null);
+    expect(sharedContent.content.length).eq(0);
+
+    ownerContent = await getMyFolderContent({
+      loggedInUserId: ownerId,
+      folderId: sharedFolder1Id,
+    });
+    expect(ownerContent.folder?.id).eq(sharedFolder1Id);
+    expect(ownerContent.folder?.parentFolder).eq(null);
+    expect(ownerContent.content.length).eq(4);
+    expect(ownerContent).toMatchObject({
+      content: expect.arrayContaining([
+        expect.objectContaining({
+          id: sharedActivity2Id,
+          isShared: true,
+          sharedWith: [userFields2, userFields1],
+          parentFolder: {
+            id: sharedFolder1Id,
+            isPublic: false,
+            isShared: true,
+            sharedWith: [userFields2, userFields1],
+            name: ownerContent.folder?.name,
+          },
+        }),
+        expect.objectContaining({
+          id: privateActivity2Id,
+          isShared: false,
+          sharedWith: [],
+          parentFolder: {
+            id: sharedFolder1Id,
+            isPublic: false,
+            isShared: true,
+            sharedWith: [userFields2, userFields1],
+            name: ownerContent.folder?.name,
+          },
+        }),
+        expect.objectContaining({
+          id: sharedFolder2Id,
+          isShared: true,
+          sharedWith: [userFields2, userFields1],
+          parentFolder: {
+            id: sharedFolder1Id,
+            isPublic: false,
+            isShared: true,
+            sharedWith: [userFields2, userFields1],
+            name: ownerContent.folder?.name,
+          },
+        }),
+        expect.objectContaining({
+          id: privateFolder2Id,
+          isShared: false,
+          sharedWith: [],
+          parentFolder: {
+            id: sharedFolder1Id,
+            isPublic: false,
+            isShared: true,
+            sharedWith: [userFields2, userFields1],
+            name: ownerContent.folder?.name,
+          },
+        }),
+      ]),
+    });
+
+    sharedContent = await getSharedFolderContent({
+      ownerId,
+      folderId: sharedFolder1Id,
+      loggedInUserId: user1Id,
+    });
+    expect(sharedContent.content.length).eq(2);
+    expect(sharedContent.folder?.id).eq(sharedFolder1Id);
+    expect(sharedContent.folder?.parentFolder).eq(null);
+    expect(sharedContent).toMatchObject({
+      content: expect.arrayContaining([
+        expect.objectContaining({
+          id: sharedActivity2Id,
+        }),
+        expect.objectContaining({
+          id: sharedFolder2Id,
+        }),
+      ]),
+    });
+
+    sharedContent = await getSharedFolderContent({
+      ownerId,
+      folderId: sharedFolder1Id,
+      loggedInUserId: user2Id,
+    });
+    expect(sharedContent.content.length).eq(2);
+    expect(sharedContent.folder?.id).eq(sharedFolder1Id);
+    expect(sharedContent.folder?.parentFolder).eq(null);
+    expect(sharedContent).toMatchObject({
+      content: expect.arrayContaining([
+        expect.objectContaining({
+          id: sharedActivity2Id,
+        }),
+        expect.objectContaining({
+          id: sharedFolder2Id,
+        }),
+      ]),
+    });
+
+    // not shared with user 3
+    await expect(
+      getSharedFolderContent({
+        ownerId,
+        folderId: sharedFolder1Id,
+        loggedInUserId: user3Id,
+      }),
+    ).rejects.toThrow("No content found");
+
+    // If other user tries to access folder via my folder, throws error
+    await expect(
+      getMyFolderContent({
+        loggedInUserId: user1Id,
+        folderId: sharedFolder1Id,
+      }),
+    ).rejects.toThrow("No content found");
+
+    ownerContent = await getMyFolderContent({
+      loggedInUserId: ownerId,
+      folderId: privateFolder1Id,
+    });
+    expect(ownerContent.folder?.id).eq(privateFolder1Id);
+    expect(ownerContent.folder?.parentFolder).eq(null);
+    expect(ownerContent.content.length).eq(4);
+    expect(ownerContent).toMatchObject({
+      content: expect.arrayContaining([
+        expect.objectContaining({
+          id: sharedActivity3Id,
+          isShared: true,
+          sharedWith: [userFields2, userFields1],
+          parentFolder: {
+            id: privateFolder1Id,
+            isPublic: false,
+            isShared: false,
+            sharedWith: [],
+            name: ownerContent.folder?.name,
+          },
+        }),
+        expect.objectContaining({
+          id: privateActivity3Id,
+          isShared: false,
+          sharedWith: [],
+          parentFolder: {
+            id: privateFolder1Id,
+            isPublic: false,
+            isShared: false,
+            sharedWith: [],
+            name: ownerContent.folder?.name,
+          },
+        }),
+        expect.objectContaining({
+          id: sharedFolder3Id,
+          isShared: true,
+          sharedWith: [userFields2, userFields1],
+          parentFolder: {
+            id: privateFolder1Id,
+            isPublic: false,
+            isShared: false,
+            sharedWith: [],
+            name: ownerContent.folder?.name,
+          },
+        }),
+        expect.objectContaining({
+          id: privateFolder3Id,
+          isShared: false,
+          sharedWith: [],
+          parentFolder: {
+            id: privateFolder1Id,
+            isPublic: false,
+            isShared: false,
+            sharedWith: [],
+            name: ownerContent.folder?.name,
+          },
+        }),
+      ]),
+    });
+
+    await expect(
+      getSharedFolderContent({
+        ownerId,
+        folderId: privateFolder1Id,
+        loggedInUserId: user1Id,
+      }),
+    ).rejects.toThrow("No content found");
+
+    // If other user tries to access folder, throws error
+    await expect(
+      getMyFolderContent({
+        loggedInUserId: user1Id,
+        folderId: privateFolder1Id,
+      }),
+    ).rejects.toThrow("No content found");
+
+    ownerContent = await getMyFolderContent({
+      loggedInUserId: ownerId,
+      folderId: sharedFolder3Id,
+    });
+    expect(ownerContent.folder?.id).eq(sharedFolder3Id);
+    expect(ownerContent.folder?.parentFolder?.id).eq(privateFolder1Id);
+    expect(ownerContent.content.length).eq(0);
+
+    sharedContent = await getSharedFolderContent({
+      ownerId,
+      folderId: sharedFolder3Id,
+      loggedInUserId: user1Id,
+    });
+    expect(sharedContent.folder?.id).eq(sharedFolder3Id);
+    expect(sharedContent.folder?.parentFolder).eq(null);
+    expect(sharedContent.content.length).eq(0);
+
+    // If other user tries to access folder, throws error
+    await expect(
+      getMyFolderContent({
+        loggedInUserId: user1Id,
+        folderId: sharedFolder3Id,
+      }),
+    ).rejects.toThrow("No content found");
+  },
+);
+
 test("content in public folder is created as public", async () => {
   const owner = await createTestUser();
   const ownerId = owner.userId;
@@ -529,6 +1019,43 @@ test("content in public folder is created as public", async () => {
   expect(content[1].license?.code).eq("CCBYSA");
 });
 
+test("content in shared folder is created shared", async () => {
+  const owner = await createTestUser();
+  const ownerId = owner.userId;
+  const user = await createTestUser();
+  const userId = user.userId;
+  const { isAdmin, isAnonymous, ...userFields } = user;
+
+  const { folderId: publicFolderId } = await createFolder(ownerId, null);
+
+  await shareFolder({
+    id: publicFolderId,
+    licenseCode: "CCBYSA",
+    ownerId,
+    users: [userId],
+  });
+
+  // create a folder and activity in public folder
+  const { activityId } = await createActivity(ownerId, publicFolderId);
+  const { folderId } = await createFolder(ownerId, publicFolderId);
+
+  const { content } = await getMyFolderContent({
+    folderId: publicFolderId,
+    loggedInUserId: ownerId,
+  });
+  expect(content.length).eq(2);
+
+  expect(content[0].id).eq(activityId);
+  expect(content[0].isShared).eq(true);
+  expect(content[0].sharedWith).eqls([userFields]);
+  expect(content[0].license?.code).eq("CCBYSA");
+
+  expect(content[1].id).eq(folderId);
+  expect(content[1].isShared).eq(true);
+  expect(content[1].sharedWith).eqls([userFields]);
+  expect(content[1].license?.code).eq("CCBYSA");
+});
+
 test("making folder public/private also makes its content public/private", async () => {
   const owner = await createTestUser();
   const ownerId = owner.userId;
@@ -649,6 +1176,278 @@ test("making folder public/private also makes its content public/private", async
   expect(content[0].license?.code).eq("CCBYSA");
 });
 
+test(
+  "making sharing/unsharing a folder also shares/unshares its content",
+  { timeout: 30000 },
+  async () => {
+    const owner = await createTestUser();
+    const ownerId = owner.userId;
+    let user1 = await createTestUser();
+    const user1Id = user1.userId;
+    user1 = await updateUser({
+      userId: user1Id,
+      firstNames: "Zoe",
+      lastNames: "Zaborowski",
+    });
+    const {
+      isAdmin: _isAdmin1,
+      isAnonymous: _isAnonymous1,
+      ...userFields1
+    } = user1;
+    let user2 = await createTestUser();
+    const user2Id = user2.userId;
+    user2 = await updateUser({
+      userId: user2Id,
+      firstNames: "Arya",
+      lastNames: "Abbas",
+    });
+    const {
+      isAdmin: _isAdmin2,
+      isAnonymous: _isAnonymous2,
+      ...userFields2
+    } = user2;
+    let user3 = await createTestUser();
+    const user3Id = user3.userId;
+    user3 = await updateUser({
+      userId: user3Id,
+      firstNames: "Nyla",
+      lastNames: "Nyquist",
+    });
+    const {
+      isAdmin: _isAdmin3,
+      isAnonymous: _isAnonymous3,
+      ...userFields3
+    } = user3;
+
+    const sharedUserFields = [userFields2, userFields1];
+    const sharedUserFields23 = [userFields2, userFields3];
+
+    const { folderId: sharedFolderId } = await createFolder(ownerId, null);
+
+    // create content in folder that will become shared
+    const { activityId: activity1Id } = await createActivity(
+      ownerId,
+      sharedFolderId,
+    );
+    const { folderId: folder1Id } = await createFolder(ownerId, sharedFolderId);
+    const { folderId: folder2Id } = await createFolder(ownerId, folder1Id);
+    const { activityId: activity2Id } = await createActivity(
+      ownerId,
+      folder2Id,
+    );
+
+    let results = await getMyFolderContent({
+      folderId: sharedFolderId,
+      loggedInUserId: ownerId,
+    });
+    let content = results.content;
+
+    expect(content[0].id).eq(activity1Id);
+    expect(content[0].isShared).eq(false);
+    expect(content[0].sharedWith).eqls([]);
+    expect(content[0].license?.code).eq("CCDUAL");
+    expect(content[1].id).eq(folder1Id);
+    expect(content[1].isShared).eq(false);
+    expect(content[1].sharedWith).eqls([]);
+    expect(content[1].license?.code).eq("CCDUAL");
+
+    results = await getMyFolderContent({
+      folderId: folder1Id,
+      loggedInUserId: ownerId,
+    });
+    content = results.content;
+    expect(content[0].id).eq(folder2Id);
+    expect(content[0].isShared).eq(false);
+    expect(content[0].sharedWith).eqls([]);
+    expect(content[0].license?.code).eq("CCDUAL");
+
+    results = await getMyFolderContent({
+      folderId: folder2Id,
+      loggedInUserId: ownerId,
+    });
+    content = results.content;
+    expect(content[0].id).eq(activity2Id);
+    expect(content[0].isShared).eq(false);
+    expect(content[0].sharedWith).eqls([]);
+    expect(content[0].license?.code).eq("CCDUAL");
+
+    await shareFolderWithEmail({
+      id: sharedFolderId,
+      licenseCode: "CCBYSA",
+      ownerId,
+      email: user2.email,
+    });
+    await shareFolderWithEmail({
+      id: sharedFolderId,
+      licenseCode: "CCBYSA",
+      ownerId,
+      email: user1.email,
+    });
+
+    results = await getMyFolderContent({
+      folderId: sharedFolderId,
+      loggedInUserId: ownerId,
+    });
+    content = results.content;
+
+    expect(content[0].id).eq(activity1Id);
+    expect(content[0].isShared).eq(true);
+    expect(content[0].sharedWith).eqls(sharedUserFields);
+    expect(content[0].license?.code).eq("CCBYSA");
+    expect(content[1].id).eq(folder1Id);
+    expect(content[1].isShared).eq(true);
+    expect(content[1].sharedWith).eqls(sharedUserFields);
+    expect(content[1].license?.code).eq("CCBYSA");
+
+    results = await getMyFolderContent({
+      folderId: folder1Id,
+      loggedInUserId: ownerId,
+    });
+    content = results.content;
+    expect(content[0].id).eq(folder2Id);
+    expect(content[0].isShared).eq(true);
+    expect(content[0].sharedWith).eqls(sharedUserFields);
+    expect(content[0].license?.code).eq("CCBYSA");
+
+    results = await getMyFolderContent({
+      folderId: folder2Id,
+      loggedInUserId: ownerId,
+    });
+    content = results.content;
+    expect(content[0].id).eq(activity2Id);
+    expect(content[0].isShared).eq(true);
+    expect(content[0].sharedWith).eqls(sharedUserFields);
+    expect(content[0].license?.code).eq("CCBYSA");
+
+    // unshare with user 1
+    await unshareFolder({
+      id: sharedFolderId,
+      ownerId,
+      users: [user1Id],
+    });
+
+    results = await getMyFolderContent({
+      folderId: sharedFolderId,
+      loggedInUserId: ownerId,
+    });
+    content = results.content;
+
+    expect(content[0].id).eq(activity1Id);
+    expect(content[0].isShared).eq(true);
+    expect(content[0].sharedWith).eqls([userFields2]);
+    expect(content[0].license?.code).eq("CCBYSA");
+    expect(content[1].id).eq(folder1Id);
+    expect(content[1].isShared).eq(true);
+    expect(content[1].sharedWith).eqls([userFields2]);
+    expect(content[1].license?.code).eq("CCBYSA");
+
+    results = await getMyFolderContent({
+      folderId: folder1Id,
+      loggedInUserId: ownerId,
+    });
+    content = results.content;
+    expect(content[0].id).eq(folder2Id);
+    expect(content[0].isShared).eq(true);
+    expect(content[0].sharedWith).eqls([userFields2]);
+    expect(content[0].license?.code).eq("CCBYSA");
+
+    results = await getMyFolderContent({
+      folderId: folder2Id,
+      loggedInUserId: ownerId,
+    });
+    content = results.content;
+    expect(content[0].id).eq(activity2Id);
+    expect(content[0].isShared).eq(true);
+    expect(content[0].sharedWith).eqls([userFields2]);
+    expect(content[0].license?.code).eq("CCBYSA");
+
+    // share middle folder with user3
+    await shareFolder({
+      id: folder2Id,
+      ownerId,
+      licenseCode: "CCBYNCSA",
+      users: [user3Id],
+    });
+
+    results = await getMyFolderContent({
+      folderId: sharedFolderId,
+      loggedInUserId: ownerId,
+    });
+    content = results.content;
+
+    expect(content[0].id).eq(activity1Id);
+    expect(content[0].isShared).eq(true);
+    expect(content[0].sharedWith).eqls([userFields2]);
+    expect(content[0].license?.code).eq("CCBYSA");
+    expect(content[1].id).eq(folder1Id);
+    expect(content[1].isShared).eq(true);
+    expect(content[1].sharedWith).eqls([userFields2]);
+    expect(content[1].license?.code).eq("CCBYSA");
+
+    results = await getMyFolderContent({
+      folderId: folder1Id,
+      loggedInUserId: ownerId,
+    });
+    content = results.content;
+    expect(content[0].id).eq(folder2Id);
+    expect(content[0].isShared).eq(true);
+    expect(content[0].sharedWith).eqls(sharedUserFields23);
+    expect(content[0].license?.code).eq("CCBYNCSA");
+
+    results = await getMyFolderContent({
+      folderId: folder2Id,
+      loggedInUserId: ownerId,
+    });
+    content = results.content;
+    expect(content[0].id).eq(activity2Id);
+    expect(content[0].isShared).eq(true);
+    expect(content[0].sharedWith).eqls(sharedUserFields23);
+    expect(content[0].license?.code).eq("CCBYNCSA");
+
+    // unshare with user 2
+    await unshareFolder({
+      id: sharedFolderId,
+      ownerId,
+      users: [user2Id],
+    });
+
+    results = await getMyFolderContent({
+      folderId: sharedFolderId,
+      loggedInUserId: ownerId,
+    });
+    content = results.content;
+
+    expect(content[0].id).eq(activity1Id);
+    expect(content[0].isShared).eq(false);
+    expect(content[0].sharedWith).eqls([]);
+    expect(content[0].license?.code).eq("CCBYSA");
+    expect(content[1].id).eq(folder1Id);
+    expect(content[1].isShared).eq(false);
+    expect(content[0].sharedWith).eqls([]);
+    expect(content[1].license?.code).eq("CCBYSA");
+
+    results = await getMyFolderContent({
+      folderId: folder1Id,
+      loggedInUserId: ownerId,
+    });
+    content = results.content;
+    expect(content[0].id).eq(folder2Id);
+    expect(content[0].isShared).eq(true);
+    expect(content[0].sharedWith).eqls([userFields3]);
+    expect(content[0].license?.code).eq("CCBYNCSA");
+
+    results = await getMyFolderContent({
+      folderId: folder2Id,
+      loggedInUserId: ownerId,
+    });
+    content = results.content;
+    expect(content[0].id).eq(activity2Id);
+    expect(content[0].isShared).eq(true);
+    expect(content[0].sharedWith).eqls([userFields3]);
+    expect(content[0].license?.code).eq("CCBYNCSA");
+  },
+);
+
 test("moving content into public folder makes it public", async () => {
   const owner = await createTestUser();
   const ownerId = owner.userId;
@@ -792,55 +1591,218 @@ test("moving content into public folder makes it public", async () => {
   expect(content[0].license?.code).eq("CCBYSA");
 });
 
-test("Test updating various activity properties", async () => {
+test("moving content into shared folder shares it", async () => {
+  const owner = await createTestUser();
+  const ownerId = owner.userId;
   const user = await createTestUser();
   const userId = user.userId;
-  const { activityId } = await createActivity(userId, null);
-  const activityName = "Test Name";
-  await updateContent({ id: activityId, name: activityName, ownerId: userId });
-  const { activity: activityContent } = await getActivityEditorData(
-    activityId,
-    userId,
-  );
-  const docId = activityContent.documents[0].id;
-  expect(activityContent.name).toBe(activityName);
-  const source = "Here comes some content, I made you some content";
-  await updateDoc({ id: docId, source, ownerId: userId });
-  const { activity: activityContent2 } = await getActivityEditorData(
-    activityId,
-    userId,
-  );
-  expect(activityContent2.documents[0].source).toBe(source);
+  const { isAdmin: _isAdmin, isAnonymous: _isAnonymous, ...userFields } = user;
 
-  const activityViewerContent = await getActivityViewerData(activityId, userId);
-  expect(activityViewerContent.activity.name).toBe(activityName);
-  expect(activityViewerContent.doc.source).toBe(source);
-});
+  const { folderId: sharedFolderId } = await createFolder(ownerId, null);
+  await shareFolder({
+    id: sharedFolderId,
+    licenseCode: "CCBYSA",
+    ownerId,
+    users: [userId],
+  });
 
-test("deleteActivity marks a activity and document as deleted and prevents its retrieval", async () => {
-  const user = await createTestUser();
-  const userId = user.userId;
-  const { activityId, docId } = await createActivity(userId, null);
+  // create to move into that folder
+  const { activityId: activity1Id } = await createActivity(ownerId, null);
+  const { folderId: folder1Id } = await createFolder(ownerId, null);
+  const { folderId: folder2Id } = await createFolder(ownerId, folder1Id);
+  const { activityId: activity2Id } = await createActivity(ownerId, folder2Id);
 
-  // activity can be retrieved
-  await getActivity(activityId);
-  await getActivityViewerData(activityId, userId);
-  await getActivityEditorData(activityId, userId);
-  await getDoc(docId);
+  let results = await getMyFolderContent({
+    folderId: null,
+    loggedInUserId: ownerId,
+  });
+  let content = results.content;
 
-  const deleteResult = await deleteActivity(activityId, userId);
-  expect(deleteResult.isDeleted).toBe(true);
+  expect(content[1].id).eq(activity1Id);
+  expect(content[1].isShared).eq(false);
+  expect(content[1].sharedWith).eqls([]);
+  expect(content[1].license?.code).eq("CCDUAL");
+  expect(content[2].id).eq(folder1Id);
+  expect(content[2].isShared).eq(false);
+  expect(content[2].sharedWith).eqls([]);
+  expect(content[2].license?.code).eq("CCDUAL");
 
-  // cannot retrieve activity
-  await expect(getActivity(activityId)).rejects.toThrow("No content found");
-  await expect(getActivityViewerData(activityId, userId)).rejects.toThrow(
-    "No content found",
-  );
-  await expect(getActivityEditorData(activityId, userId)).rejects.toThrow(
-    "No content found",
-  );
-  await expect(getDoc(docId)).rejects.toThrow("No documents found");
-});
+  results = await getMyFolderContent({
+    folderId: folder1Id,
+    loggedInUserId: ownerId,
+  });
+  content = results.content;
+  expect(content[0].id).eq(folder2Id);
+  expect(content[0].isShared).eq(false);
+  expect(content[0].sharedWith).eqls([]);
+  expect(content[0].license?.code).eq("CCDUAL");
+
+  results = await getMyFolderContent({
+    folderId: folder2Id,
+    loggedInUserId: ownerId,
+  });
+  content = results.content;
+  expect(content[0].id).eq(activity2Id);
+  expect(content[0].isShared).eq(false);
+  expect(content[0].sharedWith).eqls([]);
+  expect(content[0].license?.code).eq("CCDUAL");
+
+  // move content into shared folder
+  await moveContent({
+    id: activity1Id,
+    desiredParentFolderId: sharedFolderId,
+    ownerId,
+    desiredPosition: 0,
+  });
+  await moveContent({
+    id: folder1Id,
+    desiredParentFolderId: sharedFolderId,
+    ownerId,
+    desiredPosition: 1,
+  });
+
+  results = await getMyFolderContent({
+    folderId: sharedFolderId,
+    loggedInUserId: ownerId,
+  });
+  content = results.content;
+
+  expect(content[0].id).eq(activity1Id);
+  expect(content[0].isShared).eq(true);
+  expect(content[0].sharedWith).eqls([userFields]);
+  expect(content[0].license?.code).eq("CCBYSA");
+  expect(content[1].id).eq(folder1Id);
+  expect(content[1].isShared).eq(true);
+  expect(content[1].sharedWith).eqls([userFields]);
+  expect(content[1].license?.code).eq("CCBYSA");
+
+  results = await getMyFolderContent({
+    folderId: folder1Id,
+    loggedInUserId: ownerId,
+  });
+  content = results.content;
+  expect(content[0].id).eq(folder2Id);
+  expect(content[0].isShared).eq(true);
+  expect(content[0].sharedWith).eqls([userFields]);
+  expect(content[0].license?.code).eq("CCBYSA");
+
+  results = await getMyFolderContent({
+    folderId: folder2Id,
+    loggedInUserId: ownerId,
+  });
+  content = results.content;
+  expect(content[0].id).eq(activity2Id);
+  expect(content[0].isShared).eq(true);
+  expect(content[0].sharedWith).eqls([userFields]);
+  expect(content[0].license?.code).eq("CCBYSA");
+
+  // Create a private folder and move content into that folder.
+  // The content stays shared.
+
+  const { folderId: privateFolderId } = await createFolder(ownerId, null);
+
+  await moveContent({
+    id: activity1Id,
+    desiredParentFolderId: privateFolderId,
+    ownerId,
+    desiredPosition: 0,
+  });
+  await moveContent({
+    id: folder1Id,
+    desiredParentFolderId: privateFolderId,
+    ownerId,
+    desiredPosition: 1,
+  });
+
+  results = await getMyFolderContent({
+    folderId: privateFolderId,
+    loggedInUserId: ownerId,
+  });
+  content = results.content;
+
+  expect(content[0].id).eq(activity1Id);
+  expect(content[0].isShared).eq(true);
+  expect(content[0].sharedWith).eqls([userFields]);
+  expect(content[0].license?.code).eq("CCBYSA");
+  expect(content[1].id).eq(folder1Id);
+  expect(content[1].isShared).eq(true);
+  expect(content[1].sharedWith).eqls([userFields]);
+  expect(content[1].license?.code).eq("CCBYSA");
+
+  results = await getMyFolderContent({
+    folderId: folder1Id,
+    loggedInUserId: ownerId,
+  });
+  content = results.content;
+  expect(content[0].id).eq(folder2Id);
+  expect(content[0].isShared).eq(true);
+  expect(content[0].sharedWith).eqls([userFields]);
+  expect(content[0].license?.code).eq("CCBYSA");
+
+  results = await getMyFolderContent({
+    folderId: folder2Id,
+    loggedInUserId: ownerId,
+  });
+  content = results.content;
+  expect(content[0].id).eq(activity2Id);
+  expect(content[0].isShared).eq(true);
+  expect(content[0].sharedWith).eqls([userFields]);
+  expect(content[0].license?.code).eq("CCBYSA");
+});
+
+test("Test updating various activity properties", async () => {
+  const user = await createTestUser();
+  const userId = user.userId;
+  const { activityId } = await createActivity(userId, null);
+  const activityName = "Test Name";
+  await updateContent({ id: activityId, name: activityName, ownerId: userId });
+  const { activity: activityContent } = await getActivityEditorData(
+    activityId,
+    userId,
+  );
+  const docId = activityContent.documents[0].id;
+  expect(activityContent.name).toBe(activityName);
+  const source = "Here comes some content, I made you some content";
+  await updateDoc({ id: docId, source, ownerId: userId });
+  const { activity: activityContent2 } = await getActivityEditorData(
+    activityId,
+    userId,
+  );
+  expect(activityContent2.documents[0].source).toBe(source);
+
+  const activityViewerContent = await getActivityViewerData(activityId, userId);
+  expect(activityViewerContent.activity.name).toBe(activityName);
+  expect(activityViewerContent.activity.documents[0].source).toBe(source);
+});
+
+test("deleteActivity marks a activity and document as deleted and prevents its retrieval", async () => {
+  const user = await createTestUser();
+  const userId = user.userId;
+  const { activityId, docId } = await createActivity(userId, null);
+
+  // activity can be retrieved
+  await getActivity(activityId);
+  await getActivityViewerData(activityId, userId);
+  await getActivityEditorData(activityId, userId);
+  await getDoc(docId);
+  await getDocumentSource(docId, userId);
+
+  const deleteResult = await deleteActivity(activityId, userId);
+  expect(deleteResult.isDeleted).toBe(true);
+
+  // cannot retrieve activity
+  await expect(getActivity(activityId)).rejects.toThrow("No content found");
+  await expect(getActivityViewerData(activityId, userId)).rejects.toThrow(
+    "No content found",
+  );
+  await expect(getActivityEditorData(activityId, userId)).rejects.toThrow(
+    "No content found",
+  );
+  await expect(getDoc(docId)).rejects.toThrow("No documents found");
+  await expect(getDocumentSource(docId, userId)).rejects.toThrow(
+    "No documents found",
+  );
+});
 
 test("only owner can delete an activity", async () => {
   const owner = await createTestUser();
@@ -857,181 +1819,185 @@ test("only owner can delete an activity", async () => {
   expect(deleteResult.isDeleted).toBe(true);
 });
 
-test("deleteFolder marks a folder and all its sub content as deleted and prevents its retrieval", async () => {
-  const user = await createTestUser();
-  const userId = user.userId;
+test(
+  "deleteFolder marks a folder and all its sub content as deleted and prevents its retrieval",
+  { timeout: 30000 },
+  async () => {
+    const user = await createTestUser();
+    const userId = user.userId;
 
-  const { folderId: folder1Id } = await createFolder(userId, null);
-
-  const { activityId: activity1Id, docId: doc1Id } = await createActivity(
-    userId,
-    folder1Id,
-  );
-  const { folderId: folder2Id } = await createFolder(userId, folder1Id);
-  const { activityId: activity2Id, docId: doc2Id } = await createActivity(
-    userId,
-    folder2Id,
-  );
-  const { folderId: folder3Id } = await createFolder(userId, folder2Id);
-  const { activityId: activity3Id, docId: doc3Id } = await createActivity(
-    userId,
-    folder3Id,
-  );
+    const { folderId: folder1Id } = await createFolder(userId, null);
 
-  const { folderId: folder4Id } = await createFolder(userId, null);
-  const { activityId: activity4Id, docId: doc4Id } = await createActivity(
-    userId,
-    folder4Id,
-  );
-  const { folderId: folder5Id } = await createFolder(userId, folder4Id);
-  const { activityId: activity5Id, docId: doc5Id } = await createActivity(
-    userId,
-    folder5Id,
-  );
-  const { folderId: folder6Id } = await createFolder(userId, folder5Id);
-  const { activityId: activity6Id, docId: doc6Id } = await createActivity(
-    userId,
-    folder6Id,
-  );
+    const { activityId: activity1Id, docId: doc1Id } = await createActivity(
+      userId,
+      folder1Id,
+    );
+    const { folderId: folder2Id } = await createFolder(userId, folder1Id);
+    const { activityId: activity2Id, docId: doc2Id } = await createActivity(
+      userId,
+      folder2Id,
+    );
+    const { folderId: folder3Id } = await createFolder(userId, folder2Id);
+    const { activityId: activity3Id, docId: doc3Id } = await createActivity(
+      userId,
+      folder3Id,
+    );
 
-  // items can be retrieved
-  let baseContent = await getMyFolderContent({
-    loggedInUserId: userId,
-    folderId: null,
-  });
-  expect(baseContent.content.length).eq(2);
-  let folder1Content = await getMyFolderContent({
-    loggedInUserId: userId,
-    folderId: folder1Id,
-  });
-  expect(folder1Content.content.length).eq(2);
-  let folder2Content = await getMyFolderContent({
-    loggedInUserId: userId,
-    folderId: folder2Id,
-  });
-  expect(folder2Content.content.length).eq(2);
-  let folder3Content = await getMyFolderContent({
-    loggedInUserId: userId,
-    folderId: folder3Id,
-  });
-  expect(folder3Content.content.length).eq(1);
-  let folder4Content = await getMyFolderContent({
-    loggedInUserId: userId,
-    folderId: folder4Id,
-  });
-  expect(folder4Content.content.length).eq(2);
-  let folder5Content = await getMyFolderContent({
-    loggedInUserId: userId,
-    folderId: folder5Id,
-  });
-  expect(folder5Content.content.length).eq(2);
-  let folder6Content = await getMyFolderContent({
-    loggedInUserId: userId,
-    folderId: folder6Id,
-  });
-  expect(folder6Content.content.length).eq(1);
-
-  await getActivity(activity1Id);
-  await getActivity(activity2Id);
-  await getActivity(activity3Id);
-  await getActivity(activity4Id);
-  await getActivity(activity5Id);
-  await getActivity(activity6Id);
-  await getDoc(doc1Id);
-  await getDoc(doc2Id);
-  await getDoc(doc3Id);
-  await getDoc(doc4Id);
-  await getDoc(doc5Id);
-  await getDoc(doc6Id);
-
-  // delete the entire folder 1 and all its content
-  await deleteFolder(folder1Id, userId);
+    const { folderId: folder4Id } = await createFolder(userId, null);
+    const { activityId: activity4Id, docId: doc4Id } = await createActivity(
+      userId,
+      folder4Id,
+    );
+    const { folderId: folder5Id } = await createFolder(userId, folder4Id);
+    const { activityId: activity5Id, docId: doc5Id } = await createActivity(
+      userId,
+      folder5Id,
+    );
+    const { folderId: folder6Id } = await createFolder(userId, folder5Id);
+    const { activityId: activity6Id, docId: doc6Id } = await createActivity(
+      userId,
+      folder6Id,
+    );
 
-  baseContent = await getMyFolderContent({
-    loggedInUserId: userId,
-    folderId: null,
-  });
-  expect(baseContent.content.length).eq(1);
-  await expect(
-    getMyFolderContent({
+    // items can be retrieved
+    let baseContent = await getMyFolderContent({
+      loggedInUserId: userId,
+      folderId: null,
+    });
+    expect(baseContent.content.length).eq(2);
+    let folder1Content = await getMyFolderContent({
       loggedInUserId: userId,
       folderId: folder1Id,
-    }),
-  ).rejects.toThrow("No content found");
-  await expect(
-    getMyFolderContent({
+    });
+    expect(folder1Content.content.length).eq(2);
+    let folder2Content = await getMyFolderContent({
       loggedInUserId: userId,
       folderId: folder2Id,
-    }),
-  ).rejects.toThrow("No content found");
-  await expect(
-    getMyFolderContent({
+    });
+    expect(folder2Content.content.length).eq(2);
+    let folder3Content = await getMyFolderContent({
       loggedInUserId: userId,
       folderId: folder3Id,
-    }),
-  ).rejects.toThrow("No content found");
-  folder4Content = await getMyFolderContent({
-    loggedInUserId: userId,
-    folderId: folder4Id,
-  });
-  expect(folder4Content.content.length).eq(2);
-  folder5Content = await getMyFolderContent({
-    loggedInUserId: userId,
-    folderId: folder5Id,
-  });
-  expect(folder5Content.content.length).eq(2);
-  folder6Content = await getMyFolderContent({
-    loggedInUserId: userId,
-    folderId: folder6Id,
-  });
-  expect(folder6Content.content.length).eq(1);
-
-  await expect(getActivity(activity1Id)).rejects.toThrow("No content found");
-  await expect(getActivity(activity2Id)).rejects.toThrow("No content found");
-  await expect(getActivity(activity3Id)).rejects.toThrow("No content found");
-  await getActivity(activity4Id);
-  await getActivity(activity5Id);
-  await getActivity(activity6Id);
-  await expect(getDoc(doc1Id)).rejects.toThrow("No documents found");
-  await expect(getDoc(doc2Id)).rejects.toThrow("No documents found");
-  await expect(getDoc(doc3Id)).rejects.toThrow("No documents found");
-  await getDoc(doc4Id);
-  await getDoc(doc5Id);
-  await getDoc(doc6Id);
-
-  // delete folder 5 and its content
-  await deleteFolder(folder5Id, userId);
-
-  baseContent = await getMyFolderContent({
-    loggedInUserId: userId,
-    folderId: null,
-  });
-  expect(baseContent.content.length).eq(1);
-  folder4Content = await getMyFolderContent({
-    loggedInUserId: userId,
-    folderId: folder4Id,
-  });
-  expect(folder4Content.content.length).eq(1);
-  await expect(
-    getMyFolderContent({
+    });
+    expect(folder3Content.content.length).eq(1);
+    let folder4Content = await getMyFolderContent({
+      loggedInUserId: userId,
+      folderId: folder4Id,
+    });
+    expect(folder4Content.content.length).eq(2);
+    let folder5Content = await getMyFolderContent({
       loggedInUserId: userId,
       folderId: folder5Id,
-    }),
-  ).rejects.toThrow("No content found");
-  await expect(
-    getMyFolderContent({
+    });
+    expect(folder5Content.content.length).eq(2);
+    let folder6Content = await getMyFolderContent({
       loggedInUserId: userId,
       folderId: folder6Id,
-    }),
-  ).rejects.toThrow("No content found");
+    });
+    expect(folder6Content.content.length).eq(1);
+
+    await getActivity(activity1Id);
+    await getActivity(activity2Id);
+    await getActivity(activity3Id);
+    await getActivity(activity4Id);
+    await getActivity(activity5Id);
+    await getActivity(activity6Id);
+    await getDoc(doc1Id);
+    await getDoc(doc2Id);
+    await getDoc(doc3Id);
+    await getDoc(doc4Id);
+    await getDoc(doc5Id);
+    await getDoc(doc6Id);
+
+    // delete the entire folder 1 and all its content
+    await deleteFolder(folder1Id, userId);
+
+    baseContent = await getMyFolderContent({
+      loggedInUserId: userId,
+      folderId: null,
+    });
+    expect(baseContent.content.length).eq(1);
+    await expect(
+      getMyFolderContent({
+        loggedInUserId: userId,
+        folderId: folder1Id,
+      }),
+    ).rejects.toThrow("No content found");
+    await expect(
+      getMyFolderContent({
+        loggedInUserId: userId,
+        folderId: folder2Id,
+      }),
+    ).rejects.toThrow("No content found");
+    await expect(
+      getMyFolderContent({
+        loggedInUserId: userId,
+        folderId: folder3Id,
+      }),
+    ).rejects.toThrow("No content found");
+    folder4Content = await getMyFolderContent({
+      loggedInUserId: userId,
+      folderId: folder4Id,
+    });
+    expect(folder4Content.content.length).eq(2);
+    folder5Content = await getMyFolderContent({
+      loggedInUserId: userId,
+      folderId: folder5Id,
+    });
+    expect(folder5Content.content.length).eq(2);
+    folder6Content = await getMyFolderContent({
+      loggedInUserId: userId,
+      folderId: folder6Id,
+    });
+    expect(folder6Content.content.length).eq(1);
+
+    await expect(getActivity(activity1Id)).rejects.toThrow("No content found");
+    await expect(getActivity(activity2Id)).rejects.toThrow("No content found");
+    await expect(getActivity(activity3Id)).rejects.toThrow("No content found");
+    await getActivity(activity4Id);
+    await getActivity(activity5Id);
+    await getActivity(activity6Id);
+    await expect(getDoc(doc1Id)).rejects.toThrow("No documents found");
+    await expect(getDoc(doc2Id)).rejects.toThrow("No documents found");
+    await expect(getDoc(doc3Id)).rejects.toThrow("No documents found");
+    await getDoc(doc4Id);
+    await getDoc(doc5Id);
+    await getDoc(doc6Id);
+
+    // delete folder 5 and its content
+    await deleteFolder(folder5Id, userId);
+
+    baseContent = await getMyFolderContent({
+      loggedInUserId: userId,
+      folderId: null,
+    });
+    expect(baseContent.content.length).eq(1);
+    folder4Content = await getMyFolderContent({
+      loggedInUserId: userId,
+      folderId: folder4Id,
+    });
+    expect(folder4Content.content.length).eq(1);
+    await expect(
+      getMyFolderContent({
+        loggedInUserId: userId,
+        folderId: folder5Id,
+      }),
+    ).rejects.toThrow("No content found");
+    await expect(
+      getMyFolderContent({
+        loggedInUserId: userId,
+        folderId: folder6Id,
+      }),
+    ).rejects.toThrow("No content found");
 
-  await getActivity(activity4Id);
-  await expect(getActivity(activity5Id)).rejects.toThrow("No content found");
-  await expect(getActivity(activity6Id)).rejects.toThrow("No content found");
-  await getDoc(doc4Id);
-  await expect(getDoc(doc5Id)).rejects.toThrow("No documents found");
-  await expect(getDoc(doc6Id)).rejects.toThrow("No documents found");
-});
+    await getActivity(activity4Id);
+    await expect(getActivity(activity5Id)).rejects.toThrow("No content found");
+    await expect(getActivity(activity6Id)).rejects.toThrow("No content found");
+    await getDoc(doc4Id);
+    await expect(getDoc(doc5Id)).rejects.toThrow("No documents found");
+    await expect(getDoc(doc6Id)).rejects.toThrow("No documents found");
+  },
+);
 
 test("non-owner cannot delete folder", async () => {
   const owner = await createTestUser();
@@ -1065,7 +2031,7 @@ test("updateDoc updates document properties", async () => {
   });
   const activityViewerContent = await getActivityViewerData(activityId, userId);
   expect(activityViewerContent.activity.name).toBe(newName);
-  expect(activityViewerContent.doc.source).toBe(newContent);
+  expect(activityViewerContent.activity.documents[0].source).toBe(newContent);
 });
 
 test("move content to different locations", async () => {
@@ -1463,17 +2429,53 @@ test("copyActivityToFolder copies a public document to a new owner", async () =>
 
   const activityData = await getActivityViewerData(newActivityId, newOwnerId);
 
-  const contribHist = activityData.doc.contributorHistory;
+  const contribHist = activityData.docHistories[0].contributorHistory;
   expect(contribHist.length).eq(1);
 
   expect(contribHist[0].prevDocId).eq(docId);
   expect(contribHist[0].prevDocVersionNum).eq(1);
 });
 
-test("copyActivityToFolder remixes correct versions", async () => {
-  const ownerId1 = (await createTestUser()).userId;
-  const ownerId2 = (await createTestUser()).userId;
-  const ownerId3 = (await createTestUser()).userId;
+test("copyActivityToFolder copies a shared document to a new owner", async () => {
+  const originalOwnerId = (await createTestUser()).userId;
+  const newOwnerId = (await createTestUser()).userId;
+  const { activityId, docId } = await createActivity(originalOwnerId, null);
+  // cannot copy if not yet shared
+  await expect(
+    copyActivityToFolder(activityId, newOwnerId, null),
+  ).rejects.toThrow("No content found");
+
+  // Make the activity public before copying
+  await shareActivity({
+    id: activityId,
+    ownerId: originalOwnerId,
+    licenseCode: "CCDUAL",
+    users: [newOwnerId],
+  });
+  const newActivityId = await copyActivityToFolder(
+    activityId,
+    newOwnerId,
+    null,
+  );
+  const newActivity = await getActivity(newActivityId);
+  expect(newActivity.ownerId).toBe(newOwnerId);
+  expect(newActivity.isPublic).toBe(false);
+
+  const activityData = await getActivityViewerData(newActivityId, newOwnerId);
+
+  expect(activityData.activity.isShared).eq(false);
+
+  const contribHist = activityData.docHistories[0].contributorHistory;
+  expect(contribHist.length).eq(1);
+
+  expect(contribHist[0].prevDocId).eq(docId);
+  expect(contribHist[0].prevDocVersionNum).eq(1);
+});
+
+test("copyActivityToFolder remixes correct versions", async () => {
+  const ownerId1 = (await createTestUser()).userId;
+  const ownerId2 = (await createTestUser()).userId;
+  const ownerId3 = (await createTestUser()).userId;
 
   // create activity 1 by owner 1
   const { activityId: activityId1, docId: docId1 } = await createActivity(
@@ -1500,7 +2502,7 @@ test("copyActivityToFolder remixes correct versions", async () => {
 
   // history should be version 1 of activity 1
   const activityData2 = await getActivityViewerData(activityId2, ownerId2);
-  const contribHist2 = activityData2.doc.contributorHistory;
+  const contribHist2 = activityData2.docHistories[0].contributorHistory;
   expect(contribHist2.length).eq(1);
   expect(contribHist2[0].prevDocId).eq(docId1);
   expect(contribHist2[0].prevDocVersionNum).eq(1);
@@ -1522,23 +2524,239 @@ test("copyActivityToFolder remixes correct versions", async () => {
 
   // history should be version 2 of activity 1
   const activityData3 = await getActivityViewerData(activityId3, ownerId3);
-  const contribHist3 = activityData3.doc.contributorHistory;
+  const contribHist3 = activityData3.docHistories[0].contributorHistory;
   expect(contribHist3.length).eq(1);
   expect(contribHist3[0].prevDocId).eq(docId1);
   expect(contribHist3[0].prevDocVersionNum).eq(2);
 });
 
-test("searchPublicContent returns public activities and folders matching the query", async () => {
+test("copyActivityToFolder copies content classifications", async () => {
+  const originalOwnerId = (await createTestUser()).userId;
+  const newOwnerId = (await createTestUser()).userId;
+  const { activityId, docId } = await createActivity(originalOwnerId, null);
+
+  const { id: classifyId } = (
+    await searchPossibleClassifications("K.CC.1 common core")
+  ).find((k) => k.code === "K.CC.1")!;
+
+  await addClassification(activityId, classifyId, originalOwnerId);
+
+  await makeActivityPublic({
+    id: activityId,
+    ownerId: originalOwnerId,
+    licenseCode: "CCDUAL",
+  });
+  const newActivityId = await copyActivityToFolder(
+    activityId,
+    newOwnerId,
+    null,
+  );
+
+  const activityData = await getActivityViewerData(newActivityId, newOwnerId);
+
+  expect(activityData.activity.classifications).toHaveLength(1);
+  expect(activityData.activity.classifications[0].id).eq(classifyId);
+});
+
+test("contributor history shows only documents user can view", async () => {
+  const ownerId1 = (await createTestUser()).userId;
+  const ownerId2 = (await createTestUser()).userId;
+  const ownerId3 = (await createTestUser()).userId;
+
+  // create public activity 1 by owner 1
+  const { activityId: activityId1, docId: docId1 } = await createActivity(
+    ownerId1,
+    null,
+  );
+  await makeActivityPublic({
+    id: activityId1,
+    ownerId: ownerId1,
+    licenseCode: "CCDUAL",
+  });
+
+  // owner 2 copies activity 1 to activity 2 and shares it with owner 3
+  const activityId2 = await copyActivityToFolder(activityId1, ownerId2, null);
+  const docId2 = (await getActivity(activityId2)).documents[0].id;
+  await shareActivity({
+    id: activityId2,
+    ownerId: ownerId2,
+    licenseCode: "CCBYSA",
+    users: [ownerId3],
+  });
+
+  // owner 3 copies activity 2 to activity 3, and then copies that to public activity 4
+  const activityId3 = await copyActivityToFolder(activityId2, ownerId3, null);
+  const docId3 = (await getActivity(activityId3)).documents[0].id;
+  const activityId4 = await copyActivityToFolder(activityId3, ownerId3, null);
+  const docId4 = (await getActivity(activityId4)).documents[0].id;
+  await makeActivityPublic({
+    id: activityId4,
+    ownerId: ownerId3,
+    licenseCode: "CCBYNCSA",
+  });
+
+  // owner 3 copies activity 1 to activity 5 and shares it with owner 1
+  const activityId5 = await copyActivityToFolder(activityId1, ownerId3, null);
+  const docId5 = (await getActivity(activityId5)).documents[0].id;
+  await shareActivity({
+    id: activityId5,
+    ownerId: ownerId3,
+    licenseCode: "CCBYSA",
+    users: [ownerId1],
+  });
+
+  // owner1 just sees activity 1 in history of activity 4
+  let docHistory = (
+    await getDocumentContributorHistories({
+      docIds: [docId4],
+      loggedInUserId: ownerId1,
+    })
+  )[0].contributorHistory;
+  expect(docHistory.length).eq(1);
+  expect(docHistory[0].prevDocId).eq(docId1);
+  expect(docHistory[0].prevDoc.document.activity.id).eq(activityId1);
+  expect(docHistory[0].withLicenseCode).eq("CCDUAL");
+
+  // owner 1 just sees activity 4 and 5 in remixes of activity 1
+  let docRemixes = (
+    await getDocumentRemixes({
+      docIds: [docId1],
+      loggedInUserId: ownerId1,
+    })
+  )[0].documentVersions.flatMap((v) => v.contributorHistory);
+  expect(docRemixes.length).eq(2);
+  expect(docRemixes[0].docId).eq(docId5);
+  expect(docRemixes[0].document.activity.id).eq(activityId5);
+  expect(docRemixes[0].withLicenseCode).eq("CCDUAL");
+  expect(docRemixes[1].docId).eq(docId4);
+  expect(docRemixes[1].document.activity.id).eq(activityId4);
+  expect(docRemixes[1].withLicenseCode).eq("CCDUAL");
+
+  // owner 1 just sees direct remix from activity 1 into activity 5
+  docRemixes = (
+    await getDocumentDirectRemixes({
+      docIds: [docId1],
+      loggedInUserId: ownerId1,
+    })
+  )[0].documentVersions.flatMap((v) => v.contributorHistory);
+  expect(docRemixes.length).eq(1);
+  expect(docRemixes[0].docId).eq(docId5);
+  expect(docRemixes[0].document.activity.id).eq(activityId5);
+  expect(docRemixes[0].withLicenseCode).eq("CCDUAL");
+
+  // owner2 just sees activity 1 and 2 in history of activity 4
+  docHistory = (
+    await getDocumentContributorHistories({
+      docIds: [docId4],
+      loggedInUserId: ownerId2,
+    })
+  )[0].contributorHistory;
+  expect(docHistory.length).eq(2);
+  expect(docHistory[0].prevDocId).eq(docId2);
+  expect(docHistory[0].prevDoc.document.activity.id).eq(activityId2);
+  expect(docHistory[0].withLicenseCode).eq("CCBYSA");
+  expect(docHistory[1].prevDocId).eq(docId1);
+  expect(docHistory[1].prevDoc.document.activity.id).eq(activityId1);
+  expect(docHistory[1].withLicenseCode).eq("CCDUAL");
+
+  // owner 2 just sees activity 4 and 2 in remixes of activity 1
+  docRemixes = (
+    await getDocumentRemixes({
+      docIds: [docId1],
+      loggedInUserId: ownerId2,
+    })
+  )[0].documentVersions.flatMap((v) => v.contributorHistory);
+  expect(docRemixes.length).eq(2);
+  expect(docRemixes[0].docId).eq(docId4);
+  expect(docRemixes[0].document.activity.id).eq(activityId4);
+  expect(docRemixes[0].withLicenseCode).eq("CCDUAL");
+  expect(docRemixes[1].docId).eq(docId2);
+  expect(docRemixes[1].document.activity.id).eq(activityId2);
+  expect(docRemixes[1].withLicenseCode).eq("CCDUAL");
+
+  // owner 2 sees direct remix of activity 1 into 2
+  docRemixes = (
+    await getDocumentDirectRemixes({
+      docIds: [docId1],
+      loggedInUserId: ownerId2,
+    })
+  )[0].documentVersions.flatMap((v) => v.contributorHistory);
+  expect(docRemixes.length).eq(1);
+  expect(docRemixes[0].docId).eq(docId2);
+  expect(docRemixes[0].document.activity.id).eq(activityId2);
+  expect(docRemixes[0].withLicenseCode).eq("CCDUAL");
+
+  // owner3 sees activity 1, 2 and 3 in history of activity 4
+  docHistory = (
+    await getDocumentContributorHistories({
+      docIds: [docId4],
+      loggedInUserId: ownerId3,
+    })
+  )[0].contributorHistory;
+  expect(docHistory.length).eq(3);
+  expect(docHistory[0].prevDocId).eq(docId3);
+  expect(docHistory[0].prevDoc.document.activity.id).eq(activityId3);
+  expect(docHistory[0].withLicenseCode).eq("CCDUAL");
+  expect(docHistory[1].prevDocId).eq(docId2);
+  expect(docHistory[1].prevDoc.document.activity.id).eq(activityId2);
+  expect(docHistory[1].withLicenseCode).eq("CCBYSA");
+  expect(docHistory[2].prevDocId).eq(docId1);
+  expect(docHistory[2].prevDoc.document.activity.id).eq(activityId1);
+  expect(docHistory[2].withLicenseCode).eq("CCDUAL");
+
+  // owner 3 sees activity 5, 4, 3 and 2 in remixes of activity 1
+  docRemixes = (
+    await getDocumentRemixes({
+      docIds: [docId1],
+      loggedInUserId: ownerId3,
+    })
+  )[0].documentVersions.flatMap((v) => v.contributorHistory);
+  expect(docRemixes.length).eq(4);
+  expect(docRemixes[0].docId).eq(docId5);
+  expect(docRemixes[0].document.activity.id).eq(activityId5);
+  expect(docRemixes[0].withLicenseCode).eq("CCDUAL");
+  expect(docRemixes[1].docId).eq(docId4);
+  expect(docRemixes[1].document.activity.id).eq(activityId4);
+  expect(docRemixes[1].withLicenseCode).eq("CCDUAL");
+  expect(docRemixes[2].docId).eq(docId3);
+  expect(docRemixes[2].document.activity.id).eq(activityId3);
+  expect(docRemixes[2].withLicenseCode).eq("CCDUAL");
+  expect(docRemixes[3].docId).eq(docId2);
+  expect(docRemixes[3].document.activity.id).eq(activityId2);
+  expect(docRemixes[3].withLicenseCode).eq("CCDUAL");
+
+  // owner 3 sees direct remixes of activity 1 into 2 and 5
+  docRemixes = (
+    await getDocumentDirectRemixes({
+      docIds: [docId1],
+      loggedInUserId: ownerId3,
+    })
+  )[0].documentVersions.flatMap((v) => v.contributorHistory);
+  expect(docRemixes.length).eq(2);
+  expect(docRemixes[0].docId).eq(docId5);
+  expect(docRemixes[0].document.activity.id).eq(activityId5);
+  expect(docRemixes[0].withLicenseCode).eq("CCDUAL");
+  expect(docRemixes[1].docId).eq(docId2);
+  expect(docRemixes[1].document.activity.id).eq(activityId2);
+  expect(docRemixes[1].withLicenseCode).eq("CCDUAL");
+});
+
+test("searchSharedContent returns public/shared activities and folders matching the query", async () => {
   const owner = await createTestUser();
   const ownerId = owner.userId;
 
+  const user = await createTestUser();
+  const userId = user.userId;
+
   // Create unique session number for names in this test
   const sessionNumber = Date.now().toString();
 
   const publicActivityName = `public activity ${sessionNumber}`;
   const privateActivityName = `private activity ${sessionNumber}`;
+  const sharedActivityName = `shared activity ${sessionNumber}`;
   const publicFolderName = `public folder ${sessionNumber}`;
   const privateFolderName = `private folder ${sessionNumber}`;
+  const sharedFolderName = `shared folder ${sessionNumber}`;
 
   const { activityId: publicActivityId } = await createActivity(ownerId, null);
   await updateContent({
@@ -1559,6 +2777,19 @@ test("searchPublicContent returns public activities and folders matching the que
     ownerId,
   });
 
+  const { activityId: sharedActivityId } = await createActivity(ownerId, null);
+  await updateContent({
+    id: sharedActivityId,
+    name: sharedActivityName,
+    ownerId,
+  });
+  await shareActivityWithEmail({
+    id: sharedActivityId,
+    licenseCode: "CCDUAL",
+    ownerId,
+    email: user.email,
+  });
+
   const { folderId: publicFolderId } = await createFolder(ownerId, null);
   await updateContent({
     id: publicFolderId,
@@ -1578,20 +2809,41 @@ test("searchPublicContent returns public activities and folders matching the que
     ownerId,
   });
 
-  const searchResults = await searchPublicContent(sessionNumber);
-  expect(searchResults.length).eq(2);
+  const { folderId: sharedFolderId } = await createFolder(ownerId, null);
+  await updateContent({
+    id: sharedFolderId,
+    name: sharedFolderName,
+    ownerId,
+  });
+  await shareFolder({
+    id: sharedFolderId,
+    licenseCode: "CCDUAL",
+    ownerId,
+    users: [userId],
+  });
+
+  const searchResults = await searchSharedContent(sessionNumber, userId);
+  expect(searchResults.length).eq(4);
 
   const namesInOrder = searchResults
     .sort((a, b) => a.id - b.id)
     .map((c) => c.name);
 
-  expect(namesInOrder).eqls([publicActivityName, publicFolderName]);
+  expect(namesInOrder).eqls([
+    publicActivityName,
+    sharedActivityName,
+    publicFolderName,
+    sharedFolderName,
+  ]);
 });
 
-test("searchPublicContent returns public folders and public content even in a private folder", async () => {
+test("searchSharedContent returns public/shared activities and folders even in a private folder", async () => {
   const owner = await createTestUser();
   const ownerId = owner.userId;
 
+  const user = await createTestUser();
+  const userId = user.userId;
+
   // Create unique session number for names in this test
   const sessionNumber = Date.now().toString();
 
@@ -1599,8 +2851,10 @@ test("searchPublicContent returns public folders and public content even in a pr
 
   const publicActivityName = `public activity ${sessionNumber}`;
   const privateActivityName = `private activity ${sessionNumber}`;
+  const sharedActivityName = `shared activity ${sessionNumber}`;
   const publicFolderName = `public folder ${sessionNumber}`;
   const privateFolderName = `private folder ${sessionNumber}`;
+  const sharedFolderName = `shared folder ${sessionNumber}`;
 
   const { activityId: publicActivityId } = await createActivity(
     ownerId,
@@ -1627,6 +2881,22 @@ test("searchPublicContent returns public folders and public content even in a pr
     ownerId,
   });
 
+  const { activityId: sharedActivityId } = await createActivity(
+    ownerId,
+    parentFolderId,
+  );
+  await updateContent({
+    id: sharedActivityId,
+    name: sharedActivityName,
+    ownerId,
+  });
+  await shareActivity({
+    id: sharedActivityId,
+    licenseCode: "CCDUAL",
+    ownerId,
+    users: [userId],
+  });
+
   const { folderId: publicFolderId } = await createFolder(
     ownerId,
     parentFolderId,
@@ -1652,17 +2922,265 @@ test("searchPublicContent returns public folders and public content even in a pr
     ownerId,
   });
 
-  const searchResults = await searchPublicContent(sessionNumber);
-  expect(searchResults.length).eq(2);
+  const { folderId: sharedFolderId } = await createFolder(
+    ownerId,
+    parentFolderId,
+  );
+  await updateContent({
+    id: sharedFolderId,
+    name: sharedFolderName,
+    ownerId,
+  });
+  await shareFolder({
+    id: sharedFolderId,
+    licenseCode: "CCDUAL",
+    ownerId,
+    users: [userId],
+  });
+
+  const searchResults = await searchSharedContent(sessionNumber, userId);
+  expect(searchResults.length).eq(4);
 
   const namesInOrder = searchResults
     .sort((a, b) => a.id - b.id)
     .map((c) => c.name);
 
-  expect(namesInOrder).eqls([publicActivityName, publicFolderName]);
+  expect(namesInOrder).eqls([
+    publicActivityName,
+    sharedActivityName,
+    publicFolderName,
+    sharedFolderName,
+  ]);
+});
+
+test("searchSharedContent includes public content where a classification matches", async () => {
+  const user = await createTestUser();
+  const userId = user.userId;
+
+  const owner = await createTestUser();
+  const ownerId = owner.userId;
+  const { activityId } = await createActivity(ownerId, null);
+  await makeActivityPublic({
+    id: activityId,
+    ownerId: ownerId,
+    licenseCode: "CCDUAL",
+  });
+  const initialResults = await searchSharedContent(
+    "K.CC.1 comMMon cOREe",
+    userId,
+  );
+  expect(initialResults.filter((r) => r.id === activityId)).toHaveLength(0);
+
+  const { id: classifyId } = (
+    await searchPossibleClassifications("K.CC.1 common core")
+  ).find((k) => k.code === "K.CC.1")!;
+
+  await addClassification(activityId, classifyId, ownerId);
+  // With code
+  const resultsCode = await searchSharedContent("K.C", userId);
+  expect(resultsCode.filter((r) => r.id === activityId)).toHaveLength(1);
+  // With both
+  const resultsBoth = await searchSharedContent("common C.1", userId);
+  expect(resultsBoth.filter((r) => r.id === activityId)).toHaveLength(1);
+});
+
+test("searchSharedContent, document source matches", async () => {
+  const user = await createTestUser();
+  const userId = user.userId;
+
+  const owner = await createTestUser();
+  const ownerId = owner.userId;
+  const { activityId, docId } = await createActivity(ownerId, null);
+  await updateDoc({ id: docId, source: "bananas", ownerId });
+  await makeActivityPublic({
+    id: activityId,
+    ownerId: ownerId,
+    licenseCode: "CCDUAL",
+  });
+
+  // apple doesn't hit
+  let results = await searchSharedContent("apple", userId);
+  expect(results.filter((r) => r.id === activityId)).toHaveLength(0);
+
+  // first part of a word hits
+  results = await searchSharedContent("bana", userId);
+  expect(results.filter((r) => r.id === activityId)).toHaveLength(1);
+
+  // full word hits
+  results = await searchSharedContent("bananas", userId);
+  expect(results.filter((r) => r.id === activityId)).toHaveLength(1);
+});
+
+test("searchSharedContent, owner name matches", async () => {
+  const user = await createTestUser();
+  const userId = user.userId;
+
+  const owner = await createTestUser();
+  const ownerId = owner.userId;
+  await updateUser({ userId: ownerId, firstNames: "Arya", lastNames: "Abbas" });
+  const { activityId } = await createActivity(ownerId, null);
+  await makeActivityPublic({
+    id: activityId,
+    ownerId: ownerId,
+    licenseCode: "CCDUAL",
+  });
+
+  let results = await searchSharedContent("Arya", userId);
+  expect(results.filter((r) => r.id === activityId)).toHaveLength(1);
+
+  results = await searchSharedContent("Arya Abbas", userId);
+  expect(results.filter((r) => r.id === activityId)).toHaveLength(1);
+});
+
+test("searchSharedContent, document source is more relevant than classification", async () => {
+  const user = await createTestUser();
+  const userId = user.userId;
+
+  const owner = await createTestUser();
+  const ownerId = owner.userId;
+
+  // unique code to distinguish content added in this test
+  const code = `${Date.now()}`;
+  const { activityId: activity1Id, docId: doc1Id } = await createActivity(
+    ownerId,
+    null,
+  );
+  await updateDoc({
+    id: doc1Id,
+    source: `banana${code} muffin${code}`,
+    ownerId,
+  });
+  await makeActivityPublic({
+    id: activity1Id,
+    ownerId: ownerId,
+    licenseCode: "CCDUAL",
+  });
+
+  const { activityId: activity2Id, docId: doc2Id } = await createActivity(
+    ownerId,
+    null,
+  );
+  await updateDoc({
+    id: doc2Id,
+    source: `apple${code} muffin${code}`,
+    ownerId,
+  });
+  await makeActivityPublic({
+    id: activity2Id,
+    ownerId: ownerId,
+    licenseCode: "CCDUAL",
+  });
+
+  const { id: classify1Id } = (
+    await searchPossibleClassifications("K.CC.1 common core")
+  ).find((k) => k.code === "K.CC.1")!;
+  await addClassification(activity2Id, classify1Id, ownerId);
+
+  const { id: classify2Id } = (
+    await searchPossibleClassifications("K.OA.1 common core")
+  ).find((k) => k.code === "K.OA.1")!;
+  await addClassification(activity2Id, classify2Id, ownerId);
+
+  const { id: classify3Id } = (
+    await searchPossibleClassifications("A.SSE.3")
+  ).find((k) => k.code === "A.SSE.3 c.")!;
+  await addClassification(activity2Id, classify3Id, ownerId);
+
+  // First make sure irrelevant classifications don't help relevance
+  // (as they did when summed over records rather than taking average)
+  let results = await searchSharedContent(
+    `banana${code} muffin${code}`,
+    userId,
+  );
+
+  expect(results[0].id).eq(activity1Id);
+  expect(results[1].id).eq(activity2Id);
+
+  // Even adding in three matching classifications doesn't put the match in first
+  results = await searchSharedContent(
+    `K.CC.1 K.OA.1 A.SSE.3 c. banana${code} muffin${code}`,
+    userId,
+  );
+
+  expect(results[0].id).eq(activity1Id);
+  expect(results[1].id).eq(activity2Id);
+});
+
+test("searchSharedContent, classification increases relevance", async () => {
+  const user = await createTestUser();
+  const userId = user.userId;
+
+  const owner = await createTestUser();
+  const ownerId = owner.userId;
+
+  const { id: classifyId } = (
+    await searchPossibleClassifications("K.CC.1 common core")
+  ).find((k) => k.code === "K.CC.1")!;
+
+  // unique code to distinguish content added in this test
+  const code = `${Date.now()}`;
+  const { activityId: activity1Id, docId: doc1Id } = await createActivity(
+    ownerId,
+    null,
+  );
+  await updateDoc({
+    id: doc1Id,
+    source: `banana${code}`,
+    ownerId,
+  });
+  await makeActivityPublic({
+    id: activity1Id,
+    ownerId: ownerId,
+    licenseCode: "CCDUAL",
+  });
+
+  const { activityId: activity2Id, docId: doc2Id } = await createActivity(
+    ownerId,
+    null,
+  );
+  await updateDoc({
+    id: doc2Id,
+    source: `banana${code}`,
+    ownerId,
+  });
+  await makeActivityPublic({
+    id: activity2Id,
+    ownerId: ownerId,
+    licenseCode: "CCDUAL",
+  });
+  await addClassification(activity2Id, classifyId, ownerId);
+
+  let results = await searchSharedContent(`K.CC.1 banana${code}`, userId);
+
+  expect(results[0].id).eq(activity2Id);
+  expect(results[1].id).eq(activity1Id);
+});
+
+test("searchSharedContent, handle tags in search", async () => {
+  const user = await createTestUser();
+  const userId = user.userId;
+
+  const owner = await createTestUser();
+  const ownerId = owner.userId;
+
+  const { activityId, docId } = await createActivity(ownerId, null);
+  await updateDoc({ id: docId, source: "point", ownerId });
+  await makeActivityPublic({
+    id: activityId,
+    ownerId: ownerId,
+    licenseCode: "CCDUAL",
+  });
+
+  let results = await searchSharedContent(`<point>`, userId);
+  expect(results.length).gte(1);
 });
 
-test("searchUsersWithPublicContent returns only users with public content", async () => {
+test("searchUsersWithSharedContent returns only users with public/shared content", async () => {
+  const user1 = await createTestUser();
+  const user1Id = user1.userId;
+  const user2 = await createTestUser();
+  const user2Id = user2.userId;
+
   // owner 1 has only private content
   const owner1 = await createTestUser();
   const owner1Id = owner1.userId;
@@ -1687,32 +3205,178 @@ test("searchUsersWithPublicContent returns only users with public content", asyn
     licenseCode: "CCDUAL",
   });
 
-  // owner 3 has a public folder
-  const owner3 = await createTestUser();
-  const owner3Id = owner3.userId;
+  // owner 3 has a public folder
+  const owner3 = await createTestUser();
+  const owner3Id = owner3.userId;
+
+  const { folderId: folder3aId } = await createFolder(owner3Id, null);
+  await makeFolderPublic({
+    id: folder3aId,
+    ownerId: owner3Id,
+    licenseCode: "CCDUAL",
+  });
+
+  // owner 4 has a activity shared with user1
+  const owner4 = await createTestUser();
+  const owner4Id = owner4.userId;
+
+  const { folderId: folder4aId } = await createFolder(owner4Id, null);
+  const { activityId: activity4aId } = await createActivity(
+    owner4Id,
+    folder4aId,
+  );
+  await shareActivity({
+    id: activity4aId,
+    ownerId: owner4Id,
+    licenseCode: "CCDUAL",
+    users: [user1Id],
+  });
+
+  // owner 5 has a folder shared with user 1
+  const owner5 = await createTestUser();
+  const owner5Id = owner5.userId;
+
+  const { folderId: folder5aId } = await createFolder(owner5Id, null);
+  await shareFolder({
+    id: folder5aId,
+    ownerId: owner5Id,
+    licenseCode: "CCDUAL",
+    users: [user1Id],
+  });
+
+  // owner 6 has a activity shared with user2
+  const owner6 = await createTestUser();
+  const owner6Id = owner6.userId;
+
+  const { folderId: folder6aId } = await createFolder(owner6Id, null);
+  const { activityId: activity6aId } = await createActivity(
+    owner6Id,
+    folder6aId,
+  );
+  await shareActivity({
+    id: activity6aId,
+    ownerId: owner6Id,
+    licenseCode: "CCDUAL",
+    users: [user2Id],
+  });
+
+  // owner 7 has a folder shared with user 2
+  const owner7 = await createTestUser();
+  const owner7Id = owner7.userId;
 
-  const { folderId: folder3aId } = await createFolder(owner3Id, null);
-  await makeFolderPublic({
-    id: folder3aId,
-    ownerId: owner3Id,
+  const { folderId: folder7aId } = await createFolder(owner7Id, null);
+  await shareFolder({
+    id: folder7aId,
+    ownerId: owner7Id,
     licenseCode: "CCDUAL",
+    users: [user2Id],
   });
 
-  // cannot find owner1
-  let searchResults = await searchUsersWithPublicContent(owner1.lastNames);
+  // user1 cannot find owner1
+  let searchResults = await searchUsersWithSharedContent(
+    owner1.lastNames,
+    user1Id,
+  );
   expect(searchResults.length).eq(0);
 
-  // can find owner2
-  searchResults = await searchUsersWithPublicContent(owner2.lastNames);
+  // user1 can find owner2
+  searchResults = await searchUsersWithSharedContent(owner2.lastNames, user1Id);
   expect(searchResults.length).eq(1);
   expect(searchResults[0].firstNames).eq(owner2.firstNames);
   expect(searchResults[0].lastNames).eq(owner2.lastNames);
 
-  // can find owner3
-  searchResults = await searchUsersWithPublicContent(owner3.lastNames);
+  // user1 can find owner3
+  searchResults = await searchUsersWithSharedContent(owner3.lastNames, user1Id);
   expect(searchResults.length).eq(1);
   expect(searchResults[0].firstNames).eq(owner3.firstNames);
   expect(searchResults[0].lastNames).eq(owner3.lastNames);
+
+  // user1 can find owner4
+  searchResults = await searchUsersWithSharedContent(owner4.lastNames, user1Id);
+  expect(searchResults.length).eq(1);
+  expect(searchResults[0].firstNames).eq(owner4.firstNames);
+  expect(searchResults[0].lastNames).eq(owner4.lastNames);
+
+  // user1 can find owner5
+  searchResults = await searchUsersWithSharedContent(owner5.lastNames, user1Id);
+  expect(searchResults.length).eq(1);
+  expect(searchResults[0].firstNames).eq(owner5.firstNames);
+  expect(searchResults[0].lastNames).eq(owner5.lastNames);
+
+  // user1 cannot find owner6
+  searchResults = await searchUsersWithSharedContent(owner6.lastNames, user1Id);
+  expect(searchResults.length).eq(0);
+
+  // user1 cannot find owner7
+  searchResults = await searchUsersWithSharedContent(owner7.lastNames, user1Id);
+  expect(searchResults.length).eq(0);
+
+  // user2 can find owner6
+  searchResults = await searchUsersWithSharedContent(owner6.lastNames, user2Id);
+  expect(searchResults.length).eq(1);
+  expect(searchResults[0].firstNames).eq(owner6.firstNames);
+  expect(searchResults[0].lastNames).eq(owner6.lastNames);
+
+  // user2 can find owner7
+  searchResults = await searchUsersWithSharedContent(owner7.lastNames, user2Id);
+  expect(searchResults.length).eq(1);
+  expect(searchResults[0].firstNames).eq(owner7.firstNames);
+  expect(searchResults[0].lastNames).eq(owner7.lastNames);
+
+  // user2 cannot find owner4
+  searchResults = await searchUsersWithSharedContent(owner4.lastNames, user2Id);
+  expect(searchResults.length).eq(0);
+
+  // user2 cannot find owner5
+  searchResults = await searchUsersWithSharedContent(owner5.lastNames, user2Id);
+  expect(searchResults.length).eq(0);
+});
+
+test("share with email throws error when no match", async () => {
+  const owner = await createTestUser();
+  const ownerId = owner.userId;
+
+  const user = await createTestUser();
+  const userId = user.userId;
+
+  const otherEmail = `unique-${Date.now()}@example.com`;
+
+  const { folderId } = await createFolder(ownerId, null);
+  const { activityId } = await createActivity(ownerId, null);
+
+  await expect(
+    shareActivityWithEmail({
+      id: activityId,
+      ownerId,
+      licenseCode: "CCBYSA",
+      email: otherEmail,
+    }),
+  ).rejects.toThrow("User with email not found");
+
+  let result = await shareActivityWithEmail({
+    id: activityId,
+    ownerId,
+    licenseCode: "CCBYSA",
+    email: user.email,
+  });
+  expect(result.id).eq(activityId);
+
+  await expect(
+    shareFolderWithEmail({
+      id: folderId,
+      ownerId,
+      licenseCode: "CCBYSA",
+      email: otherEmail,
+    }),
+  ).rejects.toThrow("User with email not found");
+
+  result = await shareFolderWithEmail({
+    id: folderId,
+    ownerId,
+    licenseCode: "CCBYSA",
+    email: user.email,
+  });
+  expect(result.id).eq(folderId);
 });
 
 test("findOrCreateUser finds an existing user or creates a new one", async () => {
@@ -2164,6 +3828,18 @@ test("cannot assign other user's activity", async () => {
   await expect(assignActivity(activityId, ownerId2)).rejects.toThrow(
     "No content found",
   );
+
+  // still cannot create assignment even if activity is shared
+  await shareActivity({
+    id: activityId,
+    licenseCode: "CCDUAL",
+    ownerId: ownerId1,
+    users: [ownerId2],
+  });
+
+  await expect(assignActivity(activityId, ownerId2)).rejects.toThrow(
+    "No content found",
+  );
 });
 
 test("open and close assignment with code", async () => {
@@ -2813,18 +4489,28 @@ test("can't unassign if have data", async () => {
   );
 });
 
-test("get activity editor data only if owner or limited data for public", async () => {
+test("get activity/document data only if owner or limited data for public/shared", async () => {
   const owner = await createTestUser();
   const ownerId = owner.userId;
-  const otherUser = await createTestUser();
-  const otherUserId = otherUser.userId;
-  const { activityId } = await createActivity(ownerId, null);
+  const user1 = await createTestUser();
+  const user1Id = user1.userId;
+  const user2 = await createTestUser();
+  const user2Id = user2.userId;
+  const { activityId, docId } = await createActivity(ownerId, null);
 
   await getActivityEditorData(activityId, ownerId);
+  await getActivityViewerData(activityId, ownerId);
+  await getDocumentSource(docId, ownerId);
 
-  await expect(getActivityEditorData(activityId, otherUserId)).rejects.toThrow(
+  await expect(getActivityEditorData(activityId, user1Id)).rejects.toThrow(
     "No content found",
   );
+  await expect(getActivityViewerData(activityId, user1Id)).rejects.toThrow(
+    "No content found",
+  );
+  await expect(getDocumentSource(docId, user1Id)).rejects.toThrow(
+    "No documents found",
+  );
 
   await makeActivityPublic({ id: activityId, ownerId, licenseCode: "CCDUAL" });
 
@@ -2835,7 +4521,47 @@ test("get activity editor data only if owner or limited data for public", async
   expect(data.notMe).eq(false);
   expect(data.activity.assignmentStatus).eq("Open");
 
-  data = await getActivityEditorData(activityId, otherUserId);
+  data = await getActivityEditorData(activityId, user1Id);
+  expect(data.notMe).eq(true);
+  expect(data.activity).eqls({
+    id: activityId,
+    name: "",
+    ownerId,
+    imagePath: null,
+    assignmentStatus: "Unassigned",
+    classCode: null,
+    codeValidUntil: null,
+    isPublic: false,
+    isShared: false,
+    sharedWith: [],
+    license: null,
+    classifications: [],
+    documents: [],
+    hasScoreData: false,
+    parentFolder: null,
+  });
+
+  await getActivityViewerData(activityId, user1Id);
+  await getDocumentSource(docId, user1Id);
+
+  await makeActivityPrivate({ id: activityId, ownerId });
+  await expect(getActivityEditorData(activityId, user1Id)).rejects.toThrow(
+    "No content found",
+  );
+  await expect(getActivityViewerData(activityId, user1Id)).rejects.toThrow(
+    "No content found",
+  );
+  await expect(getDocumentSource(docId, user1Id)).rejects.toThrow(
+    "No documents found",
+  );
+
+  await shareActivity({
+    id: activityId,
+    ownerId,
+    licenseCode: "CCDUAL",
+    users: [user1Id],
+  });
+  data = await getActivityEditorData(activityId, user1Id);
   expect(data.notMe).eq(true);
   expect(data.activity).eqls({
     id: activityId,
@@ -2845,20 +4571,44 @@ test("get activity editor data only if owner or limited data for public", async
     assignmentStatus: "Unassigned",
     classCode: null,
     codeValidUntil: null,
-    isPublic: true,
+    isPublic: false,
+    isShared: false,
+    sharedWith: [],
     license: null,
+    classifications: [],
     documents: [],
     hasScoreData: false,
     parentFolder: null,
   });
+
+  await getActivityViewerData(activityId, user1Id);
+  await getDocumentSource(docId, user1Id);
+
+  await expect(getActivityEditorData(activityId, user2Id)).rejects.toThrow(
+    "No content found",
+  );
+  await expect(getActivityViewerData(activityId, user2Id)).rejects.toThrow(
+    "No content found",
+  );
+  await expect(getDocumentSource(docId, user2Id)).rejects.toThrow(
+    "No documents found",
+  );
 });
 
-test("get public activity editor data only if public", async () => {
+test("get public activity editor data only if public or shared", async () => {
   const owner = await createTestUser();
   const ownerId = owner.userId;
+
+  const user1 = await createTestUser();
+  const user1Id = user1.userId;
+  const user2 = await createTestUser();
+  const user2Id = user2.userId;
+
   const { activityId, docId } = await createActivity(ownerId, null);
+  const doenetML = "hi!";
+  await updateDoc({ id: docId, source: doenetML, ownerId });
 
-  await expect(getPublicEditorData(activityId)).rejects.toThrow(
+  await expect(getSharedEditorData(activityId, user1Id)).rejects.toThrow(
     "No content found",
   );
 
@@ -2872,13 +4622,34 @@ test("get public activity editor data only if public", async () => {
     licenseCode: "CCDUAL",
     ownerId,
   });
-  const doenetML = "hi!";
-  await updateDoc({ id: docId, source: doenetML, ownerId });
 
-  const publicData = await getPublicEditorData(activityId);
+  let sharedData = await getSharedEditorData(activityId, user1Id);
+  expect(sharedData.name).eq("Some content");
+  expect(sharedData.documents[0].source).eq(doenetML);
+
+  await makeActivityPrivate({
+    id: activityId,
+    ownerId,
+  });
+
+  await expect(getSharedEditorData(activityId, user1Id)).rejects.toThrow(
+    "No content found",
+  );
+
+  await shareActivity({
+    id: activityId,
+    licenseCode: "CCDUAL",
+    ownerId,
+    users: [user1Id],
+  });
+
+  sharedData = await getSharedEditorData(activityId, user1Id);
+  expect(sharedData.name).eq("Some content");
+  expect(sharedData.documents[0].source).eq(doenetML);
 
-  expect(publicData.name).eq("Some content");
-  expect(publicData.documents[0].source).eq(doenetML);
+  await expect(getSharedEditorData(activityId, user2Id)).rejects.toThrow(
+    "No content found",
+  );
 });
 
 test("activity editor data and my folder contents before and after assigned", async () => {
@@ -2896,10 +4667,13 @@ test("activity editor data and my folder contents before and after assigned", as
     ownerId,
     imagePath: "/activity_default.jpg",
     isPublic: false,
+    isShared: false,
+    sharedWith: [],
     assignmentStatus: "Unassigned",
     classCode: null,
     codeValidUntil: null,
     license: null,
+    classifications: [],
     documents: [
       {
         id: docId,
@@ -2943,10 +4717,13 @@ test("activity editor data and my folder contents before and after assigned", as
     ownerId,
     imagePath: "/activity_default.jpg",
     isPublic: false,
+    isShared: false,
+    sharedWith: [],
     assignmentStatus: "Open",
     classCode,
     codeValidUntil: closeAt.toJSDate(),
     license: null,
+    classifications: [],
     documents: [
       {
         id: docId,
@@ -2987,10 +4764,13 @@ test("activity editor data and my folder contents before and after assigned", as
     ownerId,
     imagePath: "/activity_default.jpg",
     isPublic: false,
+    isShared: false,
+    sharedWith: [],
     assignmentStatus: "Unassigned",
     classCode,
     codeValidUntil: null,
     license: null,
+    classifications: [],
     documents: [
       {
         id: docId,
@@ -3037,10 +4817,13 @@ test("activity editor data and my folder contents before and after assigned", as
     ownerId,
     imagePath: "/activity_default.jpg",
     isPublic: false,
+    isShared: false,
+    sharedWith: [],
     assignmentStatus: "Open",
     classCode,
     codeValidUntil: closeAt.toJSDate(),
     license: null,
+    classifications: [],
     documents: [
       {
         id: docId,
@@ -3090,10 +4873,13 @@ test("activity editor data and my folder contents before and after assigned", as
     ownerId,
     imagePath: "/activity_default.jpg",
     isPublic: false,
+    isShared: false,
+    sharedWith: [],
     assignmentStatus: "Open",
     classCode,
     codeValidUntil: closeAt.toJSDate(),
     license: null,
+    classifications: [],
     documents: [
       {
         id: docId,
@@ -3134,10 +4920,13 @@ test("activity editor data and my folder contents before and after assigned", as
     ownerId,
     imagePath: "/activity_default.jpg",
     isPublic: false,
+    isShared: false,
+    sharedWith: [],
     assignmentStatus: "Closed",
     classCode,
     codeValidUntil: null,
     license: null,
+    classifications: [],
     documents: [
       {
         id: docId,
@@ -3224,6 +5013,16 @@ test("activity editor data shows its parent folder is public", async () => {
   expect(data.parentFolder?.isPublic).eq(true);
 });
 
+test("getDocumentSource gets source", async () => {
+  const owner = await createTestUser();
+  const ownerId = owner.userId;
+  const { activityId, docId } = await createActivity(ownerId, null);
+  await updateDoc({ id: docId, source: "some content", ownerId });
+
+  const documentSource = await getDocumentSource(docId, ownerId);
+  expect(documentSource.source).eq("some content");
+});
+
 test("only user and assignment owner can load document state", async () => {
   const owner = await createTestUser();
   const ownerId = owner.userId;
@@ -5080,6 +6879,106 @@ test("get data for user's assignments", { timeout: 30000 }, async () => {
   ]);
 });
 
+test("Content classifications can only be edited by activity owner", async () => {
+  const { userId } = await createTestUser();
+  const { userId: otherId } = await createTestUser();
+  const allClassifications = await searchPossibleClassifications("");
+  const { id: classificationId } = allClassifications.find(
+    (k) => k.code === "K.CC.1",
+  )!;
+  const { activityId } = await createActivity(userId, null);
+
+  // Add
+  await expect(() =>
+    addClassification(activityId, classificationId, otherId),
+  ).rejects.toThrowError();
+  await addClassification(activityId, classificationId, userId);
+  {
+    const classifications = await getClassifications(activityId, userId);
+    expect(classifications.length).toBe(1);
+    expect(classifications[0].classification).toHaveProperty("code", "K.CC.1");
+    expect(classifications[0].classification).toHaveProperty(
+      "id",
+      classificationId,
+    );
+  }
+
+  // Remove
+  await expect(() =>
+    removeClassification(activityId, classificationId, otherId),
+  ).rejects.toThrowError();
+  await removeClassification(activityId, classificationId, userId);
+  {
+    const classifications = await getClassifications(activityId, userId);
+    expect(classifications).toEqual([]);
+  }
+});
+
+test("Get classifications of public activity", async () => {
+  const allClassifications = await searchPossibleClassifications("");
+  const { id: classId1 } = allClassifications.find((k) => k.code === "K.CC.1")!;
+  const { id: classId2 } = allClassifications.find(
+    (k) => k.code === "8.2.1.5",
+  )!;
+  const { userId: ownerId } = await createTestUser();
+  const { activityId } = await createActivity(ownerId, null);
+
+  await addClassification(activityId, classId1, ownerId);
+  await addClassification(activityId, classId2, ownerId);
+
+  const { userId: viewerId } = await createTestUser();
+  await expect(() =>
+    getClassifications(activityId, viewerId),
+  ).rejects.toThrowError("cannot be accessed");
+
+  await updateContent({
+    id: activityId,
+    ownerId,
+  });
+  await makeActivityPublic({
+    id: activityId,
+    ownerId,
+    licenseCode: "CCDUAL",
+  });
+  const classifications = await getClassifications(activityId, viewerId);
+  expect(classifications.length).toBe(2);
+});
+
+test("Search for content classifications", async () => {
+  {
+    // Code
+    const results = await searchPossibleClassifications("CC.1");
+    expect(results.find((i) => i.code === "K.CC.1")).toBeDefined();
+  }
+  {
+    // Category
+    const results = await searchPossibleClassifications("nonlinear functions");
+    expect(results.find((i) => i.code === "8.2.1.5")).toBeDefined();
+  }
+  {
+    // Grade
+    const results = await searchPossibleClassifications("Kind");
+    expect(results.find((i) => i.code === "K.CC.1")).toBeDefined();
+  }
+  {
+    // Description
+    const results = await searchPossibleClassifications("exponents");
+    expect(results.find((i) => i.code === "A.SSE.3 c.")).toBeDefined();
+  }
+  {
+    // System name
+    const results = await searchPossibleClassifications("coMMoN cOrE");
+    expect(results.find((i) => i.code === "A.SSE.3 c.")).toBeDefined();
+  }
+  {
+    // Combination of fields
+    const results = await searchPossibleClassifications(
+      "mention addition SUBTRACTION kindergarten OA operations",
+    );
+    expect(results.find((i) => i.code === "K.OA.1")).toBeDefined();
+  }
+});
+
 test("search my folder content searches all subfolders", async () => {
   const owner = await createTestUser();
   const ownerId = owner.userId;
@@ -5268,6 +7167,98 @@ test("search my folder content searches all subfolders", async () => {
   expect(content.length).eq(0);
 });
 
+test("searchMyFolderContent, document source matches", async () => {
+  const owner = await createTestUser();
+  const ownerId = owner.userId;
+  const { activityId, docId } = await createActivity(ownerId, null);
+  await updateDoc({ id: docId, source: "bananas", ownerId });
+  await makeActivityPublic({
+    id: activityId,
+    ownerId: ownerId,
+    licenseCode: "CCDUAL",
+  });
+
+  // apple doesn't hit
+  let searchResults = await searchMyFolderContent({
+    folderId: null,
+    loggedInUserId: ownerId,
+    query: "apple",
+  });
+  let content = searchResults.content;
+  expect(content.length).eq(0);
+
+  // first part of a word hits
+  searchResults = await searchMyFolderContent({
+    folderId: null,
+    loggedInUserId: ownerId,
+    query: "bana",
+  });
+  content = searchResults.content;
+  expect(content.length).eq(1);
+
+  // full word hits
+  searchResults = await searchMyFolderContent({
+    folderId: null,
+    loggedInUserId: ownerId,
+    query: "bananas",
+  });
+  content = searchResults.content;
+  expect(content.length).eq(1);
+});
+
+test("searchMyFolderContent, classification matches", async () => {
+  const owner = await createTestUser();
+  const ownerId = owner.userId;
+  const { activityId } = await createActivity(ownerId, null);
+
+  let searchResults = await searchMyFolderContent({
+    folderId: null,
+    loggedInUserId: ownerId,
+    query: "K.CC.1 comMMon cOREe",
+  });
+  let content = searchResults.content;
+  expect(content.length).eq(0);
+
+  const { id: classifyId } = (
+    await searchPossibleClassifications("K.CC.1 common core")
+  ).find((k) => k.code === "K.CC.1")!;
+
+  await addClassification(activityId, classifyId, ownerId);
+  // With code
+  searchResults = await searchMyFolderContent({
+    folderId: null,
+    loggedInUserId: ownerId,
+    query: "K.C",
+  });
+  content = searchResults.content;
+  expect(content.length).eq(1);
+
+  // With both
+  searchResults = await searchMyFolderContent({
+    folderId: null,
+    loggedInUserId: ownerId,
+    query: "common C.1",
+  });
+  content = searchResults.content;
+  expect(content.length).eq(1);
+});
+
+test("searchMyFolderContent, handle tags in search", async () => {
+  const owner = await createTestUser();
+  const ownerId = owner.userId;
+  const { activityId, docId } = await createActivity(ownerId, null);
+
+  await updateDoc({ id: docId, source: "point", ownerId });
+
+  let searchResults = await searchMyFolderContent({
+    folderId: null,
+    loggedInUserId: ownerId,
+    query: "<point>",
+  });
+  let content = searchResults.content;
+  expect(content.length).eq(1);
+});
+
 test("get licenses", async () => {
   let cc_by_sa = await getLicense("CCBYSA");
   expect(cc_by_sa.name).eq("Creative Commons Attribution-ShareAlike");
diff --git a/server/src/model.ts b/server/src/model.ts
index 1907001f69..a9008bc6a3 100644
--- a/server/src/model.ts
+++ b/server/src/model.ts
@@ -14,9 +14,29 @@ export type DoenetmlVersion = {
 
 export type AssignmentStatus = "Unassigned" | "Closed" | "Open";
 
+export type UserInfo = {
+  userId: number;
+  firstNames: string | null;
+  lastNames: string;
+  email: string;
+};
+
+export type ContentClassification = {
+  id: number;
+  code: string;
+  grade: string | null;
+  category: string;
+  description: string;
+  system: {
+    id: number;
+    name: string;
+  };
+};
+
 export type ContentStructure = {
   id: number;
   ownerId: number;
+  owner?: UserInfo;
   name: string;
   imagePath: string | null;
   assignmentStatus: AssignmentStatus;
@@ -24,7 +44,10 @@ export type ContentStructure = {
   classCode: string | null;
   codeValidUntil: Date | null;
   isPublic: boolean;
+  isShared: boolean;
+  sharedWith: UserInfo[];
   license: License | null;
+  classifications: ContentClassification[];
   documents: {
     id: number;
     versionNum?: number;
@@ -37,6 +60,8 @@ export type ContentStructure = {
     id: number;
     name: string;
     isPublic: boolean;
+    isShared: boolean;
+    sharedWith: UserInfo[];
   } | null;
 };
 
@@ -110,13 +135,18 @@ export async function createActivity(
   });
 
   let isPublic = false;
-  let licenseCode = "CCDUAL";
+  let licenseCode = undefined;
+  let sharedWith: number[] = [];
 
-  // If parent folder isn't null, check if it is public and get its license
+  // If parent folder isn't null, check if it is shared and get its license
   if (parentFolderId !== null) {
     let parentFolder = await prisma.content.findUniqueOrThrow({
       where: { id: parentFolderId, isFolder: true, isDeleted: false, ownerId },
-      select: { isPublic: true, licenseCode: true },
+      select: {
+        isPublic: true,
+        licenseCode: true,
+        sharedWith: { select: { userId: true } },
+      },
     });
     if (parentFolder.isPublic) {
       isPublic = true;
@@ -124,6 +154,13 @@ export async function createActivity(
         licenseCode = parentFolder.licenseCode;
       }
     }
+
+    if (parentFolder.sharedWith.length > 0) {
+      sharedWith = parentFolder.sharedWith.map((cs) => cs.userId);
+      if (parentFolder.licenseCode) {
+        licenseCode = parentFolder.licenseCode;
+      }
+    }
   }
 
   const activity = await prisma.content.create({
@@ -145,6 +182,9 @@ export async function createActivity(
           },
         ],
       },
+      sharedWith: {
+        createMany: { data: sharedWith.map((userId) => ({ userId })) },
+      },
     },
   });
 
@@ -167,13 +207,18 @@ export async function createFolder(
   const sortIndex = await getNextSortIndexForFolder(ownerId, parentFolderId);
 
   let isPublic = false;
-  let licenseCode = "CCDUAL";
+  let licenseCode = undefined;
+  let sharedWith: number[] = [];
 
-  // If parent folder isn't null, check if it is public and get its license
+  // If parent folder isn't null, check if it is shared and get its license
   if (parentFolderId !== null) {
     let parentFolder = await prisma.content.findUniqueOrThrow({
       where: { id: parentFolderId, isFolder: true, isDeleted: false, ownerId },
-      select: { isPublic: true, licenseCode: true },
+      select: {
+        isPublic: true,
+        licenseCode: true,
+        sharedWith: { select: { userId: true } },
+      },
     });
     if (parentFolder.isPublic) {
       isPublic = true;
@@ -181,6 +226,12 @@ export async function createFolder(
         licenseCode = parentFolder.licenseCode;
       }
     }
+    if (parentFolder.sharedWith.length > 0) {
+      sharedWith = parentFolder.sharedWith.map((cs) => cs.userId);
+      if (parentFolder.licenseCode) {
+        licenseCode = parentFolder.licenseCode;
+      }
+    }
   }
 
   const folder = await prisma.content.create({
@@ -193,6 +244,9 @@ export async function createFolder(
       isPublic,
       licenseCode,
       sortIndex,
+      sharedWith: {
+        createMany: { data: sharedWith.map((userId) => ({ userId })) },
+      },
     },
   });
 
@@ -430,6 +484,7 @@ export async function moveContent({
 
   let desiredFolderIsPublic = false;
   let desiredFolderLicenseCode: LicenseCode = "CCDUAL";
+  let desiredFolderShares: number[] = [];
 
   if (desiredParentFolderId !== null) {
     // if desired parent folder is specified, make sure it exists and is owned by `ownerId`
@@ -440,10 +495,14 @@ export async function moveContent({
         isDeleted: false,
         isFolder: true,
       },
-      select: { isPublic: true, licenseCode: true },
+      select: {
+        isPublic: true,
+        licenseCode: true,
+        sharedWith: { select: { userId: true } },
+      },
     });
 
-    // If the parent folder is public, then we'll need to make the resulting content public, as well,
+    // If the parent folder is shared, then we'll need to share the resulting content, as well,
     // with the same license.
     if (parentFolder.isPublic) {
       desiredFolderIsPublic = true;
@@ -451,6 +510,12 @@ export async function moveContent({
         desiredFolderLicenseCode = parentFolder.licenseCode as LicenseCode;
       }
     }
+    if (parentFolder.sharedWith.length > 0) {
+      desiredFolderShares = parentFolder.sharedWith.map((cs) => cs.userId);
+      if (parentFolder.licenseCode) {
+        desiredFolderLicenseCode = parentFolder.licenseCode as LicenseCode;
+      }
+    }
 
     if (content.isFolder) {
       // if content is a folder and moving it to another folder,
@@ -553,6 +618,24 @@ export async function moveContent({
       });
     }
   }
+
+  if (desiredFolderShares.length > 0) {
+    if (content.isFolder) {
+      await shareFolder({
+        id: content.id,
+        ownerId,
+        licenseCode: desiredFolderLicenseCode,
+        users: desiredFolderShares,
+      });
+    } else {
+      await shareActivity({
+        id: content.id,
+        ownerId,
+        licenseCode: desiredFolderLicenseCode,
+        users: desiredFolderShares,
+      });
+    }
+  }
 }
 
 /**
@@ -639,7 +722,6 @@ async function calculateNewSortIndex(
  * Adds `origActivityId` and its contributor history to the contributor history of the new activity.
  *
  * Throws an error if `userId` doesn't have access to `origActivityId`
- * (currently means a non-public activity with a different owner)
  *
  * Return the id of the newly created activity
  *
@@ -657,12 +739,17 @@ export async function copyActivityToFolder(
       id: origActivityId,
       isDeleted: false,
       isFolder: false,
-      OR: [{ ownerId: userId }, { isPublic: true }],
+      OR: [
+        { ownerId: userId },
+        { isPublic: true },
+        { sharedWith: { some: { userId } } },
+      ],
     },
     include: {
       documents: {
         where: { isDeleted: false },
       },
+      classifications: true,
     },
   });
 
@@ -676,6 +763,11 @@ export async function copyActivityToFolder(
       ownerId: userId,
       parentFolderId: folderId,
       sortIndex,
+      classifications: {
+        create: origActivity.classifications.map((c) => ({
+          classificationId: c.classificationId,
+        })),
+      },
     },
   });
 
@@ -723,29 +815,46 @@ export async function copyActivityToFolder(
     docId,
     prevDocId: origActivity.documents[i].id,
     prevDocVersionNum: documentsToAdd[i].originalDocVersion.versionNum,
+    withLicenseCode: origActivity.licenseCode,
   }));
   await prisma.contributorHistory.createMany({
     data: contribHistoryInfo,
   });
 
+  // Get the time stamp created in the previous query
+  const timestampDoc = (
+    await prisma.contributorHistory.findFirst({
+      where: { docId: newDocIds[0] },
+    })
+  )?.timestampDoc;
+
   // Create contributor history linking each newly created document
   // to the contributor history of the corresponding document from origActivity.
   // Note: we copy all history rather than using a linked list
-  // due to inefficient queries necessary to traverse link lists.
+  // so that this history is fixed even if the original documents
+  // are modified to change their history.
   for (let [i, origDoc] of origActivity.documents.entries()) {
     const previousHistory = await prisma.contributorHistory.findMany({
       where: {
         docId: origDoc.id,
       },
-      orderBy: { timestamp: "desc" },
     });
 
+    // Note: contributorHistory has two timestamps:
+    // - timestampPrevDoc: the time when prevDocId was remixed into a new activity
+    // - timestampDoc: this time when docId was created by remixing
+    // Each record we create below corresponds to an indirect path from prevDocId to docId
+    // so the two timestamps will be different:
+    // - timestampPrevDoc is copied from the original source to get the original remix time from prevDocId
+    // - timestampDoc is copied from the create query just run (so is essentially now)
     await prisma.contributorHistory.createMany({
       data: previousHistory.map((hist) => ({
         docId: newDocIds[i],
         prevDocId: hist.prevDocId,
         prevDocVersionNum: hist.prevDocVersionNum,
-        timestamp: hist.timestamp,
+        withLicenseCode: hist.withLicenseCode,
+        timestampPrevDoc: hist.timestampPrevDoc,
+        timestampDoc: timestampDoc,
       })),
     });
   }
@@ -827,13 +936,17 @@ export async function getActivityEditorData(
       id: activityId,
       isDeleted: false,
       isFolder: false,
-      OR: [{ ownerId: loggedInUserId }, { isPublic: true }],
+      OR: [
+        { ownerId: loggedInUserId },
+        { isPublic: true },
+        { sharedWith: { some: { userId: loggedInUserId } } },
+      ],
     },
-    select: { isAssigned: true, ownerId: true, isPublic: true },
+    select: { isAssigned: true, ownerId: true },
   });
 
   if (contentCheck.ownerId !== loggedInUserId) {
-    // activity is public but not owned by the logged in user
+    // activity is public or shared but not owned by the logged in user
 
     let activity: ContentStructure = {
       id: activityId,
@@ -843,8 +956,11 @@ export async function getActivityEditorData(
       assignmentStatus: "Unassigned",
       classCode: null,
       codeValidUntil: null,
-      isPublic: contentCheck.isPublic,
+      isPublic: false,
+      isShared: false,
+      sharedWith: [],
       license: null,
+      classifications: [],
       documents: [],
       hasScoreData: false,
       parentFolder: null,
@@ -875,6 +991,18 @@ export async function getActivityEditorData(
         classCode: true,
         codeValidUntil: true,
         isPublic: true,
+        sharedWith: {
+          select: {
+            user: {
+              select: {
+                userId: true,
+                email: true,
+                firstNames: true,
+                lastNames: true,
+              },
+            },
+          },
+        },
         license: {
           include: {
             composedOf: {
@@ -883,6 +1011,25 @@ export async function getActivityEditorData(
             },
           },
         },
+        classifications: {
+          select: {
+            classification: {
+              select: {
+                id: true,
+                grade: true,
+                code: true,
+                category: true,
+                description: true,
+                system: {
+                  select: {
+                    id: true,
+                    name: true,
+                  },
+                },
+              },
+            },
+          },
+        },
         documents: {
           select: {
             id: true,
@@ -898,7 +1045,25 @@ export async function getActivityEditorData(
           // TODO: implement ability to allow users to order the documents within an activity
           orderBy: { id: "asc" },
         },
-        parentFolder: { select: { id: true, name: true, isPublic: true } },
+        parentFolder: {
+          select: {
+            id: true,
+            name: true,
+            isPublic: true,
+            sharedWith: {
+              select: {
+                user: {
+                  select: {
+                    userId: true,
+                    email: true,
+                    firstNames: true,
+                    lastNames: true,
+                  },
+                },
+              },
+            },
+          },
+        },
         _count: { select: { assignmentScores: true } },
       },
     });
@@ -907,6 +1072,10 @@ export async function getActivityEditorData(
       ? DateTime.now() <= DateTime.fromJSDate(assignedActivity.codeValidUntil)
       : false;
 
+    const { isShared, sharedWith } = processSharedWith(
+      assignedActivity.sharedWith,
+    );
+
     activity = {
       id: assignedActivity.id,
       name: assignedActivity.name,
@@ -916,9 +1085,14 @@ export async function getActivityEditorData(
       classCode: assignedActivity.classCode,
       codeValidUntil: assignedActivity.codeValidUntil,
       isPublic: assignedActivity.isPublic,
+      isShared,
+      sharedWith,
       license: assignedActivity.license
         ? processLicense(assignedActivity.license)
         : null,
+      classifications: assignedActivity.classifications.map(
+        (c) => c.classification,
+      ),
       documents: assignedActivity.documents.map((doc) => ({
         id: doc.id,
         versionNum: doc.assignedVersion!.versionNum,
@@ -927,7 +1101,7 @@ export async function getActivityEditorData(
         doenetmlVersion: doc.assignedVersion!.doenetmlVersion,
       })),
       hasScoreData: assignedActivity._count.assignmentScores > 0,
-      parentFolder: assignedActivity.parentFolder,
+      parentFolder: processParentFolder(assignedActivity.parentFolder),
     };
   } else {
     let unassignedActivity = await prisma.content.findUniqueOrThrow({
@@ -945,6 +1119,18 @@ export async function getActivityEditorData(
         classCode: true,
         codeValidUntil: true,
         isPublic: true,
+        sharedWith: {
+          select: {
+            user: {
+              select: {
+                userId: true,
+                email: true,
+                firstNames: true,
+                lastNames: true,
+              },
+            },
+          },
+        },
         license: {
           include: {
             composedOf: {
@@ -953,6 +1139,25 @@ export async function getActivityEditorData(
             },
           },
         },
+        classifications: {
+          select: {
+            classification: {
+              select: {
+                id: true,
+                grade: true,
+                code: true,
+                category: true,
+                description: true,
+                system: {
+                  select: {
+                    id: true,
+                    name: true,
+                  },
+                },
+              },
+            },
+          },
+        },
         documents: {
           select: {
             name: true,
@@ -963,17 +1168,47 @@ export async function getActivityEditorData(
           // TODO: implement ability to allow users to order the documents within an activity
           orderBy: { id: "asc" },
         },
-        parentFolder: { select: { id: true, name: true, isPublic: true } },
+        parentFolder: {
+          select: {
+            id: true,
+            name: true,
+            isPublic: true,
+            sharedWith: {
+              select: {
+                user: {
+                  select: {
+                    userId: true,
+                    email: true,
+                    firstNames: true,
+                    lastNames: true,
+                  },
+                },
+              },
+            },
+          },
+        },
       },
     });
 
+    const {
+      sharedWith: sharedWithOrig,
+      license,
+      classifications,
+      parentFolder,
+      ...unassignedActivity2
+    } = unassignedActivity;
+
+    const { isShared, sharedWith } = processSharedWith(sharedWithOrig);
+
     activity = {
-      ...unassignedActivity,
-      license: unassignedActivity.license
-        ? processLicense(unassignedActivity.license)
-        : null,
+      ...unassignedActivity2,
+      isShared,
+      sharedWith,
+      license: license ? processLicense(license) : null,
+      classifications: classifications.map((c) => c.classification),
       assignmentStatus: "Unassigned",
       hasScoreData: false,
+      parentFolder: processParentFolder(parentFolder),
     };
   }
 
@@ -987,7 +1222,10 @@ export async function getActivityEditorData(
  *
  * @param activityId
  */
-export async function getPublicEditorData(activityId: number) {
+export async function getSharedEditorData(
+  activityId: number,
+  loggedInUserId: number,
+) {
   // TODO: add pagination or a hard limit in the number of documents one can add to an activity
 
   const preliminaryActivity = await prisma.content.findUniqueOrThrow({
@@ -995,7 +1233,11 @@ export async function getPublicEditorData(activityId: number) {
       id: activityId,
       isDeleted: false,
       isFolder: false,
-      isPublic: true,
+      OR: [
+        { ownerId: loggedInUserId },
+        { isPublic: true },
+        { sharedWith: { some: { userId: loggedInUserId } } },
+      ],
     },
     select: {
       id: true,
@@ -1003,6 +1245,12 @@ export async function getPublicEditorData(activityId: number) {
       ownerId: true,
       name: true,
       imagePath: true,
+      isPublic: true,
+      sharedWith: {
+        select: {
+          userId: true,
+        },
+      },
       documents: {
         select: {
           name: true,
@@ -1021,20 +1269,64 @@ export async function getPublicEditorData(activityId: number) {
           },
         },
       },
-      parentFolder: { select: { id: true, name: true, isPublic: true } },
+      classifications: {
+        select: {
+          classification: {
+            select: {
+              id: true,
+              grade: true,
+              code: true,
+              category: true,
+              description: true,
+              system: {
+                select: {
+                  id: true,
+                  name: true,
+                },
+              },
+            },
+          },
+        },
+      },
+      parentFolder: {
+        select: {
+          id: true,
+          name: true,
+          isPublic: true,
+          sharedWith: {
+            select: {
+              userId: true,
+            },
+          },
+        },
+      },
     },
   });
 
-  let activity: ContentStructure = {
-    ...preliminaryActivity,
-    isPublic: true,
-    license: preliminaryActivity.license
-      ? processLicense(preliminaryActivity.license)
-      : null,
+  const {
+    license,
+    classifications,
+    sharedWith: sharedWithOrig,
+    parentFolder,
+    ...preliminaryActivity2
+  } = preliminaryActivity;
+
+  const { isShared, sharedWith } = processSharedWithForUser(
+    sharedWithOrig,
+    loggedInUserId,
+  );
+
+  const activity: ContentStructure = {
+    ...preliminaryActivity2,
+    isShared,
+    sharedWith,
+    license: license ? processLicense(license) : null,
+    classifications: classifications.map((c) => c.classification),
     classCode: null,
     codeValidUntil: null,
     assignmentStatus: "Unassigned",
     hasScoreData: false,
+    parentFolder: processParentFolderForUser(parentFolder, loggedInUserId),
   };
 
   return activity;
@@ -1043,21 +1335,30 @@ export async function getPublicEditorData(activityId: number) {
 // TODO: generalize this to multi-document activities
 export async function getActivityViewerData(
   activityId: number,
-  userId: number,
+  loggedInUserId: number,
 ) {
   const preliminaryActivity = await prisma.content.findUniqueOrThrow({
     where: {
       id: activityId,
       isDeleted: false,
       isFolder: false,
-      OR: [{ ownerId: userId }, { isPublic: true }],
+      OR: [
+        { ownerId: loggedInUserId },
+        { isPublic: true },
+        { sharedWith: { some: { userId: loggedInUserId } } },
+      ],
     },
     select: {
       id: true,
       name: true,
       ownerId: true,
-      isPublic: true,
       imagePath: true,
+      isPublic: true,
+      sharedWith: {
+        select: {
+          userId: true,
+        },
+      },
       license: {
         include: {
           composedOf: {
@@ -1066,6 +1367,25 @@ export async function getActivityViewerData(
           },
         },
       },
+      classifications: {
+        select: {
+          classification: {
+            select: {
+              id: true,
+              grade: true,
+              code: true,
+              category: true,
+              description: true,
+              system: {
+                select: {
+                  id: true,
+                  name: true,
+                },
+              },
+            },
+          },
+        },
+      },
       documents: {
         where: { isDeleted: false },
         select: {
@@ -1077,7 +1397,18 @@ export async function getActivityViewerData(
         // TODO: implement ability to allow users to order the documents within an activity
         orderBy: { id: "asc" },
       },
-      parentFolder: { select: { id: true, name: true, isPublic: true } },
+      parentFolder: {
+        select: {
+          id: true,
+          name: true,
+          isPublic: true,
+          sharedWith: {
+            select: {
+              userId: true,
+            },
+          },
+        },
+      },
       owner: {
         select: {
           userId: true,
@@ -1089,31 +1420,136 @@ export async function getActivityViewerData(
     },
   });
 
-  let { owner, ...preliminaryActivity2 } = preliminaryActivity;
+  const {
+    license,
+    classifications,
+    sharedWith: sharedWithOrig,
+    parentFolder,
+    ...preliminaryActivity2
+  } = preliminaryActivity;
+
+  const { isShared, sharedWith } = processSharedWithForUser(
+    sharedWithOrig,
+    loggedInUserId,
+  );
 
-  let activity: ContentStructure = {
+  const activity: ContentStructure = {
     ...preliminaryActivity2,
     isFolder: false,
-    license: preliminaryActivity2.license
-      ? processLicense(preliminaryActivity2.license)
-      : null,
+    isShared,
+    sharedWith,
+    license: license ? processLicense(license) : null,
+    classifications: classifications.map((c) => c.classification),
     classCode: null,
     codeValidUntil: null,
     assignmentStatus: "Unassigned",
     hasScoreData: false,
+    parentFolder: processParentFolderForUser(parentFolder, loggedInUserId),
   };
 
-  const docId = activity.documents[0].id;
+  const docHistories = await getDocumentContributorHistories({
+    docIds: activity.documents.map((doc) => doc.id),
+    loggedInUserId,
+  });
+
+  return {
+    activity,
+    docHistories,
+  };
+}
 
-  let doc = await prisma.documents.findUniqueOrThrow({
-    where: { id: docId, isDeleted: false },
-    include: {
+export async function getDocumentSource(docId: number, loggedInUserId: number) {
+  let document = await prisma.documents.findUniqueOrThrow({
+    where: {
+      id: docId,
+      isDeleted: false,
+      activity: {
+        OR: [
+          { ownerId: loggedInUserId },
+          { isPublic: true },
+          { sharedWith: { some: { userId: loggedInUserId } } },
+        ],
+      },
+    },
+    select: { source: true },
+  });
+
+  return { source: document.source };
+}
+
+export async function getActivityContributorHistory({
+  activityId,
+  loggedInUserId,
+}: {
+  activityId: number;
+  loggedInUserId: number;
+}) {
+  const activity = await prisma.content.findUniqueOrThrow({
+    where: {
+      id: activityId,
+      isDeleted: false,
+      isFolder: false,
+      OR: [
+        { ownerId: loggedInUserId },
+        { isPublic: true },
+        { sharedWith: { some: { userId: loggedInUserId } } },
+      ],
+    },
+    select: { documents: { select: { id: true } } },
+  });
+
+  const docHistories = await getDocumentContributorHistories({
+    docIds: activity.documents.map((doc) => doc.id),
+    loggedInUserId,
+  });
+
+  return { docHistories };
+}
+
+export async function getDocumentContributorHistories({
+  docIds,
+  loggedInUserId,
+}: {
+  docIds: number[];
+  loggedInUserId: number;
+}) {
+  let docHistories = await prisma.documents.findMany({
+    where: {
+      id: { in: docIds },
+      isDeleted: false,
+      activity: {
+        OR: [
+          { ownerId: loggedInUserId },
+          { isPublic: true },
+          { sharedWith: { some: { userId: loggedInUserId } } },
+        ],
+      },
+    },
+    select: {
+      id: true,
       contributorHistory: {
+        where: {
+          prevDoc: {
+            document: {
+              activity: {
+                OR: [
+                  { ownerId: loggedInUserId },
+                  { isPublic: true },
+                  { sharedWith: { some: { userId: loggedInUserId } } },
+                ],
+              },
+            },
+          },
+        },
+        orderBy: { timestampPrevDoc: "desc" },
         include: {
           prevDoc: {
             select: {
+              cid: true,
+              versionNum: true,
               document: {
                 select: {
+                  source: true,
                   activity: {
                     select: {
                       id: true,
@@ -1137,29 +1573,194 @@ export async function getActivityViewerData(
     },
   });
 
-  return {
-    activity,
-    doc,
-    owner,
-  };
+  return docHistories;
 }
 
-export async function getAssignmentDataFromCode(code: string) {
-  let assignment;
+export async function getActivityRemixes({
+  activityId,
+  loggedInUserId,
+}: {
+  activityId: number;
+  loggedInUserId: number;
+}) {
+  const activity = await prisma.content.findUniqueOrThrow({
+    where: {
+      id: activityId,
+      isDeleted: false,
+      isFolder: false,
+      OR: [
+        { ownerId: loggedInUserId },
+        { isPublic: true },
+        { sharedWith: { some: { userId: loggedInUserId } } },
+      ],
+    },
+    select: { documents: { select: { id: true } } },
+  });
 
-  try {
-    assignment = await prisma.content.findFirstOrThrow({
-      where: {
-        classCode: code,
-        codeValidUntil: {
-          gte: DateTime.now().toISO(), // TODO - confirm this works with timezone stuff
-        },
-        isDeleted: false,
-        isAssigned: true,
-        isFolder: false,
-      },
-      select: {
-        id: true,
+  const docRemixes = await getDocumentRemixes({
+    docIds: activity.documents.map((doc) => doc.id),
+    loggedInUserId,
+  });
+
+  // const docDirectRemixes = await getDocumentDirectRemixes({
+  //   docIds: activity.documents.map((doc) => doc.id),
+  //   loggedInUserId,
+  // });
+
+  return { docRemixes };
+}
+
+export async function getDocumentDirectRemixes({
+  docIds,
+  loggedInUserId,
+}: {
+  docIds: number[];
+  loggedInUserId: number;
+}) {
+  let docRemixes = await prisma.documents.findMany({
+    where: {
+      id: { in: docIds },
+      isDeleted: false,
+      activity: {
+        OR: [
+          { ownerId: loggedInUserId },
+          { isPublic: true },
+          { sharedWith: { some: { userId: loggedInUserId } } },
+        ],
+      },
+    },
+    select: {
+      id: true,
+      documentVersions: {
+        select: {
+          versionNum: true,
+          contributorHistory: {
+            where: {
+              document: {
+                activity: {
+                  OR: [
+                    { ownerId: loggedInUserId },
+                    { isPublic: true },
+                    { sharedWith: { some: { userId: loggedInUserId } } },
+                  ],
+                },
+              },
+              timestampDoc: {
+                equals: prisma.contributorHistory.fields.timestampPrevDoc,
+              },
+            },
+            orderBy: { timestampDoc: "desc" },
+            include: {
+              document: {
+                select: {
+                  activity: {
+                    select: {
+                      id: true,
+                      name: true,
+                      owner: {
+                        select: {
+                          userId: true,
+                          email: true,
+                          firstNames: true,
+                          lastNames: true,
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  });
+
+  return docRemixes;
+}
+
+export async function getDocumentRemixes({
+  docIds,
+  loggedInUserId,
+}: {
+  docIds: number[];
+  loggedInUserId: number;
+}) {
+  let docRemixes = await prisma.documents.findMany({
+    where: {
+      id: { in: docIds },
+      isDeleted: false,
+      activity: {
+        OR: [
+          { ownerId: loggedInUserId },
+          { isPublic: true },
+          { sharedWith: { some: { userId: loggedInUserId } } },
+        ],
+      },
+    },
+    select: {
+      id: true,
+      documentVersions: {
+        select: {
+          versionNum: true,
+          contributorHistory: {
+            where: {
+              document: {
+                activity: {
+                  OR: [
+                    { ownerId: loggedInUserId },
+                    { isPublic: true },
+                    { sharedWith: { some: { userId: loggedInUserId } } },
+                  ],
+                },
+              },
+            },
+            orderBy: { timestampDoc: "desc" },
+            include: {
+              document: {
+                select: {
+                  activity: {
+                    select: {
+                      id: true,
+                      name: true,
+                      owner: {
+                        select: {
+                          userId: true,
+                          email: true,
+                          firstNames: true,
+                          lastNames: true,
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  });
+
+  return docRemixes;
+}
+
+export async function getAssignmentDataFromCode(code: string) {
+  let assignment;
+
+  try {
+    assignment = await prisma.content.findFirstOrThrow({
+      where: {
+        classCode: code,
+        codeValidUntil: {
+          gte: DateTime.now().toISO(), // TODO - confirm this works with timezone stuff
+        },
+        isDeleted: false,
+        isAssigned: true,
+        isFolder: false,
+      },
+      select: {
+        id: true,
         documents: {
           select: {
             id: true,
@@ -1194,58 +1795,207 @@ export async function getAssignmentDataFromCode(code: string) {
   return { assignmentFound: true, assignment };
 }
 
-export async function searchPublicContent(query: string) {
-  // TODO: how should we sort these?
+export async function searchSharedContent(
+  query: string,
+  loggedInUserId: number,
+) {
+  // remove operators that break MySQL BOOLEAN search
+  // and add * at the end of every word so that match beginning of words
+  const query_as_prefixes = query
+    .replace(/[+\-><\(\)~*\"@]+/g, " ")
+    .split(" ")
+    .filter((s) => s)
+    .map((s) => s + "*")
+    .join(" ");
+
+  let matches = await prisma.$queryRaw<
+    {
+      id: number;
+      relevance: number;
+    }[]
+  >(Prisma.sql`
+  SELECT
+    content.id,
+    AVG((MATCH(content.name) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)*100) + 
+    (MATCH(documents.source) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)*100) +
+    MATCH(users.firstNames, users.lastNames) AGAINST(${query_as_prefixes} IN BOOLEAN MODE) +
+    MATCH(classifications.code, classifications.category, classifications.description) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)
+    ) as relevance
+  FROM
+    content
+  LEFT JOIN
+    (SELECT * from documents WHERE isDeleted = FALSE) AS documents ON content.id = documents.activityId
+  LEFT JOIN
+    users ON content.ownerId = users.userId
+  LEFT JOIN
+    contentClassifications ON content.id = contentClassifications.contentId
+  LEFT JOIN
+    classifications ON contentClassifications.classificationId = classifications.id
+  WHERE
+    content.isDeleted = FALSE
+    AND (
+       content.isPublic = TRUE
+       OR content.id IN (SELECT contentId FROM contentShares WHERE userId = ${loggedInUserId})
+    )
+    AND
+    (MATCH(content.name) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)
+    OR MATCH(documents.source) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)
+    OR MATCH(users.firstNames, users.lastNames) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)
+    OR MATCH(classifications.code, classifications.category, classifications.description) AGAINST(${query_as_prefixes} IN BOOLEAN MODE))
+  GROUP BY
+    content.id
+  ORDER BY
+    relevance DESC
+  LIMIT 100
+  `);
+
+  // TODO: combine queries
 
-  let query_words = query.split(" ");
-  let content = await prisma.content.findMany({
+  const preliminaryPublicContent = await prisma.content.findMany({
     where: {
-      AND: query_words.map((qw) => ({ name: { contains: "%" + qw + "%" } })),
-      isPublic: true,
-      isDeleted: false,
+      id: { in: matches.map((m) => m.id) },
     },
     select: {
       id: true,
       isFolder: true,
       ownerId: true,
+      owner: {
+        select: {
+          userId: true,
+          firstNames: true,
+          lastNames: true,
+          email: true,
+        },
+      },
       name: true,
       imagePath: true,
-      createdAt: true,
-      lastEdited: true,
-      owner: true,
-    },
-  });
-
-  return content;
-}
-
-export async function searchUsersWithPublicContent(query: string) {
-  // TODO: how should we sort these?
-
-  let query_words = query.split(" ");
-  let usersWithPublic = await prisma.users.findMany({
-    where: {
-      AND: query_words.map((qw) => ({
-        OR: [
-          { firstNames: { contains: "%" + qw + "%" } },
-          { lastNames: { contains: "%" + qw + "%" } },
-        ],
-      })),
-      isAnonymous: false,
-      content: {
-        some: {
+      isPublic: true,
+      sharedWith: {
+        select: {
+          userId: true,
+        },
+      },
+      license: {
+        include: {
+          composedOf: {
+            select: { composedOf: true },
+            orderBy: { composedOf: { sortIndex: "asc" } },
+          },
+        },
+      },
+      classifications: {
+        select: {
+          classification: {
+            select: {
+              id: true,
+              grade: true,
+              code: true,
+              category: true,
+              description: true,
+              system: {
+                select: {
+                  id: true,
+                  name: true,
+                },
+              },
+            },
+          },
+        },
+      },
+      parentFolder: {
+        select: {
+          id: true,
+          name: true,
           isPublic: true,
-          isDeleted: false,
+          sharedWith: {
+            select: {
+              userId: true,
+            },
+          },
         },
       },
     },
-    select: {
-      userId: true,
-      firstNames: true,
-      lastNames: true,
-    },
   });
 
+  // TODO: better way to sort! (For free if combine queries)
+  const relevance = Object.fromEntries(matches.map((m) => [m.id, m.relevance]));
+
+  const publicContent: ContentStructure[] = preliminaryPublicContent
+    .sort((a, b) => relevance[b.id] - relevance[a.id])
+    .map((content) => {
+      const {
+        license,
+        classifications,
+        sharedWith: sharedWithOrig,
+        parentFolder,
+        ...content2
+      } = content;
+
+      const { isShared, sharedWith } = processSharedWithForUser(
+        sharedWithOrig,
+        loggedInUserId,
+      );
+
+      return {
+        ...content2,
+        isShared,
+        sharedWith,
+        documents: [],
+        license: license ? processLicense(license) : null,
+        classifications: classifications.map((c) => c.classification),
+        classCode: null,
+        codeValidUntil: null,
+        assignmentStatus: "Unassigned",
+        hasScoreData: false,
+        parentFolder: processParentFolderForUser(parentFolder, loggedInUserId),
+      };
+    });
+
+  return publicContent;
+}
+
+export async function searchUsersWithSharedContent(
+  query: string,
+  loggedInUserId: number,
+) {
+  // remove operators that break MySQL BOOLEAN search
+  // and add * at the end of every word so that match beginning of words
+  const query_as_prefixes = query
+    .replace(/[+\-><\(\)~*\"@]+/g, " ")
+    .split(" ")
+    .filter((s) => s)
+    .map((s) => s + "*")
+    .join(" ");
+
+  const usersWithPublic = await prisma.$queryRaw<
+    {
+      userId: number;
+      firstNames: string | null;
+      lastNames: string;
+    }[]
+  >(Prisma.sql`
+  SELECT
+    users.userId, users.firstNames, users.lastNames,
+    MATCH(users.firstNames, users.lastNames) AGAINST(${query_as_prefixes} IN BOOLEAN MODE) as relevance
+  FROM
+    users
+  WHERE
+    users.isAnonymous = FALSE
+    AND users.userId IN (
+      SELECT ownerId FROM content WHERE isDeleted = FALSE AND (
+        isPublic = TRUE
+        OR id IN (
+          SELECT contentId FROM contentShares WHERE userId = ${loggedInUserId}
+        )
+      )
+    )
+    AND
+    MATCH(users.firstNames, users.lastNames) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)
+  ORDER BY
+    relevance DESC
+  LIMIT 100
+  `);
+
   return usersWithPublic;
 }
 
@@ -1285,10 +2035,14 @@ export async function listUserAssigned(userId: number) {
     let assignmentStatus: AssignmentStatus = !isOpen ? "Closed" : "Open";
     return {
       ...obj,
+      isShared: false,
+      sharedWith: [],
       license: obj.license ? processLicense(obj.license) : null,
+      classifications: [],
       assignmentStatus,
       documents: [],
       hasScoreData: false,
+      parentFolder: processParentFolder(obj.parentFolder),
     };
   });
 
@@ -2828,6 +3582,18 @@ export async function getMyFolderContent({
         name: true,
         imagePath: true,
         isPublic: true,
+        sharedWith: {
+          select: {
+            user: {
+              select: {
+                userId: true,
+                email: true,
+                firstNames: true,
+                lastNames: true,
+              },
+            },
+          },
+        },
         license: {
           include: {
             composedOf: {
@@ -2836,21 +3602,50 @@ export async function getMyFolderContent({
             },
           },
         },
-        parentFolder: { select: { id: true, name: true, isPublic: true } },
+        parentFolder: {
+          select: {
+            id: true,
+            name: true,
+            isPublic: true,
+            sharedWith: {
+              select: {
+                user: {
+                  select: {
+                    userId: true,
+                    email: true,
+                    firstNames: true,
+                    lastNames: true,
+                  },
+                },
+              },
+            },
+          },
+        },
       },
     });
 
+    const {
+      sharedWith: sharedWithOrig,
+      license,
+      parentFolder,
+      ...preliminaryFolder2
+    } = preliminaryFolder;
+
+    const { isShared, sharedWith } = processSharedWith(sharedWithOrig);
+
     folder = {
-      ...preliminaryFolder,
+      ...preliminaryFolder2,
       isFolder: true,
+      isShared,
+      sharedWith,
       assignmentStatus: "Unassigned",
       classCode: null,
       codeValidUntil: null,
       documents: [],
       hasScoreData: false,
-      license: preliminaryFolder.license
-        ? processLicense(preliminaryFolder.license)
-        : null,
+      license: license ? processLicense(license) : null,
+      parentFolder: processParentFolder(parentFolder),
+      classifications: [],
     };
   }
 
@@ -2867,6 +3662,18 @@ export async function getMyFolderContent({
       name: true,
       imagePath: true,
       isPublic: true,
+      sharedWith: {
+        select: {
+          user: {
+            select: {
+              userId: true,
+              email: true,
+              firstNames: true,
+              lastNames: true,
+            },
+          },
+        },
+      },
       isAssigned: true,
       classCode: true,
       codeValidUntil: true,
@@ -2878,28 +3685,79 @@ export async function getMyFolderContent({
           },
         },
       },
+      classifications: {
+        select: {
+          classification: {
+            select: {
+              id: true,
+              code: true,
+              grade: true,
+              category: true,
+              description: true,
+              system: {
+                select: {
+                  id: true,
+                  name: true,
+                },
+              },
+            },
+          },
+        },
+      },
       documents: { select: { id: true, doenetmlVersion: true } },
-      parentFolder: { select: { id: true, name: true, isPublic: true } },
+      parentFolder: {
+        select: {
+          id: true,
+          name: true,
+          isPublic: true,
+          sharedWith: {
+            select: {
+              user: {
+                select: {
+                  userId: true,
+                  email: true,
+                  firstNames: true,
+                  lastNames: true,
+                },
+              },
+            },
+          },
+        },
+      },
       _count: { select: { assignmentScores: true } },
     },
     orderBy: { sortIndex: "asc" },
   });
 
-  let content: ContentStructure[] = preliminaryContent.map((obj) => {
-    let { _count, isAssigned, ...activity } = obj;
-    let isOpen = obj.codeValidUntil
+  const content: ContentStructure[] = preliminaryContent.map((obj) => {
+    const {
+      _count,
+      isAssigned,
+      sharedWith: sharedWithOrig,
+      license,
+      classifications,
+      parentFolder,
+      ...activity
+    } = obj;
+    const isOpen = obj.codeValidUntil
       ? DateTime.now() <= DateTime.fromJSDate(obj.codeValidUntil)
       : false;
-    let assignmentStatus: AssignmentStatus = !obj.isAssigned
+    const assignmentStatus: AssignmentStatus = !obj.isAssigned
       ? "Unassigned"
       : !isOpen
         ? "Closed"
         : "Open";
+    const { isShared, sharedWith } = processSharedWith(sharedWithOrig);
+
     return {
       ...activity,
-      license: activity.license ? processLicense(activity.license) : null,
+      isShared,
+      sharedWith,
+      license: license ? processLicense(license) : null,
+      classifications: classifications.map((c) => c.classification),
       assignmentStatus,
       hasScoreData: _count.assignmentScores > 0,
+      parentFolder: processParentFolder(parentFolder),
     };
   });
 
@@ -2922,7 +3780,7 @@ export async function searchMyFolderContent({
 
   if (folderId !== null) {
     // if ask for a folder, make sure it exists and is owned by logged in user
-    let preliminaryFolder = await prisma.content.findUniqueOrThrow({
+    const preliminaryFolder = await prisma.content.findUniqueOrThrow({
       where: {
         id: folderId,
         isDeleted: false,
@@ -2935,6 +3793,18 @@ export async function searchMyFolderContent({
         name: true,
         imagePath: true,
         isPublic: true,
+        sharedWith: {
+          select: {
+            user: {
+              select: {
+                userId: true,
+                email: true,
+                firstNames: true,
+                lastNames: true,
+              },
+            },
+          },
+        },
         license: {
           include: {
             composedOf: {
@@ -2943,62 +3813,108 @@ export async function searchMyFolderContent({
             },
           },
         },
-        parentFolder: { select: { id: true, name: true, isPublic: true } },
+        parentFolder: {
+          select: {
+            id: true,
+            name: true,
+            isPublic: true,
+            sharedWith: {
+              select: {
+                user: {
+                  select: {
+                    userId: true,
+                    email: true,
+                    firstNames: true,
+                    lastNames: true,
+                  },
+                },
+              },
+            },
+          },
+        },
       },
     });
 
+    const {
+      sharedWith: sharedWithOrig,
+      license,
+      parentFolder,
+      ...preliminaryFolder2
+    } = preliminaryFolder;
+    const { isShared, sharedWith } = processSharedWith(sharedWithOrig);
+
     folder = {
-      ...preliminaryFolder,
+      ...preliminaryFolder2,
       isFolder: true,
+      isShared,
+      sharedWith,
       assignmentStatus: "Unassigned",
       classCode: null,
       codeValidUntil: null,
       documents: [],
       hasScoreData: false,
-      license: preliminaryFolder.license
-        ? processLicense(preliminaryFolder.license)
-        : null,
+      license: license ? processLicense(license) : null,
+      parentFolder: processParentFolder(parentFolder),
+      classifications: [],
     };
   }
 
-  let query_words = query.split(" ");
+  let matches: {
+    id: number;
+    relevance: number;
+  }[];
 
-  let preliminaryResults;
+  // remove operators that break MySQL BOOLEAN search
+  // and add * at the end of every word so that match beginning of words
+  const query_as_prefixes = query
+    .replace(/[+\-><\(\)~*\"@]+/g, " ")
+    .split(" ")
+    .filter((s) => s)
+    .map((s) => s + "*")
+    .join(" ");
 
   if (folderId === null) {
-    preliminaryResults = await prisma.content.findMany({
-      where: {
-        AND: query_words.map((qw) => ({ name: { contains: "%" + qw + "%" } })),
-        ownerId: loggedInUserId,
-        isDeleted: false,
-      },
-      select: {
-        id: true,
-        isFolder: true,
-        ownerId: true,
-        name: true,
-        imagePath: true,
-        isPublic: true,
-        isAssigned: true,
-        classCode: true,
-        codeValidUntil: true,
-        license: {
-          include: {
-            composedOf: {
-              select: { composedOf: true },
-              orderBy: { composedOf: { sortIndex: "asc" } },
-            },
-          },
-        },
-        documents: { select: { id: true, doenetmlVersion: true } },
-        parentFolder: { select: { id: true, name: true, isPublic: true } },
-        _count: { select: { assignmentScores: true } },
-      },
-    });
+    matches = await prisma.$queryRaw<
+      {
+        id: number;
+        relevance: number;
+      }[]
+    >(Prisma.sql`
+  SELECT
+    content.id,
+    AVG((MATCH(content.name) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)*100) + 
+    (MATCH(documents.source) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)*100) +
+    MATCH(classifications.code, classifications.category, classifications.description) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)
+    ) as relevance
+  FROM
+    content
+  LEFT JOIN
+    (SELECT * from documents WHERE isDeleted = FALSE) AS documents ON content.id = documents.activityId
+  LEFT JOIN
+    contentClassifications ON content.id = contentClassifications.contentId
+  LEFT JOIN
+    classifications ON contentClassifications.classificationId = classifications.id
+  WHERE
+    content.ownerId = ${loggedInUserId}
+    AND content.isDeleted = FALSE
+    AND
+    (MATCH(content.name) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)
+    OR MATCH(documents.source) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)
+    OR MATCH(classifications.code, classifications.category, classifications.description) AGAINST(${query_as_prefixes} IN BOOLEAN MODE))
+  GROUP BY
+    content.id
+  ORDER BY
+    relevance DESC
+  LIMIT 100
+  `);
   } else {
-    let ids = (
-      await prisma.$queryRaw<{ id: number }[]>(
-        Prisma.sql`
+    matches = await prisma.$queryRaw<
+      {
+        id: number;
+        relevance: number;
+      }[]
+    >(
+      Prisma.sql`
     WITH RECURSIVE content_tree(id) AS (
       SELECT id FROM content
       WHERE parentFolderId = ${folderId} AND ownerId = ${loggedInUserId} AND isDeleted = FALSE
@@ -3008,72 +3924,166 @@ export async function searchMyFolderContent({
       ON content.parentFolderId = ft.id
       WHERE content.isDeleted = FALSE
     )
-    SELECT id from content_tree;
+
+    SELECT
+      content.id,
+      AVG((MATCH(content.name) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)*100) + 
+      (MATCH(documents.source) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)*100) +
+      MATCH(classifications.code, classifications.category, classifications.description) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)
+      ) as relevance
+    FROM
+      content
+    LEFT JOIN
+      (SELECT * from documents WHERE isDeleted = FALSE) AS documents ON content.id = documents.activityId
+    LEFT JOIN
+      contentClassifications ON content.id = contentClassifications.contentId
+    LEFT JOIN
+      classifications ON contentClassifications.classificationId = classifications.id
+    WHERE
+      content.id IN (SELECT id from content_tree)
+      AND
+      (MATCH(content.name) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)
+      OR MATCH(documents.source) AGAINST(${query_as_prefixes} IN BOOLEAN MODE)
+      OR MATCH(classifications.code, classifications.category, classifications.description) AGAINST(${query_as_prefixes} IN BOOLEAN MODE))
+    GROUP BY
+      content.id
+    ORDER BY
+      relevance DESC
+    LIMIT 100
     `,
-      )
-    ).map((obj) => obj.id);
+    );
+  }
 
-    // TODO: combine this query with above recursive query
-    preliminaryResults = await prisma.content.findMany({
-      where: {
-        AND: query_words.map((qw) => ({ name: { contains: "%" + qw + "%" } })),
-        id: { in: ids },
+  // TODO: combine queries
+
+  const preliminaryResults = await prisma.content.findMany({
+    where: {
+      id: { in: matches.map((m) => m.id) },
+    },
+    select: {
+      id: true,
+      isFolder: true,
+      ownerId: true,
+      name: true,
+      imagePath: true,
+      isPublic: true,
+      sharedWith: {
+        select: {
+          user: {
+            select: {
+              userId: true,
+              email: true,
+              firstNames: true,
+              lastNames: true,
+            },
+          },
+        },
       },
-      select: {
-        id: true,
-        isFolder: true,
-        ownerId: true,
-        name: true,
-        imagePath: true,
-        isPublic: true,
-        isAssigned: true,
-        classCode: true,
-        codeValidUntil: true,
-        license: {
-          include: {
-            composedOf: {
-              select: { composedOf: true },
-              orderBy: { composedOf: { sortIndex: "asc" } },
+      isAssigned: true,
+      classCode: true,
+      codeValidUntil: true,
+      license: {
+        include: {
+          composedOf: {
+            select: { composedOf: true },
+            orderBy: { composedOf: { sortIndex: "asc" } },
+          },
+        },
+      },
+      classifications: {
+        select: {
+          classification: {
+            select: {
+              id: true,
+              code: true,
+              grade: true,
+              category: true,
+              description: true,
+              system: {
+                select: {
+                  id: true,
+                  name: true,
+                },
+              },
             },
           },
         },
-        documents: { select: { id: true, doenetmlVersion: true } },
-        parentFolder: { select: { id: true, name: true, isPublic: true } },
-        _count: { select: { assignmentScores: true } },
       },
-    });
-  }
-
-  let content: ContentStructure[] = preliminaryResults.map((obj) => {
-    let { _count, isAssigned, ...activity } = obj;
-    let isOpen = obj.codeValidUntil
-      ? DateTime.now() <= DateTime.fromJSDate(obj.codeValidUntil)
-      : false;
-    let assignmentStatus: AssignmentStatus = !obj.isAssigned
-      ? "Unassigned"
-      : !isOpen
-        ? "Closed"
-        : "Open";
-    return {
-      ...activity,
-      license: activity.license ? processLicense(activity.license) : null,
-      assignmentStatus,
-      hasScoreData: _count.assignmentScores > 0,
-    };
+      documents: { select: { id: true, doenetmlVersion: true } },
+      parentFolder: {
+        select: {
+          id: true,
+          name: true,
+          isPublic: true,
+          sharedWith: {
+            select: {
+              user: {
+                select: {
+                  userId: true,
+                  email: true,
+                  firstNames: true,
+                  lastNames: true,
+                },
+              },
+            },
+          },
+        },
+      },
+      _count: { select: { assignmentScores: true } },
+    },
   });
 
+  // TODO: better way to sort! (For free if combine queries)
+  const relevance = Object.fromEntries(matches.map((m) => [m.id, m.relevance]));
+
+  const content: ContentStructure[] = preliminaryResults
+    .sort((a, b) => relevance[b.id] - relevance[a.id])
+    .map((obj) => {
+      const {
+        _count,
+        isAssigned,
+        sharedWith: sharedWithOrig,
+        license,
+        classifications,
+        parentFolder,
+        ...activity
+      } = obj;
+      const isOpen = obj.codeValidUntil
+        ? DateTime.now() <= DateTime.fromJSDate(obj.codeValidUntil)
+        : false;
+      const assignmentStatus: AssignmentStatus = !obj.isAssigned
+        ? "Unassigned"
+        : !isOpen
+          ? "Closed"
+          : "Open";
+      const { isShared, sharedWith } = processSharedWith(sharedWithOrig);
+
+      return {
+        ...activity,
+        isShared,
+        sharedWith,
+        license: license ? processLicense(license) : null,
+        classifications: classifications.map((c) => c.classification),
+        assignmentStatus,
+        hasScoreData: _count.assignmentScores > 0,
+        parentFolder: processParentFolder(parentFolder),
+      };
+    });
+
   return {
     content,
     folder,
   };
 }
 
-export async function getPublicFolderContent({
+export async function getSharedFolderContent({
   ownerId,
   folderId,
+  loggedInUserId,
 }: {
   ownerId: number;
   folderId: number | null;
+  loggedInUserId: number;
 }) {
   let folder: ContentStructure | null = null;
 
@@ -3084,13 +4094,22 @@ export async function getPublicFolderContent({
         ownerId,
         id: folderId,
         isDeleted: false,
-        isPublic: true,
+        OR: [
+          { isPublic: true },
+          { sharedWith: { some: { userId: loggedInUserId } } },
+        ],
       },
       select: {
         id: true,
         ownerId: true,
         name: true,
         imagePath: true,
+        isPublic: true,
+        sharedWith: {
+          select: {
+            userId: true,
+          },
+        },
         license: {
           include: {
             composedOf: {
@@ -3099,37 +4118,72 @@ export async function getPublicFolderContent({
             },
           },
         },
-        parentFolder: { select: { id: true, name: true, isPublic: true } },
+        parentFolder: {
+          select: {
+            id: true,
+            name: true,
+            isPublic: true,
+            sharedWith: {
+              select: {
+                userId: true,
+              },
+            },
+          },
+        },
       },
     });
 
-    // If parent folder is not public,
+    // If parent folder is not public or not shared with me,
     // make it look like it doesn't have a parent folder.
-    if (!preliminaryFolder.parentFolder?.isPublic) {
+    if (
+      !(
+        preliminaryFolder.parentFolder &&
+        (preliminaryFolder.parentFolder.isPublic ||
+          preliminaryFolder.parentFolder.sharedWith.findIndex(
+            (cs) => cs.userId === loggedInUserId,
+          ) !== -1)
+      )
+    ) {
       preliminaryFolder.parentFolder = null;
     }
 
+    const {
+      license,
+      sharedWith: sharedWithOrig,
+      parentFolder,
+      ...preliminaryFolder2
+    } = preliminaryFolder;
+
+    const { isShared, sharedWith } = processSharedWithForUser(
+      sharedWithOrig,
+      loggedInUserId,
+    );
+
     folder = {
-      ...preliminaryFolder,
-      isPublic: true,
+      ...preliminaryFolder2,
       isFolder: true,
+      isShared,
+      sharedWith,
       assignmentStatus: "Unassigned",
       classCode: null,
       codeValidUntil: null,
       documents: [],
       hasScoreData: false,
-      license: preliminaryFolder.license
-        ? processLicense(preliminaryFolder.license)
-        : null,
+      license: license ? processLicense(license) : null,
+      parentFolder: processParentFolderForUser(parentFolder, loggedInUserId),
+      classifications: [],
     };
   }
 
-  const preliminaryPublicContent = await prisma.content.findMany({
+  const preliminarySharedContent = await prisma.content.findMany({
     where: {
       ownerId,
       isDeleted: false,
-      isPublic: true,
       parentFolderId: folderId,
+      OR: [
+        { isPublic: true },
+        { sharedWith: { some: { userId: loggedInUserId } } },
+      ],
     },
     select: {
       id: true,
@@ -3137,6 +4191,31 @@ export async function getPublicFolderContent({
       ownerId: true,
       name: true,
       imagePath: true,
+      isPublic: true,
+      sharedWith: {
+        select: {
+          userId: true,
+        },
+      },
+      classifications: {
+        select: {
+          classification: {
+            select: {
+              id: true,
+              grade: true,
+              code: true,
+              category: true,
+              description: true,
+              system: {
+                select: {
+                  id: true,
+                  name: true,
+                },
+              },
+            },
+          },
+        },
+      },
       license: {
         include: {
           composedOf: {
@@ -3145,23 +4224,42 @@ export async function getPublicFolderContent({
           },
         },
       },
-      parentFolder: { select: { id: true, name: true, isPublic: true } },
+      parentFolder: {
+        select: {
+          id: true,
+          name: true,
+          isPublic: true,
+          sharedWith: {
+            select: {
+              userId: true,
+            },
+          },
+        },
+      },
     },
     orderBy: { sortIndex: "asc" },
   });
 
   // If looking in the base folder,
-  // also include orphaned public content,
-  // i.e., public content that is inside a private folder.
-  // That way, users can navigate to all of the owner's public content
+  // also include orphaned shared content,
+  // i.e., shared content that is inside a non-shared folder.
+  // That way, users can navigate to all of the owner's shared content
   // when start at the base folder
   if (folderId === null) {
-    let orphanedPublicContent = await prisma.content.findMany({
+    let orphanedSharedContent = await prisma.content.findMany({
       where: {
         ownerId,
         isDeleted: false,
-        isPublic: true,
-        parentFolder: { isPublic: false },
+        parentFolder: {
+          AND: [
+            { isPublic: false },
+            { sharedWith: { none: { userId: loggedInUserId } } },
+          ],
+        },
+        OR: [
+          { isPublic: true },
+          { sharedWith: { some: { userId: loggedInUserId } } },
+        ],
       },
       select: {
         id: true,
@@ -3169,6 +4267,31 @@ export async function getPublicFolderContent({
         ownerId: true,
         name: true,
         imagePath: true,
+        isPublic: true,
+        sharedWith: {
+          select: {
+            userId: true,
+          },
+        },
+        classifications: {
+          select: {
+            classification: {
+              select: {
+                id: true,
+                grade: true,
+                code: true,
+                category: true,
+                description: true,
+                system: {
+                  select: {
+                    id: true,
+                    name: true,
+                  },
+                },
+              },
+            },
+          },
+        },
         license: {
           include: {
             composedOf: {
@@ -3177,24 +4300,51 @@ export async function getPublicFolderContent({
             },
           },
         },
-        parentFolder: { select: { id: true, name: true, isPublic: true } },
+        parentFolder: {
+          select: {
+            id: true,
+            name: true,
+            isPublic: true,
+            sharedWith: {
+              select: {
+                userId: true,
+              },
+            },
+          },
+        },
       },
       orderBy: { sortIndex: "asc" },
     });
-    preliminaryPublicContent.push(...orphanedPublicContent);
+    preliminarySharedContent.push(...orphanedSharedContent);
   }
 
-  let publicContent: ContentStructure[] = preliminaryPublicContent.map(
+  const publicContent: ContentStructure[] = preliminarySharedContent.map(
     (content) => {
+      const {
+        license,
+        classifications,
+        sharedWith: sharedWithOrig,
+        parentFolder,
+        ...content2
+      } = content;
+
+      const { isShared, sharedWith } = processSharedWithForUser(
+        sharedWithOrig,
+        loggedInUserId,
+      );
+
       return {
-        ...content,
-        isPublic: true,
+        ...content2,
+        isShared,
+        sharedWith,
         documents: [],
-        license: content.license ? processLicense(content.license) : null,
+        license: license ? processLicense(license) : null,
+        classifications: classifications.map((c) => c.classification),
         classCode: null,
         codeValidUntil: null,
         assignmentStatus: "Unassigned",
         hasScoreData: false,
+        parentFolder: processParentFolderForUser(parentFolder, loggedInUserId),
       };
     },
   );
@@ -3211,27 +4361,190 @@ export async function getPublicFolderContent({
   };
 }
 
-export async function getLicense(code: string) {
-  const preliminary_license = await prisma.licenses.findUniqueOrThrow({
-    where: { code },
-    include: {
-      composedOf: {
-        select: { composedOf: true },
-        orderBy: { composedOf: { sortIndex: "asc" } },
+export async function searchPossibleClassifications(query: string) {
+  const query_words = query.split(" ");
+  const results: ContentClassification[] =
+    await prisma.classifications.findMany({
+      where: {
+        AND: query_words.map((query_word) => ({
+          OR: [
+            { code: { contains: query_word } },
+            { grade: { contains: query_word } },
+            { category: { contains: query_word } },
+            { description: { contains: query_word } },
+            { system: { name: { contains: query_word } } },
+          ],
+        })),
       },
-    },
-  });
-
-  const license = processLicense(preliminary_license);
-  return license;
+      select: {
+        id: true,
+        grade: true,
+        code: true,
+        category: true,
+        description: true,
+        system: {
+          select: {
+            id: true,
+            name: true,
+          },
+        },
+      },
+    });
+  return results;
 }
 
-export async function getAllLicenses() {
-  const preliminary_licenses = await prisma.licenses.findMany({
-    include: {
-      composedOf: {
-        select: { composedOf: true },
-        orderBy: { composedOf: { sortIndex: "asc" } },
+/**
+ * Add a classification to an activity. The activity must be owned by the logged in user.
+ * Activity id must be an activity, not a folder.
+ * @param activityId
+ * @param classificationId
+ * @param loggedInUserId
+ */
+export async function addClassification(
+  activityId: number,
+  classificationId: number,
+  loggedInUserId: number,
+) {
+  const activity = await prisma.content.findUnique({
+    where: {
+      id: activityId,
+      isFolder: false,
+      isDeleted: false,
+      ownerId: loggedInUserId,
+    },
+    select: {
+      // not using this, we just need to select one field
+      id: true,
+    },
+  });
+  if (!activity) {
+    throw new InvalidRequestError(
+      "This activity does not exist or is not owned by this user.",
+    );
+  }
+  await prisma.contentClassifications.create({
+    data: {
+      contentId: activityId,
+      classificationId,
+    },
+  });
+}
+
+/**
+ * Remove a classification to an activity. The activity must be owned by the logged in user.
+ * Activity id must be an activity, not a folder.
+ * @param activityId
+ * @param classificationId
+ * @param loggedInUserId
+ */
+export async function removeClassification(
+  activityId: number,
+  classificationId: number,
+  loggedInUserId: number,
+) {
+  const activity = await prisma.content.findUnique({
+    where: {
+      id: activityId,
+      isFolder: false,
+      isDeleted: false,
+      ownerId: loggedInUserId,
+    },
+    select: {
+      // not using this, we just need to select one field
+      id: true,
+    },
+  });
+  if (!activity) {
+    throw new InvalidRequestError(
+      "This activity does not exist or is not owned by this user.",
+    );
+  }
+  await prisma.contentClassifications.delete({
+    where: {
+      contentId_classificationId: { contentId: activityId, classificationId },
+    },
+  });
+}
+
+/**
+ * Get all classifications for an activity. The activity must be either public or owned by
+ * loggedInUser.
+ * @param activityId
+ * @param loggedInUserId
+ */
+export async function getClassifications(
+  activityId: number,
+  loggedInUserId: number,
+) {
+  const activity = await prisma.content.findUnique({
+    where: {
+      id: activityId,
+      isFolder: false,
+      isDeleted: false,
+      OR: [
+        {
+          ownerId: loggedInUserId,
+        },
+        {
+          isPublic: true,
+        },
+      ],
+    },
+    select: {
+      // not using this, we just need to select one field
+      id: true,
+    },
+  });
+  if (!activity) {
+    throw new InvalidRequestError(
+      "This activity does not exist or cannot be accessed.",
+    );
+  }
+
+  const classifications = await prisma.contentClassifications.findMany({
+    where: {
+      contentId: activityId,
+    },
+    select: {
+      classification: {
+        select: {
+          id: true,
+          system: {
+            select: {
+              name: true,
+            },
+          },
+          code: true,
+          category: true,
+          description: true,
+        },
+      },
+    },
+  });
+  return classifications;
+}
+
+export async function getLicense(code: string) {
+  const preliminary_license = await prisma.licenses.findUniqueOrThrow({
+    where: { code },
+    include: {
+      composedOf: {
+        select: { composedOf: true },
+        orderBy: { composedOf: { sortIndex: "asc" } },
+      },
+    },
+  });
+
+  const license = processLicense(preliminary_license);
+  return license;
+}
+
+export async function getAllLicenses() {
+  const preliminary_licenses = await prisma.licenses.findMany({
+    include: {
+      composedOf: {
+        select: { composedOf: true },
+        orderBy: { composedOf: { sortIndex: "asc" } },
       },
     },
     orderBy: { sortIndex: "asc" },
@@ -3241,6 +4554,131 @@ export async function getAllLicenses() {
   return licenses;
 }
 
+/**
+ * Process a list of user info from the SharedWith table
+ *
+ * Returns:
+ * - isShared: true if there were any SharedWith items
+ * - sharedWith: an array of UserInfo sorted by last names, then first names, then email.
+ */
+function processSharedWith(
+  sharedWithOrig:
+    | {
+        user: UserInfo;
+      }[]
+    | null
+    | undefined,
+): { isShared: boolean; sharedWith: UserInfo[] } {
+  if (sharedWithOrig === null || sharedWithOrig === undefined) {
+    return { isShared: false, sharedWith: [] };
+  }
+
+  let isShared = sharedWithOrig.length > 0;
+
+  let sharedWith = sharedWithOrig
+    .map((cs) => cs.user)
+    .sort(
+      (a, b) =>
+        a.lastNames.localeCompare(b.lastNames) ||
+        a.firstNames?.localeCompare(b.firstNames || "") ||
+        a.email.localeCompare(b.email),
+    );
+
+  return { isShared, sharedWith };
+}
+
+/**
+ * Process a list of userIds from the SharedWith table to determine
+ * if the content was shared with `determineSharedToUser`
+ *
+ * Returns:
+ * - isShared: true if `determineSharedToUser` is in the list of userIds
+ * - sharedWith: any empty array of UserInfo
+ *
+ * @param sharedWithIds
+ * @param determineSharedToUser
+ * @returns
+ */
+function processSharedWithForUser(
+  sharedWithIds: { userId: number }[] | null | undefined,
+  determineSharedToUser: number,
+): { isShared: boolean; sharedWith: UserInfo[] } {
+  if (sharedWithIds === null || sharedWithIds === undefined) {
+    return { isShared: false, sharedWith: [] };
+  }
+
+  const isShared =
+    sharedWithIds.findIndex((cs) => cs.userId === determineSharedToUser) !== -1;
+
+  const sharedWith: {
+    userId: number;
+    email: string;
+    firstNames: string | null;
+    lastNames: string;
+  }[] = [];
+
+  return { isShared, sharedWith };
+}
+
+/**
+ * Process a parent folder of content to standard form for the parent folder of ContentStructure
+ */
+function processParentFolder(
+  parentFolder: {
+    id: number;
+    name: string;
+    isPublic: boolean;
+    sharedWith?: {
+      user: UserInfo;
+    }[];
+  } | null,
+) {
+  if (parentFolder === null) {
+    return null;
+  }
+
+  const { isShared, sharedWith } = processSharedWith(parentFolder.sharedWith);
+
+  return {
+    id: parentFolder.id,
+    name: parentFolder.name,
+    isPublic: parentFolder.isPublic,
+    isShared,
+    sharedWith,
+  };
+}
+
+/**
+ * Process a parent folder of content to standard form for the parent folder of ContentStructure
+ * where the content sharing is just for the user `determineSharedToUser`.
+ */
+function processParentFolderForUser(
+  parentFolder: {
+    id: number;
+    name: string;
+    isPublic: boolean;
+    sharedWith: { userId: number }[];
+  } | null,
+  determineSharedToUser: number,
+) {
+  if (parentFolder === null) {
+    return null;
+  }
+
+  const { isShared, sharedWith } = processSharedWithForUser(
+    parentFolder.sharedWith,
+    determineSharedToUser,
+  );
+
+  return {
+    id: parentFolder.id,
+    name: parentFolder.name,
+    isPublic: parentFolder.isPublic,
+    isShared,
+    sharedWith,
+  };
+}
+
 function processLicense(
   preliminary_license: {
     composedOf: {
@@ -3296,6 +4734,23 @@ function processLicense(
   }
 }
 
+export async function setActivityLicense({
+  id,
+  ownerId,
+  licenseCode,
+}: {
+  id: number;
+  ownerId: number;
+  licenseCode: LicenseCode;
+}) {
+  const updated = await prisma.content.update({
+    where: { id, isDeleted: false, ownerId: ownerId, isFolder: false },
+    data: { licenseCode },
+  });
+
+  return { id: updated.id };
+}
+
 export async function makeActivityPublic({
   id,
   ownerId,
@@ -3328,6 +4783,126 @@ export async function makeActivityPrivate({
   return { id: updated.id, isPublic: updated.isPublic };
 }
 
+export async function shareActivity({
+  id,
+  ownerId,
+  licenseCode,
+  users,
+}: {
+  id: number;
+  ownerId: number;
+  licenseCode: LicenseCode;
+  users: number[];
+}) {
+  const updated = await prisma.content.update({
+    where: { id, isDeleted: false, ownerId: ownerId, isFolder: false },
+    data: {
+      licenseCode,
+      sharedWith: {
+        createMany: {
+          data: users.map((userId) => ({ userId })),
+          skipDuplicates: true,
+        },
+      },
+    },
+  });
+
+  return { id: updated.id };
+}
+
+export async function shareActivityWithEmail({
+  id,
+  ownerId,
+  licenseCode,
+  email,
+}: {
+  id: number;
+  ownerId: number;
+  licenseCode: LicenseCode;
+  email: string;
+}) {
+  let userId;
+
+  try {
+    userId = (
+      await prisma.users.findUniqueOrThrow({
+        where: { email, isAnonymous: false },
+        select: { userId: true },
+      })
+    ).userId;
+  } catch (e) {
+    if (
+      e instanceof Prisma.PrismaClientKnownRequestError &&
+      e.code === "P2025"
+    ) {
+      throw Error("User with email not found");
+    } else {
+      throw e;
+    }
+  }
+
+  if (userId === ownerId) {
+    // don't need to share with self
+    return { id };
+  }
+
+  return await shareActivity({ id, ownerId, licenseCode, users: [userId] });
+}
+
+export async function unshareActivity({
+  id,
+  ownerId,
+  users,
+}: {
+  id: number;
+  ownerId: number;
+  users: number[];
+}) {
+  await prisma.contentShares.deleteMany({
+    where: {
+      content: { id, isDeleted: false, ownerId, isFolder: false },
+      OR: users.map((userId) => ({ userId })),
+    },
+  });
+
+  return { id };
+}
+
+export async function setFolderLicense({
+  id,
+  ownerId,
+  licenseCode,
+}: {
+  id: number;
+  ownerId: number;
+  licenseCode: LicenseCode;
+}) {
+  // Set license for the folder `id` along with all the content inside it,
+  // recursing to subfolders.
+
+  // Verify the folder exists
+  await prisma.content.findUniqueOrThrow({
+    where: { id, ownerId, isFolder: true, isDeleted: false },
+    select: { id: true },
+  });
+
+  await prisma.$queryRaw(Prisma.sql`
+    WITH RECURSIVE content_tree(id) AS (
+      SELECT id FROM content
+      WHERE id = ${id} AND ownerId = ${ownerId} AND isDeleted = FALSE
+      UNION ALL
+      SELECT content.id FROM content
+      INNER JOIN content_tree AS ft
+      ON content.parentFolderId = ft.id
+      WHERE content.isDeleted = FALSE
+    )
+
+    UPDATE content
+      SET content.licenseCode = ${licenseCode}
+      WHERE content.id IN (SELECT id from content_tree);
+    `);
+}
+
 export async function makeFolderPublic({
   id,
   ownerId,
@@ -3395,3 +4970,142 @@ export async function makeFolderPrivate({
       WHERE content.id IN (SELECT id from content_tree);
     `);
 }
+
+export async function shareFolder({
+  id,
+  ownerId,
+  licenseCode,
+  users,
+}: {
+  id: number;
+  ownerId: number;
+  licenseCode: LicenseCode;
+  users: number[];
+}) {
+  // Share the folder `id` to users along with all the content inside it,
+  // recursing to subfolders.
+
+  // Verify the folder exists
+  await prisma.content.findUniqueOrThrow({
+    where: { id, ownerId, isFolder: true, isDeleted: false },
+    select: { id: true },
+  });
+
+  let contentIds = (
+    await prisma.$queryRaw<{ id: number }[]>(Prisma.sql`
+    WITH RECURSIVE content_tree(id) AS (
+      SELECT id FROM content
+      WHERE id = ${id} AND ownerId = ${ownerId} AND isDeleted = FALSE
+      UNION ALL
+      SELECT content.id FROM content
+      INNER JOIN content_tree AS ft
+      ON content.parentFolderId = ft.id
+      WHERE content.isDeleted = FALSE
+    )
+
+    SELECT id from content_tree;
+    `)
+  ).map((obj) => obj.id);
+
+  // TODO: combine queries?
+
+  await prisma.content.updateMany({
+    where: { id: { in: contentIds } },
+    data: {
+      licenseCode,
+    },
+  });
+
+  await prisma.contentShares.createMany({
+    data: users.flatMap((userId) =>
+      contentIds.map((contentId) => ({ userId, contentId })),
+    ),
+    skipDuplicates: true,
+  });
+
+  return { id };
+}
+
+export async function shareFolderWithEmail({
+  id,
+  ownerId,
+  licenseCode,
+  email,
+}: {
+  id: number;
+  ownerId: number;
+  licenseCode: LicenseCode;
+  email: string;
+}) {
+  let userId;
+
+  try {
+    userId = (
+      await prisma.users.findUniqueOrThrow({
+        where: { email, isAnonymous: false },
+        select: { userId: true },
+      })
+    ).userId;
+  } catch (e) {
+    if (
+      e instanceof Prisma.PrismaClientKnownRequestError &&
+      e.code === "P2025"
+    ) {
+      throw Error("User with email not found");
+    } else {
+      throw e;
+    }
+  }
+
+  if (userId === ownerId) {
+    // don't need to share with self
+    return { id };
+  }
+
+  return await shareFolder({ id, ownerId, licenseCode, users: [userId] });
+}
+
+export async function unshareFolder({
+  id,
+  ownerId,
+  users,
+}: {
+  id: number;
+  ownerId: number;
+  users: number[];
+}) {
+  // Stop the folder `id` along with all the content inside it,
+  // recursing to subfolders.
+
+  // Verify the folder exists
+  await prisma.content.findUniqueOrThrow({
+    where: { id, ownerId, isFolder: true, isDeleted: false },
+    select: { id: true },
+  });
+
+  let contentIds = (
+    await prisma.$queryRaw<{ id: number }[]>(Prisma.sql`
+    WITH RECURSIVE content_tree(id) AS (
+      SELECT id FROM content
+      WHERE id = ${id} AND ownerId = ${ownerId} AND isDeleted = FALSE
+      UNION ALL
+      SELECT content.id FROM content
+      INNER JOIN content_tree AS ft
+      ON content.parentFolderId = ft.id
+      WHERE content.isDeleted = FALSE
+    )
+
+    SELECT id from content_tree;
+    `)
+  ).map((obj) => obj.id);
+
+  // TODO: combine queries?
+
+  await prisma.contentShares.deleteMany({
+    where: {
+      OR: users.flatMap((userId) =>
+        contentIds.map((contentId) => ({ userId, contentId })),
+      ),
+    },
+  });
+}
diff --git a/server/src/utils/cid.ts b/server/src/utils/cid.ts
index c6907bc53c..96bb2e1cc6 100644
--- a/server/src/utils/cid.ts
+++ b/server/src/utils/cid.ts
@@ -1,4 +1,5 @@
 // Copied from doenetml utils
+// Currently also duplicated in client.
 
 import base32 from "hi-base32";