diff --git a/.vscode/settings.json b/.vscode/settings.json
index 29b929d..fa1dc58 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,6 +7,10 @@
     "jquery",
     "pandoc",
     "photoframe",
+<<<<<<< Updated upstream
     "unrecognised"
+=======
+    "swingottawa"
+>>>>>>> Stashed changes
   ]
 }
\ No newline at end of file
diff --git a/nixos-apps/default.nix b/nixos-apps/default.nix
index 8c5e9e2..da5d18b 100644
--- a/nixos-apps/default.nix
+++ b/nixos-apps/default.nix
@@ -10,7 +10,8 @@
     ./paperless.ewanick.com.nix
 
     ./fancytypist.com.nix
-    ./hydra.fancyTypist.com.nix
+
+    ./ottawa-swing-dance-society-website.nix
   ];
 
   # when in doubt, clear away the certs with
diff --git a/nixos-apps/ottawa-swing-dance-society-website.nix b/nixos-apps/ottawa-swing-dance-society-website.nix
new file mode 100644
index 0000000..f019f23
--- /dev/null
+++ b/nixos-apps/ottawa-swing-dance-society-website.nix
@@ -0,0 +1,34 @@
+{ pkgs, ... }:
+
+let
+  PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/ottawa-swing-dance-society-website";
+  PORT = "4232";
+  HOST = "localhost";
+in
+{
+  services.caddy = {
+    enable = true;
+    virtualHosts = {
+      "osds.fancytypist.dev" = {
+        extraConfig = ''
+          reverse_proxy ${HOST}:${PORT}
+        '';
+      };
+    };
+  };
+
+  systemd.services = {
+    ewanick-site = {
+      enable = true;
+      description = "A blog powered by Emanote running solely on Markdown files.";
+      path = with pkgs; [ nix git ];
+      script = ''
+        cd ${PROJECT_ROOT}
+        nix run github:srid/emanote --accept-flake-config \
+                -- run             \
+                    --port ${PORT} \
+                    --host ${HOST}
+      '';
+    };
+  };
+}
diff --git a/nixos-apps/ottawa-swing-dance-society-website/about/our-team.md b/nixos-apps/ottawa-swing-dance-society-website/about/our-team.md
new file mode 100644
index 0000000..6ffe397
--- /dev/null
+++ b/nixos-apps/ottawa-swing-dance-society-website/about/our-team.md
@@ -0,0 +1,11 @@
+# Our Team
+
+## Executive Committee
+
+The Ottawa Swing Dance Society is completely run by volunteers!
+Our team of executives is dedicated to providing a fun and safe dance environment. For more information, please review our Safety Policy.
+If you are interested in joining our  Executive Committee or trying your hand at DJing, please contact us at swingottawa [at] gmail.com.
+
+To volunteer for a door shift or set up/tear down, click here.
+
+We can't wait for you to join our team!
diff --git a/nixos-apps/ottawa-swing-dance-society-website/index.md b/nixos-apps/ottawa-swing-dance-society-website/index.md
new file mode 100644
index 0000000..625ee47
--- /dev/null
+++ b/nixos-apps/ottawa-swing-dance-society-website/index.md
@@ -0,0 +1,5 @@
+# Welcome to the OSDS
+
+This is the OSDS site
+
+The OSDS is a non-profit dedicated to promoting swing dancing culture in Ottawa, ON, on unceded Algonquin territory.