diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
new file mode 100644
index 000000000..3df58d7de
--- /dev/null
+++ b/.github/workflows/build-docker.yml
@@ -0,0 +1,51 @@
+name: Build docker images
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        package:
+          - default
+          - cdn
+          - api
+          - gateway
+          - admin-api
+          - cdn-cs
+          - gateway-offload
+    steps:
+      - uses: actions/checkout@v6
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - name: Build the docker image
+        run: nix build .#containers.x86_64-linux.docker.${{ matrix.package }}
+      - run: docker load < result
+      - name: downcase REPO
+        run: echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Compute image suffix
+        run: |
+         if [ "${{ matrix.package }}" = "default" ]; then
+         echo "SUFFIX=" >> $GITHUB_ENV
+         else
+         echo "SUFFIX=-${{ matrix.package }}" >> $GITHUB_ENV
+         fi
+      - name: Tag and push the image
+        run: |
+         IMAGE_ID=$(docker images spacebar-server-ts$SUFFIX --format '{{.ID}}')
+         docker tag $IMAGE_ID ghcr.io/$REPO$SUFFIX:latest
+         docker push ghcr.io/$REPO$SUFFIX:latest
diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml
deleted file mode 100644
index ed1ff7349..000000000
--- a/.github/workflows/publish-image.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Publish Image
-
-on:
-  release:
-    types: [published]
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  build-and-push-image:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      attestations: write
-      id-token: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      - name: Build and push Docker image
-        id: push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-      - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@v3
-        with:
-          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
-          subject-digest: ${{ steps.push.outputs.digest }}
-          push-to-registry: true
diff --git a/.idea/runConfigurations/Start_API.xml b/.idea/runConfigurations/Start_API.xml
index 83d9203ae..e0af9ce60 100644
--- a/.idea/runConfigurations/Start_API.xml
+++ b/.idea/runConfigurations/Start_API.xml
@@ -12,12 +12,15 @@
       <option name="DIRENV_ENABLED" value="false" />
       <option name="DIRENV_TRUSTED" value="false" />
     </EXTENSION>
+    <EXTENSION ID="com.intellij.javascript.debugger.execution.StartBrowserRunConfigurationExtension">
+      <browser with-js-debugger="true" />
+    </EXTENSION>
     <method v="2">
       <option name="NpmBeforeRunTask" enabled="true">
         <package-json value="$PROJECT_DIR$/package.json" />
         <command value="run" />
         <scripts>
-          <script value="build" />
+          <script value="build:tsgo" />
         </scripts>
         <node-interpreter value="project" />
         <envs />
diff --git a/.idea/runConfigurations/Start_CDN.xml b/.idea/runConfigurations/Start_CDN.xml
index aabd8e252..b6429f700 100644
--- a/.idea/runConfigurations/Start_CDN.xml
+++ b/.idea/runConfigurations/Start_CDN.xml
@@ -12,12 +12,15 @@
       <option name="DIRENV_ENABLED" value="false" />
       <option name="DIRENV_TRUSTED" value="false" />
     </EXTENSION>
+    <EXTENSION ID="com.intellij.javascript.debugger.execution.StartBrowserRunConfigurationExtension">
+      <browser with-js-debugger="true" />
+    </EXTENSION>
     <method v="2">
       <option name="NpmBeforeRunTask" enabled="true">
         <package-json value="$PROJECT_DIR$/package.json" />
         <command value="run" />
         <scripts>
-          <script value="build:src" />
+          <script value="build:src:tsgo" />
         </scripts>
         <node-interpreter value="project" />
         <envs />
diff --git a/.idea/runConfigurations/Start_Gateway.xml b/.idea/runConfigurations/Start_Gateway.xml
index 5369245fe..20c09e2fe 100644
--- a/.idea/runConfigurations/Start_Gateway.xml
+++ b/.idea/runConfigurations/Start_Gateway.xml
@@ -12,12 +12,15 @@
       <option name="DIRENV_ENABLED" value="false" />
       <option name="DIRENV_TRUSTED" value="false" />
     </EXTENSION>
+    <EXTENSION ID="com.intellij.javascript.debugger.execution.StartBrowserRunConfigurationExtension">
+      <browser with-js-debugger="true" />
+    </EXTENSION>
     <method v="2">
       <option name="NpmBeforeRunTask" enabled="true">
         <package-json value="$PROJECT_DIR$/package.json" />
         <command value="run" />
         <scripts>
-          <script value="build:src" />
+          <script value="build:src:tsgo" />
         </scripts>
         <node-interpreter value="project" />
         <envs />
diff --git a/.idea/runConfigurations/Start_bundle.xml b/.idea/runConfigurations/Start_bundle.xml
index 9a156614a..ef277db4d 100644
--- a/.idea/runConfigurations/Start_bundle.xml
+++ b/.idea/runConfigurations/Start_bundle.xml
@@ -12,12 +12,15 @@
       <option name="DIRENV_ENABLED" value="false" />
       <option name="DIRENV_TRUSTED" value="false" />
     </EXTENSION>
+    <EXTENSION ID="com.intellij.javascript.debugger.execution.StartBrowserRunConfigurationExtension">
+      <browser with-js-debugger="true" />
+    </EXTENSION>
     <method v="2">
       <option name="NpmBeforeRunTask" enabled="true">
         <package-json value="$PROJECT_DIR$/package.json" />
         <command value="run" />
         <scripts>
-          <script value="build" />
+          <script value="build:tsgo" />
         </scripts>
         <node-interpreter value="project" />
         <envs />
diff --git a/CONTRIBUTING.MD b/CONTRIBUTING.MD
new file mode 100644
index 000000000..fb702a208
--- /dev/null
+++ b/CONTRIBUTING.MD
@@ -0,0 +1,10 @@
+Welcome to Spacebar, if you've made it here, I'm guessing you're looking to contribute.
+
+A good place to start would be over at the issues tab, though https://docs.spacebar.chat/contributing/server/missingroute/
+may also be a good indicator for things that are remaining.
+
+If you find yourself working on something, or want to discuss particular issues, feel free to drop by our developers guild (<a href="https://fermi.chat/invite/developers?instance=spacebar.chat">
+<img src="https://api.old.server.spacebar.chat/api/guilds/1471300112201604309/shield.svg" />
+</a>)
+
+Keep in mind that we do, under no circumstances, accept AI-generated, AI-assisted, or otherwise machine-generated contributions, for legal reasons.
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 611a009e6..000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,75 +0,0 @@
-ARG DEBIAN_CODE=trixie
-ARG NODE_VERSION=24
-ARG PYTHON_VERSION=3.13
-ARG USER_NAME=spacebar
-ARG USER_GROUP=$USER_NAME
-ARG USER_UID=1000
-ARG USER_GID=1000
-ARG BASEDIR=/spacebar
-
-
-FROM python:${PYTHON_VERSION}-slim-${DEBIAN_CODE} AS base_python
-
-
-FROM node:${NODE_VERSION}-${DEBIAN_CODE}-slim AS base
-
-COPY --from=base_python /usr/local/bin/python* /usr/local/bin/
-COPY --from=base_python /usr/local/bin/pip* /usr/local/bin/
-COPY --from=base_python /usr/local/lib/python* /usr/local/lib/
-COPY --from=base_python /usr/local/lib/libpython* /usr/local/lib/
-
-
-FROM base AS builder
-
-ARG BRANCH
-
-WORKDIR /build
-
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends build-essential pkg-config && \
-    rm -rf /var/lib/apt/lists/*
-
-WORKDIR /build/server
-
-COPY . .
-
-RUN npm i \
-    && npm run setup
-
-
-FROM base AS final
-
-ARG USER_NAME
-ARG USER_GROUP
-ARG USER_UID
-ARG USER_GID
-ARG BASEDIR
-
-RUN mkdir -p "${BASEDIR}/server" \
-    && chown -R "${USER_UID}:${USER_GID}" "${BASEDIR}"
-
-RUN deluser node 2>/dev/null || true \
-    && delgroup node 2>/dev/null || true \
-    && rm -fr /home/node 2>/dev/null || true \
-    && addgroup --gid "$USER_GID" "$USER_GROUP" \
-    && adduser \
-        --disabled-password \
-        --gecos "" \
-        --uid "$USER_UID" \
-        --gid "$USER_GID" \
-        --no-create-home \
-        "$USER_NAME"
-
-USER ${USER_NAME}
-
-#@todo: only bring what we need
-COPY --chown=${USER_NAME}:${USER_GROUP} --from=builder /build/server "${BASEDIR}/server"
-
-ENV PORT="3001"
-ENV CONFIG_PATH="${BASEDIR}/config.json"
-ENV DATABASE="${BASEDIR}/database.db"
-
-WORKDIR "${BASEDIR}/server"
-
-ENTRYPOINT [ "npm", "run" ]
-CMD [ "start" ]
diff --git a/README.md b/README.md
index 861b18b2d..bed7f1ffb 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
   <a href="https://matrix.to/#/#spacebar:rory.gay">
     <img src="https://img.shields.io/matrix/spacebar%3Arory.gay?server_fqdn=matrix.rory.gay&fetchMode=summary&logo=matrix&logoColor=fffffff&label=Matrix" />
   </a>
-  <a href="https://fermi.chat/invite/NAa7zJ?instance=https%3A%2F%2Fspacebar.chat">
+  <a href="https://fermi.chat/invite/spacebar?instance=spacebar.chat">
     <img src="https://api.old.server.spacebar.chat/api/guilds/1006649183970562092/shield.svg" />
   </a>
   <a href="https://discord.gg/ZrnGQP6p3d">
diff --git a/assets/openapi.json b/assets/openapi.json
index 342bd7dd2..3b5edade2 100644
--- a/assets/openapi.json
+++ b/assets/openapi.json
@@ -4063,12 +4063,20 @@
                         "items": {
                             "type": "string"
                         }
+                    },
+                    "discovery_weight": {
+                        "type": "integer"
+                    },
+                    "discovery_excluded": {
+                        "type": "boolean"
                     }
                 },
                 "required": [
                     "bans",
                     "channel_ordering",
                     "channels",
+                    "discovery_excluded",
+                    "discovery_weight",
                     "emojis",
                     "features",
                     "id",
@@ -5458,7 +5466,6 @@
                 "type": "object",
                 "properties": {
                     "name": {
-                        "maxLength": 100,
                         "type": "string"
                     },
                     "type": {
@@ -8355,7 +8362,6 @@
                 "type": "object",
                 "properties": {
                     "name": {
-                        "maxLength": 100,
                         "type": "string"
                     },
                     "type": {
@@ -9424,7 +9430,7 @@
                     "byteLength": {
                         "type": "integer"
                     },
-                    "__@species@16433": {
+                    "__@species@16534": {
                         "$ref": "#/components/schemas/SharedArrayBuffer"
                     },
                     "__@toStringTag@1293": {
@@ -9433,7 +9439,7 @@
                     }
                 },
                 "required": [
-                    "__@species@16433",
+                    "__@species@16534",
                     "__@toStringTag@1293",
                     "byteLength"
                 ]
@@ -11280,6 +11286,14 @@
                             "type": "string"
                         }
                     },
+                    "discovery_weight": {
+                        "type": "integer",
+                        "default": 0
+                    },
+                    "discovery_excluded": {
+                        "type": "boolean",
+                        "default": false
+                    },
                     "id": {
                         "type": "string"
                     }
@@ -11288,6 +11302,8 @@
                     "bans",
                     "channel_ordering",
                     "channels",
+                    "discovery_excluded",
+                    "discovery_weight",
                     "emojis",
                     "features",
                     "id",
@@ -15557,9 +15573,14 @@
                     "maxWebhooks": {
                         "type": "integer",
                         "default": 100
+                    },
+                    "maxName": {
+                        "type": "integer",
+                        "default": 32
                     }
                 },
                 "required": [
+                    "maxName",
                     "maxPins",
                     "maxTopic",
                     "maxWebhooks"
diff --git a/assets/schemas.json b/assets/schemas.json
index f08697179..ff14634f8 100644
--- a/assets/schemas.json
+++ b/assets/schemas.json
@@ -4336,6 +4336,12 @@
                 "items": {
                     "type": "string"
                 }
+            },
+            "discovery_weight": {
+                "type": "integer"
+            },
+            "discovery_excluded": {
+                "type": "boolean"
             }
         },
         "additionalProperties": false,
@@ -4343,6 +4349,8 @@
             "bans",
             "channel_ordering",
             "channels",
+            "discovery_excluded",
+            "discovery_weight",
             "emojis",
             "features",
             "id",
@@ -5840,7 +5848,6 @@
         "type": "object",
         "properties": {
             "name": {
-                "maxLength": 100,
                 "type": "string"
             },
             "type": {
@@ -9296,7 +9303,6 @@
         "type": "object",
         "properties": {
             "name": {
-                "maxLength": 100,
                 "type": "string"
             },
             "type": {
@@ -10415,7 +10421,7 @@
             "byteLength": {
                 "type": "integer"
             },
-            "__@species@16433": {
+            "__@species@16534": {
                 "$ref": "#/definitions/SharedArrayBuffer"
             },
             "__@toStringTag@1293": {
@@ -10425,7 +10431,7 @@
         },
         "additionalProperties": false,
         "required": [
-            "__@species@16433",
+            "__@species@16534",
             "__@toStringTag@1293",
             "byteLength"
         ],
@@ -12626,6 +12632,14 @@
                     "type": "string"
                 }
             },
+            "discovery_weight": {
+                "type": "integer",
+                "default": 0
+            },
+            "discovery_excluded": {
+                "type": "boolean",
+                "default": false
+            },
             "id": {
                 "type": "string"
             }
@@ -12635,6 +12649,8 @@
             "bans",
             "channel_ordering",
             "channels",
+            "discovery_excluded",
+            "discovery_weight",
             "emojis",
             "features",
             "id",
@@ -17346,10 +17362,15 @@
             "maxWebhooks": {
                 "type": "integer",
                 "default": 100
+            },
+            "maxName": {
+                "type": "integer",
+                "default": 32
             }
         },
         "additionalProperties": false,
         "required": [
+            "maxName",
             "maxPins",
             "maxTopic",
             "maxWebhooks"
diff --git a/extra/admin-api/DataMappings/Spacebar.DataMappings.AdminApi/Spacebar.DataMappings.AdminApi.csproj b/extra/admin-api/DataMappings/Spacebar.DataMappings.AdminApi/Spacebar.DataMappings.AdminApi.csproj
new file mode 100644
index 000000000..809a0b7e5
--- /dev/null
+++ b/extra/admin-api/DataMappings/Spacebar.DataMappings.AdminApi/Spacebar.DataMappings.AdminApi.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net10.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\Models\Spacebar.Models.Db\Spacebar.Models.Db.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
+        <PackageReference Include="Spacebar.Models.Db" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
+        <ProjectReference Include="..\..\Models\Spacebar.Models.AdminApi\Spacebar.Models.AdminApi.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
+        <PackageReference Include="Spacebar.Models.AdminApi" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
+    </ItemGroup>
+</Project>
diff --git a/extra/admin-api/DataMappings/Spacebar.DataMappings.AdminApi/User.cs b/extra/admin-api/DataMappings/Spacebar.DataMappings.AdminApi/User.cs
new file mode 100644
index 000000000..ea9c8255a
--- /dev/null
+++ b/extra/admin-api/DataMappings/Spacebar.DataMappings.AdminApi/User.cs
@@ -0,0 +1,26 @@
+using Spacebar.Models.AdminApi;
+
+namespace Spacebar.DataMappings.AdminApi;
+
+public static class User
+{
+    // public static UserModel ToPartialUser(this Models.Db.Models.User user)
+    // {
+    //     return new PartialUser() {
+    //         Id = user.Id,
+    //         Discriminator = user.Discriminator,
+    //         Username = user.Username,
+    //         AccentColor = user.AccentColor,
+    //         Avatar = user.Avatar,
+    //         AvatarDecorationData = user.AvatarDecorationData,
+    //         Banner = user.Banner,
+    //         Bot = user.Bot,
+    //         Collectibles = user.Collectibles,
+    //         DisplayNameStyles = user.DisplayNameStyles,
+    //         // GlobalName = x.GlobalName,
+    //         PrimaryGuild = user.PrimaryGuild,
+    //         PublicFlags = user.PublicFlags,
+    //         System = user.System,
+    //     };
+    // }
+}
\ No newline at end of file
diff --git a/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Channel.cs b/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Channel.cs
new file mode 100644
index 000000000..b43312033
--- /dev/null
+++ b/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Channel.cs
@@ -0,0 +1,13 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Spacebar.Models.Generic;
+
+namespace Spacebar.DataMappings.Generic;
+
+public static class Channel {
+    extension(Models.Db.Models.Channel channel) {
+        [JsonIgnore]
+        public IEnumerable<ChannelPermissionOverwrite>? MappedPermissionOverwrites =>
+            channel.PermissionOverwrites is null ? [] : JsonSerializer.Deserialize<List<ChannelPermissionOverwrite>>(channel.PermissionOverwrites);
+    }
+}
\ No newline at end of file
diff --git a/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Member.cs b/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Member.cs
index 2650fc383..2a61b75ae 100644
--- a/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Member.cs
+++ b/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Member.cs
@@ -2,9 +2,9 @@
 
 namespace Spacebar.DataMappings.Generic;
 
-public static class Member
+public static class MemberExtensions
 {
-    public static Models.Generic.Member ToPublicMember(this Models.Db.Models.Member member, PartialUser? partialUser = null)
+    public static Member ToPublicMember(this Models.Db.Models.Member member, PartialUser? partialUser = null)
     {
         return new()
         {
@@ -15,7 +15,8 @@ public static Models.Generic.Member ToPublicMember(this Models.Db.Models.Member
             Collectibles = member.Collectibles,
             DisplayNameStyles = member.DisplayNameStyles,
             Bio = string.IsNullOrWhiteSpace(member.Bio) ? null : member.Bio,
-            Nick = string.IsNullOrWhiteSpace(member.Nick) ? null : member.Nick
+            Nick = string.IsNullOrWhiteSpace(member.Nick) ? null : member.Nick,
+            Roles = member.Roles.Select(x=>x.Id).ToList()
         };
     }
 }
\ No newline at end of file
diff --git a/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Spacebar.DataMappings.Generic.csproj b/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Spacebar.DataMappings.Generic.csproj
index 3f8936a6f..452a2e0e4 100644
--- a/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Spacebar.DataMappings.Generic.csproj
+++ b/extra/admin-api/DataMappings/Spacebar.DataMappings.Generic/Spacebar.DataMappings.Generic.csproj
@@ -7,9 +7,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\Models\Spacebar.Models.Db\Spacebar.Models.Db.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
+        <ProjectReference Include="..\..\Models\Spacebar.Models.Db\Spacebar.Models.Db.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
         <PackageReference Include="Spacebar.Models.Db" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
-      <ProjectReference Include="..\..\Models\Spacebar.Models.Generic\Spacebar.Models.Generic.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
+        <ProjectReference Include="..\..\Models\Spacebar.Models.Generic\Spacebar.Models.Generic.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
         <PackageReference Include="Spacebar.Models.Generic" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
     </ItemGroup>
 
diff --git a/extra/admin-api/Interop/Spacebar.Interop.Authentication.AspNetCore/SpacebarAspNetAuthenticationService.cs b/extra/admin-api/Interop/Spacebar.Interop.Authentication.AspNetCore/SpacebarAspNetAuthenticationService.cs
index 07abb9fed..5bb42a21d 100644
--- a/extra/admin-api/Interop/Spacebar.Interop.Authentication.AspNetCore/SpacebarAspNetAuthenticationService.cs
+++ b/extra/admin-api/Interop/Spacebar.Interop.Authentication.AspNetCore/SpacebarAspNetAuthenticationService.cs
@@ -23,4 +23,9 @@ public async Task<User> GetCurrentUserAsync(HttpRequest request) {
         var token = GetTokenAsync(request);
         return await authService.GetCurrentUserAsync(token);
     }
+
+    public Task<Session> GetCurrentSessionAsync(HttpRequest request) {
+        var token = GetTokenAsync(request);
+        return authService.GetCurrentSessionAsync(token);
+    }
 }
\ No newline at end of file
diff --git a/extra/admin-api/Interop/Spacebar.Interop.Authentication/SpacebarAuthenticationConfiguration.cs b/extra/admin-api/Interop/Spacebar.Interop.Authentication/SpacebarAuthenticationConfiguration.cs
index f1186ce0e..8fb81b282 100644
--- a/extra/admin-api/Interop/Spacebar.Interop.Authentication/SpacebarAuthenticationConfiguration.cs
+++ b/extra/admin-api/Interop/Spacebar.Interop.Authentication/SpacebarAuthenticationConfiguration.cs
@@ -11,6 +11,7 @@ public SpacebarAuthenticationConfiguration(IConfiguration configuration) {
     public required string PublicKeyPath { get; set; }
     
     public string? OverrideUid { get; set; }
+    public string? OverrideDid { get; set; }
     public bool DisableAuthentication { get; set; } = false;
     public bool Enforce2FA { get; set; } = true;
     public TimeSpan AuthCacheExpiry { get; set; } = TimeSpan.FromSeconds(30);
diff --git a/extra/admin-api/Interop/Spacebar.Interop.Authentication/SpacebarAuthenticationService.cs b/extra/admin-api/Interop/Spacebar.Interop.Authentication/SpacebarAuthenticationService.cs
index 5f9ff500f..1094a7146 100644
--- a/extra/admin-api/Interop/Spacebar.Interop.Authentication/SpacebarAuthenticationService.cs
+++ b/extra/admin-api/Interop/Spacebar.Interop.Authentication/SpacebarAuthenticationService.cs
@@ -10,6 +10,7 @@ namespace Spacebar.Interop.Authentication;
 
 public class SpacebarAuthenticationService(ILogger<SpacebarAuthenticationService> logger, SpacebarDbContext db, SpacebarAuthenticationConfiguration config) {
     private static readonly ExpiringSemaphoreCache<User> UserCache = new();
+    private static readonly ExpiringSemaphoreCache<Session> SessionCache = new();
 
     public async Task<TokenValidationResult?> ValidateTokenAsync(string token) {
         var handler = new JwtSecurityTokenHandler();
@@ -47,13 +48,13 @@ public async Task<User> GetCurrentUserAsync(string token) {
             config.AuthCacheExpiry);
     }
 
-    public async Task<User> GetCurrentSessionAsync(string token) {
+    public async Task<Session> GetCurrentSessionAsync(string token) {
         var res = await ValidateTokenAsync(token);
-        return await UserCache.GetOrAdd(token,
+        return await SessionCache.GetOrAdd(token,
             async () => {
-                var uid = config.OverrideUid ?? res?.ClaimsIdentity.Claims.First(x => x.Type == "id").Value;
-                if (string.IsNullOrWhiteSpace(uid)) throw new InvalidOperationException("No user ID specified, is the access token valid?");
-                return await db.Users.FindAsync(uid) ?? throw new InvalidOperationException();
+                var did = config.OverrideDid ?? res?.ClaimsIdentity.Claims.First(x => x.Type == "did").Value;
+                if (string.IsNullOrWhiteSpace(did)) throw new InvalidOperationException("No device ID specified, is the access token valid?");
+                return await db.Sessions.FindAsync(did) ?? throw new InvalidOperationException();
             },
             config.AuthCacheExpiry);
     }
diff --git a/extra/admin-api/Models/Spacebar.Models.Gateway/CloseCode.cs b/extra/admin-api/Models/Spacebar.Models.Gateway/CloseCode.cs
new file mode 100644
index 000000000..a6d9c5f90
--- /dev/null
+++ b/extra/admin-api/Models/Spacebar.Models.Gateway/CloseCode.cs
@@ -0,0 +1,19 @@
+namespace Spacebar.Models.Gateway;
+
+public enum CloseCode {
+    UnknownError = 4000,
+    UnknownOpcode = 4001,
+    DecodeError = 4002,
+    NotAuthenticated = 4003,
+    AuthenticationFailed = 4004,
+    AlreadyAuthenticated = 4005,
+    InvalidSession = 4006,
+    InvalidSeq = 4007,
+    RateLimited = 4008,
+    SessionTimedOut = 4009,
+    InvalidShard = 4010,
+    ShardingRequired = 4011,
+    InvalidApiVersion = 4012,
+    InvalidIntent = 4013,
+    DisallowedIntent = 4014,
+}
\ No newline at end of file
diff --git a/extra/admin-api/Models/Spacebar.Models.Gateway/GuildMemberListUpdate.cs b/extra/admin-api/Models/Spacebar.Models.Gateway/GuildMemberListUpdate.cs
new file mode 100644
index 000000000..3d81c3609
--- /dev/null
+++ b/extra/admin-api/Models/Spacebar.Models.Gateway/GuildMemberListUpdate.cs
@@ -0,0 +1,74 @@
+using System.Text.Json.Serialization;
+using Spacebar.Models.Generic;
+
+public class GuildMemberListUpdate {
+    [JsonPropertyName("id")]
+    public string ListId { get; set; } = null!;
+
+    [JsonPropertyName("guild_id")]
+    public string GuildId { get; set; } = null!;
+
+    [JsonPropertyName("online_count")]
+    public int OnlineCount { get; set; }
+
+    [JsonPropertyName("member_count")]
+    public int MemberCount { get; set; }
+
+    [JsonPropertyName("ops")]
+    public List<BaseGuildMemberListUpdateOperation> Operations { get; set; } = null!;
+
+    [JsonPropertyName("groups")]
+    public List<GuildMemberListGroupCount> Groups { get; set; } = null!;
+}
+
+// i cba to write a dictionary converter for this...
+public class GuildMemberListGroupCount {
+    /// <summary>
+    ///     Role ID, "online" or "offline"
+    /// </summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; }
+
+    [JsonPropertyName("count")]
+    public int Count { get; set; }
+
+    public static implicit operator KeyValuePair<string, int>(GuildMemberListGroupCount groupCount) => new(groupCount.Id, groupCount.Count);
+    public static implicit operator GuildMemberListGroupCount(KeyValuePair<string, int> kvp) => new() { Id = kvp.Key, Count = kvp.Value };
+}
+
+public enum GuildMemberListUpdateOperationType {
+    [JsonStringEnumMemberName("sync")] Sync = 0,
+    [JsonStringEnumMemberName("insert")] Insert = 1,
+    [JsonStringEnumMemberName("update")] Update = 2,
+    [JsonStringEnumMemberName("delete")] Delete = 3,
+
+    [JsonStringEnumMemberName("invalidate")]
+    Invalidate = 4
+}
+
+#region Operations
+
+public class BaseGuildMemberListUpdateOperation {
+    [JsonPropertyName("op")]
+    public GuildMemberListUpdateOperationType Operation { get; set; }
+}
+
+public class GuildMemberListSyncOperation : BaseGuildMemberListUpdateOperation {
+    [JsonPropertyName("range")]
+    public int[] Range { get; set; } = null!;
+
+    [JsonPropertyName("items")]
+    public List<GuildMemberListSyncItem> Items { get; set; } = null!;
+}
+
+public class GuildMemberListSyncItem {
+    public class GuildMemberListMemberSyncItem : GuildMemberListSyncItem {
+        [JsonPropertyName("member")]
+        public Member Member { get; set; } = null!;
+    }
+}
+
+#endregion
+
+// TODO: diff algo
+// TODO: snapshots
\ No newline at end of file
diff --git a/extra/admin-api/Models/Spacebar.Models.Gateway/GuildSyncResponse.cs b/extra/admin-api/Models/Spacebar.Models.Gateway/GuildSyncResponse.cs
index 566e6c83d..fcd38c106 100644
--- a/extra/admin-api/Models/Spacebar.Models.Gateway/GuildSyncResponse.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Gateway/GuildSyncResponse.cs
@@ -8,7 +8,7 @@ public class GuildSyncResponse {
     public string GuildId { get; set; }
 
     [JsonPropertyName("presences")]
-    public List<PresenceResponse> Presences { get; set; }
+    public List<Presence> Presences { get; set; }
 
     [JsonPropertyName("members")]
     public List<Member> Members { get; set; }
diff --git a/extra/admin-api/Models/Spacebar.Models.Gateway/IdentifyRequest.cs b/extra/admin-api/Models/Spacebar.Models.Gateway/IdentifyRequest.cs
index a956655ed..ee39e292c 100644
--- a/extra/admin-api/Models/Spacebar.Models.Gateway/IdentifyRequest.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Gateway/IdentifyRequest.cs
@@ -3,8 +3,7 @@
 
 namespace Spacebar.Models.Gateway;
 
-public class IdentifyRequest
-{
+public class IdentifyRequest {
     [JsonPropertyName("token")]
     public string Token { get; set; }
 
@@ -34,8 +33,7 @@ public class IdentifyRequest
 }
 
 [Flags]
-public enum GatewayIntentFlags
-{
+public enum GatewayIntentFlags : ulong {
     Guilds = 1,
     GuildMembers = 1 << 1,
     GuildModeration = 1 << 2,
@@ -68,8 +66,7 @@ public enum GatewayIntentFlags
 }
 
 [Flags]
-public enum GatewayCapabilityFlags
-{
+public enum GatewayCapabilityFlags {
     LazyUserNotes = 1,
     NoAffineUserIds = 1 << 1,
     VersionedReadStates = 1 << 2,
diff --git a/extra/admin-api/Models/Spacebar.Models.Gateway/QoSPayload.cs b/extra/admin-api/Models/Spacebar.Models.Gateway/QoSPayload.cs
new file mode 100644
index 000000000..efb8dff9f
--- /dev/null
+++ b/extra/admin-api/Models/Spacebar.Models.Gateway/QoSPayload.cs
@@ -0,0 +1,14 @@
+using System.Text.Json.Serialization;
+
+namespace Spacebar.Models.Gateway;
+
+public class QoSPayload {
+    [JsonPropertyName("ver")]
+    public int Version { get; set; }
+
+    [JsonPropertyName("active")]
+    public bool Active { get; set; }
+
+    [JsonPropertyName("reasons")]
+    public List<string> Reasons { get; set; } = [];
+}
\ No newline at end of file
diff --git a/extra/admin-api/Models/Spacebar.Models.Gateway/ReadyResponse.cs b/extra/admin-api/Models/Spacebar.Models.Gateway/ReadyResponse.cs
new file mode 100644
index 000000000..5573cdb59
--- /dev/null
+++ b/extra/admin-api/Models/Spacebar.Models.Gateway/ReadyResponse.cs
@@ -0,0 +1,3 @@
+namespace Spacebar.Models.Gateway;
+
+public class ReadyResponse { }
\ No newline at end of file
diff --git a/extra/admin-api/Models/Spacebar.Models.Gateway/SbWebsocketMeta.cs b/extra/admin-api/Models/Spacebar.Models.Gateway/SbWebsocketMeta.cs
new file mode 100644
index 000000000..6281426f0
--- /dev/null
+++ b/extra/admin-api/Models/Spacebar.Models.Gateway/SbWebsocketMeta.cs
@@ -0,0 +1,52 @@
+using System.Text.Json.Serialization;
+
+namespace Spacebar.Models.Gateway;
+
+// TODO: move to interop
+public class SbWebsocketMeta
+{
+    [JsonPropertyName("user_id")]
+    public string UserId { get; set; } = string.Empty;
+
+    [JsonPropertyName("session_id")]
+    public string SessionId { get; set; } = string.Empty;
+
+    [JsonPropertyName("accessToken")]
+    public string AccessToken { get; set; } = string.Empty;
+
+    [JsonPropertyName("encoding")]
+    public string Encoding { get; set; } = "json";
+
+    [JsonPropertyName("compress")]
+    public string? Compress { get; set; }
+
+    [JsonPropertyName("ipAddress")]
+    public string? IpAddress { get; set; }
+
+    [JsonPropertyName("userAgent")]
+    public string? UserAgent { get; set; }
+
+    [JsonPropertyName("fingerprint")]
+    public string? Fingerprint { get; set; }
+
+    [JsonPropertyName("shard_count")]
+    public int? ShardCount { get; set; }
+
+    [JsonPropertyName("shard_id")]
+    public int? ShardId { get; set; }
+
+    [JsonPropertyName("intents")]
+    public GatewayIntentFlags Intents { get; set; } = default!;
+
+    [JsonPropertyName("sequence")]
+    public long Sequence { get; set; }
+
+    [JsonPropertyName("capabilities")]
+    public GatewayCapabilityFlags? Capabilities { get; set; }
+
+    [JsonPropertyName("large_threshold")]
+    public int LargeThreshold { get; set; }
+
+    [JsonPropertyName("qos")]
+    public QoSPayload? Qos { get; set; }
+}
\ No newline at end of file
diff --git a/extra/admin-api/Models/Spacebar.Models.Generic/Channel.cs b/extra/admin-api/Models/Spacebar.Models.Generic/Channel.cs
new file mode 100644
index 000000000..857d2e787
--- /dev/null
+++ b/extra/admin-api/Models/Spacebar.Models.Generic/Channel.cs
@@ -0,0 +1,17 @@
+using System.Text.Json.Serialization;
+
+namespace Spacebar.Models.Generic;
+
+public class ChannelPermissionOverwrite {
+    [JsonPropertyName("id")]
+    public string Id { get; set; }
+
+    [JsonPropertyName("type")]
+    public int Type { get; set; }
+
+    [JsonPropertyName("allow"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+    public ulong Allow { get; set; }
+
+    [JsonPropertyName("deny"), JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+    public ulong Deny { get; set; }
+}
\ No newline at end of file
diff --git a/extra/admin-api/Models/Spacebar.Models.Generic/Member.cs b/extra/admin-api/Models/Spacebar.Models.Generic/Member.cs
index 23b849211..9ead95595 100644
--- a/extra/admin-api/Models/Spacebar.Models.Generic/Member.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Generic/Member.cs
@@ -28,4 +28,13 @@ public class Member {
 
     [JsonPropertyName("bio")]
     public string? Bio { get; set; }
+
+    [JsonPropertyName("roles")]
+    public List<string>? Roles { get; set; }
+}
+
+// Unsure if this is used anywhere outside of op14...?
+public class MemberWithPresence : Member {
+    [JsonPropertyName("presence")]
+    public Presence? Presence { get; set; }
 }
\ No newline at end of file
diff --git a/extra/admin-api/Models/Spacebar.Models.Gateway/PresenceResponse.cs b/extra/admin-api/Models/Spacebar.Models.Generic/PresenceResponse.cs
similarity index 83%
rename from extra/admin-api/Models/Spacebar.Models.Gateway/PresenceResponse.cs
rename to extra/admin-api/Models/Spacebar.Models.Generic/PresenceResponse.cs
index 53d4cb248..97dcf21c4 100644
--- a/extra/admin-api/Models/Spacebar.Models.Gateway/PresenceResponse.cs
+++ b/extra/admin-api/Models/Spacebar.Models.Generic/PresenceResponse.cs
@@ -3,9 +3,9 @@
 using System.Text.Json.Serialization;
 using Spacebar.Models.Generic;
 
-namespace Spacebar.Models.Gateway;
+namespace Spacebar.Models.Generic;
 
-public class PresenceResponse {
+public class Presence {
     [JsonPropertyName("user")]
     public required PartialUser User { get; set; }
 
@@ -29,6 +29,14 @@ public class PresenceResponse {
     [JsonPropertyName("has_played_game")]
     public bool? HasPlayedGame { get; set; }
 
+    // Unsure if this is used outside of op14
+    [JsonPropertyName("game")]
+    public JsonObject? Game { get; set; }
+
+    // Unsure if used outside of op14
+    [JsonPropertyName("processed_at_timestamp")]
+    public ulong? ProcessedAtTimestamp { get; set; }
+
     [SuppressMessage("ReSharper", "UnusedMember.Local")]
     public class ClientStatuses {
         [JsonPropertyName("desktop"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
diff --git a/extra/admin-api/Models/Spacebar.Models.Generic/Trace.cs b/extra/admin-api/Models/Spacebar.Models.Generic/Trace.cs
new file mode 100644
index 000000000..e67227974
--- /dev/null
+++ b/extra/admin-api/Models/Spacebar.Models.Generic/Trace.cs
@@ -0,0 +1,67 @@
+using System.Diagnostics;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+
+namespace Spacebar.Models.Generic;
+
+public class Trace {
+    [JsonPropertyName("micros")]
+    public long Micros { get; set; }
+
+    [JsonIgnore]
+    public string? Name { get; set; }
+
+    [JsonIgnore]
+    public List<Trace>? Calls { get; set; }
+
+    [JsonPropertyName("calls")]
+    // zipped array of [string, Trace]
+    public JsonArray? ZippedCalls {
+        get {
+            if (Calls == null) return null;
+            var arr = new JsonArray();
+            foreach (var t in Calls) {
+                arr.Add(t.Name);
+                arr.Add(t);
+            }
+
+            return arr;
+        }
+    }
+
+    public JsonArray AsRoot() {
+        return new() {
+            Name,
+            this
+        };
+    }
+}
+
+public static class TraceResult {
+    public static async Task<TraceResult<T>> TraceAsync<T>(string name, Func<Task<T>> func) {
+        var sw = Stopwatch.StartNew();
+        var result = await func();
+        sw.Stop();
+        return new TraceResult<T> {
+            Name = name,
+            Micros = sw.Elapsed.Microseconds,
+            Result = result
+        };
+    }
+
+    public static async Task<TraceResult<T>> Trace<T>(string name, Func<T> func) {
+        var sw = Stopwatch.StartNew();
+        var result = func();
+        sw.Stop();
+        return new TraceResult<T> {
+            Name = name,
+            Micros = sw.Elapsed.Microseconds,
+            Result = result
+        };
+    }
+}
+
+public class TraceResult<T> : Trace {
+    [JsonIgnore]
+    public T Result { get; set; }
+}
\ No newline at end of file
diff --git a/extra/admin-api/Spacebar.AdminApi/Controllers/TestControllers/IpcTestController.cs b/extra/admin-api/Spacebar.AdminApi/Controllers/TestControllers/IpcTestController.cs
new file mode 100644
index 000000000..228606f79
--- /dev/null
+++ b/extra/admin-api/Spacebar.AdminApi/Controllers/TestControllers/IpcTestController.cs
@@ -0,0 +1,70 @@
+using System.Diagnostics;
+using ArcaneLibs;
+using Microsoft.AspNetCore.Mvc;
+using Spacebar.AdminApi.Extensions;
+using Spacebar.Interop.Authentication;
+using Spacebar.Interop.Authentication.AspNetCore;
+using Spacebar.Interop.Replication.Abstractions;
+using Spacebar.Models.AdminApi;
+using Spacebar.Models.Db.Contexts;
+
+namespace Spacebar.AdminApi.Controllers.TestControllers;
+
+[ApiController]
+public class IpcTestController(
+    ILogger<UserController> logger,
+    SpacebarAuthenticationConfiguration config,
+    SpacebarDbContext db,
+    IServiceProvider sp,
+    SpacebarAspNetAuthenticationService auth,
+    ISpacebarReplication replication
+)  : ControllerBase {
+    [HttpGet("test")]
+    public async IAsyncEnumerable<string> Test() {
+        (await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
+
+        var guildId = "1006649183970562092";
+        // var roleId = "1006706520514028812"; //Administrator
+        var roleId = "1391303296148639051"; //Spacebar Maintainer
+        // int color = 16711680; //Administrator
+        int color = 99839; //Spacebar Maintainer
+
+        int framerate = 30;
+        float delay = 1000f / framerate;
+        var secondsPerRotation = 6.243f;
+        // use delay, 255f = one rotation, lengthFactor = iterations to make a full rotation
+        var lengthFactor = (secondsPerRotation * 1000f / delay);
+        Console.WriteLine("Length factor: {0}, RPS: {1}", lengthFactor, 0);
+        var re = new RainbowEnumerator(lengthFactor: lengthFactor, offset: color, skip: 1);
+        var sw = Stopwatch.StartNew();
+        while (true) {
+            var clr = re.Next();
+            color = clr.r << 16 | clr.g << 8 | clr.b;
+            await replication.SendAsync(new() {
+                Event = "GUILD_ROLE_UPDATE",
+                GuildId = guildId,
+                Origin = "Admin API (GET /users/test)",
+                Payload = new {
+                    guild_id = guildId,
+                    role = new {
+                        id = roleId,
+                        guild_id = guildId,
+                        color,
+                        hoist = false,
+                        managed = false,
+                        mentionable = true,
+                        name = "Spacebar Maintainer",
+                        permissions = "8",
+                        position = 5,
+                        unicode_emoji = "",
+                        flags = 0
+                    }
+                }
+            });
+
+            yield return $"{clr.r:X2} {clr.g:X2} {clr.b:X2} | {color:X8} | {sw.Elapsed} (waiting {Math.Max(0, (int)delay - (int)sw.ElapsedMilliseconds)} out of {delay} ms)";
+            await Task.Delay(Math.Max(0, (int)delay - (int)sw.ElapsedMilliseconds));
+            sw.Restart();
+        }
+    }
+}
\ No newline at end of file
diff --git a/extra/admin-api/Spacebar.AdminApi/Controllers/UserController.cs b/extra/admin-api/Spacebar.AdminApi/Controllers/UserController.cs
index e9dfa15ce..7b76aabde 100644
--- a/extra/admin-api/Spacebar.AdminApi/Controllers/UserController.cs
+++ b/extra/admin-api/Spacebar.AdminApi/Controllers/UserController.cs
@@ -22,6 +22,10 @@ public class UserController(
     SpacebarAspNetAuthenticationService auth,
     ISpacebarReplication replication
 ) : ControllerBase {
+    /// <summary>
+    /// Get all users
+    /// </summary>
+    /// <returns>List of user objects</returns>
     [HttpGet]
     public async IAsyncEnumerable<UserModel> Get() {
         (await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
@@ -77,6 +81,63 @@ public async IAsyncEnumerable<UserModel> Get() {
         }
     }
 
+    /// <summary>
+    /// Get user by ID
+    /// </summary>
+    /// <param name="id">User ID</param>
+    /// <returns>User object</returns>
+    [HttpGet("{id}")]
+    public async Task<UserModel> GetById(string id) {
+        (await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
+
+        return await db.Users
+            .Include(user => user.ApplicationBotUser)
+            .Include(user => user.MessageAuthors)
+            .Include(user => user.Sessions)
+            .Include(user => user.Templates)
+            .Include(user => user.VoiceStates)
+            .Include(user => user.Guilds)
+            .Select(x => new UserModel {
+                Id = x.Id,
+                Username = x.Username,
+                Discriminator = x.Discriminator,
+                Avatar = x.Avatar,
+                AccentColor = x.AccentColor,
+                Banner = x.Banner,
+                ThemeColors = x.ThemeColors,
+                Pronouns = x.Pronouns,
+                Phone = x.Phone,
+                Desktop = x.Desktop,
+                Mobile = x.Mobile,
+                Premium = x.Premium,
+                PremiumType = x.PremiumType,
+                Bot = x.Bot,
+                Bio = x.Bio,
+                System = x.System,
+                NsfwAllowed = x.NsfwAllowed,
+                MfaEnabled = x.MfaEnabled,
+                WebauthnEnabled = x.WebauthnEnabled,
+                CreatedAt = x.CreatedAt,
+                PremiumSince = x.PremiumSince,
+                Verified = x.Verified,
+                Disabled = x.Disabled,
+                Deleted = x.Deleted,
+                Email = x.Email,
+                Flags = x.Flags,
+                PublicFlags = x.PublicFlags,
+                Rights = x.Rights,
+                ApplicationBotUser = x.ApplicationBotUser == null ? null : new(),
+                ConnectedAccounts = new List<UserModel.ConnectedAccountModel>(),
+                MessageCount = x.MessageAuthors.Count, // This property is weirdly named due to scaffolding, might patch later
+                SessionCount = x.Sessions.Count,
+                TemplateCount = x.Templates.Count,
+                VoiceStateCount = x.VoiceStates.Count,
+                GuildCount = x.Guilds.Count,
+                OwnedGuildCount = x.Guilds.Count(g => g.OwnerId == x.Id)
+            })
+            .SingleAsync(x => x.Id == id);
+    }
+
     [HttpGet("{id}/delete")]
     public async IAsyncEnumerable<AsyncActionResult> DeleteUser(string id, [FromQuery] int messageDeleteChunkSize = 100) {
         (await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
@@ -171,129 +232,6 @@ await replication.SendAsync(new() {
         }
     }
 
-    [HttpGet("duplicate")]
-    public async Task<IActionResult> Duplicate() {
-        (await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
-
-        var msg = db.Messages.First();
-        var channels = db.Channels.Select(x => new { x.Id, x.GuildId }).ToList();
-        int count = 1;
-        while (true) {
-            foreach (var channel in channels) {
-                var newMsg = new Message {
-                    Id = $"{Random.Shared.NextInt64()}",
-                    ChannelId = channel.Id,
-                    GuildId = channel.GuildId,
-                    AuthorId = msg.AuthorId,
-                    Content = msg.Content,
-                    MemberId = msg.MemberId,
-                    Timestamp = msg.Timestamp,
-                    EditedTimestamp = msg.EditedTimestamp,
-                    Tts = msg.Tts,
-                    MentionEveryone = msg.MentionEveryone,
-                    Attachments = msg.Attachments,
-                    Embeds = msg.Embeds,
-                    Reactions = msg.Reactions,
-                    Nonce = msg.Nonce,
-                    PinnedAt = msg.PinnedAt,
-                    Type = msg.Type,
-                };
-                db.Messages.Add(newMsg);
-                count++;
-            }
-
-            if (count % 100 == 0) {
-                await db.SaveChangesAsync();
-                await db.Database.ExecuteSqlRawAsync("VACUUM FULL messages");
-            }
-
-            if (count >= 100_000) {
-                await db.SaveChangesAsync();
-                await db.Database.ExecuteSqlRawAsync("VACUUM FULL messages");
-                await db.Database.ExecuteSqlRawAsync("REINDEX TABLE messages");
-                return Ok();
-            }
-        }
-    }
-
-    [HttpGet("duplicate/{id}")]
-    public async Task<IActionResult> DuplicateMessage(ulong id, [FromQuery] int count = 100) {
-        (await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
-
-        var msg = await db.Messages.FindAsync(id.ToString());
-        int createdCount = 1;
-        while (true) {
-            var newMsg = new Message {
-                Id = $"{Random.Shared.NextInt64()}",
-                ChannelId = msg.ChannelId,
-                GuildId = msg.GuildId,
-                AuthorId = msg.AuthorId,
-                Content = msg.Content,
-                MemberId = msg.MemberId,
-                Timestamp = msg.Timestamp,
-                EditedTimestamp = msg.EditedTimestamp,
-                Tts = msg.Tts,
-                MentionEveryone = msg.MentionEveryone,
-                Attachments = msg.Attachments,
-                Embeds = msg.Embeds,
-                Reactions = msg.Reactions,
-                Nonce = msg.Nonce,
-                PinnedAt = msg.PinnedAt,
-                Type = msg.Type,
-            };
-            db.Messages.Add(newMsg);
-            createdCount++;
-
-            if (createdCount % 100 == 0) {
-                await db.SaveChangesAsync();
-            }
-
-            if (createdCount >= count) {
-                await db.SaveChangesAsync();
-                await db.Database.ExecuteSqlRawAsync("VACUUM FULL messages");
-                await db.Database.ExecuteSqlRawAsync("REINDEX TABLE messages");
-                return Ok();
-            }
-        }
-
-        await db.SaveChangesAsync();
-        await db.Database.ExecuteSqlRawAsync("VACUUM FULL messages");
-
-        return Ok();
-    }
-
-    [HttpGet("truncate_messages")]
-    public async Task TruncateMessages() {
-        (await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
-
-        var channels = db.Channels.Select(x => new { x.Id, x.GuildId }).ToList();
-
-        var ss = new SemaphoreSlim(12, 12);
-
-        async Task TruncateChannelMessages(string channelId, string guildId) {
-            await ss.WaitAsync();
-            var tasks = Enumerable.Range(0, 99).Select(i => Task.Run(async () => {
-                await using var scope = sp.CreateAsyncScope();
-                await using var _db = scope.ServiceProvider.GetRequiredService<SpacebarDbContext>();
-                // set timeout
-                _db.Database.SetCommandTimeout(6000);
-                await _db.Database.ExecuteSqlAsync($"""
-                                                    DELETE FROM messages
-                                                      WHERE channel_id = '{channelId}'
-                                                        AND guild_id = '{guildId}'
-                                                        AND id LIKE '%{i:00}';
-                                                    """);
-
-                Console.WriteLine($"Truncated messages for {channelId} in {guildId} ending with {i}");
-            })).ToList();
-            await Task.WhenAll(tasks);
-            ss.Release();
-        }
-
-        var tasks = channels.Select(c => TruncateChannelMessages(c.Id, c.GuildId)).ToList();
-        await Task.WhenAll(tasks);
-    }
-
     private async IAsyncEnumerable<T> AggregateAsyncEnumerablesWithoutOrder<T>(params IEnumerable<IAsyncEnumerable<T>> enumerables) {
         (await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
 
@@ -347,75 +285,4 @@ private async IAsyncEnumerable<T> AggregateAsyncEnumerablesWithoutOrder<T>(param
             }
         }
     }
-
-    // {
-    // "op": 0,
-    // "t": "GUILD_ROLE_UPDATE",
-    // "d": {
-    // "guild_id": "1006649183970562092",
-    // "role": {
-    // "id": "1006706520514028812",
-    // "guild_id": "1006649183970562092",
-    // "color": 16711680,
-    // "hoist": true,
-    // "managed": false,
-    // "mentionable": true,
-    // "name": "Adminstrator",
-    // "permissions": "9",
-    // "position": 5,
-    // "unicode_emoji": "💖",
-    // "flags": 0
-    // }
-    // },
-    // "s": 38
-    // }
-
-    [HttpGet("test")]
-    public async IAsyncEnumerable<string> Test() {
-        (await auth.GetCurrentUserAsync(Request)).GetRights().AssertHasAllRights(SpacebarRights.Rights.OPERATOR);
-
-        var guildId = "1006649183970562092";
-        // var roleId = "1006706520514028812"; //Administrator
-        var roleId = "1391303296148639051"; //Spacebar Maintainer
-        // int color = 16711680; //Administrator
-        int color = 99839; //Spacebar Maintainer
-
-        int framerate = 30;
-        float delay = 1000f / framerate;
-        var secondsPerRotation = 6.243f;
-        // use delay, 255f = one rotation, lengthFactor = iterations to make a full rotation
-        var lengthFactor = (secondsPerRotation * 1000f / delay);
-        Console.WriteLine("Length factor: {0}, RPS: {1}", lengthFactor, 0);
-        var re = new RainbowEnumerator(lengthFactor: lengthFactor, offset: color, skip: 1);
-        var sw = Stopwatch.StartNew();
-        while (true) {
-            var clr = re.Next();
-            color = clr.r << 16 | clr.g << 8 | clr.b;
-            await replication.SendAsync(new() {
-                Event = "GUILD_ROLE_UPDATE",
-                GuildId = guildId,
-                Origin = "Admin API (GET /users/test)",
-                Payload = new {
-                    guild_id = guildId,
-                    role = new {
-                        id = roleId,
-                        guild_id = guildId,
-                        color,
-                        hoist = false,
-                        managed = false,
-                        mentionable = true,
-                        name = "Spacebar Maintainer",
-                        permissions = "8",
-                        position = 5,
-                        unicode_emoji = "",
-                        flags = 0
-                    }
-                }
-            });
-
-            yield return $"{clr.r:X2} {clr.g:X2} {clr.b:X2} | {color:X8} | {sw.Elapsed} (waiting {Math.Max(0, (int)delay - (int)sw.ElapsedMilliseconds)} out of {delay} ms)";
-            await Task.Delay(Math.Max(0, (int)delay - (int)sw.ElapsedMilliseconds));
-            sw.Restart();
-        }
-    }
 }
\ No newline at end of file
diff --git a/extra/admin-api/Spacebar.GatewayOffload/Controllers/IdentifyController.cs b/extra/admin-api/Spacebar.GatewayOffload/Controllers/IdentifyController.cs
index 6ce9f9fb8..d49790a98 100644
--- a/extra/admin-api/Spacebar.GatewayOffload/Controllers/IdentifyController.cs
+++ b/extra/admin-api/Spacebar.GatewayOffload/Controllers/IdentifyController.cs
@@ -1,13 +1,52 @@
 using Microsoft.AspNetCore.Mvc;
 using Spacebar.Interop.Authentication;
-using Spacebar.Interop.Authentication.AspNetCore;
+using Spacebar.Interop.Replication.Abstractions;
 using Spacebar.Models.Db.Contexts;
+using Spacebar.Models.Gateway;
+using Spacebar.Models.Generic;
 
 namespace Spacebar.GatewayOffload.Controllers;
 
 [ApiController]
 [Route("/_spacebar/offload/gateway/Identify")]
-public class IdentifyController(ILogger<IdentifyController> logger, SpacebarAuthenticationService authService, SpacebarDbContext db, IServiceProvider sp) : ControllerBase
-{
-    
+public class IdentifyController(ILogger<IdentifyController> logger, SpacebarAuthenticationService authService, SpacebarDbContext db, IServiceProvider sp) : ControllerBase {
+    [HttpPost("")]
+    public async IAsyncEnumerable<ReplicationMessage> DoIdentify(IdentifyRequest payload) {
+        var user = await TraceResult.TraceAsync("getAuthUser", () => authService.GetCurrentUserAsync(payload.Token));
+        var session = await TraceResult.TraceAsync("getAuthSession", () => authService.GetCurrentSessionAsync(payload.Token));
+
+        var socketMeta = new SbWebsocketMeta() {
+            // Auth data
+            AccessToken = payload.Token,
+            UserId = user.Result.Id,
+            SessionId = session.Result.SessionId,
+            // Client capabilities
+            Capabilities = payload.Capabilities ??= 0,
+            LargeThreshold = payload.LargeTreshold ??= user.Result.Bot ? 20 : 250,
+            Intents = payload.Intents ??= (GatewayIntentFlags)0b_110_11111111_11111111_11111111_11111111,
+            // Sharding info
+            ShardId = payload.Shard?[0],
+            ShardCount = payload.Shard?[1],
+        };
+
+        if (socketMeta is { ShardId: not null, ShardCount: not null }) {
+            if (socketMeta.ShardId < 0 || socketMeta.ShardCount <= 0 || socketMeta.ShardId >= socketMeta.ShardCount) {
+                logger.LogWarning("Invalid sharding from {userId}: {shardId}/{shardCount}", user.Result.Id, socketMeta.ShardId, socketMeta.ShardCount);
+                yield return this.Close(CloseCode.InvalidShard);
+                yield break;
+            }
+        }
+
+        yield return new() {
+            Payload = new ReadyResponse { },
+        };
+    }
+
+    private ReplicationMessage Close(CloseCode closeCode) => new() {
+        Origin = "IdentifyController",
+        Event = "SB_GW_CLOSE",
+        Payload = new {
+            code = closeCode,
+        }
+    };
 }
\ No newline at end of file
diff --git a/extra/admin-api/Spacebar.GatewayOffload/Controllers/Op12Controller.cs b/extra/admin-api/Spacebar.GatewayOffload/Controllers/Op12Controller.cs
index a2008345e..db45a8952 100644
--- a/extra/admin-api/Spacebar.GatewayOffload/Controllers/Op12Controller.cs
+++ b/extra/admin-api/Spacebar.GatewayOffload/Controllers/Op12Controller.cs
@@ -1,3 +1,4 @@
+using System.Collections.Frozen;
 using System.Linq.Expressions;
 using System.Text.Json;
 using System.Text.Json.Nodes;
@@ -10,6 +11,7 @@
 using Spacebar.Models.Db.Contexts;
 using Spacebar.Models.Db.Models;
 using Spacebar.Models.Gateway;
+using Spacebar.Models.Generic;
 
 namespace Spacebar.GatewayOffload.Controllers;
 
@@ -21,7 +23,7 @@ public class Op12Controller(ILogger<Op12Controller> logger, SpacebarAspNetAuthen
     public async IAsyncEnumerable<ReplicationMessage> DoGuildSync(List<string> guildIds)
     {
         var user = await authService.GetCurrentUserAsync(Request);
-        guildIds = (await db.Members.Where(x => x.Id == user.Id).Select(x => x.GuildId).ToListAsync())
+        guildIds = (await db.Members.AsNoTracking().Where(x => x.Id == user.Id).Select(x => x.GuildId).ToListAsync())
             .Intersect(guildIds)
             .OrderByDescending(gi => db.Members.Count(m => m.GuildId == gi))
             .ToList();
@@ -41,44 +43,44 @@ public async IAsyncEnumerable<ReplicationMessage> DoGuildSync(List<string> guild
     }
 
     // TODO: figure out how to abstract this to a function without EFCore complaining about not being translatable...
-    //private static Func<Session, bool>  IsOnline = (Session session) => session.Status != "offline" && session.Status != "invisible" && session.Status != "unknown";
+    private static Expression<Func<Session, bool>> IsOnline = (Session session) => session.Status != "offline" && session.Status != "invisible" && session.Status != "unknown";
 
     private async Task<GuildSyncResponse> GetGuildSyncAsync(string guildId)
     {
         await using var sc = sp.CreateAsyncScope();
         var _db = sc.ServiceProvider.GetRequiredService<SpacebarDbContext>();
-        var memberCount = await _db.Members.Where(x => x.GuildId == guildId).CountAsync();
+        var memberCount = await _db.Members.AsNoTracking().Where(x => x.GuildId == guildId).CountAsync();
 
         var offlineTreshold = DateTime.Now.Subtract(TimeSpan.FromDays(14));
         var isLargeGuild = memberCount > 10000;
 
-        var members = await _db.Members.Where(x => x.GuildId == guildId)
+        var members = await _db.Members.AsNoTracking().Where(x => x.GuildId == guildId)
             .Include(x => x.IdNavigation)
             .ThenInclude(x => x.Sessions.Where(s =>
                 !s.IsAdminSession && (
-                    // see TODO on IsOnline
+                    // see TODO on IsOnline - somehow need to replicate `IsOnline(s)`
                     s.Status != "offline" && s.Status != "invisible" && s.Status != "unknown"
                 ) && (!isLargeGuild || s.LastSeen >= offlineTreshold)))
             .Where(x => x.IdNavigation.Sessions.Count > 0) // ignore members without sessions
             .ToListAsync();
 
-        var mappedPartialUsers = members.Select(x => x.IdNavigation).ToDictionary(x => x.Id, x => x.ToPartialUser());
-        var mappedMembers = members.ToDictionary(m => m.Id, m => m.ToPublicMember(mappedPartialUsers[m.Id]));
+        var mappedPartialUsers = members.Select(x => x.IdNavigation).ToFrozenDictionary(x => x.Id, x => x.ToPartialUser());
+        var mappedMembers = members.ToFrozenDictionary(m => m.Id, m => m.ToPublicMember(mappedPartialUsers[m.Id]));
 
-        var presences = members.Select(x => x.IdNavigation).Where(x => x.Sessions.Count > 0).ToDictionary(x => x.Id, x =>
+        var presences = members.Select(x => x.IdNavigation).Where(x => x.Sessions.Count > 0).ToFrozenDictionary(x => x.Id, x =>
         {
             var sortedSessions = x.Sessions.OrderByDescending(s => s.LastSeen).ToList();
-            return new PresenceResponse()
+            return new Presence()
             {
                 GuildId = guildId,
                 User = mappedPartialUsers[x.Id],
                 Activities = x.Sessions.Where(s => s.Status is not ("offline" or "invisible" or "unknown"))
                     .SelectMany(s => JsonSerializer.Deserialize<JsonObject[]>(s.Activities) ?? []).ToList(),
                 Status = sortedSessions.FirstOrDefault(s => !string.IsNullOrWhiteSpace(s.Status))?.Status ?? "offline",
-                ClientStatus = JsonSerializer.Deserialize<PresenceResponse.ClientStatuses>(sortedSessions.First(s => !string.IsNullOrWhiteSpace(s.ClientStatus)).ClientStatus) ??
+                ClientStatus = JsonSerializer.Deserialize<Presence.ClientStatuses>(sortedSessions.First(s => !string.IsNullOrWhiteSpace(s.ClientStatus)).ClientStatus) ??
                                new()
             };
-        }).Where(x => x.Value.Activities.Count > 0).ToDictionary();
+        }).Where(x => x.Value.Activities.Count > 0).ToFrozenDictionary();
 
         var r = new GuildSyncResponse()
         {
diff --git a/extra/admin-api/Spacebar.GatewayOffload/Controllers/Op14Controller.cs b/extra/admin-api/Spacebar.GatewayOffload/Controllers/Op14Controller.cs
index 84f03b892..9f32eef2f 100644
--- a/extra/admin-api/Spacebar.GatewayOffload/Controllers/Op14Controller.cs
+++ b/extra/admin-api/Spacebar.GatewayOffload/Controllers/Op14Controller.cs
@@ -1,13 +1,50 @@
+using System.Text.Json;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Spacebar.GatewayOffload.Extensions.Db;
+using Spacebar.Interop.Authentication.AspNetCore;
 using Spacebar.Interop.Replication.Abstractions;
+using Spacebar.Models.Db.Contexts;
+using Spacebar.Models.Gateway;
+using Spacebar.Models.Generic;
 
 namespace Spacebar.GatewayOffload.Controllers;
 
 [ApiController]
 [Route("/_spacebar/offload/gateway/LazyRequest")]
-public class Op14Controller : ControllerBase {
+public class Op14Controller(ILogger<Op12Controller> logger, SpacebarAspNetAuthenticationService authService, SpacebarDbContext db, IServiceProvider sp) : ControllerBase {
     [HttpPost]
-    public async IAsyncEnumerable<ReplicationMessage> DoLazyRequest() {
-        yield break;
+    public async IAsyncEnumerable<ReplicationMessage> DoLazyRequest([FromBody] LazyRequest payload) {
+        var user = await TraceResult.TraceAsync("getAuthUser", () => authService.GetCurrentUserAsync(Request));
+        var session = await TraceResult.TraceAsync("getAuthSession", () => authService.GetCurrentSessionAsync(Request));
+
+        if (!await db.Members.AsNoTracking().AnyAsync(m => m.GuildId == payload.GuildId && m.Id == user.Result.Id)) {
+            logger.LogWarning("User {user} requested lazy member list for guild {guildId}, but is not a member", user.Result.Id, payload.GuildId);
+            yield break;
+        }
+
+        if (payload.Channels.Count == 0) {
+            logger.LogWarning("User {user} requested lazy member list for guild {guildId}, but is not a member", user.Result.Tag, payload.GuildId);
+            yield break;
+        }
+
+        // Fetch hoisted roles for the guild to define groups
+        var hoistedRoles = await db.Roles
+            .AsNoTracking()
+            .Where(r => r.GuildId == payload.GuildId && r.Hoist)
+            .OrderByDescending(r => r.Position)
+            .Select(r => new { r.Id })
+            .ToListAsync();
+    }
+
+    private async Task<string?> GetMemberListIdAsync(SpacebarDbContext db, string guildId, string channelId) {
+        var channel = await db.Channels.AsNoTracking().FirstOrDefaultAsync(c => c.Id == channelId && c.GuildId == guildId);
+        if (channel == null) return null;
+
+        if (string.IsNullOrWhiteSpace(channel.PermissionOverwrites) || channel.PermissionOverwrites == "[]") {
+            return "everyone";
+        }
+
+        return null; // TODO
     }
 }
\ No newline at end of file
diff --git a/extra/admin-api/Spacebar.GatewayOffload/Extensions/Db/UserExtensions.cs b/extra/admin-api/Spacebar.GatewayOffload/Extensions/Db/UserExtensions.cs
new file mode 100644
index 000000000..27b4fb16f
--- /dev/null
+++ b/extra/admin-api/Spacebar.GatewayOffload/Extensions/Db/UserExtensions.cs
@@ -0,0 +1,9 @@
+using Spacebar.Models.Db.Models;
+
+namespace Spacebar.GatewayOffload.Extensions.Db;
+
+public static class UserExtensions {
+    extension(User user) {
+        public string Tag => $"{user.Username}#{user.Discriminator}";
+    }
+}
\ No newline at end of file
diff --git a/extra/admin-api/Spacebar.GatewayOffload/Program.cs b/extra/admin-api/Spacebar.GatewayOffload/Program.cs
index 5cfe28d4e..947ca35f6 100644
--- a/extra/admin-api/Spacebar.GatewayOffload/Program.cs
+++ b/extra/admin-api/Spacebar.GatewayOffload/Program.cs
@@ -1,8 +1,11 @@
+using System.Text.Json;
 using System.Text.Json.Serialization;
+using ArcaneLibs.Extensions;
 using Microsoft.EntityFrameworkCore;
 using Spacebar.Interop.Authentication;
 using Spacebar.Interop.Authentication.AspNetCore;
 using Spacebar.Models.Db.Contexts;
+using Spacebar.Models.Generic;
 
 var builder = WebApplication.CreateBuilder(args);
 if (!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("APPSETTINGS_PATH")))
@@ -18,9 +21,7 @@
     options.JsonSerializerOptions.WriteIndented = true;
     options.JsonSerializerOptions.MaxDepth = 100;
     // options.JsonSerializerOptions.DefaultBufferSize = ;
-}).AddMvcOptions(o=> {
-    o.SuppressOutputFormatterBuffering = true;
-});
+}).AddMvcOptions(o => { o.SuppressOutputFormatterBuffering = true; });
 // Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi
 builder.Services.AddOpenApi();
 
diff --git a/extra/admin-api/Spacebar.UApi/Controllers/GuildMembersController.cs b/extra/admin-api/Spacebar.UApi/Controllers/GuildMembersController.cs
new file mode 100644
index 000000000..ac8c1d40c
--- /dev/null
+++ b/extra/admin-api/Spacebar.UApi/Controllers/GuildMembersController.cs
@@ -0,0 +1,36 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Spacebar.Interop.Authentication.AspNetCore;
+using Spacebar.Models.Db.Contexts;
+using Spacebar.DataMappings.Generic;
+using Spacebar.Models.Generic;
+
+namespace Spacebar.UApi.Controllers;
+
+[Route("/api/v{_}/guilds/{guildId}/members/")]
+public class GuildMembersController(ILogger<GuildMembersController> logger, SpacebarDbContext db, SpacebarAspNetAuthenticationService authService) : ControllerBase {
+    /// <summary>
+    ///     Get a guild member by ID
+    /// </summary>
+    /// <param name="guildId">Guild ID</param>
+    /// <param name="memberId">Member ID</param>
+    /// <returns>The public member projection</returns>
+    /// <exception cref="InvalidOperationException">An error has occured</exception>
+    [HttpGet("{memberId}")]
+    public async Task<Member> GetMemberAsync(string guildId, string memberId) {
+        var user = await authService.GetCurrentUserAsync(Request);
+        var cmember = db.Members.SingleOrDefault(x => x.Id == user.Id && x.GuildId == guildId);
+        if (cmember is null)
+            throw new InvalidOperationException("You are not a member of this guild.");
+
+        var member = db.Members
+            .Include(x => x.IdNavigation) // User object
+            .Include(x => x.Roles)
+            .SingleOrDefault(x => x.Id == user.Id && x.GuildId == guildId);
+
+        if (member is null)
+            throw new InvalidOperationException("Member not found");
+
+        return member.ToPublicMember();
+    }
+}
\ No newline at end of file
diff --git a/extra/admin-api/Spacebar.UApi/Program.cs b/extra/admin-api/Spacebar.UApi/Program.cs
new file mode 100644
index 000000000..4695b7abc
--- /dev/null
+++ b/extra/admin-api/Spacebar.UApi/Program.cs
@@ -0,0 +1,83 @@
+using System.Text.Json.Serialization;
+using ArcaneLibs;
+using Microsoft.EntityFrameworkCore;
+using Spacebar.Interop.Authentication;
+using Spacebar.Interop.Authentication.AspNetCore;
+using Spacebar.Models.Db.Contexts;
+
+var builder = WebApplication.CreateBuilder(args);
+if (!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("APPSETTINGS_PATH")))
+    builder.Configuration.AddJsonFile(Environment.GetEnvironmentVariable("APPSETTINGS_PATH")!);
+
+// Add services to the container.
+
+builder.Services.AddControllers(options => {
+    options.MaxValidationDepth = null;
+    // options.MaxIAsyncEnumerableBufferLimit = 1;
+}).AddJsonOptions(options => {
+    options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
+    options.JsonSerializerOptions.WriteIndented = true;
+    options.JsonSerializerOptions.MaxDepth = 100;
+    // options.JsonSerializerOptions.DefaultBufferSize = ;
+}).AddMvcOptions(o => { o.SuppressOutputFormatterBuffering = true; });
+// Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi
+builder.Services.AddOpenApi();
+
+builder.Services.AddDbContextPool<SpacebarDbContext>(options => {
+    options
+        .UseNpgsql(builder.Configuration.GetConnectionString("Spacebar"))
+        .EnableDetailedErrors();
+});
+
+builder.Services.AddSingleton<SpacebarAuthenticationConfiguration>();
+builder.Services.AddScoped<SpacebarAuthenticationService>();
+builder.Services.AddScoped<SpacebarAspNetAuthenticationService>();
+
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment()) {
+    app.MapOpenApi();
+}
+
+app.UseAuthorization();
+
+app.MapControllers();
+app.Use((context, next) => {
+    context.Response.Headers["Access-Control-Allow-Origin"] = "*";
+    context.Response.Headers["Access-Control-Allow-Methods"] = "GET, POST, PUT, DELETE, OPTIONS";
+    context.Response.Headers["Access-Control-Allow-Headers"] = "*, Authorization";
+    if (context.Request.Method == "OPTIONS") {
+        context.Response.StatusCode = 200;
+        return Task.CompletedTask;
+    }
+
+    return next();
+});
+
+// fallback to proxy in case we dont have a specific endpoint...
+// TODO config
+app.MapFallback("{*_}", async context => {
+    var client = new StreamingHttpClient();
+    var requestMessage = new HttpRequestMessage(
+        new HttpMethod(context.Request.Method),
+        "http://api.old.server.spacebar.chat" + context.Request.Path + context.Request.QueryString
+    ) {
+        Content = new StreamContent(context.Request.Body)
+    };
+    Console.WriteLine(requestMessage.RequestUri);
+
+    foreach (var header in context.Request.Headers)
+        if (header.Key is not ("Accept-Encoding" or "Host"))
+            requestMessage.Headers.TryAddWithoutValidation(header.Key, header.Value.ToArray());
+
+    var responseMessage = await client.SendUnhandledAsync(requestMessage, CancellationToken.None);
+    context.Response.StatusCode = (int)responseMessage.StatusCode;
+
+    foreach (var header in responseMessage.Headers) context.Response.Headers[header.Key] = header.Value.ToArray();
+    foreach (var header in responseMessage.Content.Headers) context.Response.Headers[header.Key] = header.Value.ToArray();
+
+    await responseMessage.Content.CopyToAsync(context.Response.Body);
+});
+
+app.Run();
\ No newline at end of file
diff --git a/extra/admin-api/Spacebar.UApi/Properties/launchSettings.json b/extra/admin-api/Spacebar.UApi/Properties/launchSettings.json
new file mode 100644
index 000000000..6871efac7
--- /dev/null
+++ b/extra/admin-api/Spacebar.UApi/Properties/launchSettings.json
@@ -0,0 +1,14 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "applicationUrl": "http://localhost:5085",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/extra/admin-api/Spacebar.UApi/Spacebar.UApi.csproj b/extra/admin-api/Spacebar.UApi/Spacebar.UApi.csproj
new file mode 100644
index 000000000..1fe9c7999
--- /dev/null
+++ b/extra/admin-api/Spacebar.UApi/Spacebar.UApi.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+    <PropertyGroup>
+        <TargetFramework>net10.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="ArcaneLibs" Version="1.0.1-preview.20260126-091403"/>
+        <PackageReference Include="ArcaneLibs.StringNormalisation" Version="1.0.1-preview.20260126-091403"/>
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.2"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\DataMappings\Spacebar.DataMappings.Generic\Spacebar.DataMappings.Generic.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
+        <PackageReference Include="Spacebar.DataMappings.Generic" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
+        <ProjectReference Include="..\Interop\Spacebar.Interop.Authentication.AspNetCore\Spacebar.Interop.Authentication.AspNetCore.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
+        <PackageReference Include="Spacebar.Interop.Authentication.AspNetCore" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
+        <ProjectReference Include="..\Interop\Spacebar.Interop.Replication.UnixSocket\Spacebar.Interop.Replication.UnixSocket.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
+        <PackageReference Include="Spacebar.Interop.Replication.UnixSocket" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
+        <ProjectReference Include="..\Models\Spacebar.Models.AdminApi\Spacebar.Models.AdminApi.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
+        <PackageReference Include="Spacebar.Models.AdminApi" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
+        <ProjectReference Include="..\Models\Spacebar.Models.Config\Spacebar.Models.Config.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
+        <PackageReference Include="Spacebar.Models.Config" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
+        <ProjectReference Include="..\Models\Spacebar.Models.Db\Spacebar.Models.Db.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
+        <PackageReference Include="Spacebar.Models.Db" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
+        <ProjectReference Include="..\Models\Spacebar.Models.Generic\Spacebar.Models.Generic.csproj" Condition="'$(ContinuousIntegrationBuild)'!='true'"/>
+        <PackageReference Include="Spacebar.Models.Generic" Version="*-preview*" Condition="'$(ContinuousIntegrationBuild)'=='true'"/>
+    </ItemGroup>
+</Project>
diff --git a/extra/admin-api/Spacebar.UApi/Spacebar.UApi.http b/extra/admin-api/Spacebar.UApi/Spacebar.UApi.http
new file mode 100644
index 000000000..aae3b7c30
--- /dev/null
+++ b/extra/admin-api/Spacebar.UApi/Spacebar.UApi.http
@@ -0,0 +1,6 @@
+@Spacebar.UApi_HostAddress = http://localhost:5085
+
+GET {{Spacebar.UApi_HostAddress}}/weatherforecast/
+Accept: application/json
+
+###
diff --git a/extra/admin-api/Spacebar.UApi/appsettings.Development.json b/extra/admin-api/Spacebar.UApi/appsettings.Development.json
new file mode 100644
index 000000000..0c208ae91
--- /dev/null
+++ b/extra/admin-api/Spacebar.UApi/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
diff --git a/extra/admin-api/Spacebar.UApi/appsettings.json b/extra/admin-api/Spacebar.UApi/appsettings.json
new file mode 100644
index 000000000..10f68b8c8
--- /dev/null
+++ b/extra/admin-api/Spacebar.UApi/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
diff --git a/extra/admin-api/SpacebarAdminAPI.sln b/extra/admin-api/SpacebarAdminAPI.sln
deleted file mode 100644
index e6dfb5272..000000000
--- a/extra/admin-api/SpacebarAdminAPI.sln
+++ /dev/null
@@ -1,387 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.AdminApi", "Spacebar.AdminApi\Spacebar.AdminApi.csproj", "{00E58C53-0AC1-4113-8CCF-D299861EA8D3}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{04787943-EBB6-4DE4-96D5-4CFB4A2CEE99}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.AdminApiTest", "Utilities\Spacebar.AdminApiTest\Spacebar.AdminApiTest.csproj", "{374314B2-7149-4316-8750-4E1E7BF6C3B4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.AdminApi.TestClient", "Utilities\Spacebar.AdminApi.TestClient\Spacebar.AdminApi.TestClient.csproj", "{498DAD05-336E-4851-ABD8-4E7CCA8312B0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.AdminApi.PrepareTestData", "Utilities\Spacebar.AdminApi.PrepareTestData\Spacebar.AdminApi.PrepareTestData.csproj", "{BCC6501C-16A7-4787-BA47-52DAE06718A8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.Cdn", "Spacebar.Cdn\Spacebar.Cdn.csproj", "{A2B0770E-D5E6-47BC-8595-4469F5C3E993}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Models", "Models", "{259D1A9B-2927-4571-A366-68C3BB30C2B2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.Models.Config", "Models\Spacebar.Models.Config\Spacebar.Models.Config.csproj", "{709BCD85-2E06-429B-A53E-95CCD286A94F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.Models.Db", "Models\Spacebar.Models.Db\Spacebar.Models.Db.csproj", "{753A55F0-A2CD-447B-8664-B06CB606CEAB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfigTest", "Utilities\ConfigTest\ConfigTest.csproj", "{9B190B74-C7D0-4E60-9D73-008136A800FF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordEmojiConverter", "Utilities\DiscordEmojiConverter\DiscordEmojiConverter.csproj", "{BCE9DADB-4274-4190-8EA7-54F3EF6D5ECF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.CleanSettingsRows", "Utilities\Spacebar.CleanSettingsRows\Spacebar.CleanSettingsRows.csproj", "{9AABE503-5D27-4D7F-8A01-4430422C4284}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.Models.AdminApi", "Models\Spacebar.Models.AdminApi\Spacebar.Models.AdminApi.csproj", "{F13D96E4-9C85-4853-B812-7FD35620382C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Interop", "Interop", "{16DBEA54-D51A-4D91-84DF-C701B6B4786F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.Interop.Replication.Abstractions", "Interop\Spacebar.Interop.Replication.Abstractions\Spacebar.Interop.Replication.Abstractions.csproj", "{6F2A4C4B-8EAA-4469-9320-B52C23D9640F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.Interop.Replication.RabbitMq", "Interop\Spacebar.Interop.Replication.RabbitMq\Spacebar.Interop.Replication.RabbitMq.csproj", "{2FAE6018-CF95-4B44-A7F7-D6FAF596076D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.Interop.Replication.UnixSocket", "Interop\Spacebar.Interop.Replication.UnixSocket\Spacebar.Interop.Replication.UnixSocket.csproj", "{2D8F75C2-C4DC-4DBC-A880-5BF021D637E5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.Cdn.Fsck", "Utilities\Spacebar.Cdn.Fsck\Spacebar.Cdn.Fsck.csproj", "{05B1FEDA-1112-49C8-B7E8-539B5ED8C05D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.Interop.Cdn.Abstractions", "Interop\Spacebar.Interop.Cdn.Abstractions\Spacebar.Interop.Cdn.Abstractions.csproj", "{B494C58D-2D53-49F4-9E3E-1DCF60828802}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.Cdn.Migration", "Utilities\Spacebar.Cdn.Migration\Spacebar.Cdn.Migration.csproj", "{2B18EB6B-331D-41A9-A9D1-C2518E2AD914}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.Interop.Cdn.Signing", "Interop\Spacebar.Interop.Cdn.Signing\Spacebar.Interop.Cdn.Signing.csproj", "{95A8E8CC-53B2-4FC6-B41E-196BE5F96BB5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.Interop.Authentication", "Interop\Spacebar.Interop.Authentication\Spacebar.Interop.Authentication.csproj", "{8864E79A-2FF3-4B08-8AE9-F9D877CC69B3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.GatewayOffload", "Spacebar.GatewayOffload\Spacebar.GatewayOffload.csproj", "{CFD6ADD1-29D8-414A-B4E4-E2F74CC7D27B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.Interop.Authentication.AspNetCore", "Interop\Spacebar.Interop.Authentication.AspNetCore\Spacebar.Interop.Authentication.AspNetCore.csproj", "{BB961FD8-61C2-4443-AB68-B8088CBC3D43}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.Models.Generic", "Models\Spacebar.Models.Generic\Spacebar.Models.Generic.csproj", "{58766A5F-BA91-41F1-8A09-44E96685E361}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.Models.Gateway", "Models\Spacebar.Models.Gateway\Spacebar.Models.Gateway.csproj", "{0057DA5E-3183-4A7A-B092-167137872FF8}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataMappings", "DataMappings", "{98939AC0-3ADA-4DB2-8B21-FFB6AF29A2D2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spacebar.DataMappings.Generic", "DataMappings\Spacebar.DataMappings.Generic\Spacebar.DataMappings.Generic.csproj", "{7ACE56E6-7A6C-459C-8A7E-5F572DDBB00E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{00E58C53-0AC1-4113-8CCF-D299861EA8D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{00E58C53-0AC1-4113-8CCF-D299861EA8D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{00E58C53-0AC1-4113-8CCF-D299861EA8D3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{00E58C53-0AC1-4113-8CCF-D299861EA8D3}.Debug|x64.Build.0 = Debug|Any CPU
-		{00E58C53-0AC1-4113-8CCF-D299861EA8D3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{00E58C53-0AC1-4113-8CCF-D299861EA8D3}.Debug|x86.Build.0 = Debug|Any CPU
-		{00E58C53-0AC1-4113-8CCF-D299861EA8D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{00E58C53-0AC1-4113-8CCF-D299861EA8D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{00E58C53-0AC1-4113-8CCF-D299861EA8D3}.Release|x64.ActiveCfg = Release|Any CPU
-		{00E58C53-0AC1-4113-8CCF-D299861EA8D3}.Release|x64.Build.0 = Release|Any CPU
-		{00E58C53-0AC1-4113-8CCF-D299861EA8D3}.Release|x86.ActiveCfg = Release|Any CPU
-		{00E58C53-0AC1-4113-8CCF-D299861EA8D3}.Release|x86.Build.0 = Release|Any CPU
-		{374314B2-7149-4316-8750-4E1E7BF6C3B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{374314B2-7149-4316-8750-4E1E7BF6C3B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{374314B2-7149-4316-8750-4E1E7BF6C3B4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{374314B2-7149-4316-8750-4E1E7BF6C3B4}.Debug|x64.Build.0 = Debug|Any CPU
-		{374314B2-7149-4316-8750-4E1E7BF6C3B4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{374314B2-7149-4316-8750-4E1E7BF6C3B4}.Debug|x86.Build.0 = Debug|Any CPU
-		{374314B2-7149-4316-8750-4E1E7BF6C3B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{374314B2-7149-4316-8750-4E1E7BF6C3B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{374314B2-7149-4316-8750-4E1E7BF6C3B4}.Release|x64.ActiveCfg = Release|Any CPU
-		{374314B2-7149-4316-8750-4E1E7BF6C3B4}.Release|x64.Build.0 = Release|Any CPU
-		{374314B2-7149-4316-8750-4E1E7BF6C3B4}.Release|x86.ActiveCfg = Release|Any CPU
-		{374314B2-7149-4316-8750-4E1E7BF6C3B4}.Release|x86.Build.0 = Release|Any CPU
-		{498DAD05-336E-4851-ABD8-4E7CCA8312B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{498DAD05-336E-4851-ABD8-4E7CCA8312B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{498DAD05-336E-4851-ABD8-4E7CCA8312B0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{498DAD05-336E-4851-ABD8-4E7CCA8312B0}.Debug|x64.Build.0 = Debug|Any CPU
-		{498DAD05-336E-4851-ABD8-4E7CCA8312B0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{498DAD05-336E-4851-ABD8-4E7CCA8312B0}.Debug|x86.Build.0 = Debug|Any CPU
-		{498DAD05-336E-4851-ABD8-4E7CCA8312B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{498DAD05-336E-4851-ABD8-4E7CCA8312B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{498DAD05-336E-4851-ABD8-4E7CCA8312B0}.Release|x64.ActiveCfg = Release|Any CPU
-		{498DAD05-336E-4851-ABD8-4E7CCA8312B0}.Release|x64.Build.0 = Release|Any CPU
-		{498DAD05-336E-4851-ABD8-4E7CCA8312B0}.Release|x86.ActiveCfg = Release|Any CPU
-		{498DAD05-336E-4851-ABD8-4E7CCA8312B0}.Release|x86.Build.0 = Release|Any CPU
-		{BCC6501C-16A7-4787-BA47-52DAE06718A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BCC6501C-16A7-4787-BA47-52DAE06718A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BCC6501C-16A7-4787-BA47-52DAE06718A8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BCC6501C-16A7-4787-BA47-52DAE06718A8}.Debug|x64.Build.0 = Debug|Any CPU
-		{BCC6501C-16A7-4787-BA47-52DAE06718A8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BCC6501C-16A7-4787-BA47-52DAE06718A8}.Debug|x86.Build.0 = Debug|Any CPU
-		{BCC6501C-16A7-4787-BA47-52DAE06718A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BCC6501C-16A7-4787-BA47-52DAE06718A8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BCC6501C-16A7-4787-BA47-52DAE06718A8}.Release|x64.ActiveCfg = Release|Any CPU
-		{BCC6501C-16A7-4787-BA47-52DAE06718A8}.Release|x64.Build.0 = Release|Any CPU
-		{BCC6501C-16A7-4787-BA47-52DAE06718A8}.Release|x86.ActiveCfg = Release|Any CPU
-		{BCC6501C-16A7-4787-BA47-52DAE06718A8}.Release|x86.Build.0 = Release|Any CPU
-		{A2B0770E-D5E6-47BC-8595-4469F5C3E993}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2B0770E-D5E6-47BC-8595-4469F5C3E993}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2B0770E-D5E6-47BC-8595-4469F5C3E993}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A2B0770E-D5E6-47BC-8595-4469F5C3E993}.Debug|x64.Build.0 = Debug|Any CPU
-		{A2B0770E-D5E6-47BC-8595-4469F5C3E993}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A2B0770E-D5E6-47BC-8595-4469F5C3E993}.Debug|x86.Build.0 = Debug|Any CPU
-		{A2B0770E-D5E6-47BC-8595-4469F5C3E993}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2B0770E-D5E6-47BC-8595-4469F5C3E993}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2B0770E-D5E6-47BC-8595-4469F5C3E993}.Release|x64.ActiveCfg = Release|Any CPU
-		{A2B0770E-D5E6-47BC-8595-4469F5C3E993}.Release|x64.Build.0 = Release|Any CPU
-		{A2B0770E-D5E6-47BC-8595-4469F5C3E993}.Release|x86.ActiveCfg = Release|Any CPU
-		{A2B0770E-D5E6-47BC-8595-4469F5C3E993}.Release|x86.Build.0 = Release|Any CPU
-		{709BCD85-2E06-429B-A53E-95CCD286A94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{709BCD85-2E06-429B-A53E-95CCD286A94F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{709BCD85-2E06-429B-A53E-95CCD286A94F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{709BCD85-2E06-429B-A53E-95CCD286A94F}.Debug|x64.Build.0 = Debug|Any CPU
-		{709BCD85-2E06-429B-A53E-95CCD286A94F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{709BCD85-2E06-429B-A53E-95CCD286A94F}.Debug|x86.Build.0 = Debug|Any CPU
-		{709BCD85-2E06-429B-A53E-95CCD286A94F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{709BCD85-2E06-429B-A53E-95CCD286A94F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{709BCD85-2E06-429B-A53E-95CCD286A94F}.Release|x64.ActiveCfg = Release|Any CPU
-		{709BCD85-2E06-429B-A53E-95CCD286A94F}.Release|x64.Build.0 = Release|Any CPU
-		{709BCD85-2E06-429B-A53E-95CCD286A94F}.Release|x86.ActiveCfg = Release|Any CPU
-		{709BCD85-2E06-429B-A53E-95CCD286A94F}.Release|x86.Build.0 = Release|Any CPU
-		{753A55F0-A2CD-447B-8664-B06CB606CEAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{753A55F0-A2CD-447B-8664-B06CB606CEAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{753A55F0-A2CD-447B-8664-B06CB606CEAB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{753A55F0-A2CD-447B-8664-B06CB606CEAB}.Debug|x64.Build.0 = Debug|Any CPU
-		{753A55F0-A2CD-447B-8664-B06CB606CEAB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{753A55F0-A2CD-447B-8664-B06CB606CEAB}.Debug|x86.Build.0 = Debug|Any CPU
-		{753A55F0-A2CD-447B-8664-B06CB606CEAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{753A55F0-A2CD-447B-8664-B06CB606CEAB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{753A55F0-A2CD-447B-8664-B06CB606CEAB}.Release|x64.ActiveCfg = Release|Any CPU
-		{753A55F0-A2CD-447B-8664-B06CB606CEAB}.Release|x64.Build.0 = Release|Any CPU
-		{753A55F0-A2CD-447B-8664-B06CB606CEAB}.Release|x86.ActiveCfg = Release|Any CPU
-		{753A55F0-A2CD-447B-8664-B06CB606CEAB}.Release|x86.Build.0 = Release|Any CPU
-		{9B190B74-C7D0-4E60-9D73-008136A800FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B190B74-C7D0-4E60-9D73-008136A800FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B190B74-C7D0-4E60-9D73-008136A800FF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9B190B74-C7D0-4E60-9D73-008136A800FF}.Debug|x64.Build.0 = Debug|Any CPU
-		{9B190B74-C7D0-4E60-9D73-008136A800FF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9B190B74-C7D0-4E60-9D73-008136A800FF}.Debug|x86.Build.0 = Debug|Any CPU
-		{9B190B74-C7D0-4E60-9D73-008136A800FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B190B74-C7D0-4E60-9D73-008136A800FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9B190B74-C7D0-4E60-9D73-008136A800FF}.Release|x64.ActiveCfg = Release|Any CPU
-		{9B190B74-C7D0-4E60-9D73-008136A800FF}.Release|x64.Build.0 = Release|Any CPU
-		{9B190B74-C7D0-4E60-9D73-008136A800FF}.Release|x86.ActiveCfg = Release|Any CPU
-		{9B190B74-C7D0-4E60-9D73-008136A800FF}.Release|x86.Build.0 = Release|Any CPU
-		{BCE9DADB-4274-4190-8EA7-54F3EF6D5ECF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BCE9DADB-4274-4190-8EA7-54F3EF6D5ECF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BCE9DADB-4274-4190-8EA7-54F3EF6D5ECF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BCE9DADB-4274-4190-8EA7-54F3EF6D5ECF}.Debug|x64.Build.0 = Debug|Any CPU
-		{BCE9DADB-4274-4190-8EA7-54F3EF6D5ECF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BCE9DADB-4274-4190-8EA7-54F3EF6D5ECF}.Debug|x86.Build.0 = Debug|Any CPU
-		{BCE9DADB-4274-4190-8EA7-54F3EF6D5ECF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BCE9DADB-4274-4190-8EA7-54F3EF6D5ECF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BCE9DADB-4274-4190-8EA7-54F3EF6D5ECF}.Release|x64.ActiveCfg = Release|Any CPU
-		{BCE9DADB-4274-4190-8EA7-54F3EF6D5ECF}.Release|x64.Build.0 = Release|Any CPU
-		{BCE9DADB-4274-4190-8EA7-54F3EF6D5ECF}.Release|x86.ActiveCfg = Release|Any CPU
-		{BCE9DADB-4274-4190-8EA7-54F3EF6D5ECF}.Release|x86.Build.0 = Release|Any CPU
-		{9AABE503-5D27-4D7F-8A01-4430422C4284}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9AABE503-5D27-4D7F-8A01-4430422C4284}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9AABE503-5D27-4D7F-8A01-4430422C4284}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9AABE503-5D27-4D7F-8A01-4430422C4284}.Debug|x64.Build.0 = Debug|Any CPU
-		{9AABE503-5D27-4D7F-8A01-4430422C4284}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9AABE503-5D27-4D7F-8A01-4430422C4284}.Debug|x86.Build.0 = Debug|Any CPU
-		{9AABE503-5D27-4D7F-8A01-4430422C4284}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9AABE503-5D27-4D7F-8A01-4430422C4284}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9AABE503-5D27-4D7F-8A01-4430422C4284}.Release|x64.ActiveCfg = Release|Any CPU
-		{9AABE503-5D27-4D7F-8A01-4430422C4284}.Release|x64.Build.0 = Release|Any CPU
-		{9AABE503-5D27-4D7F-8A01-4430422C4284}.Release|x86.ActiveCfg = Release|Any CPU
-		{9AABE503-5D27-4D7F-8A01-4430422C4284}.Release|x86.Build.0 = Release|Any CPU
-		{F13D96E4-9C85-4853-B812-7FD35620382C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F13D96E4-9C85-4853-B812-7FD35620382C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F13D96E4-9C85-4853-B812-7FD35620382C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F13D96E4-9C85-4853-B812-7FD35620382C}.Debug|x64.Build.0 = Debug|Any CPU
-		{F13D96E4-9C85-4853-B812-7FD35620382C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F13D96E4-9C85-4853-B812-7FD35620382C}.Debug|x86.Build.0 = Debug|Any CPU
-		{F13D96E4-9C85-4853-B812-7FD35620382C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F13D96E4-9C85-4853-B812-7FD35620382C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F13D96E4-9C85-4853-B812-7FD35620382C}.Release|x64.ActiveCfg = Release|Any CPU
-		{F13D96E4-9C85-4853-B812-7FD35620382C}.Release|x64.Build.0 = Release|Any CPU
-		{F13D96E4-9C85-4853-B812-7FD35620382C}.Release|x86.ActiveCfg = Release|Any CPU
-		{F13D96E4-9C85-4853-B812-7FD35620382C}.Release|x86.Build.0 = Release|Any CPU
-		{6F2A4C4B-8EAA-4469-9320-B52C23D9640F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F2A4C4B-8EAA-4469-9320-B52C23D9640F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F2A4C4B-8EAA-4469-9320-B52C23D9640F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6F2A4C4B-8EAA-4469-9320-B52C23D9640F}.Debug|x64.Build.0 = Debug|Any CPU
-		{6F2A4C4B-8EAA-4469-9320-B52C23D9640F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6F2A4C4B-8EAA-4469-9320-B52C23D9640F}.Debug|x86.Build.0 = Debug|Any CPU
-		{6F2A4C4B-8EAA-4469-9320-B52C23D9640F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F2A4C4B-8EAA-4469-9320-B52C23D9640F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F2A4C4B-8EAA-4469-9320-B52C23D9640F}.Release|x64.ActiveCfg = Release|Any CPU
-		{6F2A4C4B-8EAA-4469-9320-B52C23D9640F}.Release|x64.Build.0 = Release|Any CPU
-		{6F2A4C4B-8EAA-4469-9320-B52C23D9640F}.Release|x86.ActiveCfg = Release|Any CPU
-		{6F2A4C4B-8EAA-4469-9320-B52C23D9640F}.Release|x86.Build.0 = Release|Any CPU
-		{2FAE6018-CF95-4B44-A7F7-D6FAF596076D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2FAE6018-CF95-4B44-A7F7-D6FAF596076D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2FAE6018-CF95-4B44-A7F7-D6FAF596076D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2FAE6018-CF95-4B44-A7F7-D6FAF596076D}.Debug|x64.Build.0 = Debug|Any CPU
-		{2FAE6018-CF95-4B44-A7F7-D6FAF596076D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2FAE6018-CF95-4B44-A7F7-D6FAF596076D}.Debug|x86.Build.0 = Debug|Any CPU
-		{2FAE6018-CF95-4B44-A7F7-D6FAF596076D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2FAE6018-CF95-4B44-A7F7-D6FAF596076D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2FAE6018-CF95-4B44-A7F7-D6FAF596076D}.Release|x64.ActiveCfg = Release|Any CPU
-		{2FAE6018-CF95-4B44-A7F7-D6FAF596076D}.Release|x64.Build.0 = Release|Any CPU
-		{2FAE6018-CF95-4B44-A7F7-D6FAF596076D}.Release|x86.ActiveCfg = Release|Any CPU
-		{2FAE6018-CF95-4B44-A7F7-D6FAF596076D}.Release|x86.Build.0 = Release|Any CPU
-		{2D8F75C2-C4DC-4DBC-A880-5BF021D637E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D8F75C2-C4DC-4DBC-A880-5BF021D637E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D8F75C2-C4DC-4DBC-A880-5BF021D637E5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2D8F75C2-C4DC-4DBC-A880-5BF021D637E5}.Debug|x64.Build.0 = Debug|Any CPU
-		{2D8F75C2-C4DC-4DBC-A880-5BF021D637E5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2D8F75C2-C4DC-4DBC-A880-5BF021D637E5}.Debug|x86.Build.0 = Debug|Any CPU
-		{2D8F75C2-C4DC-4DBC-A880-5BF021D637E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D8F75C2-C4DC-4DBC-A880-5BF021D637E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D8F75C2-C4DC-4DBC-A880-5BF021D637E5}.Release|x64.ActiveCfg = Release|Any CPU
-		{2D8F75C2-C4DC-4DBC-A880-5BF021D637E5}.Release|x64.Build.0 = Release|Any CPU
-		{2D8F75C2-C4DC-4DBC-A880-5BF021D637E5}.Release|x86.ActiveCfg = Release|Any CPU
-		{2D8F75C2-C4DC-4DBC-A880-5BF021D637E5}.Release|x86.Build.0 = Release|Any CPU
-		{05B1FEDA-1112-49C8-B7E8-539B5ED8C05D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{05B1FEDA-1112-49C8-B7E8-539B5ED8C05D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{05B1FEDA-1112-49C8-B7E8-539B5ED8C05D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{05B1FEDA-1112-49C8-B7E8-539B5ED8C05D}.Debug|x64.Build.0 = Debug|Any CPU
-		{05B1FEDA-1112-49C8-B7E8-539B5ED8C05D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{05B1FEDA-1112-49C8-B7E8-539B5ED8C05D}.Debug|x86.Build.0 = Debug|Any CPU
-		{05B1FEDA-1112-49C8-B7E8-539B5ED8C05D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{05B1FEDA-1112-49C8-B7E8-539B5ED8C05D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{05B1FEDA-1112-49C8-B7E8-539B5ED8C05D}.Release|x64.ActiveCfg = Release|Any CPU
-		{05B1FEDA-1112-49C8-B7E8-539B5ED8C05D}.Release|x64.Build.0 = Release|Any CPU
-		{05B1FEDA-1112-49C8-B7E8-539B5ED8C05D}.Release|x86.ActiveCfg = Release|Any CPU
-		{05B1FEDA-1112-49C8-B7E8-539B5ED8C05D}.Release|x86.Build.0 = Release|Any CPU
-		{B494C58D-2D53-49F4-9E3E-1DCF60828802}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B494C58D-2D53-49F4-9E3E-1DCF60828802}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B494C58D-2D53-49F4-9E3E-1DCF60828802}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B494C58D-2D53-49F4-9E3E-1DCF60828802}.Debug|x64.Build.0 = Debug|Any CPU
-		{B494C58D-2D53-49F4-9E3E-1DCF60828802}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B494C58D-2D53-49F4-9E3E-1DCF60828802}.Debug|x86.Build.0 = Debug|Any CPU
-		{B494C58D-2D53-49F4-9E3E-1DCF60828802}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B494C58D-2D53-49F4-9E3E-1DCF60828802}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B494C58D-2D53-49F4-9E3E-1DCF60828802}.Release|x64.ActiveCfg = Release|Any CPU
-		{B494C58D-2D53-49F4-9E3E-1DCF60828802}.Release|x64.Build.0 = Release|Any CPU
-		{B494C58D-2D53-49F4-9E3E-1DCF60828802}.Release|x86.ActiveCfg = Release|Any CPU
-		{B494C58D-2D53-49F4-9E3E-1DCF60828802}.Release|x86.Build.0 = Release|Any CPU
-		{2B18EB6B-331D-41A9-A9D1-C2518E2AD914}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B18EB6B-331D-41A9-A9D1-C2518E2AD914}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B18EB6B-331D-41A9-A9D1-C2518E2AD914}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2B18EB6B-331D-41A9-A9D1-C2518E2AD914}.Debug|x64.Build.0 = Debug|Any CPU
-		{2B18EB6B-331D-41A9-A9D1-C2518E2AD914}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2B18EB6B-331D-41A9-A9D1-C2518E2AD914}.Debug|x86.Build.0 = Debug|Any CPU
-		{2B18EB6B-331D-41A9-A9D1-C2518E2AD914}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B18EB6B-331D-41A9-A9D1-C2518E2AD914}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B18EB6B-331D-41A9-A9D1-C2518E2AD914}.Release|x64.ActiveCfg = Release|Any CPU
-		{2B18EB6B-331D-41A9-A9D1-C2518E2AD914}.Release|x64.Build.0 = Release|Any CPU
-		{2B18EB6B-331D-41A9-A9D1-C2518E2AD914}.Release|x86.ActiveCfg = Release|Any CPU
-		{2B18EB6B-331D-41A9-A9D1-C2518E2AD914}.Release|x86.Build.0 = Release|Any CPU
-		{95A8E8CC-53B2-4FC6-B41E-196BE5F96BB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{95A8E8CC-53B2-4FC6-B41E-196BE5F96BB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{95A8E8CC-53B2-4FC6-B41E-196BE5F96BB5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{95A8E8CC-53B2-4FC6-B41E-196BE5F96BB5}.Debug|x64.Build.0 = Debug|Any CPU
-		{95A8E8CC-53B2-4FC6-B41E-196BE5F96BB5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{95A8E8CC-53B2-4FC6-B41E-196BE5F96BB5}.Debug|x86.Build.0 = Debug|Any CPU
-		{95A8E8CC-53B2-4FC6-B41E-196BE5F96BB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{95A8E8CC-53B2-4FC6-B41E-196BE5F96BB5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{95A8E8CC-53B2-4FC6-B41E-196BE5F96BB5}.Release|x64.ActiveCfg = Release|Any CPU
-		{95A8E8CC-53B2-4FC6-B41E-196BE5F96BB5}.Release|x64.Build.0 = Release|Any CPU
-		{95A8E8CC-53B2-4FC6-B41E-196BE5F96BB5}.Release|x86.ActiveCfg = Release|Any CPU
-		{95A8E8CC-53B2-4FC6-B41E-196BE5F96BB5}.Release|x86.Build.0 = Release|Any CPU
-		{8864E79A-2FF3-4B08-8AE9-F9D877CC69B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8864E79A-2FF3-4B08-8AE9-F9D877CC69B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8864E79A-2FF3-4B08-8AE9-F9D877CC69B3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8864E79A-2FF3-4B08-8AE9-F9D877CC69B3}.Debug|x64.Build.0 = Debug|Any CPU
-		{8864E79A-2FF3-4B08-8AE9-F9D877CC69B3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8864E79A-2FF3-4B08-8AE9-F9D877CC69B3}.Debug|x86.Build.0 = Debug|Any CPU
-		{8864E79A-2FF3-4B08-8AE9-F9D877CC69B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8864E79A-2FF3-4B08-8AE9-F9D877CC69B3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8864E79A-2FF3-4B08-8AE9-F9D877CC69B3}.Release|x64.ActiveCfg = Release|Any CPU
-		{8864E79A-2FF3-4B08-8AE9-F9D877CC69B3}.Release|x64.Build.0 = Release|Any CPU
-		{8864E79A-2FF3-4B08-8AE9-F9D877CC69B3}.Release|x86.ActiveCfg = Release|Any CPU
-		{8864E79A-2FF3-4B08-8AE9-F9D877CC69B3}.Release|x86.Build.0 = Release|Any CPU
-		{CFD6ADD1-29D8-414A-B4E4-E2F74CC7D27B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFD6ADD1-29D8-414A-B4E4-E2F74CC7D27B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFD6ADD1-29D8-414A-B4E4-E2F74CC7D27B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CFD6ADD1-29D8-414A-B4E4-E2F74CC7D27B}.Debug|x64.Build.0 = Debug|Any CPU
-		{CFD6ADD1-29D8-414A-B4E4-E2F74CC7D27B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CFD6ADD1-29D8-414A-B4E4-E2F74CC7D27B}.Debug|x86.Build.0 = Debug|Any CPU
-		{CFD6ADD1-29D8-414A-B4E4-E2F74CC7D27B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CFD6ADD1-29D8-414A-B4E4-E2F74CC7D27B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CFD6ADD1-29D8-414A-B4E4-E2F74CC7D27B}.Release|x64.ActiveCfg = Release|Any CPU
-		{CFD6ADD1-29D8-414A-B4E4-E2F74CC7D27B}.Release|x64.Build.0 = Release|Any CPU
-		{CFD6ADD1-29D8-414A-B4E4-E2F74CC7D27B}.Release|x86.ActiveCfg = Release|Any CPU
-		{CFD6ADD1-29D8-414A-B4E4-E2F74CC7D27B}.Release|x86.Build.0 = Release|Any CPU
-		{BB961FD8-61C2-4443-AB68-B8088CBC3D43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB961FD8-61C2-4443-AB68-B8088CBC3D43}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB961FD8-61C2-4443-AB68-B8088CBC3D43}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BB961FD8-61C2-4443-AB68-B8088CBC3D43}.Debug|x64.Build.0 = Debug|Any CPU
-		{BB961FD8-61C2-4443-AB68-B8088CBC3D43}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BB961FD8-61C2-4443-AB68-B8088CBC3D43}.Debug|x86.Build.0 = Debug|Any CPU
-		{BB961FD8-61C2-4443-AB68-B8088CBC3D43}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BB961FD8-61C2-4443-AB68-B8088CBC3D43}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BB961FD8-61C2-4443-AB68-B8088CBC3D43}.Release|x64.ActiveCfg = Release|Any CPU
-		{BB961FD8-61C2-4443-AB68-B8088CBC3D43}.Release|x64.Build.0 = Release|Any CPU
-		{BB961FD8-61C2-4443-AB68-B8088CBC3D43}.Release|x86.ActiveCfg = Release|Any CPU
-		{BB961FD8-61C2-4443-AB68-B8088CBC3D43}.Release|x86.Build.0 = Release|Any CPU
-		{58766A5F-BA91-41F1-8A09-44E96685E361}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58766A5F-BA91-41F1-8A09-44E96685E361}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58766A5F-BA91-41F1-8A09-44E96685E361}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{58766A5F-BA91-41F1-8A09-44E96685E361}.Debug|x64.Build.0 = Debug|Any CPU
-		{58766A5F-BA91-41F1-8A09-44E96685E361}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{58766A5F-BA91-41F1-8A09-44E96685E361}.Debug|x86.Build.0 = Debug|Any CPU
-		{58766A5F-BA91-41F1-8A09-44E96685E361}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58766A5F-BA91-41F1-8A09-44E96685E361}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58766A5F-BA91-41F1-8A09-44E96685E361}.Release|x64.ActiveCfg = Release|Any CPU
-		{58766A5F-BA91-41F1-8A09-44E96685E361}.Release|x64.Build.0 = Release|Any CPU
-		{58766A5F-BA91-41F1-8A09-44E96685E361}.Release|x86.ActiveCfg = Release|Any CPU
-		{58766A5F-BA91-41F1-8A09-44E96685E361}.Release|x86.Build.0 = Release|Any CPU
-		{0057DA5E-3183-4A7A-B092-167137872FF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0057DA5E-3183-4A7A-B092-167137872FF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0057DA5E-3183-4A7A-B092-167137872FF8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0057DA5E-3183-4A7A-B092-167137872FF8}.Debug|x64.Build.0 = Debug|Any CPU
-		{0057DA5E-3183-4A7A-B092-167137872FF8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0057DA5E-3183-4A7A-B092-167137872FF8}.Debug|x86.Build.0 = Debug|Any CPU
-		{0057DA5E-3183-4A7A-B092-167137872FF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0057DA5E-3183-4A7A-B092-167137872FF8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0057DA5E-3183-4A7A-B092-167137872FF8}.Release|x64.ActiveCfg = Release|Any CPU
-		{0057DA5E-3183-4A7A-B092-167137872FF8}.Release|x64.Build.0 = Release|Any CPU
-		{0057DA5E-3183-4A7A-B092-167137872FF8}.Release|x86.ActiveCfg = Release|Any CPU
-		{0057DA5E-3183-4A7A-B092-167137872FF8}.Release|x86.Build.0 = Release|Any CPU
-		{7ACE56E6-7A6C-459C-8A7E-5F572DDBB00E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7ACE56E6-7A6C-459C-8A7E-5F572DDBB00E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7ACE56E6-7A6C-459C-8A7E-5F572DDBB00E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7ACE56E6-7A6C-459C-8A7E-5F572DDBB00E}.Debug|x64.Build.0 = Debug|Any CPU
-		{7ACE56E6-7A6C-459C-8A7E-5F572DDBB00E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7ACE56E6-7A6C-459C-8A7E-5F572DDBB00E}.Debug|x86.Build.0 = Debug|Any CPU
-		{7ACE56E6-7A6C-459C-8A7E-5F572DDBB00E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7ACE56E6-7A6C-459C-8A7E-5F572DDBB00E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7ACE56E6-7A6C-459C-8A7E-5F572DDBB00E}.Release|x64.ActiveCfg = Release|Any CPU
-		{7ACE56E6-7A6C-459C-8A7E-5F572DDBB00E}.Release|x64.Build.0 = Release|Any CPU
-		{7ACE56E6-7A6C-459C-8A7E-5F572DDBB00E}.Release|x86.ActiveCfg = Release|Any CPU
-		{7ACE56E6-7A6C-459C-8A7E-5F572DDBB00E}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{374314B2-7149-4316-8750-4E1E7BF6C3B4} = {04787943-EBB6-4DE4-96D5-4CFB4A2CEE99}
-		{498DAD05-336E-4851-ABD8-4E7CCA8312B0} = {04787943-EBB6-4DE4-96D5-4CFB4A2CEE99}
-		{BCC6501C-16A7-4787-BA47-52DAE06718A8} = {04787943-EBB6-4DE4-96D5-4CFB4A2CEE99}
-		{709BCD85-2E06-429B-A53E-95CCD286A94F} = {259D1A9B-2927-4571-A366-68C3BB30C2B2}
-		{753A55F0-A2CD-447B-8664-B06CB606CEAB} = {259D1A9B-2927-4571-A366-68C3BB30C2B2}
-		{9B190B74-C7D0-4E60-9D73-008136A800FF} = {04787943-EBB6-4DE4-96D5-4CFB4A2CEE99}
-		{BCE9DADB-4274-4190-8EA7-54F3EF6D5ECF} = {04787943-EBB6-4DE4-96D5-4CFB4A2CEE99}
-		{9AABE503-5D27-4D7F-8A01-4430422C4284} = {04787943-EBB6-4DE4-96D5-4CFB4A2CEE99}
-		{F13D96E4-9C85-4853-B812-7FD35620382C} = {259D1A9B-2927-4571-A366-68C3BB30C2B2}
-		{6F2A4C4B-8EAA-4469-9320-B52C23D9640F} = {16DBEA54-D51A-4D91-84DF-C701B6B4786F}
-		{2FAE6018-CF95-4B44-A7F7-D6FAF596076D} = {16DBEA54-D51A-4D91-84DF-C701B6B4786F}
-		{2D8F75C2-C4DC-4DBC-A880-5BF021D637E5} = {16DBEA54-D51A-4D91-84DF-C701B6B4786F}
-		{05B1FEDA-1112-49C8-B7E8-539B5ED8C05D} = {04787943-EBB6-4DE4-96D5-4CFB4A2CEE99}
-		{B494C58D-2D53-49F4-9E3E-1DCF60828802} = {16DBEA54-D51A-4D91-84DF-C701B6B4786F}
-		{2B18EB6B-331D-41A9-A9D1-C2518E2AD914} = {04787943-EBB6-4DE4-96D5-4CFB4A2CEE99}
-		{95A8E8CC-53B2-4FC6-B41E-196BE5F96BB5} = {16DBEA54-D51A-4D91-84DF-C701B6B4786F}
-		{8864E79A-2FF3-4B08-8AE9-F9D877CC69B3} = {16DBEA54-D51A-4D91-84DF-C701B6B4786F}
-		{BB961FD8-61C2-4443-AB68-B8088CBC3D43} = {16DBEA54-D51A-4D91-84DF-C701B6B4786F}
-		{58766A5F-BA91-41F1-8A09-44E96685E361} = {259D1A9B-2927-4571-A366-68C3BB30C2B2}
-		{0057DA5E-3183-4A7A-B092-167137872FF8} = {259D1A9B-2927-4571-A366-68C3BB30C2B2}
-		{7ACE56E6-7A6C-459C-8A7E-5F572DDBB00E} = {98939AC0-3ADA-4DB2-8B21-FFB6AF29A2D2}
-	EndGlobalSection
-EndGlobal
diff --git a/extra/admin-api/SpacebarAdminAPI.slnx b/extra/admin-api/SpacebarAdminAPI.slnx
new file mode 100644
index 000000000..34ed54028
--- /dev/null
+++ b/extra/admin-api/SpacebarAdminAPI.slnx
@@ -0,0 +1,41 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/DataMappings/">
+    <Project Path="DataMappings/Spacebar.DataMappings.AdminApi/Spacebar.DataMappings.AdminApi.csproj" />
+    <Project Path="DataMappings/Spacebar.DataMappings.Generic/Spacebar.DataMappings.Generic.csproj" />
+  </Folder>
+  <Folder Name="/Interop/">
+    <Project Path="Interop/Spacebar.Interop.Authentication.AspNetCore/Spacebar.Interop.Authentication.AspNetCore.csproj" />
+    <Project Path="Interop/Spacebar.Interop.Authentication/Spacebar.Interop.Authentication.csproj" />
+    <Project Path="Interop/Spacebar.Interop.Cdn.Abstractions/Spacebar.Interop.Cdn.Abstractions.csproj" />
+    <Project Path="Interop/Spacebar.Interop.Cdn.Signing/Spacebar.Interop.Cdn.Signing.csproj" />
+    <Project Path="Interop/Spacebar.Interop.Replication.Abstractions/Spacebar.Interop.Replication.Abstractions.csproj" />
+    <Project Path="Interop/Spacebar.Interop.Replication.RabbitMq/Spacebar.Interop.Replication.RabbitMq.csproj" />
+    <Project Path="Interop/Spacebar.Interop.Replication.UnixSocket/Spacebar.Interop.Replication.UnixSocket.csproj" />
+  </Folder>
+  <Folder Name="/Models/">
+    <Project Path="Models/Spacebar.Models.AdminApi/Spacebar.Models.AdminApi.csproj" />
+    <Project Path="Models/Spacebar.Models.Config/Spacebar.Models.Config.csproj" />
+    <Project Path="Models/Spacebar.Models.Db/Spacebar.Models.Db.csproj" />
+    <Project Path="Models/Spacebar.Models.Gateway/Spacebar.Models.Gateway.csproj" />
+    <Project Path="Models/Spacebar.Models.Generic/Spacebar.Models.Generic.csproj" />
+  </Folder>
+  <Folder Name="/Utilities/">
+    <Project Path="Utilities/ConfigTest/ConfigTest.csproj" />
+    <Project Path="Utilities/DiscordEmojiConverter/DiscordEmojiConverter.csproj" />
+    <Project Path="Utilities/Spacebar.AdminApi.PrepareTestData/Spacebar.AdminApi.PrepareTestData.csproj" />
+    <Project Path="Utilities/Spacebar.AdminApi.TestClient/Spacebar.AdminApi.TestClient.csproj" />
+    <Project Path="Utilities/Spacebar.AdminApiTest/Spacebar.AdminApiTest.csproj" />
+    <Project Path="Utilities/Spacebar.Cdn.Fsck/Spacebar.Cdn.Fsck.csproj" />
+    <Project Path="Utilities/Spacebar.Cdn.Migration/Spacebar.Cdn.Migration.csproj" />
+    <Project Path="Utilities/Spacebar.CleanSettingsRows/Spacebar.CleanSettingsRows.csproj" />
+  </Folder>
+  <Project Path="Spacebar.AdminApi/Spacebar.AdminApi.csproj" />
+  <Project Path="Spacebar.Cdn/Spacebar.Cdn.csproj" />
+  <Project Path="Spacebar.GatewayOffload/Spacebar.GatewayOffload.csproj" />
+  <Project Path="Spacebar.UApi/Spacebar.UApi.csproj" />
+</Solution>
diff --git a/flake.lock b/flake.lock
index c75943333..923e9f168 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1770197578,
-        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
+        "lastModified": 1770562336,
+        "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
+        "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index ab482c6aa..3a1f34cc9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,9 +41,18 @@
                 default = pkgs.dockerTools.buildLayeredImage {
                   name = "spacebar-server-ts";
                   tag = builtins.replaceStrings [ "+" ] [ "_" ] self.packages.${system}.default.version;
-                  contents = [ self.packages.${system}.default ];
+                  contents = [
+                    self.packages.${system}.default
+                    pkgs.dockerTools.binSh
+                    pkgs.dockerTools.usrBinEnv
+                    pkgs.dockerTools.caCertificates
+                  ];
                   config = {
                     Cmd = [ "${self.outputs.packages.${system}.default}/bin/start-bundle" ];
+                    WorkingDir = "/data";
+                    Env = [
+                      "PORT=3001"
+                    ];
                     Expose = [ "3001" ];
                   };
                 };
@@ -55,9 +64,16 @@
                   tag = builtins.replaceStrings [ "+" ] [ "_" ] self.packages.${system}.default.version;
                   contents = [
                     self.packages.${system}.default
+                    pkgs.dockerTools.binSh
+                    pkgs.dockerTools.usrBinEnv
+                    pkgs.dockerTools.caCertificates
                   ];
                   config = {
                     Cmd = [ "${self.outputs.packages.${system}.default}/bin/start-${mod}" ];
+                    WorkingDir = "/data";
+                    Env = [
+                      "PORT=3001"
+                    ];
                     Expose = [ "3001" ];
                   };
                 }
@@ -70,6 +86,7 @@
                 nodePackages.typescript
                 nodePackages.patch-package
                 nodePackages.prettier
+                (pkgs.python3.withPackages (ps: with ps; [ setuptools ]))
               ];
             };
           }
diff --git a/nix/testVm/configuration.nix b/nix/testVm/configuration.nix
index a39531c2b..2b1c19a5e 100644
--- a/nix/testVm/configuration.nix
+++ b/nix/testVm/configuration.nix
@@ -1,6 +1,20 @@
 { pkgs, lib, ... }:
+let
+  nginxTestSigning = {
+    addSSL = true;
+    enableACME = false;
+
+    # We don't care about certificates around here...
+    sslCertificate = "${pkgs.path}/nixos/tests/common/acme/server/acme.test.cert.pem";
+    sslCertificateKey = "${pkgs.path}/nixos/tests/common/acme/server/acme.test.key.pem";
+  };
+in
 {
   networking.hostName = "sbtest";
+  services.nginx.virtualHosts."sb.localhost" = nginxTestSigning;
+  services.nginx.virtualHosts."api.sb.localhost" = nginxTestSigning;
+  services.nginx.virtualHosts."gw.sb.localhost" = nginxTestSigning;
+  services.nginx.virtualHosts."cdn.sb.localhost" = nginxTestSigning;
 
   services.spacebarchat-server =
     let
diff --git a/package-lock.json b/package-lock.json
index 281b14e81..fbbbacf9a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,21 +23,21 @@
                 "cheerio": "^1.2.0",
                 "cookie-parser": "^1.4.7",
                 "discord-protos": "^1.2.102",
-                "dotenv": "^17.2.3",
-                "email-providers": "^2.20.0",
+                "dotenv": "^17.2.4",
+                "email-providers": "^2.21.0",
                 "exif-be-gone": "^1.5.1",
                 "express": "^5.2.1",
                 "fast-zlib": "^2.0.1",
                 "fido2-lib": "^3.5.6",
                 "file-type": "^21.3.0",
                 "form-data": "^4.0.5",
-                "i18next": "^25.8.0",
+                "i18next": "^25.8.6",
                 "i18next-fs-backend": "^2.6.1",
                 "i18next-http-middleware": "^3.9.2",
                 "image-size": "^2.0.2",
                 "json-bigint": "^1.0.0",
                 "jsonwebtoken": "^9.0.3",
-                "module-alias": "^2.2.3",
+                "module-alias": "^2.3.4",
                 "morgan": "^1.10.1",
                 "ms": "^2.1.3",
                 "multer": "^2.0.2",
@@ -69,13 +69,13 @@
                 "@types/morgan": "^1.9.10",
                 "@types/multer": "^2.0.0",
                 "@types/murmurhash-js": "^1.0.6",
-                "@types/node": "^24.10.9",
+                "@types/node": "^24.10.13",
                 "@types/nodemailer": "^7.0.9",
                 "@types/probe-image-size": "^7.2.5",
                 "@types/sharp": "^0.31.1",
                 "@types/ws": "^8.18.1",
-                "@typescript-eslint/eslint-plugin": "^8.54.0",
-                "@typescript-eslint/parser": "^8.54.0",
+                "@typescript-eslint/eslint-plugin": "^8.55.0",
+                "@typescript-eslint/parser": "^8.55.0",
                 "@typescript/native-preview": "^7.0.0-dev.20260119.1",
                 "eslint": "^9.39.2",
                 "globals": "^16.5.0",
@@ -2266,9 +2266,9 @@
             }
         },
         "node_modules/@types/node": {
-            "version": "24.10.9",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.9.tgz",
-            "integrity": "sha512-ne4A0IpG3+2ETuREInjPNhUGis1SFjv1d5asp8MzEAGtOZeTeHVDOYqOgqfhvseqg/iXty2hjBf1zAOb7RNiNw==",
+            "version": "24.10.13",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.13.tgz",
+            "integrity": "sha512-oH72nZRfDv9lADUBSo104Aq7gPHpQZc4BTx38r9xf9pg5LfP6EzSyH2n7qFmmxRQXh7YlUXODcYsg6PuTDSxGg==",
             "license": "MIT",
             "dependencies": {
                 "undici-types": "~7.16.0"
@@ -2389,17 +2389,17 @@
             }
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.54.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.54.0.tgz",
-            "integrity": "sha512-hAAP5io/7csFStuOmR782YmTthKBJ9ND3WVL60hcOjvtGFb+HJxH4O5huAcmcZ9v9G8P+JETiZ/G1B8MALnWZQ==",
+            "version": "8.55.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.55.0.tgz",
+            "integrity": "sha512-1y/MVSz0NglV1ijHC8OT49mPJ4qhPYjiK08YUQVbIOyu+5k862LKUHFkpKHWu//zmr7hDR2rhwUm6gnCGNmGBQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/regexpp": "^4.12.2",
-                "@typescript-eslint/scope-manager": "8.54.0",
-                "@typescript-eslint/type-utils": "8.54.0",
-                "@typescript-eslint/utils": "8.54.0",
-                "@typescript-eslint/visitor-keys": "8.54.0",
+                "@typescript-eslint/scope-manager": "8.55.0",
+                "@typescript-eslint/type-utils": "8.55.0",
+                "@typescript-eslint/utils": "8.55.0",
+                "@typescript-eslint/visitor-keys": "8.55.0",
                 "ignore": "^7.0.5",
                 "natural-compare": "^1.4.0",
                 "ts-api-utils": "^2.4.0"
@@ -2412,7 +2412,7 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "@typescript-eslint/parser": "^8.54.0",
+                "@typescript-eslint/parser": "^8.55.0",
                 "eslint": "^8.57.0 || ^9.0.0",
                 "typescript": ">=4.8.4 <6.0.0"
             }
@@ -2428,16 +2428,16 @@
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.54.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.54.0.tgz",
-            "integrity": "sha512-BtE0k6cjwjLZoZixN0t5AKP0kSzlGu7FctRXYuPAm//aaiZhmfq1JwdYpYr1brzEspYyFeF+8XF5j2VK6oalrA==",
+            "version": "8.55.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.55.0.tgz",
+            "integrity": "sha512-4z2nCSBfVIMnbuu8uinj+f0o4qOeggYJLbjpPHka3KH1om7e+H9yLKTYgksTaHcGco+NClhhY2vyO3HsMH1RGw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.54.0",
-                "@typescript-eslint/types": "8.54.0",
-                "@typescript-eslint/typescript-estree": "8.54.0",
-                "@typescript-eslint/visitor-keys": "8.54.0",
+                "@typescript-eslint/scope-manager": "8.55.0",
+                "@typescript-eslint/types": "8.55.0",
+                "@typescript-eslint/typescript-estree": "8.55.0",
+                "@typescript-eslint/visitor-keys": "8.55.0",
                 "debug": "^4.4.3"
             },
             "engines": {
@@ -2453,14 +2453,14 @@
             }
         },
         "node_modules/@typescript-eslint/project-service": {
-            "version": "8.54.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.54.0.tgz",
-            "integrity": "sha512-YPf+rvJ1s7MyiWM4uTRhE4DvBXrEV+d8oC3P9Y2eT7S+HBS0clybdMIPnhiATi9vZOYDc7OQ1L/i6ga6NFYK/g==",
+            "version": "8.55.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.55.0.tgz",
+            "integrity": "sha512-zRcVVPFUYWa3kNnjaZGXSu3xkKV1zXy8M4nO/pElzQhFweb7PPtluDLQtKArEOGmjXoRjnUZ29NjOiF0eCDkcQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/tsconfig-utils": "^8.54.0",
-                "@typescript-eslint/types": "^8.54.0",
+                "@typescript-eslint/tsconfig-utils": "^8.55.0",
+                "@typescript-eslint/types": "^8.55.0",
                 "debug": "^4.4.3"
             },
             "engines": {
@@ -2475,14 +2475,14 @@
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.54.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.54.0.tgz",
-            "integrity": "sha512-27rYVQku26j/PbHYcVfRPonmOlVI6gihHtXFbTdB5sb6qA0wdAQAbyXFVarQ5t4HRojIz64IV90YtsjQSSGlQg==",
+            "version": "8.55.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.55.0.tgz",
+            "integrity": "sha512-fVu5Omrd3jeqeQLiB9f1YsuK/iHFOwb04bCtY4BSCLgjNbOD33ZdV6KyEqplHr+IlpgT0QTZ/iJ+wT7hvTx49Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.54.0",
-                "@typescript-eslint/visitor-keys": "8.54.0"
+                "@typescript-eslint/types": "8.55.0",
+                "@typescript-eslint/visitor-keys": "8.55.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2493,9 +2493,9 @@
             }
         },
         "node_modules/@typescript-eslint/tsconfig-utils": {
-            "version": "8.54.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.54.0.tgz",
-            "integrity": "sha512-dRgOyT2hPk/JwxNMZDsIXDgyl9axdJI3ogZ2XWhBPsnZUv+hPesa5iuhdYt2gzwA9t8RE5ytOJ6xB0moV0Ujvw==",
+            "version": "8.55.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.55.0.tgz",
+            "integrity": "sha512-1R9cXqY7RQd7WuqSN47PK9EDpgFUK3VqdmbYrvWJZYDd0cavROGn+74ktWBlmJ13NXUQKlZ/iAEQHI/V0kKe0Q==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2510,15 +2510,15 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.54.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.54.0.tgz",
-            "integrity": "sha512-hiLguxJWHjjwL6xMBwD903ciAwd7DmK30Y9Axs/etOkftC3ZNN9K44IuRD/EB08amu+Zw6W37x9RecLkOo3pMA==",
+            "version": "8.55.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.55.0.tgz",
+            "integrity": "sha512-x1iH2unH4qAt6I37I2CGlsNs+B9WGxurP2uyZLRz6UJoZWDBx9cJL1xVN/FiOmHEONEg6RIufdvyT0TEYIgC5g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.54.0",
-                "@typescript-eslint/typescript-estree": "8.54.0",
-                "@typescript-eslint/utils": "8.54.0",
+                "@typescript-eslint/types": "8.55.0",
+                "@typescript-eslint/typescript-estree": "8.55.0",
+                "@typescript-eslint/utils": "8.55.0",
                 "debug": "^4.4.3",
                 "ts-api-utils": "^2.4.0"
             },
@@ -2535,9 +2535,9 @@
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.54.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.54.0.tgz",
-            "integrity": "sha512-PDUI9R1BVjqu7AUDsRBbKMtwmjWcn4J3le+5LpcFgWULN3LvHC5rkc9gCVxbrsrGmO1jfPybN5s6h4Jy+OnkAA==",
+            "version": "8.55.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.55.0.tgz",
+            "integrity": "sha512-ujT0Je8GI5BJWi+/mMoR0wxwVEQaxM+pi30xuMiJETlX80OPovb2p9E8ss87gnSVtYXtJoU9U1Cowcr6w2FE0w==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2549,16 +2549,16 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.54.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.54.0.tgz",
-            "integrity": "sha512-BUwcskRaPvTk6fzVWgDPdUndLjB87KYDrN5EYGetnktoeAvPtO4ONHlAZDnj5VFnUANg0Sjm7j4usBlnoVMHwA==",
+            "version": "8.55.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.55.0.tgz",
+            "integrity": "sha512-EwrH67bSWdx/3aRQhCoxDaHM+CrZjotc2UCCpEDVqfCE+7OjKAGWNY2HsCSTEVvWH2clYQK8pdeLp42EVs+xQw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/project-service": "8.54.0",
-                "@typescript-eslint/tsconfig-utils": "8.54.0",
-                "@typescript-eslint/types": "8.54.0",
-                "@typescript-eslint/visitor-keys": "8.54.0",
+                "@typescript-eslint/project-service": "8.55.0",
+                "@typescript-eslint/tsconfig-utils": "8.55.0",
+                "@typescript-eslint/types": "8.55.0",
+                "@typescript-eslint/visitor-keys": "8.55.0",
                 "debug": "^4.4.3",
                 "minimatch": "^9.0.5",
                 "semver": "^7.7.3",
@@ -2603,16 +2603,16 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.54.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.54.0.tgz",
-            "integrity": "sha512-9Cnda8GS57AQakvRyG0PTejJNlA2xhvyNtEVIMlDWOOeEyBkYWhGPnfrIAnqxLMTSTo6q8g12XVjjev5l1NvMA==",
+            "version": "8.55.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.55.0.tgz",
+            "integrity": "sha512-BqZEsnPGdYpgyEIkDC1BadNY8oMwckftxBT+C8W0g1iKPdeqKZBtTfnvcq0nf60u7MkjFO8RBvpRGZBPw4L2ow==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.9.1",
-                "@typescript-eslint/scope-manager": "8.54.0",
-                "@typescript-eslint/types": "8.54.0",
-                "@typescript-eslint/typescript-estree": "8.54.0"
+                "@typescript-eslint/scope-manager": "8.55.0",
+                "@typescript-eslint/types": "8.55.0",
+                "@typescript-eslint/typescript-estree": "8.55.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2627,13 +2627,13 @@
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.54.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.54.0.tgz",
-            "integrity": "sha512-VFlhGSl4opC0bprJiItPQ1RfUhGDIBokcPwaFH4yiBCaNPeld/9VeXbiPO1cLyorQi1G1vL+ecBk1x8o1axORA==",
+            "version": "8.55.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.55.0.tgz",
+            "integrity": "sha512-AxNRwEie8Nn4eFS1FzDMJWIISMGoXMb037sgCBJ3UR6o0fQTzr2tqN9WT+DkWJPhIdQCfV7T6D387566VtnCJA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.54.0",
+                "@typescript-eslint/types": "8.55.0",
                 "eslint-visitor-keys": "^4.2.1"
             },
             "engines": {
@@ -2658,28 +2658,28 @@
             }
         },
         "node_modules/@typescript/native-preview": {
-            "version": "7.0.0-dev.20260131.1",
-            "resolved": "https://registry.npmjs.org/@typescript/native-preview/-/native-preview-7.0.0-dev.20260131.1.tgz",
-            "integrity": "sha512-bMGqUBvyazwCC6Ycst2JbtP/JOcR4ifYtP8tBnq0G92iooNp47/0aMziQQT6voF1tEYntpMC+TWenLz3pdhwpQ==",
+            "version": "7.0.0-dev.20260212.1",
+            "resolved": "https://registry.npmjs.org/@typescript/native-preview/-/native-preview-7.0.0-dev.20260212.1.tgz",
+            "integrity": "sha512-VHAVbp8d2VGm90EK//brKIYvT3iPrLXMq4/LApCdkKww/Hfn33zPRVmig4rswNaJiVu8XhcdHld5yfMw6d5A9Q==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
                 "tsgo": "bin/tsgo.js"
             },
             "optionalDependencies": {
-                "@typescript/native-preview-darwin-arm64": "7.0.0-dev.20260131.1",
-                "@typescript/native-preview-darwin-x64": "7.0.0-dev.20260131.1",
-                "@typescript/native-preview-linux-arm": "7.0.0-dev.20260131.1",
-                "@typescript/native-preview-linux-arm64": "7.0.0-dev.20260131.1",
-                "@typescript/native-preview-linux-x64": "7.0.0-dev.20260131.1",
-                "@typescript/native-preview-win32-arm64": "7.0.0-dev.20260131.1",
-                "@typescript/native-preview-win32-x64": "7.0.0-dev.20260131.1"
+                "@typescript/native-preview-darwin-arm64": "7.0.0-dev.20260212.1",
+                "@typescript/native-preview-darwin-x64": "7.0.0-dev.20260212.1",
+                "@typescript/native-preview-linux-arm": "7.0.0-dev.20260212.1",
+                "@typescript/native-preview-linux-arm64": "7.0.0-dev.20260212.1",
+                "@typescript/native-preview-linux-x64": "7.0.0-dev.20260212.1",
+                "@typescript/native-preview-win32-arm64": "7.0.0-dev.20260212.1",
+                "@typescript/native-preview-win32-x64": "7.0.0-dev.20260212.1"
             }
         },
         "node_modules/@typescript/native-preview-darwin-arm64": {
-            "version": "7.0.0-dev.20260131.1",
-            "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-arm64/-/native-preview-darwin-arm64-7.0.0-dev.20260131.1.tgz",
-            "integrity": "sha512-f6lulb0m7uN1tvT4SX4gLpGpkdoTUD8lXcpbhDSOS79lh61BuozEB7yDaIFCHACJcQOjf+pSKj7ouXuRKXKbTg==",
+            "version": "7.0.0-dev.20260212.1",
+            "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-arm64/-/native-preview-darwin-arm64-7.0.0-dev.20260212.1.tgz",
+            "integrity": "sha512-HH4bOVbNW6ITv00VSaE3aZjCuU2d+amgFZKdhbq7NpcJDxFvxyy9GT9gkKV0D1DXz5qoxZIcyBEIbwrhABb9vg==",
             "cpu": [
                 "arm64"
             ],
@@ -2691,9 +2691,9 @@
             ]
         },
         "node_modules/@typescript/native-preview-darwin-x64": {
-            "version": "7.0.0-dev.20260131.1",
-            "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-x64/-/native-preview-darwin-x64-7.0.0-dev.20260131.1.tgz",
-            "integrity": "sha512-S2hV8ucpfmJpfyjlBloeZyLw0vFX3Y2vPm58MWWMGmnwxoDMpmYwQPkHwYePoY0DSDc2pDVZlvCXwwJoSs5/Dg==",
+            "version": "7.0.0-dev.20260212.1",
+            "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-x64/-/native-preview-darwin-x64-7.0.0-dev.20260212.1.tgz",
+            "integrity": "sha512-vnQ2xRJscbtyS/jHO5QY2xAZ3c11Yn1ZAor/XODDrxd7N7jIrm0Vtc2CIwsi51oncLS1SZtUd9cHZmJg5zUJrQ==",
             "cpu": [
                 "x64"
             ],
@@ -2705,9 +2705,9 @@
             ]
         },
         "node_modules/@typescript/native-preview-linux-arm": {
-            "version": "7.0.0-dev.20260131.1",
-            "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm/-/native-preview-linux-arm-7.0.0-dev.20260131.1.tgz",
-            "integrity": "sha512-X3+ZmIGEXkSYym8SGkSnDywM8AGU6eFElZlWd9PhNeCzs0P0n/TB8z5DiRAljM9q8UzovBKpeWIY3mxWP9e4vg==",
+            "version": "7.0.0-dev.20260212.1",
+            "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm/-/native-preview-linux-arm-7.0.0-dev.20260212.1.tgz",
+            "integrity": "sha512-T8sF3YtYtODhWnFNhVuL/GABCHpKJs6ZxTtSC1LtXoM/CE0Ai06k5WKOxJG5rJrBtLIW+Dempk7qKPfhNliDTA==",
             "cpu": [
                 "arm"
             ],
@@ -2719,9 +2719,9 @@
             ]
         },
         "node_modules/@typescript/native-preview-linux-arm64": {
-            "version": "7.0.0-dev.20260131.1",
-            "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm64/-/native-preview-linux-arm64-7.0.0-dev.20260131.1.tgz",
-            "integrity": "sha512-lrDU5aE4+VmnoCnNcQI88QIV1aj0Thk+wVTRrvPPc2yXN5KjskPG5vuhERHNjK8F9pgNKGQcqRJPX0Yxi2VJWg==",
+            "version": "7.0.0-dev.20260212.1",
+            "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm64/-/native-preview-linux-arm64-7.0.0-dev.20260212.1.tgz",
+            "integrity": "sha512-suA5OryrhL/tE7AiQXiNNV88XwKEOfO0sypJQj+cfg/fpQ2trFyDZcsdMLYVZ7J0zirDai6H3TDETYYoNFE1/g==",
             "cpu": [
                 "arm64"
             ],
@@ -2733,9 +2733,9 @@
             ]
         },
         "node_modules/@typescript/native-preview-linux-x64": {
-            "version": "7.0.0-dev.20260131.1",
-            "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-x64/-/native-preview-linux-x64-7.0.0-dev.20260131.1.tgz",
-            "integrity": "sha512-3IeODG6qcbtlFeDgyzNvtBYfNEvMhfX/xCAQDpyo9Qtk9nrN/cLVm/C6rvmI0ohS1U3gyHVh3pi4rDJKhnFxjA==",
+            "version": "7.0.0-dev.20260212.1",
+            "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-x64/-/native-preview-linux-x64-7.0.0-dev.20260212.1.tgz",
+            "integrity": "sha512-w687rpZKJM0Lev0ya0GYJlnFCITTUmN8jDpwLXn60jrNEZzL2J4F7biA6papr2sMdKRfWvRklhjB1TKHbJ6FKA==",
             "cpu": [
                 "x64"
             ],
@@ -2747,9 +2747,9 @@
             ]
         },
         "node_modules/@typescript/native-preview-win32-arm64": {
-            "version": "7.0.0-dev.20260131.1",
-            "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-arm64/-/native-preview-win32-arm64-7.0.0-dev.20260131.1.tgz",
-            "integrity": "sha512-qcO/OdyehtzLHjfElIULSgwlKvPOTeoIDaf4y5J8svXLA50FttSbJYW+kJpAkpW5hREpARuQUT3uVrvXGG5t1g==",
+            "version": "7.0.0-dev.20260212.1",
+            "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-arm64/-/native-preview-win32-arm64-7.0.0-dev.20260212.1.tgz",
+            "integrity": "sha512-NhCXPQF6OTNEZl8iwRE1ef/zHiqit5p3m7hdT2vfAOi1iA2eoazX0zTSdhgjX83o9cLjen3V1R7nbSYehFHaqw==",
             "cpu": [
                 "arm64"
             ],
@@ -2761,9 +2761,9 @@
             ]
         },
         "node_modules/@typescript/native-preview-win32-x64": {
-            "version": "7.0.0-dev.20260131.1",
-            "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-x64/-/native-preview-win32-x64-7.0.0-dev.20260131.1.tgz",
-            "integrity": "sha512-ys+nGNklbVwpIgJq4PlVUH6FNhIstc+m7F49NNCBjG5hvyfX7RajWBNf1FP+Jkw/Iuwdl8WnWhTA9UDFBzSHig==",
+            "version": "7.0.0-dev.20260212.1",
+            "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-x64/-/native-preview-win32-x64-7.0.0-dev.20260212.1.tgz",
+            "integrity": "sha512-0yqSBlASRx9rqM12QvaWc227w+bIsuI2EwAiNsoB1ybRbCXoXMah1RQlfjjTpD02eWCe/029vwrNhq+FLn7Z8A==",
             "cpu": [
                 "x64"
             ],
@@ -3087,14 +3087,14 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.13.4",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.4.tgz",
-            "integrity": "sha512-1wVkUaAO6WyaYtCkcYCOx12ZgpGf9Zif+qXa4n+oYzK558YryKqiL6UWwd5DqiH3VRW0GYhTZQ/vlgJrCoNQlg==",
+            "version": "1.13.5",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz",
+            "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==",
             "license": "MIT",
             "optional": true,
             "dependencies": {
-                "follow-redirects": "^1.15.6",
-                "form-data": "^4.0.4",
+                "follow-redirects": "^1.15.11",
+                "form-data": "^4.0.5",
                 "proxy-from-env": "^1.1.0"
             }
         },
@@ -3891,9 +3891,9 @@
             }
         },
         "node_modules/dotenv": {
-            "version": "17.2.3",
-            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz",
-            "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==",
+            "version": "17.2.4",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.4.tgz",
+            "integrity": "sha512-mudtfb4zRB4bVvdj0xRo+e6duH1csJRM8IukBqfTRvHotn9+LBXB8ynAidP9zHqoRC/fsllXgk4kCKlR21fIhw==",
             "license": "BSD-2-Clause",
             "engines": {
                 "node": ">=12"
@@ -3938,9 +3938,9 @@
             "license": "MIT"
         },
         "node_modules/email-providers": {
-            "version": "2.20.0",
-            "resolved": "https://registry.npmjs.org/email-providers/-/email-providers-2.20.0.tgz",
-            "integrity": "sha512-H22liMleijYZHlXKBslzp2J3v4rh0ZIeZxVU6Fwi0BVvdQ5OQz9FcsTZaIlNn09f29oYj4jvCQhscwLVrhOthg==",
+            "version": "2.21.0",
+            "resolved": "https://registry.npmjs.org/email-providers/-/email-providers-2.21.0.tgz",
+            "integrity": "sha512-c31t0e+U4D15pBwEapk+Ft04O9Zk/T/KrYBglRMen2GQd9W41n7Ev1ShxhLyUWQwtFRnRDcjg8o3JLFAhR+qlg==",
             "license": "ISC",
             "engines": {
                 "node": ">=16"
@@ -4831,7 +4831,7 @@
             "version": "7.2.3",
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
             "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-            "deprecated": "Glob versions prior to v9 are no longer supported",
+            "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
             "devOptional": true,
             "license": "ISC",
             "dependencies": {
@@ -5044,9 +5044,9 @@
             }
         },
         "node_modules/i18next": {
-            "version": "25.8.0",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.0.tgz",
-            "integrity": "sha512-urrg4HMFFMQZ2bbKRK7IZ8/CTE7D8H4JRlAwqA2ZwDRFfdd0K/4cdbNNLgfn9mo+I/h9wJu61qJzH7jCFAhUZQ==",
+            "version": "25.8.6",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.6.tgz",
+            "integrity": "sha512-HsS6p2yr/Vo5EPljWuBJ9OxKVFok2Q/Oa6PvFTpv2bMcDt2sQMOnKDQ7FTDDdME+3d1YULQjKj7aVSZP1bCouQ==",
             "funding": [
                 {
                     "type": "individual",
@@ -5846,9 +5846,9 @@
             }
         },
         "node_modules/module-alias": {
-            "version": "2.2.3",
-            "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.3.tgz",
-            "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==",
+            "version": "2.3.4",
+            "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.3.4.tgz",
+            "integrity": "sha512-bOclZt8hkpuGgSSoG07PKmvzTizROilUTvLNyrMqvlC9snhs7y7GzjNWAVbISIOlhCP1T14rH1PDAV9iNyBq/w==",
             "license": "MIT"
         },
         "node_modules/module-details-from-path": {
@@ -6929,9 +6929,9 @@
             }
         },
         "node_modules/qs": {
-            "version": "6.14.1",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
-            "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==",
+            "version": "6.14.2",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
+            "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==",
             "license": "BSD-3-Clause",
             "dependencies": {
                 "side-channel": "^1.1.0"
@@ -7153,9 +7153,9 @@
             }
         },
         "node_modules/semver": {
-            "version": "7.7.3",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-            "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+            "version": "7.7.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
             "license": "ISC",
             "bin": {
                 "semver": "bin/semver.js"
@@ -7554,7 +7554,7 @@
             "version": "6.2.1",
             "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
             "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
-            "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me",
+            "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
             "license": "ISC",
             "optional": true,
             "dependencies": {
@@ -7653,21 +7653,21 @@
             }
         },
         "node_modules/tldts": {
-            "version": "7.0.21",
-            "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.21.tgz",
-            "integrity": "sha512-Plu6V8fF/XU6d2k8jPtlQf5F4Xx2hAin4r2C2ca7wR8NK5MbRTo9huLUWRe28f3Uk8bYZfg74tit/dSjc18xnw==",
+            "version": "7.0.23",
+            "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.23.tgz",
+            "integrity": "sha512-ASdhgQIBSay0R/eXggAkQ53G4nTJqTXqC2kbaBbdDwM7SkjyZyO0OaaN1/FH7U/yCeqOHDwFO5j8+Os/IS1dXw==",
             "license": "MIT",
             "dependencies": {
-                "tldts-core": "^7.0.21"
+                "tldts-core": "^7.0.23"
             },
             "bin": {
                 "tldts": "bin/cli.js"
             }
         },
         "node_modules/tldts-core": {
-            "version": "7.0.21",
-            "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.21.tgz",
-            "integrity": "sha512-oVOMdHvgjqyzUZH1rOESgJP1uNe2bVrfK0jUHHmiM2rpEiRbf3j4BrsIc6JigJRbHGanQwuZv/R+LTcHsw+bLA==",
+            "version": "7.0.23",
+            "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.23.tgz",
+            "integrity": "sha512-0g9vrtDQLrNIiCj22HSe9d4mLVG3g5ph5DZ8zCKBr4OtrspmNB6ss7hVyzArAeE88ceZocIEGkyW1Ime7fxPtQ==",
             "license": "MIT"
         },
         "node_modules/tmp": {
@@ -7978,6 +7978,7 @@
             "version": "10.5.0",
             "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
             "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+            "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
             "license": "ISC",
             "dependencies": {
                 "foreground-child": "^3.1.0",
@@ -8096,9 +8097,9 @@
             }
         },
         "node_modules/undici": {
-            "version": "7.19.2",
-            "resolved": "https://registry.npmjs.org/undici/-/undici-7.19.2.tgz",
-            "integrity": "sha512-4VQSpGEGsWzk0VYxyB/wVX/Q7qf9t5znLRgs0dzszr9w9Fej/8RVNQ+S20vdXSAyra/bJ7ZQfGv6ZMj7UEbzSg==",
+            "version": "7.21.0",
+            "resolved": "https://registry.npmjs.org/undici/-/undici-7.21.0.tgz",
+            "integrity": "sha512-Hn2tCQpoDt1wv23a68Ctc8Cr/BHpUSfaPYrkajTXOS9IKpxVRx/X5m1K2YkbK2ipgZgxXSgsUinl3x+2YdSSfg==",
             "license": "MIT",
             "engines": {
                 "node": ">=20.18.1"
diff --git a/package.json b/package.json
index 022f4492a..86d1aa126 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
         "start:api": "node --enable-source-maps dist/api/start.js",
         "start:cdn": "node --enable-source-maps dist/cdn/start.js",
         "start:gateway": "node --enable-source-maps dist/gateway/start.js",
+        "start:webrtc": "node --enable-source-maps dist/webrtc/start.js",
         "build": "npm run build:src && npm run generate:schema && npm run generate:openapi",
         "build:src": "tsc -b -v",
         "build:tsgo": "npm run build:src:tsgo && npm run generate:schema && npm run generate:openapi",
@@ -60,13 +61,13 @@
         "@types/ms": "^2.1.0",
         "@types/multer": "^2.0.0",
         "@types/murmurhash-js": "^1.0.6",
-        "@types/node": "^24.10.9",
+        "@types/node": "^24.10.13",
         "@types/nodemailer": "^7.0.9",
         "@types/probe-image-size": "^7.2.5",
         "@types/sharp": "^0.31.1",
         "@types/ws": "^8.18.1",
-        "@typescript-eslint/eslint-plugin": "^8.54.0",
-        "@typescript-eslint/parser": "^8.54.0",
+        "@typescript-eslint/eslint-plugin": "^8.55.0",
+        "@typescript-eslint/parser": "^8.55.0",
         "@typescript/native-preview": "^7.0.0-dev.20260119.1",
         "eslint": "^9.39.2",
         "globals": "^16.5.0",
@@ -92,21 +93,21 @@
         "cheerio": "^1.2.0",
         "cookie-parser": "^1.4.7",
         "discord-protos": "^1.2.102",
-        "dotenv": "^17.2.3",
-        "email-providers": "^2.20.0",
+        "dotenv": "^17.2.4",
+        "email-providers": "^2.21.0",
         "exif-be-gone": "^1.5.1",
         "express": "^5.2.1",
         "fast-zlib": "^2.0.1",
         "fido2-lib": "^3.5.6",
         "file-type": "^21.3.0",
         "form-data": "^4.0.5",
-        "i18next": "^25.8.0",
+        "i18next": "^25.8.6",
         "i18next-fs-backend": "^2.6.1",
         "i18next-http-middleware": "^3.9.2",
         "image-size": "^2.0.2",
         "json-bigint": "^1.0.0",
         "jsonwebtoken": "^9.0.3",
-        "module-alias": "^2.2.3",
+        "module-alias": "^2.3.4",
         "morgan": "^1.10.1",
         "ms": "^2.1.3",
         "multer": "^2.0.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 663f5081c..f5caabdac 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -48,10 +48,10 @@ importers:
         specifier: ^1.2.102
         version: 1.2.102
       dotenv:
-        specifier: ^17.2.3
+        specifier: ^17.2.4
         version: 17.2.4
       email-providers:
-        specifier: ^2.20.0
+        specifier: ^2.21.0
         version: 2.21.0
       exif-be-gone:
         specifier: ^1.5.1
@@ -72,8 +72,8 @@ importers:
         specifier: ^4.0.5
         version: 4.0.5
       i18next:
-        specifier: ^25.8.0
-        version: 25.8.4(typescript@5.9.3)
+        specifier: ^25.8.6
+        version: 25.8.7(typescript@5.9.3)
       i18next-fs-backend:
         specifier: ^2.6.1
         version: 2.6.1
@@ -90,8 +90,8 @@ importers:
         specifier: ^9.0.3
         version: 9.0.3
       module-alias:
-        specifier: ^2.2.3
-        version: 2.2.3
+        specifier: ^2.3.4
+        version: 2.3.4
       morgan:
         specifier: ^1.10.1
         version: 1.10.1
@@ -127,7 +127,7 @@ importers:
         version: 2.8.1
       typeorm:
         specifier: ^0.3.28
-        version: 0.3.28(pg-query-stream@4.12.0(pg@8.18.0))(pg@8.18.0)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@24.10.12)(typescript@5.9.3))
+        version: 0.3.28(pg-query-stream@4.12.0(pg@8.18.0))(pg@8.18.0)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@24.10.13)(typescript@5.9.3))
       wretch:
         specifier: ^2.11.1
         version: 2.11.1
@@ -206,8 +206,8 @@ importers:
         specifier: ^1.0.6
         version: 1.0.6
       '@types/node':
-        specifier: ^24.10.9
-        version: 24.10.12
+        specifier: ^24.10.13
+        version: 24.10.13
       '@types/nodemailer':
         specifier: ^7.0.9
         version: 7.0.9
@@ -221,10 +221,10 @@ importers:
         specifier: ^8.18.1
         version: 8.18.1
       '@typescript-eslint/eslint-plugin':
-        specifier: ^8.54.0
+        specifier: ^8.55.0
         version: 8.55.0(@typescript-eslint/parser@8.55.0(eslint@9.39.2)(typescript@5.9.3))(eslint@9.39.2)(typescript@5.9.3)
       '@typescript-eslint/parser':
-        specifier: ^8.54.0
+        specifier: ^8.55.0
         version: 8.55.0(eslint@9.39.2)(typescript@5.9.3)
       '@typescript/native-preview':
         specifier: ^7.0.0-dev.20260119.1
@@ -249,7 +249,7 @@ importers:
         version: 4.2.2(prettier@3.8.1)
       ts-node:
         specifier: ^10.9.2
-        version: 10.9.2(@types/node@24.10.12)(typescript@5.9.3)
+        version: 10.9.2(@types/node@24.10.13)(typescript@5.9.3)
       typescript:
         specifier: ^5.9.3
         version: 5.9.3
@@ -935,8 +935,8 @@ packages:
   '@types/node@18.19.130':
     resolution: {integrity: sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==}
 
-  '@types/node@24.10.12':
-    resolution: {integrity: sha512-68e+T28EbdmLSTkPgs3+UacC6rzmqrcWFPQs1C8mwJhI/r5Uxr0yEuQotczNRROd1gq30NGxee+fo0rSIxpyAw==}
+  '@types/node@24.10.13':
+    resolution: {integrity: sha512-oH72nZRfDv9lADUBSo104Aq7gPHpQZc4BTx38r9xf9pg5LfP6EzSyH2n7qFmmxRQXh7YlUXODcYsg6PuTDSxGg==}
 
   '@types/nodemailer@7.0.9':
     resolution: {integrity: sha512-vI8oF1M+8JvQhsId0Pc38BdUP2evenIIys7c7p+9OZXSPOH5c1dyINP1jT8xQ2xPuBUXmIC87s+91IZMDjH8Ow==}
@@ -1913,8 +1913,8 @@ packages:
   i18next-http-middleware@3.9.2:
     resolution: {integrity: sha512-vzd0Z89xR1yF2V2USVS2G6oOzNilTXsBkxQ16GFPGJO4whQI/LIreh4p4Qy7HXQlGrWVp83YaekuG36+t9anJA==}
 
-  i18next@25.8.4:
-    resolution: {integrity: sha512-a9A0MnUjKvzjEN/26ZY1okpra9kA8MEwzYEz1BNm+IyxUKPRH6ihf0p7vj8YvULwZHKHl3zkJ6KOt4hewxBecQ==}
+  i18next@25.8.7:
+    resolution: {integrity: sha512-ttxxc5+67S/0hhoeVdEgc1lRklZhdfcUSEPp1//uUG2NB88X3667gRsDar+ZWQFdysnOsnb32bcoMsa4mtzhkQ==}
     peerDependencies:
       typescript: ^5
     peerDependenciesMeta:
@@ -2248,8 +2248,8 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  module-alias@2.2.3:
-    resolution: {integrity: sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==}
+  module-alias@2.3.4:
+    resolution: {integrity: sha512-bOclZt8hkpuGgSSoG07PKmvzTizROilUTvLNyrMqvlC9snhs7y7GzjNWAVbISIOlhCP1T14rH1PDAV9iNyBq/w==}
 
   module-details-from-path@1.0.4:
     resolution: {integrity: sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w==}
@@ -3224,7 +3224,7 @@ snapshots:
   '@apm-js-collab/tracing-hooks@0.3.1':
     dependencies:
       '@apm-js-collab/code-transformer': 0.8.2
-      debug: 4.4.1
+      debug: 4.4.3
       module-details-from-path: 1.0.4
     transitivePeerDependencies:
       - supports-color
@@ -4019,20 +4019,20 @@ snapshots:
 
   '@types/amqplib@0.10.8':
     dependencies:
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@types/bcrypt@6.0.0':
     dependencies:
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@types/body-parser@1.19.6':
     dependencies:
       '@types/connect': 3.4.38
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@types/connect@3.4.38':
     dependencies:
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@types/cookie-parser@1.4.10(@types/express@5.0.6)':
     dependencies:
@@ -4042,7 +4042,7 @@ snapshots:
 
   '@types/express-serve-static-core@5.1.1':
     dependencies:
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
       '@types/qs': 6.14.0
       '@types/range-parser': 1.2.7
       '@types/send': 0.17.5
@@ -4057,7 +4057,7 @@ snapshots:
 
   '@types/i18next-node-fs-backend@2.1.5(typescript@5.9.3)':
     dependencies:
-      i18next: 25.8.4(typescript@5.9.3)
+      i18next: 25.8.7(typescript@5.9.3)
     transitivePeerDependencies:
       - typescript
 
@@ -4068,7 +4068,7 @@ snapshots:
   '@types/jsonwebtoken@9.0.10':
     dependencies:
       '@types/ms': 2.1.0
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@types/mime@1.3.5': {}
 
@@ -4076,7 +4076,7 @@ snapshots:
 
   '@types/morgan@1.9.10':
     dependencies:
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@types/ms@2.1.0': {}
 
@@ -4088,11 +4088,11 @@ snapshots:
 
   '@types/mysql@2.15.27':
     dependencies:
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@types/needle@3.3.0':
     dependencies:
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@types/node@16.9.1':
     optional: true
@@ -4101,17 +4101,17 @@ snapshots:
     dependencies:
       undici-types: 5.26.5
 
-  '@types/node@24.10.12':
+  '@types/node@24.10.13':
     dependencies:
       undici-types: 7.16.0
 
   '@types/nodemailer@7.0.9':
     dependencies:
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@types/notp@2.0.5':
     dependencies:
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@types/pg-pool@2.0.7':
     dependencies:
@@ -4119,14 +4119,14 @@ snapshots:
 
   '@types/pg@8.15.6':
     dependencies:
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
       pg-protocol: 1.10.3
       pg-types: 2.2.0
 
   '@types/probe-image-size@7.2.5':
     dependencies:
       '@types/needle': 3.3.0
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@types/qs@6.14.0': {}
 
@@ -4135,24 +4135,24 @@ snapshots:
   '@types/send@0.17.5':
     dependencies:
       '@types/mime': 1.3.5
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@types/serve-static@2.2.0':
     dependencies:
       '@types/http-errors': 2.0.5
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@types/sharp@0.31.1':
     dependencies:
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@types/tedious@4.0.14':
     dependencies:
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@types/ws@8.18.1':
     dependencies:
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
 
   '@typescript-eslint/eslint-plugin@8.55.0(@typescript-eslint/parser@8.55.0(eslint@9.39.2)(typescript@5.9.3))(eslint@9.39.2)(typescript@5.9.3)':
     dependencies:
@@ -5237,7 +5237,7 @@ snapshots:
 
   i18next-http-middleware@3.9.2: {}
 
-  i18next@25.8.4(typescript@5.9.3):
+  i18next@25.8.7(typescript@5.9.3):
     dependencies:
       '@babel/runtime': 7.28.6
     optionalDependencies:
@@ -5607,7 +5607,7 @@ snapshots:
   mkdirp@1.0.4:
     optional: true
 
-  module-alias@2.2.3: {}
+  module-alias@2.3.4: {}
 
   module-details-from-path@1.0.4: {}
 
@@ -6082,7 +6082,7 @@ snapshots:
 
   require-in-the-middle@8.0.1:
     dependencies:
-      debug: 4.4.1
+      debug: 4.4.3
       module-details-from-path: 1.0.4
     transitivePeerDependencies:
       - supports-color
@@ -6416,14 +6416,14 @@ snapshots:
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
 
-  ts-node@10.9.2(@types/node@24.10.12)(typescript@5.9.3):
+  ts-node@10.9.2(@types/node@24.10.13)(typescript@5.9.3):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
       '@tsconfig/node10': 1.0.11
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.4
-      '@types/node': 24.10.12
+      '@types/node': 24.10.13
       acorn: 8.15.0
       acorn-walk: 8.3.4
       arg: 4.1.3
@@ -6464,7 +6464,7 @@ snapshots:
 
   typedarray@0.0.6: {}
 
-  typeorm@0.3.28(pg-query-stream@4.12.0(pg@8.18.0))(pg@8.18.0)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@24.10.12)(typescript@5.9.3)):
+  typeorm@0.3.28(pg-query-stream@4.12.0(pg@8.18.0))(pg@8.18.0)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@24.10.13)(typescript@5.9.3)):
     dependencies:
       '@sqltools/formatter': 1.2.5
       ansis: 4.2.0
@@ -6485,7 +6485,7 @@ snapshots:
       pg: 8.18.0
       pg-query-stream: 4.12.0(pg@8.18.0)
       sqlite3: 5.1.7
-      ts-node: 10.9.2(@types/node@24.10.12)(typescript@5.9.3)
+      ts-node: 10.9.2(@types/node@24.10.13)(typescript@5.9.3)
     transitivePeerDependencies:
       - babel-plugin-macros
       - supports-color
diff --git a/src/api/Server.ts b/src/api/Server.ts
index 207c53eec..a6bb5178d 100644
--- a/src/api/Server.ts
+++ b/src/api/Server.ts
@@ -160,7 +160,7 @@ export class SpacebarServer extends Server {
 
             res.json({
                 api: {
-                    baseUrl: Config.get().api.endpointPublic?.split("/api")[0],
+                    baseUrl: Config.get().api.endpointPublic?.split("/api/")[0],
                     apiVersions: {
                         default: Config.get().api.defaultVersion,
                         active: Config.get().api.activeVersions,
diff --git a/src/api/middlewares/Translation.ts b/src/api/middlewares/Translation.ts
index 3ca204b65..c8ba16a93 100644
--- a/src/api/middlewares/Translation.ts
+++ b/src/api/middlewares/Translation.ts
@@ -21,7 +21,7 @@ import path from "path";
 import i18next from "i18next";
 import i18nextMiddleware from "i18next-http-middleware";
 import i18nextBackend from "i18next-fs-backend";
-import { Router } from "express";
+import { RequestHandler, Router } from "express";
 
 const ASSET_FOLDER_PATH = path.join(__dirname, "..", "..", "..", "assets");
 
@@ -44,5 +44,5 @@ export async function initTranslation(router: Router) {
             load: "all",
         });
 
-    router.use(i18nextMiddleware.handle(i18next, {}));
+    router.use(i18nextMiddleware.handle(i18next, {}) as unknown as RequestHandler);
 }
diff --git a/src/api/routes/channels/#channel_id/index.ts b/src/api/routes/channels/#channel_id/index.ts
index a840c8072..81b942001 100644
--- a/src/api/routes/channels/#channel_id/index.ts
+++ b/src/api/routes/channels/#channel_id/index.ts
@@ -17,7 +17,19 @@
 */
 
 import { route } from "@spacebar/api";
-import { Channel, ChannelDeleteEvent, ChannelUpdateEvent, Recipient, emitEvent, handleFile } from "@spacebar/util";
+import {
+    Channel,
+    ChannelDeleteEvent,
+    ChannelUpdateEvent,
+    Recipient,
+    emitEvent,
+    handleFile,
+    Config,
+    FieldError,
+    ErrorList,
+    ObjectErrorContent,
+    makeObjectErrorContent,
+} from "@spacebar/util";
 import { Request, Response, Router } from "express";
 import { ChannelModifySchema, ChannelType } from "@spacebar/schemas";
 import tickets from "./tickets";
@@ -176,6 +188,7 @@ router.patch(
                 channel.available_tags = channel.available_tags.filter((_) => filter.has(_.id));
             }
         }
+
         if (payload.applied_tags) {
             if (channel.isThread()) {
                 const parent = await Channel.findOneOrFail({
@@ -203,6 +216,19 @@ router.patch(
 
         if (payload.icon) payload.icon = await handleFile(`/channel-icons/${channel_id}`, payload.icon);
 
+        const channelLimits = Config.get().limits.channel;
+
+        const errors: ErrorList = {};
+        if (payload.name && (payload.name.length < 1 || payload.name.length > channelLimits.maxName))
+            errors["name"] = makeObjectErrorContent("BASE_TYPE_BAD_LENGTH", `Channel name must be between 1 and ${channelLimits.maxName} characters`);
+        if (payload.topic !== undefined && payload.topic.length > channelLimits.maxTopic)
+            errors["topic"] = makeObjectErrorContent("BASE_TYPE_BAD_LENGTH", `Channel topic must be less than ${channelLimits.maxTopic} characters`);
+        if (payload.user_limit !== undefined && payload.user_limit < 0) errors["user_limit"] = makeObjectErrorContent("BASE_TYPE_BAD_VALUE", "User limit must be 0 or higher");
+
+        if (Object.keys(errors).length) {
+            throw new FieldError(400, "Invalid form body", errors);
+        }
+
         channel.assign(payload);
         if (channel.thread_metadata) {
             if (payload.archived !== undefined) {
diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts b/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts
index 88938063b..75fd5d274 100644
--- a/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts
+++ b/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts
@@ -150,6 +150,7 @@ router.get(
     }),
     async (req: Request, res: Response) => {
         const { message_id, channel_id } = req.params as { [key: string]: string };
+        const limit = req.query.limit ? Number(req.query.limit) : 25;
         const emoji = getEmoji(req.params.emoji as string);
 
         const message = await Message.findOneOrFail({
@@ -164,6 +165,7 @@ router.get(
                     id: In(reaction.user_ids),
                 },
                 select: PublicUserProjection,
+                take: limit,
             })
         ).map((user) => user.toPublicUser());
 
diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts
index fdeaf70b3..885551695 100644
--- a/src/api/routes/channels/#channel_id/messages/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/index.ts
@@ -137,6 +137,7 @@ router.get(
         const query: FindManyOptions<Message> & {
             where: { id?: FindOperator<string> | FindOperator<string>[] };
         } = {
+            relationLoadStrategy: "query",
             order: { timestamp: "DESC" },
             take: limit,
             where: { channel_id },
@@ -149,16 +150,6 @@ router.get(
                 mention_channels: true,
                 sticker_items: true,
                 attachments: true,
-                referenced_message: {
-                    author: true,
-                    webhook: true,
-                    application: true,
-                    mentions: true,
-                    mention_roles: true,
-                    mention_channels: true,
-                    sticker_items: true,
-                    attachments: true,
-                },
                 thread: {
                     recipients: {
                         user: true,
@@ -208,6 +199,7 @@ router.get(
             messages = await Message.find(query);
         }
 
+        await Message.fillReplies(messages);
         const endpoint = Config.get().cdn.endpointPublic;
 
         await populateForwardLinks(messages);
@@ -276,25 +268,6 @@ router.get(
             return x;
         });
 
-        // polyfill message references for old messages
-        await Promise.all(
-            ret
-                .filter((msg) => msg.message_reference && !msg.referenced_message?.id && msg.message_reference.message_id)
-                .map(async (msg) => {
-                    const whereOptions: { id: string; guild_id?: string; channel_id?: string } = {
-                        id: msg.message_reference!.message_id as string,
-                    };
-                    if (msg.message_reference!.guild_id) whereOptions.guild_id = msg.message_reference!.guild_id;
-                    if (msg.message_reference!.channel_id) whereOptions.channel_id = msg.message_reference!.channel_id;
-
-                    msg.referenced_message =
-                        (await Message.findOne({
-                            where: whereOptions,
-                            relations: { author: true, mentions: true, mention_roles: true, mention_channels: true },
-                        })) ?? undefined;
-                }),
-        );
-
         return res.json(ret);
     },
 );
diff --git a/src/api/routes/channels/#channel_id/messages/pins/index.ts b/src/api/routes/channels/#channel_id/messages/pins/index.ts
index 7a8798522..a947d875f 100644
--- a/src/api/routes/channels/#channel_id/messages/pins/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/pins/index.ts
@@ -173,12 +173,27 @@ router.get(
 
         const pins = await Message.find({
             where: { channel_id: channel_id, pinned_at: Not(IsNull()) },
-            relations: { author: true },
+            relations: {
+                author: true,
+                webhook: true,
+                application: true,
+                mentions: true,
+                mention_roles: true,
+                mention_channels: true,
+                sticker_items: true,
+                attachments: true,
+                thread: {
+                    recipients: {
+                        user: true,
+                    },
+                },
+            },
             order: { pinned_at: "DESC" },
         });
+        await Message.fillReplies(pins);
 
         const items = pins.map((message: Message) => ({
-            message,
+            message: message.toJSON(),
             pinned_at: message.pinned_at,
         }));
 
diff --git a/src/api/routes/channels/#channel_id/pins.ts b/src/api/routes/channels/#channel_id/pins.ts
index e93c57a0e..8c96fa7a6 100644
--- a/src/api/routes/channels/#channel_id/pins.ts
+++ b/src/api/routes/channels/#channel_id/pins.ts
@@ -174,11 +174,26 @@ router.get(
 
         const pins = await Message.find({
             where: { channel_id: channel_id, pinned_at: Not(IsNull()) },
-            relations: { author: true },
+            relations: {
+                author: true,
+                webhook: true,
+                application: true,
+                mentions: true,
+                mention_roles: true,
+                mention_channels: true,
+                sticker_items: true,
+                attachments: true,
+                thread: {
+                    recipients: {
+                        user: true,
+                    },
+                },
+            },
             order: { pinned_at: "DESC" },
         });
+        await Message.fillReplies(pins);
 
-        res.send(pins);
+        res.send(pins.map((_) => _.toJSON()));
     },
 );
 
diff --git a/src/api/routes/discoverable-guilds.ts b/src/api/routes/discoverable-guilds.ts
index 8f059f570..87de37a3b 100644
--- a/src/api/routes/discoverable-guilds.ts
+++ b/src/api/routes/discoverable-guilds.ts
@@ -44,31 +44,21 @@ router.get(
                   select: { guild_id: true },
               }).then((members) => members.map((member) => member.guild_id))
             : [];
-        let guilds;
-        if (categories == undefined) {
-            guilds = showAllGuilds
-                ? await Guild.find({
-                      take: Math.abs(Number(limit || configLimit)),
-                  })
-                : await Guild.find({
-                      where: { features: Like(`%DISCOVERABLE%`) },
-                      take: Math.abs(Number(limit || configLimit)),
-                  });
-        } else {
-            guilds = showAllGuilds
-                ? await Guild.find({
-                      where: { primary_category_id: categories.toString(), id: Not(In(hiddenGuildIds)) },
-                      take: Math.abs(Number(limit || configLimit)),
-                  })
-                : await Guild.find({
-                      where: {
-                          primary_category_id: categories.toString(),
-                          features: Like("%DISCOVERABLE%"),
-                          id: Not(In(hiddenGuildIds)),
-                      },
-                      take: Math.abs(Number(limit || configLimit)),
-                  });
-        }
+
+        const guilds = await Guild.find({
+            where: {
+                id: Not(In(hiddenGuildIds)),
+                discovery_excluded: false,
+                ...(categories == undefined ? {} : { primary_category_id: categories.toString() }), // TODO: isnt this an array?
+                ...(showAllGuilds ? {} : { features: Like("%DISCOVERABLE%") }),
+            },
+            order: {
+                discovery_weight: "DESC",
+                member_count: "DESC",
+            },
+            skip: Math.abs(Number(offset || Config.get().guild.discovery.offset)),
+            take: Math.abs(Number(limit || configLimit)),
+        });
 
         const total = guilds ? guilds.length : undefined;
 
diff --git a/src/api/routes/users/#user_id/profile.ts b/src/api/routes/users/#user_id/profile.ts
index fccdeca32..749aaa2ed 100644
--- a/src/api/routes/users/#user_id/profile.ts
+++ b/src/api/routes/users/#user_id/profile.ts
@@ -45,7 +45,7 @@ router.get("/", route({ responses: { 200: { body: "UserProfileResponse" } } }),
             where: { id: user_id },
         });
         const self_member = await Member.find({
-            where: { id: user_id },
+            where: { id: req.user_id },
         });
 
         for (const rmem of requested_member) {
diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts
index 702c5f1a6..256ff8b77 100644
--- a/src/api/util/handlers/Message.ts
+++ b/src/api/util/handlers/Message.ts
@@ -130,6 +130,7 @@ export async function handleMessage(opts: MessageOptions): Promise<Message> {
     }
     if (!ephermal) {
         channel.last_message_id = message.id;
+        channel.save();
     }
 
     if (cloudAttachments && cloudAttachments.length > 0) {
diff --git a/src/cdn/Server.ts b/src/cdn/Server.ts
index 68974433d..c76e93a81 100644
--- a/src/cdn/Server.ts
+++ b/src/cdn/Server.ts
@@ -63,42 +63,6 @@ export class CDNServer extends Server {
 
         await registerRoutes(this, path.join(__dirname, "routes/"));
 
-        this.app.use("/icons/", avatarsRoute);
-        console.log("[Server] Route /icons registered");
-
-        this.app.use("/role-icons/", iconsRoute);
-        console.log("[Server] Route /role-icons registered");
-
-        this.app.use("/emojis/", avatarsRoute);
-        console.log("[Server] Route /emojis registered");
-
-        this.app.use("/stickers/", avatarsRoute);
-        console.log("[Server] Route /stickers registered");
-
-        this.app.use("/banners/", avatarsRoute);
-        console.log("[Server] Route /banners registered");
-
-        this.app.use("/splashes/", avatarsRoute);
-        console.log("[Server] Route /splashes registered");
-
-        this.app.use("/discovery-splashes/", avatarsRoute);
-        console.log("[Server] Route /discovery-splashes registered");
-
-        this.app.use("/app-icons/", avatarsRoute);
-        console.log("[Server] Route /app-icons registered");
-
-        this.app.use("/app-assets/", avatarsRoute);
-        console.log("[Server] Route /app-assets registered");
-
-        this.app.use("/discover-splashes/", avatarsRoute);
-        console.log("[Server] Route /discover-splashes registered");
-
-        this.app.use("/team-icons/", avatarsRoute);
-        console.log("[Server] Route /team-icons registered");
-
-        this.app.use("/channel-icons/", avatarsRoute);
-        console.log("[Server] Route /channel-icons registered");
-
         this.app.use("/guilds/:guild_id/users/:user_id/avatars", guildProfilesRoute);
         console.log("[Server] Route /guilds/:guild_id/users/:user_id/avatars registered");
 
diff --git a/src/cdn/routes/app-assets.ts b/src/cdn/routes/app-assets.ts
new file mode 100644
index 000000000..4ac514258
--- /dev/null
+++ b/src/cdn/routes/app-assets.ts
@@ -0,0 +1,117 @@
+/*
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Router, Response, Request } from "express";
+import { Config, Snowflake } from "@spacebar/util";
+import { storage } from "../util/Storage";
+import { fileTypeFromBuffer } from "file-type";
+import { HTTPError } from "lambert-server";
+import crypto from "crypto";
+import { multer } from "../util/multer";
+import { cache } from "../util/cache";
+
+// TODO: check premium and animated pfp are allowed in the config
+// TODO: generate different sizes of icon
+// TODO: generate different image types of icon
+// TODO: delete old icons
+
+const ANIMATED_MIME_TYPES = ["image/apng", "image/gif", "image/gifv"];
+const STATIC_MIME_TYPES = ["image/png", "image/jpeg", "image/webp", "image/svg+xml", "image/svg"];
+const ALLOWED_MIME_TYPES = [...ANIMATED_MIME_TYPES, ...STATIC_MIME_TYPES];
+
+const router = Router({ mergeParams: true });
+
+const pathPrefix = "app-assets";
+router.post("/:guild_id", multer.single("file"), async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    if (!req.file) throw new HTTPError("Missing file");
+    const { buffer, size } = req.file;
+    const { guild_id } = req.params as { [key: string]: string };
+
+    let hash = crypto.createHash("md5").update(Snowflake.generate()).digest("hex");
+
+    const type = await fileTypeFromBuffer(buffer);
+    if (!type || !ALLOWED_MIME_TYPES.includes(type.mime)) throw new HTTPError("Invalid file type");
+    if (ANIMATED_MIME_TYPES.includes(type.mime)) hash = `a_${hash}`; // animated icons have a_ infront of the hash
+
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+    const endpoint = Config.get().cdn.endpointPublic;
+
+    await storage.set(path, buffer);
+
+    return res.json({
+        id: hash,
+        content_type: type.mime,
+        size,
+        url: `${endpoint}${req.baseUrl}/${guild_id}/${hash}`,
+    });
+});
+
+router.get("/:guild_id", cache, async (req: Request, res: Response) => {
+    let { guild_id } = req.params as { [key: string]: string };
+    guild_id = guild_id.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+});
+
+export const getAvatar = async (req: Request, res: Response) => {
+    const { guild_id } = req.params as { [key: string]: string };
+    let { hash } = req.params as { [key: string]: string };
+    hash = hash.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}/${hash}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+};
+
+router.get("/:guild_id/:hash", cache, getAvatar);
+
+router.delete("/:guild_id/:id", async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    const { guild_id, id } = req.params as { [key: string]: string };
+    const path = `${pathPrefix}/${guild_id}/${id}`;
+
+    await storage.delete(path);
+
+    return res.send({ success: true });
+});
+
+async function getOrMoveFile(newPath: string, oldPath: string) {
+    let file = await storage.get(newPath);
+    if (!file) {
+        if (await storage.exists(oldPath)) {
+            console.log(`[${pathPrefix}] found file at old path ${oldPath}, moving to new path ${newPath}`);
+            await storage.move(oldPath, newPath);
+            file = await storage.get(newPath);
+        }
+    }
+    if (!file) throw new HTTPError("not found", 404);
+    return file;
+}
+
+export default router;
diff --git a/src/cdn/routes/app-icons.ts b/src/cdn/routes/app-icons.ts
new file mode 100644
index 000000000..c7b1e8678
--- /dev/null
+++ b/src/cdn/routes/app-icons.ts
@@ -0,0 +1,117 @@
+/*
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Router, Response, Request } from "express";
+import { Config, Snowflake } from "@spacebar/util";
+import { storage } from "../util/Storage";
+import { fileTypeFromBuffer } from "file-type";
+import { HTTPError } from "lambert-server";
+import crypto from "crypto";
+import { multer } from "../util/multer";
+import { cache } from "../util/cache";
+
+// TODO: check premium and animated pfp are allowed in the config
+// TODO: generate different sizes of icon
+// TODO: generate different image types of icon
+// TODO: delete old icons
+
+const ANIMATED_MIME_TYPES = ["image/apng", "image/gif", "image/gifv"];
+const STATIC_MIME_TYPES = ["image/png", "image/jpeg", "image/webp", "image/svg+xml", "image/svg"];
+const ALLOWED_MIME_TYPES = [...ANIMATED_MIME_TYPES, ...STATIC_MIME_TYPES];
+
+const router = Router({ mergeParams: true });
+
+const pathPrefix = "app-icons";
+router.post("/:guild_id", multer.single("file"), async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    if (!req.file) throw new HTTPError("Missing file");
+    const { buffer, size } = req.file;
+    const { guild_id } = req.params as { [key: string]: string };
+
+    let hash = crypto.createHash("md5").update(Snowflake.generate()).digest("hex");
+
+    const type = await fileTypeFromBuffer(buffer);
+    if (!type || !ALLOWED_MIME_TYPES.includes(type.mime)) throw new HTTPError("Invalid file type");
+    if (ANIMATED_MIME_TYPES.includes(type.mime)) hash = `a_${hash}`; // animated icons have a_ infront of the hash
+
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+    const endpoint = Config.get().cdn.endpointPublic;
+
+    await storage.set(path, buffer);
+
+    return res.json({
+        id: hash,
+        content_type: type.mime,
+        size,
+        url: `${endpoint}${req.baseUrl}/${guild_id}/${hash}`,
+    });
+});
+
+router.get("/:guild_id", cache, async (req: Request, res: Response) => {
+    let { guild_id } = req.params as { [key: string]: string };
+    guild_id = guild_id.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+});
+
+export const getAvatar = async (req: Request, res: Response) => {
+    const { guild_id } = req.params as { [key: string]: string };
+    let { hash } = req.params as { [key: string]: string };
+    hash = hash.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}/${hash}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+};
+
+router.get("/:guild_id/:hash", cache, getAvatar);
+
+router.delete("/:guild_id/:id", async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    const { guild_id, id } = req.params as { [key: string]: string };
+    const path = `${pathPrefix}/${guild_id}/${id}`;
+
+    await storage.delete(path);
+
+    return res.send({ success: true });
+});
+
+async function getOrMoveFile(newPath: string, oldPath: string) {
+    let file = await storage.get(newPath);
+    if (!file) {
+        if (await storage.exists(oldPath)) {
+            console.log(`[${pathPrefix}] found file at old path ${oldPath}, moving to new path ${newPath}`);
+            await storage.move(oldPath, newPath);
+            file = await storage.get(newPath);
+        }
+    }
+    if (!file) throw new HTTPError("not found", 404);
+    return file;
+}
+
+export default router;
diff --git a/src/cdn/routes/banners.ts b/src/cdn/routes/banners.ts
new file mode 100644
index 000000000..ebbbcc4eb
--- /dev/null
+++ b/src/cdn/routes/banners.ts
@@ -0,0 +1,117 @@
+/*
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Router, Response, Request } from "express";
+import { Config, Snowflake } from "@spacebar/util";
+import { storage } from "../util/Storage";
+import { fileTypeFromBuffer } from "file-type";
+import { HTTPError } from "lambert-server";
+import crypto from "crypto";
+import { multer } from "../util/multer";
+import { cache } from "../util/cache";
+
+// TODO: check premium and animated pfp are allowed in the config
+// TODO: generate different sizes of icon
+// TODO: generate different image types of icon
+// TODO: delete old icons
+
+const ANIMATED_MIME_TYPES = ["image/apng", "image/gif", "image/gifv"];
+const STATIC_MIME_TYPES = ["image/png", "image/jpeg", "image/webp", "image/svg+xml", "image/svg"];
+const ALLOWED_MIME_TYPES = [...ANIMATED_MIME_TYPES, ...STATIC_MIME_TYPES];
+
+const router = Router({ mergeParams: true });
+
+const pathPrefix = "banners";
+router.post("/:guild_id", multer.single("file"), async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    if (!req.file) throw new HTTPError("Missing file");
+    const { buffer, size } = req.file;
+    const { guild_id } = req.params as { [key: string]: string };
+
+    let hash = crypto.createHash("md5").update(Snowflake.generate()).digest("hex");
+
+    const type = await fileTypeFromBuffer(buffer);
+    if (!type || !ALLOWED_MIME_TYPES.includes(type.mime)) throw new HTTPError("Invalid file type");
+    if (ANIMATED_MIME_TYPES.includes(type.mime)) hash = `a_${hash}`; // animated icons have a_ infront of the hash
+
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+    const endpoint = Config.get().cdn.endpointPublic;
+
+    await storage.set(path, buffer);
+
+    return res.json({
+        id: hash,
+        content_type: type.mime,
+        size,
+        url: `${endpoint}${req.baseUrl}/${guild_id}/${hash}`,
+    });
+});
+
+router.get("/:guild_id", cache, async (req: Request, res: Response) => {
+    let { guild_id } = req.params as { [key: string]: string };
+    guild_id = guild_id.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+});
+
+export const getAvatar = async (req: Request, res: Response) => {
+    const { guild_id } = req.params as { [key: string]: string };
+    let { hash } = req.params as { [key: string]: string };
+    hash = hash.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}/${hash}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+};
+
+router.get("/:guild_id/:hash", cache, getAvatar);
+
+router.delete("/:guild_id/:id", async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    const { guild_id, id } = req.params as { [key: string]: string };
+    const path = `${pathPrefix}/${guild_id}/${id}`;
+
+    await storage.delete(path);
+
+    return res.send({ success: true });
+});
+
+async function getOrMoveFile(newPath: string, oldPath: string) {
+    let file = await storage.get(newPath);
+    if (!file) {
+        if (await storage.exists(oldPath)) {
+            console.log(`[${pathPrefix}] found file at old path ${oldPath}, moving to new path ${newPath}`);
+            await storage.move(oldPath, newPath);
+            file = await storage.get(newPath);
+        }
+    }
+    if (!file) throw new HTTPError("not found", 404);
+    return file;
+}
+
+export default router;
diff --git a/src/cdn/routes/channel-icons.ts b/src/cdn/routes/channel-icons.ts
new file mode 100644
index 000000000..5885b64fe
--- /dev/null
+++ b/src/cdn/routes/channel-icons.ts
@@ -0,0 +1,117 @@
+/*
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Router, Response, Request } from "express";
+import { Config, Snowflake } from "@spacebar/util";
+import { storage } from "../util/Storage";
+import { fileTypeFromBuffer } from "file-type";
+import { HTTPError } from "lambert-server";
+import crypto from "crypto";
+import { multer } from "../util/multer";
+import { cache } from "../util/cache";
+
+// TODO: check premium and animated pfp are allowed in the config
+// TODO: generate different sizes of icon
+// TODO: generate different image types of icon
+// TODO: delete old icons
+
+const ANIMATED_MIME_TYPES = ["image/apng", "image/gif", "image/gifv"];
+const STATIC_MIME_TYPES = ["image/png", "image/jpeg", "image/webp", "image/svg+xml", "image/svg"];
+const ALLOWED_MIME_TYPES = [...ANIMATED_MIME_TYPES, ...STATIC_MIME_TYPES];
+
+const router = Router({ mergeParams: true });
+
+const pathPrefix = "channel-icons";
+router.post("/:guild_id", multer.single("file"), async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    if (!req.file) throw new HTTPError("Missing file");
+    const { buffer, size } = req.file;
+    const { guild_id } = req.params as { [key: string]: string };
+
+    let hash = crypto.createHash("md5").update(Snowflake.generate()).digest("hex");
+
+    const type = await fileTypeFromBuffer(buffer);
+    if (!type || !ALLOWED_MIME_TYPES.includes(type.mime)) throw new HTTPError("Invalid file type");
+    if (ANIMATED_MIME_TYPES.includes(type.mime)) hash = `a_${hash}`; // animated icons have a_ infront of the hash
+
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+    const endpoint = Config.get().cdn.endpointPublic;
+
+    await storage.set(path, buffer);
+
+    return res.json({
+        id: hash,
+        content_type: type.mime,
+        size,
+        url: `${endpoint}${req.baseUrl}/${guild_id}/${hash}`,
+    });
+});
+
+router.get("/:guild_id", cache, async (req: Request, res: Response) => {
+    let { guild_id } = req.params as { [key: string]: string };
+    guild_id = guild_id.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+});
+
+export const getAvatar = async (req: Request, res: Response) => {
+    const { guild_id } = req.params as { [key: string]: string };
+    let { hash } = req.params as { [key: string]: string };
+    hash = hash.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}/${hash}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+};
+
+router.get("/:guild_id/:hash", cache, getAvatar);
+
+router.delete("/:guild_id/:id", async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    const { guild_id, id } = req.params as { [key: string]: string };
+    const path = `${pathPrefix}/${guild_id}/${id}`;
+
+    await storage.delete(path);
+
+    return res.send({ success: true });
+});
+
+async function getOrMoveFile(newPath: string, oldPath: string) {
+    let file = await storage.get(newPath);
+    if (!file) {
+        if (await storage.exists(oldPath)) {
+            console.log(`[${pathPrefix}] found file at old path ${oldPath}, moving to new path ${newPath}`);
+            await storage.move(oldPath, newPath);
+            file = await storage.get(newPath);
+        }
+    }
+    if (!file) throw new HTTPError("not found", 404);
+    return file;
+}
+
+export default router;
diff --git a/src/cdn/routes/discover-splashes.ts b/src/cdn/routes/discover-splashes.ts
new file mode 100644
index 000000000..ea4fbd885
--- /dev/null
+++ b/src/cdn/routes/discover-splashes.ts
@@ -0,0 +1,117 @@
+/*
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Router, Response, Request } from "express";
+import { Config, Snowflake } from "@spacebar/util";
+import { storage } from "../util/Storage";
+import { fileTypeFromBuffer } from "file-type";
+import { HTTPError } from "lambert-server";
+import crypto from "crypto";
+import { multer } from "../util/multer";
+import { cache } from "../util/cache";
+
+// TODO: check premium and animated pfp are allowed in the config
+// TODO: generate different sizes of icon
+// TODO: generate different image types of icon
+// TODO: delete old icons
+
+const ANIMATED_MIME_TYPES = ["image/apng", "image/gif", "image/gifv"];
+const STATIC_MIME_TYPES = ["image/png", "image/jpeg", "image/webp", "image/svg+xml", "image/svg"];
+const ALLOWED_MIME_TYPES = [...ANIMATED_MIME_TYPES, ...STATIC_MIME_TYPES];
+
+const router = Router({ mergeParams: true });
+
+const pathPrefix = "discover-splashes";
+router.post("/:guild_id", multer.single("file"), async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    if (!req.file) throw new HTTPError("Missing file");
+    const { buffer, size } = req.file;
+    const { guild_id } = req.params as { [key: string]: string };
+
+    let hash = crypto.createHash("md5").update(Snowflake.generate()).digest("hex");
+
+    const type = await fileTypeFromBuffer(buffer);
+    if (!type || !ALLOWED_MIME_TYPES.includes(type.mime)) throw new HTTPError("Invalid file type");
+    if (ANIMATED_MIME_TYPES.includes(type.mime)) hash = `a_${hash}`; // animated icons have a_ infront of the hash
+
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+    const endpoint = Config.get().cdn.endpointPublic;
+
+    await storage.set(path, buffer);
+
+    return res.json({
+        id: hash,
+        content_type: type.mime,
+        size,
+        url: `${endpoint}${req.baseUrl}/${guild_id}/${hash}`,
+    });
+});
+
+router.get("/:guild_id", cache, async (req: Request, res: Response) => {
+    let { guild_id } = req.params as { [key: string]: string };
+    guild_id = guild_id.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+});
+
+export const getAvatar = async (req: Request, res: Response) => {
+    const { guild_id } = req.params as { [key: string]: string };
+    let { hash } = req.params as { [key: string]: string };
+    hash = hash.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}/${hash}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+};
+
+router.get("/:guild_id/:hash", cache, getAvatar);
+
+router.delete("/:guild_id/:id", async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    const { guild_id, id } = req.params as { [key: string]: string };
+    const path = `${pathPrefix}/${guild_id}/${id}`;
+
+    await storage.delete(path);
+
+    return res.send({ success: true });
+});
+
+async function getOrMoveFile(newPath: string, oldPath: string) {
+    let file = await storage.get(newPath);
+    if (!file) {
+        if (await storage.exists(oldPath)) {
+            console.log(`[${pathPrefix}] found file at old path ${oldPath}, moving to new path ${newPath}`);
+            await storage.move(oldPath, newPath);
+            file = await storage.get(newPath);
+        }
+    }
+    if (!file) throw new HTTPError("not found", 404);
+    return file;
+}
+
+export default router;
diff --git a/src/cdn/routes/discovery-splashes.ts b/src/cdn/routes/discovery-splashes.ts
new file mode 100644
index 000000000..f87158941
--- /dev/null
+++ b/src/cdn/routes/discovery-splashes.ts
@@ -0,0 +1,117 @@
+/*
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Router, Response, Request } from "express";
+import { Config, Snowflake } from "@spacebar/util";
+import { storage } from "../util/Storage";
+import { fileTypeFromBuffer } from "file-type";
+import { HTTPError } from "lambert-server";
+import crypto from "crypto";
+import { multer } from "../util/multer";
+import { cache } from "../util/cache";
+
+// TODO: check premium and animated pfp are allowed in the config
+// TODO: generate different sizes of icon
+// TODO: generate different image types of icon
+// TODO: delete old icons
+
+const ANIMATED_MIME_TYPES = ["image/apng", "image/gif", "image/gifv"];
+const STATIC_MIME_TYPES = ["image/png", "image/jpeg", "image/webp", "image/svg+xml", "image/svg"];
+const ALLOWED_MIME_TYPES = [...ANIMATED_MIME_TYPES, ...STATIC_MIME_TYPES];
+
+const router = Router({ mergeParams: true });
+
+const pathPrefix = "discovery-splashes";
+router.post("/:guild_id", multer.single("file"), async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    if (!req.file) throw new HTTPError("Missing file");
+    const { buffer, size } = req.file;
+    const { guild_id } = req.params as { [key: string]: string };
+
+    let hash = crypto.createHash("md5").update(Snowflake.generate()).digest("hex");
+
+    const type = await fileTypeFromBuffer(buffer);
+    if (!type || !ALLOWED_MIME_TYPES.includes(type.mime)) throw new HTTPError("Invalid file type");
+    if (ANIMATED_MIME_TYPES.includes(type.mime)) hash = `a_${hash}`; // animated icons have a_ infront of the hash
+
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+    const endpoint = Config.get().cdn.endpointPublic;
+
+    await storage.set(path, buffer);
+
+    return res.json({
+        id: hash,
+        content_type: type.mime,
+        size,
+        url: `${endpoint}${req.baseUrl}/${guild_id}/${hash}`,
+    });
+});
+
+router.get("/:guild_id", cache, async (req: Request, res: Response) => {
+    let { guild_id } = req.params as { [key: string]: string };
+    guild_id = guild_id.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+});
+
+export const getAvatar = async (req: Request, res: Response) => {
+    const { guild_id } = req.params as { [key: string]: string };
+    let { hash } = req.params as { [key: string]: string };
+    hash = hash.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}/${hash}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+};
+
+router.get("/:guild_id/:hash", cache, getAvatar);
+
+router.delete("/:guild_id/:id", async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    const { guild_id, id } = req.params as { [key: string]: string };
+    const path = `${pathPrefix}/${guild_id}/${id}`;
+
+    await storage.delete(path);
+
+    return res.send({ success: true });
+});
+
+async function getOrMoveFile(newPath: string, oldPath: string) {
+    let file = await storage.get(newPath);
+    if (!file) {
+        if (await storage.exists(oldPath)) {
+            console.log(`[${pathPrefix}] found file at old path ${oldPath}, moving to new path ${newPath}`);
+            await storage.move(oldPath, newPath);
+            file = await storage.get(newPath);
+        }
+    }
+    if (!file) throw new HTTPError("not found", 404);
+    return file;
+}
+
+export default router;
diff --git a/src/cdn/routes/emojis.ts b/src/cdn/routes/emojis.ts
new file mode 100644
index 000000000..56eae53e3
--- /dev/null
+++ b/src/cdn/routes/emojis.ts
@@ -0,0 +1,117 @@
+/*
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Router, Response, Request } from "express";
+import { Config, Snowflake } from "@spacebar/util";
+import { storage } from "../util/Storage";
+import { fileTypeFromBuffer } from "file-type";
+import { HTTPError } from "lambert-server";
+import crypto from "crypto";
+import { multer } from "../util/multer";
+import { cache } from "../util/cache";
+
+// TODO: check premium and animated pfp are allowed in the config
+// TODO: generate different sizes of icon
+// TODO: generate different image types of icon
+// TODO: delete old icons
+
+const ANIMATED_MIME_TYPES = ["image/apng", "image/gif", "image/gifv"];
+const STATIC_MIME_TYPES = ["image/png", "image/jpeg", "image/webp", "image/svg+xml", "image/svg"];
+const ALLOWED_MIME_TYPES = [...ANIMATED_MIME_TYPES, ...STATIC_MIME_TYPES];
+
+const router = Router({ mergeParams: true });
+
+const pathPrefix = "emojis";
+router.post("/:guild_id", multer.single("file"), async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    if (!req.file) throw new HTTPError("Missing file");
+    const { buffer, size } = req.file;
+    const { guild_id } = req.params as { [key: string]: string };
+
+    let hash = crypto.createHash("md5").update(Snowflake.generate()).digest("hex");
+
+    const type = await fileTypeFromBuffer(buffer);
+    if (!type || !ALLOWED_MIME_TYPES.includes(type.mime)) throw new HTTPError("Invalid file type");
+    if (ANIMATED_MIME_TYPES.includes(type.mime)) hash = `a_${hash}`; // animated icons have a_ infront of the hash
+
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+    const endpoint = Config.get().cdn.endpointPublic;
+
+    await storage.set(path, buffer);
+
+    return res.json({
+        id: hash,
+        content_type: type.mime,
+        size,
+        url: `${endpoint}${req.baseUrl}/${guild_id}/${hash}`,
+    });
+});
+
+router.get("/:guild_id", cache, async (req: Request, res: Response) => {
+    let { guild_id } = req.params as { [key: string]: string };
+    guild_id = guild_id.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+});
+
+export const getAvatar = async (req: Request, res: Response) => {
+    const { guild_id } = req.params as { [key: string]: string };
+    let { hash } = req.params as { [key: string]: string };
+    hash = hash.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}/${hash}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+};
+
+router.get("/:guild_id/:hash", cache, getAvatar);
+
+router.delete("/:guild_id/:id", async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    const { guild_id, id } = req.params as { [key: string]: string };
+    const path = `${pathPrefix}/${guild_id}/${id}`;
+
+    await storage.delete(path);
+
+    return res.send({ success: true });
+});
+
+async function getOrMoveFile(newPath: string, oldPath: string) {
+    let file = await storage.get(newPath);
+    if (!file) {
+        if (await storage.exists(oldPath)) {
+            console.log(`[${pathPrefix}] found file at old path ${oldPath}, moving to new path ${newPath}`);
+            await storage.move(oldPath, newPath);
+            file = await storage.get(newPath);
+        }
+    }
+    if (!file) throw new HTTPError("not found", 404);
+    return file;
+}
+
+export default router;
diff --git a/src/cdn/routes/icons.ts b/src/cdn/routes/icons.ts
new file mode 100644
index 000000000..0106c05c5
--- /dev/null
+++ b/src/cdn/routes/icons.ts
@@ -0,0 +1,117 @@
+/*
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Router, Response, Request } from "express";
+import { Config, Snowflake } from "@spacebar/util";
+import { storage } from "../util/Storage";
+import { fileTypeFromBuffer } from "file-type";
+import { HTTPError } from "lambert-server";
+import crypto from "crypto";
+import { multer } from "../util/multer";
+import { cache } from "../util/cache";
+
+// TODO: check premium and animated pfp are allowed in the config
+// TODO: generate different sizes of icon
+// TODO: generate different image types of icon
+// TODO: delete old icons
+
+const ANIMATED_MIME_TYPES = ["image/apng", "image/gif", "image/gifv"];
+const STATIC_MIME_TYPES = ["image/png", "image/jpeg", "image/webp", "image/svg+xml", "image/svg"];
+const ALLOWED_MIME_TYPES = [...ANIMATED_MIME_TYPES, ...STATIC_MIME_TYPES];
+
+const router = Router({ mergeParams: true });
+
+const pathPrefix = "icons";
+router.post("/:guild_id", multer.single("file"), async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    if (!req.file) throw new HTTPError("Missing file");
+    const { buffer, size } = req.file;
+    const { guild_id } = req.params as { [key: string]: string };
+
+    let hash = crypto.createHash("md5").update(Snowflake.generate()).digest("hex");
+
+    const type = await fileTypeFromBuffer(buffer);
+    if (!type || !ALLOWED_MIME_TYPES.includes(type.mime)) throw new HTTPError("Invalid file type");
+    if (ANIMATED_MIME_TYPES.includes(type.mime)) hash = `a_${hash}`; // animated icons have a_ infront of the hash
+
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+    const endpoint = Config.get().cdn.endpointPublic;
+
+    await storage.set(path, buffer);
+
+    return res.json({
+        id: hash,
+        content_type: type.mime,
+        size,
+        url: `${endpoint}${req.baseUrl}/${guild_id}/${hash}`,
+    });
+});
+
+router.get("/:guild_id", cache, async (req: Request, res: Response) => {
+    let { guild_id } = req.params as { [key: string]: string };
+    guild_id = guild_id.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+});
+
+export const getAvatar = async (req: Request, res: Response) => {
+    const { guild_id } = req.params as { [key: string]: string };
+    let { hash } = req.params as { [key: string]: string };
+    hash = hash.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}/${hash}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+};
+
+router.get("/:guild_id/:hash", cache, getAvatar);
+
+router.delete("/:guild_id/:id", async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    const { guild_id, id } = req.params as { [key: string]: string };
+    const path = `${pathPrefix}/${guild_id}/${id}`;
+
+    await storage.delete(path);
+
+    return res.send({ success: true });
+});
+
+async function getOrMoveFile(newPath: string, oldPath: string) {
+    let file = await storage.get(newPath);
+    if (!file) {
+        if (await storage.exists(oldPath)) {
+            console.log(`[${pathPrefix}] found file at old path ${oldPath}, moving to new path ${newPath}`);
+            await storage.move(oldPath, newPath);
+            file = await storage.get(newPath);
+        }
+    }
+    if (!file) throw new HTTPError("not found", 404);
+    return file;
+}
+
+export default router;
diff --git a/src/cdn/routes/splashes.ts b/src/cdn/routes/splashes.ts
new file mode 100644
index 000000000..07a98cec8
--- /dev/null
+++ b/src/cdn/routes/splashes.ts
@@ -0,0 +1,117 @@
+/*
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Router, Response, Request } from "express";
+import { Config, Snowflake } from "@spacebar/util";
+import { storage } from "../util/Storage";
+import { fileTypeFromBuffer } from "file-type";
+import { HTTPError } from "lambert-server";
+import crypto from "crypto";
+import { multer } from "../util/multer";
+import { cache } from "../util/cache";
+
+// TODO: check premium and animated pfp are allowed in the config
+// TODO: generate different sizes of icon
+// TODO: generate different image types of icon
+// TODO: delete old icons
+
+const ANIMATED_MIME_TYPES = ["image/apng", "image/gif", "image/gifv"];
+const STATIC_MIME_TYPES = ["image/png", "image/jpeg", "image/webp", "image/svg+xml", "image/svg"];
+const ALLOWED_MIME_TYPES = [...ANIMATED_MIME_TYPES, ...STATIC_MIME_TYPES];
+
+const router = Router({ mergeParams: true });
+
+const pathPrefix = "splashes";
+router.post("/:guild_id", multer.single("file"), async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    if (!req.file) throw new HTTPError("Missing file");
+    const { buffer, size } = req.file;
+    const { guild_id } = req.params as { [key: string]: string };
+
+    let hash = crypto.createHash("md5").update(Snowflake.generate()).digest("hex");
+
+    const type = await fileTypeFromBuffer(buffer);
+    if (!type || !ALLOWED_MIME_TYPES.includes(type.mime)) throw new HTTPError("Invalid file type");
+    if (ANIMATED_MIME_TYPES.includes(type.mime)) hash = `a_${hash}`; // animated icons have a_ infront of the hash
+
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+    const endpoint = Config.get().cdn.endpointPublic;
+
+    await storage.set(path, buffer);
+
+    return res.json({
+        id: hash,
+        content_type: type.mime,
+        size,
+        url: `${endpoint}${req.baseUrl}/${guild_id}/${hash}`,
+    });
+});
+
+router.get("/:guild_id", cache, async (req: Request, res: Response) => {
+    let { guild_id } = req.params as { [key: string]: string };
+    guild_id = guild_id.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+});
+
+export const getAvatar = async (req: Request, res: Response) => {
+    const { guild_id } = req.params as { [key: string]: string };
+    let { hash } = req.params as { [key: string]: string };
+    hash = hash.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}/${hash}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+};
+
+router.get("/:guild_id/:hash", cache, getAvatar);
+
+router.delete("/:guild_id/:id", async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    const { guild_id, id } = req.params as { [key: string]: string };
+    const path = `${pathPrefix}/${guild_id}/${id}`;
+
+    await storage.delete(path);
+
+    return res.send({ success: true });
+});
+
+async function getOrMoveFile(newPath: string, oldPath: string) {
+    let file = await storage.get(newPath);
+    if (!file) {
+        if (await storage.exists(oldPath)) {
+            console.log(`[${pathPrefix}] found file at old path ${oldPath}, moving to new path ${newPath}`);
+            await storage.move(oldPath, newPath);
+            file = await storage.get(newPath);
+        }
+    }
+    if (!file) throw new HTTPError("not found", 404);
+    return file;
+}
+
+export default router;
diff --git a/src/cdn/routes/stickers.ts b/src/cdn/routes/stickers.ts
new file mode 100644
index 000000000..bb7ab2add
--- /dev/null
+++ b/src/cdn/routes/stickers.ts
@@ -0,0 +1,117 @@
+/*
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Router, Response, Request } from "express";
+import { Config, Snowflake } from "@spacebar/util";
+import { storage } from "../util/Storage";
+import { fileTypeFromBuffer } from "file-type";
+import { HTTPError } from "lambert-server";
+import crypto from "crypto";
+import { multer } from "../util/multer";
+import { cache } from "../util/cache";
+
+// TODO: check premium and animated pfp are allowed in the config
+// TODO: generate different sizes of icon
+// TODO: generate different image types of icon
+// TODO: delete old icons
+
+const ANIMATED_MIME_TYPES = ["image/apng", "image/gif", "image/gifv"];
+const STATIC_MIME_TYPES = ["image/png", "image/jpeg", "image/webp", "image/svg+xml", "image/svg"];
+const ALLOWED_MIME_TYPES = [...ANIMATED_MIME_TYPES, ...STATIC_MIME_TYPES];
+
+const router = Router({ mergeParams: true });
+
+const pathPrefix = "stickers";
+router.post("/:guild_id", multer.single("file"), async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    if (!req.file) throw new HTTPError("Missing file");
+    const { buffer, size } = req.file;
+    const { guild_id } = req.params as { [key: string]: string };
+
+    let hash = crypto.createHash("md5").update(Snowflake.generate()).digest("hex");
+
+    const type = await fileTypeFromBuffer(buffer);
+    if (!type || !ALLOWED_MIME_TYPES.includes(type.mime)) throw new HTTPError("Invalid file type");
+    if (ANIMATED_MIME_TYPES.includes(type.mime)) hash = `a_${hash}`; // animated icons have a_ infront of the hash
+
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+    const endpoint = Config.get().cdn.endpointPublic;
+
+    await storage.set(path, buffer);
+
+    return res.json({
+        id: hash,
+        content_type: type.mime,
+        size,
+        url: `${endpoint}${req.baseUrl}/${guild_id}/${hash}`,
+    });
+});
+
+router.get("/:guild_id", cache, async (req: Request, res: Response) => {
+    let { guild_id } = req.params as { [key: string]: string };
+    guild_id = guild_id.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+});
+
+export const getAvatar = async (req: Request, res: Response) => {
+    const { guild_id } = req.params as { [key: string]: string };
+    let { hash } = req.params as { [key: string]: string };
+    hash = hash.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}/${hash}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+};
+
+router.get("/:guild_id/:hash", cache, getAvatar);
+
+router.delete("/:guild_id/:id", async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    const { guild_id, id } = req.params as { [key: string]: string };
+    const path = `${pathPrefix}/${guild_id}/${id}`;
+
+    await storage.delete(path);
+
+    return res.send({ success: true });
+});
+
+async function getOrMoveFile(newPath: string, oldPath: string) {
+    let file = await storage.get(newPath);
+    if (!file) {
+        if (await storage.exists(oldPath)) {
+            console.log(`[${pathPrefix}] found file at old path ${oldPath}, moving to new path ${newPath}`);
+            await storage.move(oldPath, newPath);
+            file = await storage.get(newPath);
+        }
+    }
+    if (!file) throw new HTTPError("not found", 404);
+    return file;
+}
+
+export default router;
diff --git a/src/cdn/routes/team-icons.ts b/src/cdn/routes/team-icons.ts
new file mode 100644
index 000000000..3ddbd1ed0
--- /dev/null
+++ b/src/cdn/routes/team-icons.ts
@@ -0,0 +1,117 @@
+/*
+	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
+	Copyright (C) 2023 Spacebar and Spacebar Contributors
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published
+	by the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Router, Response, Request } from "express";
+import { Config, Snowflake } from "@spacebar/util";
+import { storage } from "../util/Storage";
+import { fileTypeFromBuffer } from "file-type";
+import { HTTPError } from "lambert-server";
+import crypto from "crypto";
+import { multer } from "../util/multer";
+import { cache } from "../util/cache";
+
+// TODO: check premium and animated pfp are allowed in the config
+// TODO: generate different sizes of icon
+// TODO: generate different image types of icon
+// TODO: delete old icons
+
+const ANIMATED_MIME_TYPES = ["image/apng", "image/gif", "image/gifv"];
+const STATIC_MIME_TYPES = ["image/png", "image/jpeg", "image/webp", "image/svg+xml", "image/svg"];
+const ALLOWED_MIME_TYPES = [...ANIMATED_MIME_TYPES, ...STATIC_MIME_TYPES];
+
+const router = Router({ mergeParams: true });
+
+const pathPrefix = "team-icons";
+router.post("/:guild_id", multer.single("file"), async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    if (!req.file) throw new HTTPError("Missing file");
+    const { buffer, size } = req.file;
+    const { guild_id } = req.params as { [key: string]: string };
+
+    let hash = crypto.createHash("md5").update(Snowflake.generate()).digest("hex");
+
+    const type = await fileTypeFromBuffer(buffer);
+    if (!type || !ALLOWED_MIME_TYPES.includes(type.mime)) throw new HTTPError("Invalid file type");
+    if (ANIMATED_MIME_TYPES.includes(type.mime)) hash = `a_${hash}`; // animated icons have a_ infront of the hash
+
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+    const endpoint = Config.get().cdn.endpointPublic;
+
+    await storage.set(path, buffer);
+
+    return res.json({
+        id: hash,
+        content_type: type.mime,
+        size,
+        url: `${endpoint}${req.baseUrl}/${guild_id}/${hash}`,
+    });
+});
+
+router.get("/:guild_id", cache, async (req: Request, res: Response) => {
+    let { guild_id } = req.params as { [key: string]: string };
+    guild_id = guild_id.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+});
+
+export const getAvatar = async (req: Request, res: Response) => {
+    const { guild_id } = req.params as { [key: string]: string };
+    let { hash } = req.params as { [key: string]: string };
+    hash = hash.split(".")[0]; // remove .file extension
+    const path = `${pathPrefix}/${guild_id}/${hash}`;
+
+    const file = await getOrMoveFile(path, `avatars/${guild_id}/${hash}`);
+    const type = await fileTypeFromBuffer(file);
+
+    res.set("Content-Type", type?.mime);
+
+    return res.send(file);
+};
+
+router.get("/:guild_id/:hash", cache, getAvatar);
+
+router.delete("/:guild_id/:id", async (req: Request, res: Response) => {
+    if (req.headers.signature !== Config.get().security.requestSignature) throw new HTTPError("Invalid request signature");
+    const { guild_id, id } = req.params as { [key: string]: string };
+    const path = `${pathPrefix}/${guild_id}/${id}`;
+
+    await storage.delete(path);
+
+    return res.send({ success: true });
+});
+
+async function getOrMoveFile(newPath: string, oldPath: string) {
+    let file = await storage.get(newPath);
+    if (!file) {
+        if (await storage.exists(oldPath)) {
+            console.log(`[${pathPrefix}] found file at old path ${oldPath}, moving to new path ${newPath}`);
+            await storage.move(oldPath, newPath);
+            file = await storage.get(newPath);
+        }
+    }
+    if (!file) throw new HTTPError("not found", 404);
+    return file;
+}
+
+export default router;
diff --git a/src/cdn/util/FileStorage.ts b/src/cdn/util/FileStorage.ts
index 6f01b3c5c..ff7a56ee8 100644
--- a/src/cdn/util/FileStorage.ts
+++ b/src/cdn/util/FileStorage.ts
@@ -74,4 +74,17 @@ export class FileStorage implements Storage {
         //TODO we should delete the parent directory if empty
         fs.unlinkSync(getPath(path));
     }
+
+    async exists(path: string) {
+        return fs.existsSync(getPath(path));
+    }
+
+    async move(path: string, newPath: string) {
+        path = getPath(path);
+        newPath = getPath(newPath);
+
+        if (!fs.existsSync(dirname(newPath))) fs.mkdirSync(dirname(newPath), { recursive: true });
+
+        fs.renameSync(path, newPath);
+    }
 }
diff --git a/src/cdn/util/S3Storage.ts b/src/cdn/util/S3Storage.ts
index f657fd299..de575e5d2 100644
--- a/src/cdn/util/S3Storage.ts
+++ b/src/cdn/util/S3Storage.ts
@@ -32,10 +32,11 @@ export class S3Storage implements Storage {
     public constructor(
         private region: string,
         private bucket: string,
+        private endpoint: string,
         private basePath?: string,
     ) {
         const { S3 } = require("@aws-sdk/client-s3");
-        this.client = new S3({ region });
+        this.client = new S3({ region: region, endpoint: endpoint });
     }
 
     /**
@@ -95,4 +96,28 @@ export class S3Storage implements Storage {
             Key: `${this.bucketBasePath}${path}`,
         });
     }
+
+    async exists(path: string): Promise<boolean> {
+        try {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-expect-error
+            await this.client.headObject({
+                Bucket: this.bucket,
+                Key: `${this.bucketBasePath}${path}`,
+            });
+            return true;
+        } catch (err) {
+            if (err && typeof err === "object" && "name" in err && (err as { [key: string]: string }).name === "NotFound") {
+                return false;
+            }
+            console.error(`[CDN] Unable to check existence of S3 object at path ${path}.`);
+            console.error(err);
+            return false;
+        }
+    }
+
+    async move(path: string, newPath: string): Promise<void> {
+        await this.clone(path, newPath);
+        await this.delete(path);
+    }
 }
diff --git a/src/cdn/util/Storage.ts b/src/cdn/util/Storage.ts
index 1184bde8d..199c53ff7 100644
--- a/src/cdn/util/Storage.ts
+++ b/src/cdn/util/Storage.ts
@@ -27,6 +27,8 @@ export interface Storage {
     clone(path: string, newPath: string): Promise<void>;
     get(path: string): Promise<Buffer | null>;
     delete(path: string): Promise<void>;
+    exists(path: string): Promise<boolean>;
+    move(path: string, newPath: string): Promise<void>;
 }
 
 let storage: Storage;
@@ -60,6 +62,12 @@ if (process.env.STORAGE_PROVIDER === "file" || !process.env.STORAGE_PROVIDER) {
         process.exit(1);
     }
 
+    let endpoint = process.env.STORAGE_ENDPOINT;
+
+    if (!endpoint) {
+        endpoint = `https://s3.${region}.amazonaws.com`;
+    }
+
     if (!bucket) {
         console.error(`[CDN] You must provide a bucket when using the S3 storage provider.`);
         process.exit(1);
@@ -74,7 +82,7 @@ if (process.env.STORAGE_PROVIDER === "file" || !process.env.STORAGE_PROVIDER) {
     }
 
     const { S3Storage } = require("S3Storage");
-    storage = new S3Storage(region, bucket, location);
+    storage = new S3Storage(region, bucket, endpoint, location);
 }
 
 export { storage };
diff --git a/src/gateway/listener/listener.ts b/src/gateway/listener/listener.ts
index deec5014e..b49514927 100644
--- a/src/gateway/listener/listener.ts
+++ b/src/gateway/listener/listener.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -245,7 +245,12 @@ async function consume(this: WebSocket, opts: EventOpts) {
             this.events[data.user.id] = await listenEvent(data.user.id, handlePresenceUpdate.bind(this), this.listen_options);
             break;
         case "GUILD_CREATE":
-            this.events[id] = await listenEvent(id, consumer, listenOpts);
+            Promise.all([
+                ...data.channels.map(async ({ id }: { id: string }) => {
+                    this.events[id] = await listenEvent(id, consumer, listenOpts);
+                }),
+                listenEvent(id, consumer, listenOpts).then((ret) => (this.events[id] = ret)),
+            ]);
             break;
         case "CHANNEL_UPDATE": {
             const exists = this.events[id];
diff --git a/src/gateway/opcodes/Identify.ts b/src/gateway/opcodes/Identify.ts
index 322b427c8..a46b05130 100644
--- a/src/gateway/opcodes/Identify.ts
+++ b/src/gateway/opcodes/Identify.ts
@@ -475,6 +475,8 @@ export async function onIdentify(this: WebSocket, data: Payload) {
                     member,
                 };
             }),
+            guild_scheduled_events: [],
+            presences: [],
         };
 
         if (user.bot) {
diff --git a/src/schemas/uncategorised/ChannelModifySchema.ts b/src/schemas/uncategorised/ChannelModifySchema.ts
index b83dc12e9..093da8e64 100644
--- a/src/schemas/uncategorised/ChannelModifySchema.ts
+++ b/src/schemas/uncategorised/ChannelModifySchema.ts
@@ -19,9 +19,6 @@
 import { ChannelPermissionOverwriteType, ChannelType, TagCreateSchema } from "@spacebar/schemas";
 
 export interface ChannelModifySchema {
-    /**
-     * @maxLength 100
-     */
     name?: string;
     type?: ChannelType;
     topic?: string;
diff --git a/src/util/config/types/subconfigurations/limits/ChannelLimits.ts b/src/util/config/types/subconfigurations/limits/ChannelLimits.ts
index 266e6a327..6d5d28f86 100644
--- a/src/util/config/types/subconfigurations/limits/ChannelLimits.ts
+++ b/src/util/config/types/subconfigurations/limits/ChannelLimits.ts
@@ -20,4 +20,5 @@ export class ChannelLimits {
     maxPins: number = 500;
     maxTopic: number = 1024;
     maxWebhooks: number = 100;
+    maxName: number = 32;
 }
diff --git a/src/util/entities/Guild.ts b/src/util/entities/Guild.ts
index 56740ab56..aac3daf0e 100644
--- a/src/util/entities/Guild.ts
+++ b/src/util/entities/Guild.ts
@@ -298,6 +298,12 @@ export class Guild extends BaseClass {
     @Column({ select: false, type: "simple-array" })
     channel_ordering: string[];
 
+    @Column()
+    discovery_weight: number = 0;
+
+    @Column()
+    discovery_excluded: boolean = false;
+
     static async createGuild(body: {
         name?: string;
         icon?: string | null;
diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts
index a399a4ea3..ba28e26f2 100644
--- a/src/util/entities/Message.ts
+++ b/src/util/entities/Message.ts
@@ -22,7 +22,7 @@ import { Role } from "./Role";
 import { Channel } from "./Channel";
 import { InteractionType } from "../interfaces/Interaction";
 import { Application } from "./Application";
-import { Column, CreateDateColumn, Entity, FindOneOptions, Index, JoinColumn, JoinTable, ManyToMany, ManyToOne, Not, OneToMany, Raw, RelationId } from "typeorm";
+import { Column, CreateDateColumn, Entity, FindOneOptions, In, Index, JoinColumn, JoinTable, ManyToMany, ManyToOne, Not, OneToMany, Raw, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
 import { Guild } from "./Guild";
 import { Webhook } from "./Webhook";
@@ -255,13 +255,38 @@ export class Message extends BaseClass {
     @Column({ nullable: true })
     avatar?: string;
 
-    toJSON(): Message {
+    static async fillReplies(messages: Message[]) {
+        const ms = messages
+            .filter((msg) => msg.message_reference && !msg.referenced_message?.id && msg.message_reference.message_id)
+            .filter((msg) => [MessageType.REPLY, MessageType.THREAD_STARTER_MESSAGE, MessageType.CONTEXT_MENU_COMMAND].includes(msg.type));
+        if (!ms.length) return;
+        const curMs = new Map(messages.map((m) => [m.id, m] as const));
+        const neededIds = new Set(ms.map((m) => m.message_reference!.message_id as string)).difference(curMs);
+        if (neededIds.size) {
+            const newMessages = await Message.find({
+                where: {
+                    id: In([...neededIds]),
+                },
+                relations: { author: true, mentions: true, mention_roles: true, mention_channels: true },
+            });
+            newMessages.forEach((msg) => curMs.set(msg.id, msg));
+        }
+        for (const message of ms) {
+            message.referenced_message = curMs.get(message.message_reference!.message_id as string) || undefined;
+        }
+    }
+
+    toJSON(shallow = false): Message {
         return {
             ...this,
             author_id: undefined,
             member_id: undefined,
             webhook_id: this.webhook_id ?? undefined,
             application_id: undefined,
+            mentions: this.mentions.map((user) => {
+                if (user && !user.toPublicUser) console.trace("toPublic user missing!!!");
+                return user?.toPublicUser?.() ?? user ?? undefined;
+            }),
 
             nonce: this.nonce ?? undefined,
             tts: this.tts ?? false,
@@ -283,6 +308,9 @@ export class Message extends BaseClass {
             poll: this.poll ?? undefined,
             content: this.content ?? "",
             reply_ids: this.reply_ids ?? undefined,
+            pinned: this.pinned,
+            thread: this.thread ? this.thread.toJSON() : this.thread,
+            referenced_message: this.referenced_message && !shallow ? this.referenced_message.toJSON(true) : undefined,
         };
     }
 
diff --git a/src/util/migration/postgres/1770748070808-GuildDiscoveryHoisting.ts b/src/util/migration/postgres/1770748070808-GuildDiscoveryHoisting.ts
new file mode 100644
index 000000000..5d0d84a9d
--- /dev/null
+++ b/src/util/migration/postgres/1770748070808-GuildDiscoveryHoisting.ts
@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class GuildDiscoveryHoisting1770748070808 implements MigrationInterface {
+    name = "GuildDiscoveryHoisting1770748070808";
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "guilds" ADD "discovery_weight" integer NOT NULL DEFAULT 0`);
+        await queryRunner.query(`ALTER TABLE "guilds" ADD "discovery_excluded" boolean NOT NULL DEFAULT FALSE`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "guilds" DROP COLUMN "discovery_excluded"`);
+        await queryRunner.query(`ALTER TABLE "guilds" DROP COLUMN "discovery_weight"`);
+    }
+}
diff --git a/src/util/util/Database.ts b/src/util/util/Database.ts
index 52168e9a0..805a9c18c 100644
--- a/src/util/util/Database.ts
+++ b/src/util/util/Database.ts
@@ -50,7 +50,14 @@ if (!isHeadlessProcess) {
     let hasWarnedSqlite = false;
     if (isSqlite && !hasWarnedSqlite) {
         hasWarnedSqlite = true;
-        console.log(`[Database] ${red(`You are running sqlite! Please keep in mind that we recommend setting up a dedicated database!`)}`);
+        console.log(
+            `[Database] ${red(`You do not have a database configured. This implies that it will try to use SQLite, which has been broken for a while and is unlikely to see a real fix any time soon.`)}`,
+        );
+        console.log(`[Database] ${red(`Please set up a PostgreSQL database instead: https://docs.spacebar.chat/setup/server/database/.`)}`);
+        console.log(
+            `[Database] ${red(`Alternatively, if you're able to install Nix (except MacOSX), and are trying to run a quick and dirty localhost instance: nix run .\\#testVm.config.system.build.vm, then open a client and connect to http://localhost:8080`)}`,
+        );
+        console.log(`[Database] ${red(`If you would like to try *anyways*, see the error below:`)}`);
         try {
             const _ = require("sqlite3");
         } catch (e) {
diff --git a/src/util/util/FieldError.ts b/src/util/util/FieldError.ts
index eb91a0ecb..f0ba4aeed 100644
--- a/src/util/util/FieldError.ts
+++ b/src/util/util/FieldError.ts
@@ -28,6 +28,10 @@ export type ErrorList = Record<string, ObjectErrorContent>;
 export type ErrorContent = { code: string; message: string };
 export type ObjectErrorContent = { _errors: ErrorContent[] };
 
+export function makeObjectErrorContent(code: string, message: string): ObjectErrorContent {
+    return { _errors: [{ code, message }] };
+}
+
 export function FieldErrors(fields: Record<string, { code?: string; message: string }>, errors?: ErrorObject[]) {
     const errorObj: ErrorList = {};
     for (const [key, { message, code }] of Object.entries(fields)) {
diff --git a/src/util/util/email/clients/SMTPEmailClient.ts b/src/util/util/email/clients/SMTPEmailClient.ts
index b8452489c..f0d3e8fe6 100644
--- a/src/util/util/email/clients/SMTPEmailClient.ts
+++ b/src/util/util/email/clients/SMTPEmailClient.ts
@@ -27,7 +27,7 @@ export class SMTPEmailClient extends BaseEmailClient {
     override async init(): Promise<void> {
         try {
             // try to import the transporter package
-            this.nodemailer = require("nodemailer").default;
+            this.nodemailer = require("nodemailer");
         } catch {
             // if the package is not installed, log an error and return void so we don't set the transporter
             console.error("[Email] nodemailer is not installed. Please run `npm install --no-save nodemailer` to install it.");
@@ -37,25 +37,37 @@ export class SMTPEmailClient extends BaseEmailClient {
         const { host, port, secure, username, password } = Config.get().email.smtp;
 
         // ensure all required configuration values are set
-        if (!host || !port || secure === null || !username || !password) return console.error("[Email] SMTP has not been configured correctly.");
+        if (!host || !port || secure === null) return console.error("[Email] SMTP has not been configured correctly.");
 
         if (!Config.get().email.senderAddress && !Config.get().general.correspondenceEmail)
             return console.error(
                 '[Email] You have to configure either "email_senderAddress" or "general_correspondenceEmail" for emails to work. The configured value is used as the sender address.',
             );
 
+        /* Allow for SMTP relays with and without username/passwords (IE: Smarthosts/Local Relays, etc) */
+        let nodemailer_opts: unknown;
+        if (!username || !password) {
+            nodemailer_opts = {
+                host,
+                port,
+                secure,
+            };
+        } else {
+            nodemailer_opts = {
+                host,
+                port,
+                secure,
+                auth: {
+                    user: username,
+                    pass: password,
+                },
+            };
+        }
+
         // construct the transporter
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-expect-error
-        const transporter = this.nodemailer.createTransport({
-            host,
-            port,
-            secure,
-            auth: {
-                user: username,
-                pass: password,
-            },
-        });
+        const transporter = this.nodemailer.createTransport(nodemailer_opts);
 
         // verify connection configuration
         const verified = await transporter.verify().catch((err: unknown) => {