diff --git a/Cargo.lock b/Cargo.lock
index d00281b..7231f0f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -117,7 +117,7 @@ dependencies = [
 [[package]]
 name = "any_spawner"
 version = "0.1.1"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "futures",
  "thiserror",
@@ -168,7 +168,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -197,7 +197,7 @@ dependencies = [
  "manyhow",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -213,7 +213,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "quote-use",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -514,7 +514,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_json",
- "syn 2.0.76",
+ "syn 2.0.77",
  "zstd",
 ]
 
@@ -726,7 +726,7 @@ dependencies = [
 [[package]]
 name = "const_str_slice_concat"
 version = "0.1.0"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 
 [[package]]
 name = "convert_case"
@@ -861,7 +861,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -872,7 +872,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -918,7 +918,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -939,7 +939,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -949,7 +949,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -969,7 +969,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
  "unicode-xid",
 ]
 
@@ -1021,7 +1021,7 @@ dependencies = [
 [[package]]
 name = "either_of"
 version = "0.1.0"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "pin-project-lite",
 ]
@@ -1226,7 +1226,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1675,7 +1675,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1847,8 +1847,8 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hydration_context"
-version = "0.2.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.2.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "futures",
  "js-sys",
@@ -1975,7 +1975,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9311685eb9a34808bbb0608ad2fcab9ae216266beca5848613e95553ac914e3b"
 dependencies = [
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -2057,8 +2057,8 @@ dependencies = [
 
 [[package]]
 name = "leptos"
-version = "0.7.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "any_spawner",
  "base64 0.22.1",
@@ -2094,11 +2094,12 @@ dependencies = [
 
 [[package]]
 name = "leptos_axum"
-version = "0.7.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "any_spawner",
  "axum",
+ "dashmap",
  "futures",
  "http 1.1.0",
  "http-body-util",
@@ -2108,6 +2109,7 @@ dependencies = [
  "leptos_macro",
  "leptos_meta",
  "leptos_router",
+ "once_cell",
  "parking_lot",
  "serde_json",
  "server_fn",
@@ -2118,8 +2120,8 @@ dependencies = [
 
 [[package]]
 name = "leptos_config"
-version = "0.7.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "config",
  "regex",
@@ -2130,8 +2132,8 @@ dependencies = [
 
 [[package]]
 name = "leptos_dom"
-version = "0.7.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "js-sys",
  "or_poisoned",
@@ -2144,8 +2146,8 @@ dependencies = [
 
 [[package]]
 name = "leptos_hot_reload"
-version = "0.7.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "anyhow",
  "camino",
@@ -2155,14 +2157,14 @@ dependencies = [
  "quote",
  "rstml",
  "serde",
- "syn 2.0.76",
+ "syn 2.0.77",
  "walkdir",
 ]
 
 [[package]]
 name = "leptos_integration_utils"
-version = "0.7.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "futures",
  "hydration_context",
@@ -2175,8 +2177,8 @@ dependencies = [
 
 [[package]]
 name = "leptos_macro"
-version = "0.7.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "attribute-derive",
  "cfg-if",
@@ -2190,14 +2192,14 @@ dependencies = [
  "quote",
  "rstml",
  "server_fn_macro",
- "syn 2.0.76",
+ "syn 2.0.77",
  "uuid",
 ]
 
 [[package]]
 name = "leptos_meta"
-version = "0.7.0-beta3"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "futures",
  "indexmap",
@@ -2211,8 +2213,8 @@ dependencies = [
 
 [[package]]
 name = "leptos_router"
-version = "0.7.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "any_spawner",
  "either_of",
@@ -2227,6 +2229,7 @@ dependencies = [
  "percent-encoding",
  "reactive_graph",
  "send_wrapper",
+ "serde",
  "tachys",
  "thiserror",
  "url",
@@ -2236,8 +2239,8 @@ dependencies = [
 
 [[package]]
 name = "leptos_router_macro"
-version = "0.7.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -2246,8 +2249,8 @@ dependencies = [
 
 [[package]]
 name = "leptos_server"
-version = "0.7.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "any_spawner",
  "base64 0.22.1",
@@ -2364,7 +2367,7 @@ dependencies = [
  "manyhow-macros",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -2471,8 +2474,8 @@ dependencies = [
 
 [[package]]
 name = "next_tuple"
-version = "0.1.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.1.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 
 [[package]]
 name = "nom"
@@ -2579,7 +2582,7 @@ dependencies = [
 [[package]]
 name = "oco_ref"
 version = "0.2.0"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "serde",
  "thiserror",
@@ -2594,7 +2597,7 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 [[package]]
 name = "or_poisoned"
 version = "0.1.0"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 
 [[package]]
 name = "overload"
@@ -2705,7 +2708,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -2803,7 +2806,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
 dependencies = [
  "proc-macro2",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -2879,7 +2882,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
  "version_check",
  "yansi 1.0.1",
 ]
@@ -3023,7 +3026,7 @@ dependencies = [
  "proc-macro-utils 0.10.0",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3084,8 +3087,8 @@ dependencies = [
 
 [[package]]
 name = "reactive_graph"
-version = "0.1.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.1.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "any_spawner",
  "async-lock",
@@ -3196,9 +3199,9 @@ dependencies = [
 
 [[package]]
 name = "rgb"
-version = "0.8.49"
+version = "0.8.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cd5a1e95672f201913966f39baf355b53b5d92833431847295ae0346a5b939"
+checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
 dependencies = [
  "bytemuck",
 ]
@@ -3269,7 +3272,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
  "syn_derive",
  "thiserror",
 ]
@@ -3439,7 +3442,7 @@ checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3498,8 +3501,8 @@ dependencies = [
 
 [[package]]
 name = "server_fn"
-version = "0.7.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "axum",
  "bytes",
@@ -3534,24 +3537,24 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro"
-version = "0.7.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "const_format",
  "convert_case",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
  "xxhash-rust",
 ]
 
 [[package]]
 name = "server_fn_macro_default"
-version = "0.7.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.7.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "server_fn_macro",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3754,7 +3757,7 @@ dependencies = [
  "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3777,7 +3780,7 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.76",
+ "syn 2.0.77",
  "tempfile",
  "tokio",
  "url",
@@ -3924,9 +3927,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.76"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3942,7 +3945,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3983,8 +3986,8 @@ dependencies = [
 
 [[package]]
 name = "tachys"
-version = "0.1.0-beta3"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.1.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "any_spawner",
  "const_str_slice_concat",
@@ -4048,7 +4051,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -4063,8 +4066,8 @@ dependencies = [
 
 [[package]]
 name = "throw_error"
-version = "0.2.0-beta2"
-source = "git+https://github.com/leptos-rs/leptos.git#4f1ee65e6cd6533507e4ec7f2f29122e9aca48d9"
+version = "0.2.0-beta4"
+source = "git+https://github.com/leptos-rs/leptos.git#3b1b2e2dcc0b373f249c85fe537ffedb6ec48235"
 dependencies = [
  "pin-project-lite",
 ]
@@ -4139,7 +4142,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -4374,7 +4377,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -4435,7 +4438,7 @@ checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -4614,7 +4617,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
  "wasm-bindgen-shared",
 ]
 
@@ -4648,7 +4651,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -5001,7 +5004,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -5031,7 +5034,7 @@ checksum = "42bfd190a07ca8cfde7cd4c52b3ac463803dc07323db8c34daa697e86365978c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -5052,7 +5055,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 5793126..3d943ec 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -11,11 +11,7 @@ serde = { version = "1.0.197", features = ["serde_derive"] }
 serde_json = "1.0.120"
 tower-sessions = "0.12.0"
 build-info = "0.0.38"
-# leptos = { version = "0.6.12", features = ["hydrate", "nightly", "rustls", "experimental-islands"] }
-# leptos = { git = "https://github.com/leptos-rs/leptos.git", rev = "db02d3f581954ed6f21a477aee698440f6285aba", features = ["hydrate", "nightly", "rustls", "experimental-islands"] }
 leptos = { git = "https://github.com/leptos-rs/leptos.git", features = ["nightly", "rustls", "experimental-islands"] }
-# leptos_router = { version = "0.6.12", features = ["hydrate"] }
-# leptos_router = { git = "https://github.com/leptos-rs/leptos.git", rev = "db02d3f581954ed6f21a477aee698440f6285aba", features = ["nightly"] }
 leptos_router = { git = "https://github.com/leptos-rs/leptos.git", features = ["nightly"] }
 wasm-bindgen = "0.2.92"
 http = "1.1.0"
@@ -23,7 +19,7 @@ const_format = "0.2.32"
 # i don't actually use this but I need to activate that specific feature to get it to work so like whatever
 getrandom = { version = "0.2.15", default-features = false, features = ["js"] }
 uuid = { version = "1.10.0", features = ["serde"] }
-web-sys = { version = "0.3.70", features = ["Clipboard", "Window", "Navigator", "Permissions"] }
+web-sys = { version = "0.3.70", features = ["Clipboard", "Window", "Navigator", "Permissions", "HtmlFormElement", "FormData"] }
 wasm-bindgen-futures = "0.4.43"
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
@@ -41,8 +37,6 @@ chrono = { version = "0.4.35", default-features = false }
 tower-http = { version = "0.5.2", default-features = false, features = ["fs"] }
 oxipng = { version = "9.0.0", default-features = false, features = ["parallel"] }
 tower-no-ai = "0.1.1"
-# leptos_axum = { version = "0.6.12", features = ["experimental-islands"] }
-# leptos_axum = { git = "https://github.com/leptos-rs/leptos.git", rev = "db02d3f581954ed6f21a477aee698440f6285aba" }
 leptos_axum = { git = "https://github.com/leptos-rs/leptos.git" }
 argon2 = { version = "0.5.3", features = ["std"] }
 axum-auth = { version = "0.7.0", default-features = false, features = ["auth-basic"] }
diff --git a/backend/src/wedding/admin.rs b/backend/src/wedding/admin.rs
index 62b897d..3ddce26 100644
--- a/backend/src/wedding/admin.rs
+++ b/backend/src/wedding/admin.rs
@@ -1,5 +1,5 @@
 use leptos::{web_sys::window, prelude::*};
-use super::{SHARED_READABLE, server::{all_relations, AddGuest, Relation, PartySize, NOT_AUTHORIZED_ERR}};
+use super::{view_with_title, SHARED_READABLE, server::{all_relations, AddGuest, Relation, PartySize, NOT_AUTHORIZED_ERR}};
 
 // unfortunately, this whole thing's gotta be an island 'cause we want the list of relations to be
 // reactive to when we add a new one
@@ -8,7 +8,7 @@ pub fn admin() -> impl IntoView {
 	let new_guest = ServerMultiAction::<AddGuest>::new();
 	let relations = Resource::new(move || new_guest.version(), move |_| all_relations());
 
-	view! {
+	view_with_title("Wedding Admin", view! {
 		<style>{ SHARED_READABLE }</style>
 		<style>
 			{
@@ -58,12 +58,9 @@ pub fn admin() -> impl IntoView {
 							}
 								.into_any()
 						}
-						Err(ref e) => {
-							view! {
-								<div>{format!("Ran into an error: {e}")}</div>
-							}
-								.into_any()
-						}
+						Err(ref e) => view! {
+							<div>{format!("Ran into an error: {e}")}</div>
+						}.into_any(),
 						Ok(ref relations) => {
 							// feels kinda bad to clone but if we could `await` `relations` itself, then it
 							// would be cloned away, so this isn't like a performance hit
@@ -79,8 +76,12 @@ pub fn admin() -> impl IntoView {
 									Relation::AnnouncementOnly(r) => Some(r.clone()),
 									_ => None,
 								});
+
 							view! {
 								<h1>"Guests"</h1>
+								// todo: make a little table up here about total rsvp'd size, total
+								// invited size, estimated size accounting for current rsvp rate,
+								// etc.
 								{guests
 									.map(|g| {
 										view! {
@@ -151,7 +152,7 @@ pub fn admin() -> impl IntoView {
 				}
 			})}
 		</Suspense>
-	}
+	})
 }
 
 fn copy_rsvp_link_to_clipboard(id: uuid::Uuid) {
diff --git a/backend/src/wedding/app.rs b/backend/src/wedding/app.rs
index 9f8b66f..c09073d 100644
--- a/backend/src/wedding/app.rs
+++ b/backend/src/wedding/app.rs
@@ -7,12 +7,12 @@ pub fn wedding_app(state: AxumState) -> impl IntoView {
 	let options = state.leptos_opts;
 
 	view! {
-		<!DOCTYPE html> 
+		<!DOCTYPE html>
 		<html lang="en">
 			<head>
 				<meta charset="utf-8" />
 				<meta name="viewport" content="width=device-width, initial-scale=1" />
-				<HydrationScripts options=options islands=true />
+				<HydrationScripts options islands=true />
 			</head>
 			<body>
 				<RouterApp />
diff --git a/backend/src/wedding/mod.rs b/backend/src/wedding/mod.rs
index a568655..149e3c9 100644
--- a/backend/src/wedding/mod.rs
+++ b/backend/src/wedding/mod.rs
@@ -1,4 +1,5 @@
 use const_format::concatcp;
+use leptos::prelude::*;
 
 pub mod main_page;
 pub mod server;
@@ -10,6 +11,21 @@ pub mod app;
 #[cfg(not(target_family = "wasm"))]
 pub mod faq;
 
+fn view_with_title<T>(title: &'static str, view: T) -> impl IntoView
+where
+	T: IntoView
+{
+	view! {
+		<!DOCTYPE html>
+		<html>
+			<head>
+				<title>{ title }</title>
+			</head>
+		</html>
+		<body>{ view }</body>
+	}
+}
+
 pub const SHARED_STYLE: &str = concatcp!(r#"
 	@import url('https://fonts.googleapis.com/css2?family=Euphoria+Script&display=swap');
 	* {
diff --git a/backend/src/wedding/rsvp_page.rs b/backend/src/wedding/rsvp_page.rs
index d825b1c..f4cae90 100644
--- a/backend/src/wedding/rsvp_page.rs
+++ b/backend/src/wedding/rsvp_page.rs
@@ -2,8 +2,10 @@ use const_format::concatcp;
 use leptos::prelude::*;
 use leptos_router::{hooks::use_params, params::{ParamsMap, ParamsError, Params}};
 use uuid::Uuid;
+use web_sys::{FormData, HtmlFormElement, HtmlInputElement, SubmitEvent};
+use wasm_bindgen::JsCast;
 
-use super::{SHARED_READABLE, server::{guest_with_id, Guest, UpdateRsvp, PartySize}};
+use super::{SHARED_READABLE, view_with_title, server::{guest_with_id, Guest, UpdateRsvp, PartySize}};
 
 use std::{str::FromStr, sync::Arc};
 
@@ -33,6 +35,15 @@ const STYLE: &str = concatcp!(
 		width: 100%;
 		margin-bottom: 16px;
 	}
+	#checkbox-details {
+		margin-left: 20px;
+	}
+	.sublabel, .sublabel * {
+		font-size: 16px;
+	}
+	#err_title {
+		color: red;
+	}
 	"#
 );
 
@@ -49,29 +60,22 @@ pub fn rsvp_page() -> impl IntoView {
 		<Suspense>
 			{move || Suspend::new(async move {
 				match guest.await {
-					Ok(Some(guest)) => {
-						view! {
-							<h1>{format!("Welcome, {}", &guest.name)}</h1>
-							<RsvpForm guest />
-						}
-							.into_any()
-					}
-					Ok(None) => {
-						view! {
-							<div id="initial-response">
-								"Oops, looks like that id doesn't exist :/"
-							</div>
-						}
-							.into_any()
-					}
-					Err(e) => {
-						view! {
-							<div id="initial-response">
-								{move || format!("Couldn't retrieve guest: {e}")}
-							</div>
-						}
-							.into_any()
-					}
+					Ok(Some(guest)) => view_with_title("Harper/Welker Wedding RSVP form", view!{
+						<h1>{format!("Welcome, {}", &guest.name)}</h1>
+						<RsvpForm guest />
+					}).into_any(),
+
+					Ok(None) => view! {
+						<div id="initial-response">
+							"Oops, looks like that id doesn't exist :/"
+						</div>
+					}.into_any(),
+
+					Err(e) => view! {
+						<div id="initial-response">
+							{move || format!("Couldn't retrieve guest: {e}")}
+						</div>
+					}.into_any()
 				}
 			})}
 		</Suspense>
@@ -81,6 +85,53 @@ pub fn rsvp_page() -> impl IntoView {
 #[island]
 fn rsvp_form(guest: Guest) -> impl IntoView {
 	let submit = ServerAction::<UpdateRsvp>::new();
+	let (err, set_err) = signal(None);
+
+	let submit_callback = move |ev: SubmitEvent| {
+		ev.prevent_default();
+		let form = ev.target()
+			.expect("Something submitted this")
+			.dyn_into::<HtmlFormElement>()
+			.expect("This is what it must be");
+
+		let data = FormData::new_with_form(&form)
+			.expect("this just gotta work");
+
+		let doc = window()
+			.document()
+			.expect("No document???");
+
+		let attending = doc.query_selector("#attending")
+			.ok()
+			.flatten()
+			.expect("this checkbox better be there")
+			.dyn_ref::<HtmlInputElement>()
+			// yes we know it's an input
+			.unwrap()
+			.checked()
+			.to_string();
+
+		data.set_with_str("attending", &attending.to_string())
+			.unwrap();
+
+		let accepted_plus_one = doc.query_selector("#accepted_plus_one")
+			.expect("This better not error")
+			.and_then(|el| el.dyn_into::<HtmlInputElement>().ok())
+			.map(|input| input.checked());
+
+		if let Some(accepted) = accepted_plus_one {
+			data.set_with_str("accepted_plus_one", &accepted.to_string())
+				.unwrap();
+		}
+
+		match UpdateRsvp::from_form_data(&data) {
+			Err(e) => {
+				set_err(Some(format!("Couldn't create update request: {e}")));
+				ev.prevent_default();
+			},
+			Ok(update) => drop(submit.dispatch(update)),
+		}
+	};
 
 	// To show:
 	// 1. You may bring your family. How many people, total, will be present in your party?
@@ -92,12 +143,12 @@ fn rsvp_form(guest: Guest) -> impl IntoView {
 	// 6. Please confirm your email address
 	let content = move || match submit.value()() {
 		None => view! {
-			<ActionForm action=submit>
+			<form on:submit=submit_callback>
 				<label for="full_address">
-					"What's your address (including city, state, and country if relevant)? We need this to send you an announcement :)"
+					<span>"What's your address (including city, state, and country if relevant)?"</span>
+					<div class="sublabel">"We need this to send you an announcement :)"</div>
 				</label>
-				<br />
-				<input type="text" id="full_address" name="full_address" placeholder="make sure to include city and state :)" required />
+				<input type="text" id="full_address" name="full_address" placeholder="make sure to include city and state!" required />
 				<br />
 
 				<label for="email">"What's your email?"</label>
@@ -105,44 +156,48 @@ fn rsvp_form(guest: Guest) -> impl IntoView {
 				<input type="email" id="email" name="email" placeholder="email here :)" required />
 				<br />
 
+				<input type="checkbox" id="attending" name="attending" prop:checked/><span>"I can attend"</span>
+				<div id="checkbox-details" class="sublabel">
+					<label for="attending">"^ Check this box if you are able to attend our wedding celebration on the evening of December 14, 2024, in SLC, Utah."</label>
+					<br/>
+					<span>"(Details about specific times and addresses will be emailed to you if so)"</span>
+				</div>
+
 				{move || match guest.party_size {
-					PartySize::Group(size) => {
-						view! {
-							<span id="party-size">
-								<label for="group_size">
-									"How many people will be in your party, total?"
-								</label>
-								<br />
-								<input
-									type="number"
-									id="group_size"
-									name="group_size"
-									min="1"
-									required
-									value=size
-								/>
-							</span>
-						}
-							.into_any()
-					}
+					PartySize::NotAttending => view!{
+						"You have previously indicated you are not able to attend our wedding celebration. If that is not the case anymore, please contact us personally :)"
+					}.into_any(),
+					PartySize::Group(size) => view! {
+						<span id="party-size">
+							<label for="group_size">
+								"How many people will be in your party, total?"
+							</label>
+							<br />
+							<input
+								type="number"
+								id="group_size"
+								name="group_size"
+								min="1"
+								required
+								value=size
+							/>
+						</span>
+					}.into_any(),
 					PartySize::NoPlusOne => ().into_any(),
 					PartySize::AllowedPlusOne | PartySize::NotBringing | PartySize::Bringing => {
 						view! {
 							<span id="party-size">
-								<label for="accepted_plus_one">
-									"Will you be bringing a plus one?"
-								</label>
-								<br />
 								<input
 									type="checkbox"
 									id="accepted_plus_one"
 									name="accepted_plus_one"
-									required
-									value=guest.party_size == PartySize::Bringing
+									prop:checked={ guest.party_size == PartySize::Bringing }
 								/>
+								<label for="accepted_plus_one">
+									"Check this is you will be bringing a plus-one"
+								</label>
 							</span>
-						}
-							.into_any()
+						}.into_any()
 					}
 				}}
 				<br />
@@ -151,13 +206,20 @@ fn rsvp_form(guest: Guest) -> impl IntoView {
 					"Are there any dietary restrictions or notes that we should keep in mind for anyone in your party?"
 				</label>
 				<br />
-				<textarea id="extra_notes" name="extra_notes" placeholder="dietary restrictions!" />
+				<textarea id="extra_notes" name="extra_notes" placeholder="dietary restrictions?" />
 				<br />
 
 				<input type="text" id="id" name="id" value=guest.id.to_string() hidden required />
 
-				<input type="submit" value="Submit" />
-			</ActionForm>
+				<input type="submit" value="Submit" on:submit=submit_callback />
+
+				{ move || match err() {
+					Some(err) => view! {
+						<div><span id="err_title">"error: "</span>{ err }</div>
+					}.into_any(),
+					None => ().into_any()
+				}}
+			</form>
 		}.into_any(),
 		Some(Err(e)) => view! {
 			<div id="form-response">
diff --git a/backend/src/wedding/server.rs b/backend/src/wedding/server.rs
index 981b6ed..0c451ba 100644
--- a/backend/src/wedding/server.rs
+++ b/backend/src/wedding/server.rs
@@ -81,7 +81,9 @@ pub enum PartySize {
 	// a single person who is allowed a plus one but will not be bringing one
 	NotBringing,
 	// a single person who is allowed a plus one and will be bringing one
-	Bringing
+	Bringing,
+	// someone who we invited but was unable to come in the end
+	NotAttending
 }
 
 impl PartySize {
@@ -93,6 +95,7 @@ impl PartySize {
 	pub const ALLOWED_PLUS_ONE_I32: i32 = Self::GROUP_MAX + 2;
 	pub const NOT_BRINGING_I32: i32 = Self::GROUP_MAX + 3;
 	pub const BRINGING_I32: i32 = Self::GROUP_MAX + 4;
+	pub const NOT_ATTENDING_I32: i32 = Self::GROUP_MAX + 5;
 
 	pub fn total_size(&self) -> u8 {
 		match self {
@@ -100,6 +103,7 @@ impl PartySize {
 			// if they haven't specified, just assume it's a no. for now. i guess.
 			Self::NoPlusOne | Self::NotBringing | Self::AllowedPlusOne => 1,
 			Self::Bringing => 2,
+			Self::NotAttending => 0
 		}
 	}
 
@@ -110,7 +114,8 @@ impl PartySize {
 			PartySize::NoPlusOne => Self::NO_PLUS_ONE_I32,
 			PartySize::AllowedPlusOne => Self::ALLOWED_PLUS_ONE_I32,
 			PartySize::NotBringing => Self::NOT_BRINGING_I32,
-			PartySize::Bringing => Self::BRINGING_I32
+			PartySize::Bringing => Self::BRINGING_I32,
+			PartySize::NotAttending => Self::NOT_ATTENDING_I32
 			// WHENEVER YOU UPDATE THIS, MAKE SURE TO UPDATE THE TryFrom<i32> AS WELL TO MATCH
 		}
 	}
@@ -140,6 +145,7 @@ impl TryFrom<i32> for PartySize {
 			Self::ALLOWED_PLUS_ONE_I32 => Ok(Self::AllowedPlusOne),
 			Self::NOT_BRINGING_I32 => Ok(Self::NotBringing),
 			Self::BRINGING_I32 => Ok(Self::Bringing),
+			Self::NOT_ATTENDING_I32 => Ok(Self::NotAttending),
 			other_val => Err(InvalidValue(other_val))
 		}
 	}
@@ -170,7 +176,8 @@ impl Display for PartySize {
 			Self::NoPlusOne => write!(f, "Single person, no +1 allowed"),
 			Self::AllowedPlusOne => write!(f, "+1 allowed; no rsvp yet"),
 			Self::NotBringing => write!(f, "+1 allowed but not taking"),
-			Self::Bringing => write!(f, "Person with +1")
+			Self::Bringing => write!(f, "Person with +1"),
+			Self::NotAttending => write!(f, "Not Attending"),
 		}
 	}
 }
@@ -189,6 +196,7 @@ fn all_party_sizes_can_serde() {
 	check(PartySize::AllowedPlusOne);
 	check(PartySize::NotBringing);
 	check(PartySize::Bringing);
+	check(PartySize::NotAttending);
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
@@ -228,6 +236,7 @@ pub async fn guest_with_id(id: Uuid) -> Result<Option<Guest>, ServerFnError> {
 async fn update_rsvp(
 	accepted_plus_one: Option<bool>,
 	group_size: Option<u8>,
+	attending: bool,
 	full_address: String,
 	email: String,
 	extra_notes: String,
@@ -237,28 +246,35 @@ async fn update_rsvp(
 		"party_size BETWEEN ", PartySize::Group(0).to_int(), " AND ", PartySize::Group(u8::MAX).to_int()
 	);
 	static PLUS_ONE_COND: &str = concatcp!(
-		"(party_size is ", PartySize::AllowedPlusOne.to_int(),
-		" OR ", PartySize::NotBringing.to_int(),
-		" OR ", PartySize::Bringing.to_int(), ")"
+		"(party_size = ", PartySize::AllowedPlusOne.to_int(),
+		" OR party_size = ", PartySize::NotBringing.to_int(),
+		" OR party_size = ", PartySize::Bringing.to_int(), ")"
 	);
-	static ALONE_COND: &str = concatcp!("party_size IS ", PartySize::NoPlusOne.to_int());
+	static ALONE_COND: &str = concatcp!("party_size = ", PartySize::NoPlusOne.to_int());
 
 	let (mut tx, response): (Tx<Postgres>, _) = ext().await?;
 
-	let (party_size, extra_cond) = match (accepted_plus_one, group_size) {
-		// arbitrarily make group_size override accepted_plus_one. If they submit both, act as if
-		// they only submitted group_size
-		(_, Some(size)) => (PartySize::Group(size), GROUP_SIZE_COND),
-		(Some(accepted), None) => (
-			if accepted { PartySize::Bringing } else { PartySize::NotBringing },
-			PLUS_ONE_COND
-		),
-		(None, None) => (PartySize::NoPlusOne, ALONE_COND)
+	let (party_size, extra_cond) = if attending {
+		match (accepted_plus_one, group_size) {
+			// arbitrarily make group_size override accepted_plus_one. If they submit both, act as if
+			// they only submitted group_size
+			(_, Some(size)) => (PartySize::Group(size), GROUP_SIZE_COND),
+			(Some(accepted), None) => (
+				if accepted { PartySize::Bringing } else { PartySize::NotBringing },
+				PLUS_ONE_COND
+			),
+			(None, None) => (PartySize::NoPlusOne, ALONE_COND)
+		}
+	} else {
+		// just need a fully true condition for this case
+		(PartySize::NotAttending, "'1' = '1'")
 	};
 
-	query(&format!(
+	let q = format!(
 		"UPDATE {GUESTS_TABLE} SET party_size = $1, full_address = $2, email = $3, extra_notes = $4 WHERE id = $5 AND {extra_cond}"
-	))
+	);
+
+	query(&q)
 		.bind(i32::from(party_size))
 		.bind(full_address)
 		.bind(email)