diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 1afe622..16ffb00 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -30,17 +30,6 @@ jobs:
           components: rustfmt
       - run: cargo fmt --check
 
-  prettier:
-    name: Format frontend
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 23
-      - run: npm ci
-      - run: npm run format:check
-
   clippy:
     name: Lint
     runs-on: ubuntu-22.04
diff --git a/.sqlx/query-05de6b93f0e3c646b1ac95a2a3df70a689edffc1ab148e767238d2b28b7b6f77.json b/.sqlx/query-05de6b93f0e3c646b1ac95a2a3df70a689edffc1ab148e767238d2b28b7b6f77.json
new file mode 100644
index 0000000..13bcc4e
--- /dev/null
+++ b/.sqlx/query-05de6b93f0e3c646b1ac95a2a3df70a689edffc1ab148e767238d2b28b7b6f77.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "UPDATE rsvp_sessions\n             SET stripe_checkout_session_id = ?, stripe_client_secret = ?, updated_at = CURRENT_TIMESTAMP\n             WHERE id = ?",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "05de6b93f0e3c646b1ac95a2a3df70a689edffc1ab148e767238d2b28b7b6f77"
+}
diff --git a/.sqlx/query-c9f07131ab783144f4962daa23c91a75490a99a7689587115b92debcc06c114a.json b/.sqlx/query-1041a86bb05f0dd39693fb3942b212fe491fa3cee195fd2ce0ae74940ab5ad57.json
similarity index 59%
rename from .sqlx/query-c9f07131ab783144f4962daa23c91a75490a99a7689587115b92debcc06c114a.json
rename to .sqlx/query-1041a86bb05f0dd39693fb3942b212fe491fa3cee195fd2ce0ae74940ab5ad57.json
index 519ed81..825efb1 100644
--- a/.sqlx/query-c9f07131ab783144f4962daa23c91a75490a99a7689587115b92debcc06c114a.json
+++ b/.sqlx/query-1041a86bb05f0dd39693fb3942b212fe491fa3cee195fd2ce0ae74940ab5ad57.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                u.id AS user_id,\n                u.first_name as \"first_name!\",\n                u.last_name as \"last_name!\",\n                u.email,\n                CASE\n                    WHEN rs.user_id IS NOT NULL AND rs.user_id != r.user_id\n                    THEN hu.first_name || ' ' || hu.last_name\n                    ELSE NULL\n                END AS guest_of,\n\n                sp.name AS spot_name,\n                r.contribution,\n\n                FALSE AS \"is_manual!: bool\",\n                r.created_at,\n                r.checkin_at,\n\n                rs.id AS \"session_id!: i64\",\n                rs.status AS \"status!\"\n            FROM rsvps r\n            JOIN rsvp_sessions rs ON rs.id = r.session_id\n            JOIN spots sp ON sp.id = r.spot_id\n            JOIN users u  ON u.id  = r.user_id\n            JOIN users hu ON hu.id = rs.user_id\n            WHERE rs.event_id = ?\n              AND rs.status IN ('payment_pending', 'payment_confirmed')\n\n            UNION ALL\n\n            SELECT\n                u.id AS user_id,\n                u.first_name as \"first_name!\",\n                u.last_name as \"last_name!\",\n                u.email,\n                cu.first_name || ' ' || cu.last_name AS guest_of,\n\n                NULL AS spot_name,\n                0 AS contribution,\n\n                TRUE AS \"is_manual!: bool\",\n                mr.created_at,\n                mr.checkin_at,\n\n                0 AS \"session_id!: i64\",\n                'manual' AS \"status!\"\n            FROM manual_rsvps mr\n            JOIN users u ON u.id = mr.user_id\n            JOIN users cu ON cu.id = mr.creator_user_id\n            WHERE mr.event_id = ?\n\n            ORDER BY 11;\n            ",
+  "query": "\n            SELECT\n                u.id AS user_id,\n                u.first_name as \"first_name!\",\n                u.last_name as \"last_name!\",\n                u.email,\n                CASE\n                    WHEN rs.user_id IS NOT NULL AND rs.user_id != r.user_id\n                    THEN hu.first_name || ' ' || hu.last_name\n                    ELSE NULL\n                END AS guest_of,\n\n                sp.name AS spot_name,\n                r.contribution,\n\n                FALSE AS \"is_manual!: bool\",\n                r.created_at,\n                r.checkin_at,\n\n                rs.id AS \"session_id!: i64\",\n                rs.token AS session_token,\n                rs.status AS \"status!\"\n            FROM rsvps r\n            JOIN rsvp_sessions rs ON rs.id = r.session_id\n            JOIN spots sp ON sp.id = r.spot_id\n            JOIN users u  ON u.id  = r.user_id\n            JOIN users hu ON hu.id = rs.user_id\n            WHERE rs.event_id = ?\n              AND rs.status IN ('payment_pending', 'payment_confirmed')\n\n            UNION ALL\n\n            SELECT\n                u.id AS user_id,\n                u.first_name as \"first_name!\",\n                u.last_name as \"last_name!\",\n                u.email,\n                cu.first_name || ' ' || cu.last_name AS guest_of,\n\n                NULL AS spot_name,\n                0 AS contribution,\n\n                TRUE AS \"is_manual!: bool\",\n                mr.created_at,\n                mr.checkin_at,\n\n                0 AS \"session_id!: i64\",\n                NULL AS session_token,\n                'manual' AS \"status!\"\n            FROM manual_rsvps mr\n            JOIN users u ON u.id = mr.user_id\n            JOIN users cu ON cu.id = mr.creator_user_id\n            WHERE mr.event_id = ?\n\n            ORDER BY 11;\n            ",
   "describe": {
     "columns": [
       {
@@ -59,9 +59,14 @@
         "type_info": "Integer"
       },
       {
-        "name": "status!",
+        "name": "session_token",
         "ordinal": 11,
         "type_info": "Text"
+      },
+      {
+        "name": "status!",
+        "ordinal": 12,
+        "type_info": "Text"
       }
     ],
     "parameters": {
@@ -79,8 +84,9 @@
       false,
       true,
       false,
+      false,
       false
     ]
   },
-  "hash": "c9f07131ab783144f4962daa23c91a75490a99a7689587115b92debcc06c114a"
+  "hash": "1041a86bb05f0dd39693fb3942b212fe491fa3cee195fd2ce0ae74940ab5ad57"
 }
diff --git a/.sqlx/query-2ee5f2eb3e517e0954c5bc4d7161c1b0e36e560b22aea8eed6209df746e7c1d0.json b/.sqlx/query-2ee5f2eb3e517e0954c5bc4d7161c1b0e36e560b22aea8eed6209df746e7c1d0.json
deleted file mode 100644
index b074aed..0000000
--- a/.sqlx/query-2ee5f2eb3e517e0954c5bc4d7161c1b0e36e560b22aea8eed6209df746e7c1d0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT rs.status, u.email\n               FROM users u\n               JOIN rsvps r ON r.user_id = u.id\n               JOIN rsvp_sessions rs ON rs.id = r.session_id\n               WHERE rs.event_id = ?\n                 AND rs.id != ?\n            ",
-  "describe": {
-    "columns": [
-      {
-        "name": "status",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "email",
-        "ordinal": 1,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "2ee5f2eb3e517e0954c5bc4d7161c1b0e36e560b22aea8eed6209df746e7c1d0"
-}
diff --git a/.sqlx/query-3cf23aa88d50cc738bf4d7827dd8e1f7dd2064184f20110ad37ce307d8b51560.json b/.sqlx/query-3cf23aa88d50cc738bf4d7827dd8e1f7dd2064184f20110ad37ce307d8b51560.json
new file mode 100644
index 0000000..0f6f695
--- /dev/null
+++ b/.sqlx/query-3cf23aa88d50cc738bf4d7827dd8e1f7dd2064184f20110ad37ce307d8b51560.json
@@ -0,0 +1,32 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT r.id as rsvp_id, r.spot_id, r.contribution\n             FROM rsvps r\n             JOIN rsvp_sessions rs ON rs.id = r.session_id\n             WHERE rs.event_id = ? AND rs.user_id = ?\n               AND rs.status IN (?, ?)",
+  "describe": {
+    "columns": [
+      {
+        "name": "rsvp_id",
+        "ordinal": 0,
+        "type_info": "Integer"
+      },
+      {
+        "name": "spot_id",
+        "ordinal": 1,
+        "type_info": "Integer"
+      },
+      {
+        "name": "contribution",
+        "ordinal": 2,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "3cf23aa88d50cc738bf4d7827dd8e1f7dd2064184f20110ad37ce307d8b51560"
+}
diff --git a/.sqlx/query-6c8440178822b581416628666b0a649068ec9c534b94a578d9820f3abbe018d7.json b/.sqlx/query-6c8440178822b581416628666b0a649068ec9c534b94a578d9820f3abbe018d7.json
new file mode 100644
index 0000000..8aadaf2
--- /dev/null
+++ b/.sqlx/query-6c8440178822b581416628666b0a649068ec9c534b94a578d9820f3abbe018d7.json
@@ -0,0 +1,50 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT s.name AS spot_name,\n                    u.first_name AS \"first_name!: String\",\n                    u.last_name AS \"last_name!: String\",\n                    u.email, u.phone, r.contribution\n             FROM rsvps r\n             JOIN spots s ON s.id = r.spot_id\n             JOIN rsvp_sessions rs ON rs.id = r.session_id\n             JOIN users u ON u.id = r.user_id\n             WHERE rs.event_id = ? AND rs.user_id = ?\n               AND rs.status IN (?, ?)\n             ORDER BY r.created_at",
+  "describe": {
+    "columns": [
+      {
+        "name": "spot_name",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "first_name!: String",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "last_name!: String",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "email",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "phone",
+        "ordinal": 4,
+        "type_info": "Text"
+      },
+      {
+        "name": "contribution",
+        "ordinal": 5,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": [
+      false,
+      true,
+      true,
+      false,
+      true,
+      false
+    ]
+  },
+  "hash": "6c8440178822b581416628666b0a649068ec9c534b94a578d9820f3abbe018d7"
+}
diff --git a/.sqlx/query-c0c119524815d33dd5e781f3e525c248b47e6b311211b3cd74ce45db486e77cc.json b/.sqlx/query-6d0324262bfb2d4ea03c0fb53354f78ba37a10ca73a55e8ac6879616537164f1.json
similarity index 63%
rename from .sqlx/query-c0c119524815d33dd5e781f3e525c248b47e6b311211b3cd74ce45db486e77cc.json
rename to .sqlx/query-6d0324262bfb2d4ea03c0fb53354f78ba37a10ca73a55e8ac6879616537164f1.json
index 7221c0c..7841753 100644
--- a/.sqlx/query-c0c119524815d33dd5e781f3e525c248b47e6b311211b3cd74ce45db486e77cc.json
+++ b/.sqlx/query-6d0324262bfb2d4ea03c0fb53354f78ba37a10ca73a55e8ac6879616537164f1.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT\n                r.id AS rsvp_id,\n                r.user_id,\n                s.name AS spot_name,\n                u.first_name,\n                u.last_name,\n                u.email,\n                u.phone,\n                r.contribution\n               FROM rsvps r\n               JOIN spots s ON s.id = r.spot_id\n               JOIN rsvp_sessions rs ON rs.id = r.session_id\n               LEFT JOIN users u ON u.id = r.user_id\n               WHERE rs.id = ?\n            ",
+  "query": "SELECT r.id AS rsvp_id, r.user_id, s.name AS spot_name,\n                    u.first_name, u.last_name, u.email, u.phone, r.contribution\n             FROM rsvps r\n             JOIN spots s ON s.id = r.spot_id\n             JOIN rsvp_sessions rs ON rs.id = r.session_id\n             LEFT JOIN users u ON u.id = r.user_id\n             WHERE rs.id = ?\n             ORDER BY r.created_at",
   "describe": {
     "columns": [
       {
@@ -58,5 +58,5 @@
       false
     ]
   },
-  "hash": "c0c119524815d33dd5e781f3e525c248b47e6b311211b3cd74ce45db486e77cc"
+  "hash": "6d0324262bfb2d4ea03c0fb53354f78ba37a10ca73a55e8ac6879616537164f1"
 }
diff --git a/.sqlx/query-71894732375ed3dd056e4662459015847e03f419803362daed674162b5eef82d.json b/.sqlx/query-71894732375ed3dd056e4662459015847e03f419803362daed674162b5eef82d.json
new file mode 100644
index 0000000..fe760ce
--- /dev/null
+++ b/.sqlx/query-71894732375ed3dd056e4662459015847e03f419803362daed674162b5eef82d.json
@@ -0,0 +1,32 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT rs.id AS session_id, rs.status, u.email\n             FROM users u\n             JOIN rsvps r ON r.user_id = u.id\n             JOIN rsvp_sessions rs ON rs.id = r.session_id\n             WHERE rs.event_id = ?",
+  "describe": {
+    "columns": [
+      {
+        "name": "session_id",
+        "ordinal": 0,
+        "type_info": "Integer"
+      },
+      {
+        "name": "status",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "email",
+        "ordinal": 2,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "71894732375ed3dd056e4662459015847e03f419803362daed674162b5eef82d"
+}
diff --git a/.sqlx/query-72ed5154a55670ee5dd0036673e26cc94dde4ad07969e4e41b73bab927cba609.json b/.sqlx/query-72ed5154a55670ee5dd0036673e26cc94dde4ad07969e4e41b73bab927cba609.json
new file mode 100644
index 0000000..cc98631
--- /dev/null
+++ b/.sqlx/query-72ed5154a55670ee5dd0036673e26cc94dde4ad07969e4e41b73bab927cba609.json
@@ -0,0 +1,32 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT r.id as rsvp_id, r.spot_id, r.contribution\n             FROM rsvps r\n             JOIN rsvp_sessions rs ON rs.id = r.session_id\n             WHERE rs.event_id = ?\n               AND rs.status IN (?, ?, ?)",
+  "describe": {
+    "columns": [
+      {
+        "name": "rsvp_id",
+        "ordinal": 0,
+        "type_info": "Integer"
+      },
+      {
+        "name": "spot_id",
+        "ordinal": 1,
+        "type_info": "Integer"
+      },
+      {
+        "name": "contribution",
+        "ordinal": 2,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "72ed5154a55670ee5dd0036673e26cc94dde4ad07969e4e41b73bab927cba609"
+}
diff --git a/.sqlx/query-8ad04fb6a4301ca8d5b613604a8261243e25005b244f89fafcd5d30bce1632f6.json b/.sqlx/query-8ad04fb6a4301ca8d5b613604a8261243e25005b244f89fafcd5d30bce1632f6.json
new file mode 100644
index 0000000..db329d9
--- /dev/null
+++ b/.sqlx/query-8ad04fb6a4301ca8d5b613604a8261243e25005b244f89fafcd5d30bce1632f6.json
@@ -0,0 +1,98 @@
+{
+  "db_name": "SQLite",
+  "query": "INSERT INTO rsvp_sessions\n               (event_id, token, status, user_id, user_version, parent_session_id)\n               VALUES (?, ?, ?, ?, ?, ?)\n               RETURNING *",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Integer"
+      },
+      {
+        "name": "event_id",
+        "ordinal": 1,
+        "type_info": "Integer"
+      },
+      {
+        "name": "token",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "status",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "user_id",
+        "ordinal": 4,
+        "type_info": "Integer"
+      },
+      {
+        "name": "user_version",
+        "ordinal": 5,
+        "type_info": "Integer"
+      },
+      {
+        "name": "stripe_client_secret",
+        "ordinal": 6,
+        "type_info": "Text"
+      },
+      {
+        "name": "stripe_payment_intent_id",
+        "ordinal": 7,
+        "type_info": "Text"
+      },
+      {
+        "name": "stripe_charge_id",
+        "ordinal": 8,
+        "type_info": "Integer"
+      },
+      {
+        "name": "stripe_refund_id",
+        "ordinal": 9,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 10,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "updated_at",
+        "ordinal": 11,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "parent_session_id",
+        "ordinal": 12,
+        "type_info": "Integer"
+      },
+      {
+        "name": "stripe_checkout_session_id",
+        "ordinal": 13,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 6
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "8ad04fb6a4301ca8d5b613604a8261243e25005b244f89fafcd5d30bce1632f6"
+}
diff --git a/.sqlx/query-988cb36da7c06fd28a2a7ad3efe80a2da801646970f8298cabd0db2834d72334.json b/.sqlx/query-988cb36da7c06fd28a2a7ad3efe80a2da801646970f8298cabd0db2834d72334.json
new file mode 100644
index 0000000..e1e80ed
--- /dev/null
+++ b/.sqlx/query-988cb36da7c06fd28a2a7ad3efe80a2da801646970f8298cabd0db2834d72334.json
@@ -0,0 +1,32 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT r.id as rsvp_id, r.spot_id, r.contribution\n             FROM rsvps r\n             JOIN rsvp_sessions rs ON rs.id = r.session_id\n             WHERE rs.event_id = ? AND rs.user_id = ?\n               AND rs.status IN (?, ?, ?)",
+  "describe": {
+    "columns": [
+      {
+        "name": "rsvp_id",
+        "ordinal": 0,
+        "type_info": "Integer"
+      },
+      {
+        "name": "spot_id",
+        "ordinal": 1,
+        "type_info": "Integer"
+      },
+      {
+        "name": "contribution",
+        "ordinal": 2,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 5
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "988cb36da7c06fd28a2a7ad3efe80a2da801646970f8298cabd0db2834d72334"
+}
diff --git a/.sqlx/query-77284e1814e4ea7672ade202789dd3dcfd1d5c60b98e661ca1b298b04c19653b.json b/.sqlx/query-a7e807c5eccd6b6a64513cd9edcec0c4233a6cf5871f63a4bdacceab369bc303.json
similarity index 78%
rename from .sqlx/query-77284e1814e4ea7672ade202789dd3dcfd1d5c60b98e661ca1b298b04c19653b.json
rename to .sqlx/query-a7e807c5eccd6b6a64513cd9edcec0c4233a6cf5871f63a4bdacceab369bc303.json
index f6840a6..faae005 100644
--- a/.sqlx/query-77284e1814e4ea7672ade202789dd3dcfd1d5c60b98e661ca1b298b04c19653b.json
+++ b/.sqlx/query-a7e807c5eccd6b6a64513cd9edcec0c4233a6cf5871f63a4bdacceab369bc303.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT * FROM rsvp_sessions\n               WHERE user_id = ? AND event_id = ?\n                 AND status IN ('payment_pending', 'payment_confirmed')\n               LIMIT 1",
+  "query": "SELECT * FROM rsvp_sessions\n               WHERE user_id = ? AND event_id = ?\n                 AND status IN (?, ?)",
   "describe": {
     "columns": [
       {
@@ -62,10 +62,20 @@
         "name": "updated_at",
         "ordinal": 11,
         "type_info": "Datetime"
+      },
+      {
+        "name": "parent_session_id",
+        "ordinal": 12,
+        "type_info": "Integer"
+      },
+      {
+        "name": "stripe_checkout_session_id",
+        "ordinal": 13,
+        "type_info": "Text"
       }
     ],
     "parameters": {
-      "Right": 2
+      "Right": 4
     },
     "nullable": [
       false,
@@ -79,8 +89,10 @@
       true,
       true,
       false,
-      false
+      false,
+      true,
+      true
     ]
   },
-  "hash": "77284e1814e4ea7672ade202789dd3dcfd1d5c60b98e661ca1b298b04c19653b"
+  "hash": "a7e807c5eccd6b6a64513cd9edcec0c4233a6cf5871f63a4bdacceab369bc303"
 }
diff --git a/.sqlx/query-aa47682155f3c1b6d5186a1d54c3f0eba6aca9f0eea1c6cb5e732a2ccbecd6f5.json b/.sqlx/query-aa47682155f3c1b6d5186a1d54c3f0eba6aca9f0eea1c6cb5e732a2ccbecd6f5.json
new file mode 100644
index 0000000..1d4da7f
--- /dev/null
+++ b/.sqlx/query-aa47682155f3c1b6d5186a1d54c3f0eba6aca9f0eea1c6cb5e732a2ccbecd6f5.json
@@ -0,0 +1,98 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT * FROM rsvp_sessions\n               WHERE parent_session_id = ?\n                 AND status IN (?, ?, ?)\n               LIMIT 1",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Integer"
+      },
+      {
+        "name": "event_id",
+        "ordinal": 1,
+        "type_info": "Integer"
+      },
+      {
+        "name": "token",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "status",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "user_id",
+        "ordinal": 4,
+        "type_info": "Integer"
+      },
+      {
+        "name": "user_version",
+        "ordinal": 5,
+        "type_info": "Integer"
+      },
+      {
+        "name": "stripe_client_secret",
+        "ordinal": 6,
+        "type_info": "Text"
+      },
+      {
+        "name": "stripe_payment_intent_id",
+        "ordinal": 7,
+        "type_info": "Text"
+      },
+      {
+        "name": "stripe_charge_id",
+        "ordinal": 8,
+        "type_info": "Integer"
+      },
+      {
+        "name": "stripe_refund_id",
+        "ordinal": 9,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 10,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "updated_at",
+        "ordinal": 11,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "parent_session_id",
+        "ordinal": 12,
+        "type_info": "Integer"
+      },
+      {
+        "name": "stripe_checkout_session_id",
+        "ordinal": 13,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "aa47682155f3c1b6d5186a1d54c3f0eba6aca9f0eea1c6cb5e732a2ccbecd6f5"
+}
diff --git a/.sqlx/query-3d82179023e55e3899ad4cde3f700122bf54516baa25b9d7eebc5a970ec74145.json b/.sqlx/query-ae97a70f035b2e1bbb446e664f55a0cde5898c3caba11fbb18c0e707eba1760e.json
similarity index 69%
rename from .sqlx/query-3d82179023e55e3899ad4cde3f700122bf54516baa25b9d7eebc5a970ec74145.json
rename to .sqlx/query-ae97a70f035b2e1bbb446e664f55a0cde5898c3caba11fbb18c0e707eba1760e.json
index 975537f..4124ced 100644
--- a/.sqlx/query-3d82179023e55e3899ad4cde3f700122bf54516baa25b9d7eebc5a970ec74145.json
+++ b/.sqlx/query-ae97a70f035b2e1bbb446e664f55a0cde5898c3caba11fbb18c0e707eba1760e.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT\n                s.id,\n                s.token,\n                s.status,\n                s.created_at,\n                s.updated_at,\n                e.title AS event_title,\n                e.slug AS event_slug,\n                u.email AS user_email\n            FROM rsvp_sessions s\n            JOIN events e ON e.id = s.event_id\n            LEFT JOIN users u ON u.id = s.user_id\n            WHERE e.start > datetime('now', '-24 hours')\n            ORDER BY s.updated_at DESC",
+  "query": "SELECT\n                s.id,\n                s.token,\n                s.status,\n                s.created_at,\n                s.updated_at,\n                e.title AS event_title,\n                e.slug AS event_slug,\n                u.email AS user_email,\n                ps.token AS parent_token\n            FROM rsvp_sessions s\n            JOIN events e ON e.id = s.event_id\n            LEFT JOIN users u ON u.id = s.user_id\n            LEFT JOIN rsvp_sessions ps ON ps.id = s.parent_session_id\n            WHERE e.start > datetime('now', '-24 hours')\n            ORDER BY s.updated_at DESC",
   "describe": {
     "columns": [
       {
@@ -42,6 +42,11 @@
         "name": "user_email",
         "ordinal": 7,
         "type_info": "Text"
+      },
+      {
+        "name": "parent_token",
+        "ordinal": 8,
+        "type_info": "Text"
       }
     ],
     "parameters": {
@@ -55,8 +60,9 @@
       false,
       false,
       false,
+      true,
       true
     ]
   },
-  "hash": "3d82179023e55e3899ad4cde3f700122bf54516baa25b9d7eebc5a970ec74145"
+  "hash": "ae97a70f035b2e1bbb446e664f55a0cde5898c3caba11fbb18c0e707eba1760e"
 }
diff --git a/.sqlx/query-b4c62be45767038bd8a4bc1ae18f1563047d3602e275a3d7199e086e0d7af88c.json b/.sqlx/query-b4c62be45767038bd8a4bc1ae18f1563047d3602e275a3d7199e086e0d7af88c.json
index b15e4b3..d748b0f 100644
--- a/.sqlx/query-b4c62be45767038bd8a4bc1ae18f1563047d3602e275a3d7199e086e0d7af88c.json
+++ b/.sqlx/query-b4c62be45767038bd8a4bc1ae18f1563047d3602e275a3d7199e086e0d7af88c.json
@@ -62,6 +62,16 @@
         "name": "updated_at",
         "ordinal": 11,
         "type_info": "Datetime"
+      },
+      {
+        "name": "parent_session_id",
+        "ordinal": 12,
+        "type_info": "Integer"
+      },
+      {
+        "name": "stripe_checkout_session_id",
+        "ordinal": 13,
+        "type_info": "Text"
       }
     ],
     "parameters": {
@@ -79,7 +89,9 @@
       true,
       true,
       false,
-      false
+      false,
+      true,
+      true
     ]
   },
   "hash": "b4c62be45767038bd8a4bc1ae18f1563047d3602e275a3d7199e086e0d7af88c"
diff --git a/.sqlx/query-beae8fe5b9443d004e595b7240d20ac75666b604db733e5b2b95ed027ea158b5.json b/.sqlx/query-beae8fe5b9443d004e595b7240d20ac75666b604db733e5b2b95ed027ea158b5.json
index 8ab94f2..c1ad54a 100644
--- a/.sqlx/query-beae8fe5b9443d004e595b7240d20ac75666b604db733e5b2b95ed027ea158b5.json
+++ b/.sqlx/query-beae8fe5b9443d004e595b7240d20ac75666b604db733e5b2b95ed027ea158b5.json
@@ -62,6 +62,16 @@
         "name": "updated_at",
         "ordinal": 11,
         "type_info": "Datetime"
+      },
+      {
+        "name": "parent_session_id",
+        "ordinal": 12,
+        "type_info": "Integer"
+      },
+      {
+        "name": "stripe_checkout_session_id",
+        "ordinal": 13,
+        "type_info": "Text"
       }
     ],
     "parameters": {
@@ -79,7 +89,9 @@
       true,
       true,
       false,
-      false
+      false,
+      true,
+      true
     ]
   },
   "hash": "beae8fe5b9443d004e595b7240d20ac75666b604db733e5b2b95ed027ea158b5"
diff --git a/.sqlx/query-cb8ebe3dbe5eb6bcb86522afa953d96c436371c4aee43fd916de2f72198bffd3.json b/.sqlx/query-cb8ebe3dbe5eb6bcb86522afa953d96c436371c4aee43fd916de2f72198bffd3.json
deleted file mode 100644
index fa5e875..0000000
--- a/.sqlx/query-cb8ebe3dbe5eb6bcb86522afa953d96c436371c4aee43fd916de2f72198bffd3.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE rsvp_sessions\n             SET stripe_client_secret = ?, updated_at = CURRENT_TIMESTAMP\n             WHERE id = ?",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "cb8ebe3dbe5eb6bcb86522afa953d96c436371c4aee43fd916de2f72198bffd3"
-}
diff --git a/.sqlx/query-d5ed71da563d1e1ec855dc3043100b349da6f365d7c011616ee37d551169e3cc.json b/.sqlx/query-d5ed71da563d1e1ec855dc3043100b349da6f365d7c011616ee37d551169e3cc.json
index 01b8a8e..5ae78ae 100644
--- a/.sqlx/query-d5ed71da563d1e1ec855dc3043100b349da6f365d7c011616ee37d551169e3cc.json
+++ b/.sqlx/query-d5ed71da563d1e1ec855dc3043100b349da6f365d7c011616ee37d551169e3cc.json
@@ -62,6 +62,16 @@
         "name": "updated_at",
         "ordinal": 11,
         "type_info": "Datetime"
+      },
+      {
+        "name": "parent_session_id",
+        "ordinal": 12,
+        "type_info": "Integer"
+      },
+      {
+        "name": "stripe_checkout_session_id",
+        "ordinal": 13,
+        "type_info": "Text"
       }
     ],
     "parameters": {
@@ -79,7 +89,9 @@
       true,
       true,
       false,
-      false
+      false,
+      true,
+      true
     ]
   },
   "hash": "d5ed71da563d1e1ec855dc3043100b349da6f365d7c011616ee37d551169e3cc"
diff --git a/.sqlx/query-4d491f9fa61509759db0864629f2c38d4a895451f4a16bde94c601f5bee1c2e7.json b/.sqlx/query-d858f3afb9b9ad35ecb072bc29cba5f94c5ab223eb8c19b6d321f0bb4f99e4fd.json
similarity index 58%
rename from .sqlx/query-4d491f9fa61509759db0864629f2c38d4a895451f4a16bde94c601f5bee1c2e7.json
rename to .sqlx/query-d858f3afb9b9ad35ecb072bc29cba5f94c5ab223eb8c19b6d321f0bb4f99e4fd.json
index 14b0628..5d012cf 100644
--- a/.sqlx/query-4d491f9fa61509759db0864629f2c38d4a895451f4a16bde94c601f5bee1c2e7.json
+++ b/.sqlx/query-d858f3afb9b9ad35ecb072bc29cba5f94c5ab223eb8c19b6d321f0bb4f99e4fd.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT\n                s.name AS spot_name,\n                u.first_name AS \"first_name!: String\",\n                u.last_name AS \"last_name!: String\",\n                u.email,\n                u.phone,\n                r.contribution\n               FROM rsvps r\n               JOIN spots s ON s.id = r.spot_id\n               JOIN rsvp_sessions rs ON rs.id = r.session_id\n               JOIN users u ON u.id = r.user_id\n               WHERE rs.id = ?\n            ",
+  "query": "SELECT s.name AS spot_name,\n                    u.first_name AS \"first_name!: String\",\n                    u.last_name AS \"last_name!: String\",\n                    u.email, u.phone, r.contribution\n             FROM rsvps r\n             JOIN spots s ON s.id = r.spot_id\n             JOIN rsvp_sessions rs ON rs.id = r.session_id\n             JOIN users u ON u.id = r.user_id\n             WHERE rs.id = ?\n             ORDER BY r.created_at",
   "describe": {
     "columns": [
       {
@@ -46,5 +46,5 @@
       false
     ]
   },
-  "hash": "4d491f9fa61509759db0864629f2c38d4a895451f4a16bde94c601f5bee1c2e7"
+  "hash": "d858f3afb9b9ad35ecb072bc29cba5f94c5ab223eb8c19b6d321f0bb4f99e4fd"
 }
diff --git a/.sqlx/query-e8dd518fdf1f27e5bddb3f65ca4ae844e133f8c89919e705b945df6480c92044.json b/.sqlx/query-e8dd518fdf1f27e5bddb3f65ca4ae844e133f8c89919e705b945df6480c92044.json
index 56a0b0e..797de05 100644
--- a/.sqlx/query-e8dd518fdf1f27e5bddb3f65ca4ae844e133f8c89919e705b945df6480c92044.json
+++ b/.sqlx/query-e8dd518fdf1f27e5bddb3f65ca4ae844e133f8c89919e705b945df6480c92044.json
@@ -62,6 +62,16 @@
         "name": "updated_at",
         "ordinal": 11,
         "type_info": "Datetime"
+      },
+      {
+        "name": "parent_session_id",
+        "ordinal": 12,
+        "type_info": "Integer"
+      },
+      {
+        "name": "stripe_checkout_session_id",
+        "ordinal": 13,
+        "type_info": "Text"
       }
     ],
     "parameters": {
@@ -79,7 +89,9 @@
       true,
       true,
       false,
-      false
+      false,
+      true,
+      true
     ]
   },
   "hash": "e8dd518fdf1f27e5bddb3f65ca4ae844e133f8c89919e705b945df6480c92044"
diff --git a/.sqlx/query-fe154fdc6fa3fbb807b7b69d466728697892c95303df4d4712203c4800125099.json b/.sqlx/query-fe154fdc6fa3fbb807b7b69d466728697892c95303df4d4712203c4800125099.json
new file mode 100644
index 0000000..7f6cd59
--- /dev/null
+++ b/.sqlx/query-fe154fdc6fa3fbb807b7b69d466728697892c95303df4d4712203c4800125099.json
@@ -0,0 +1,62 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT r.id AS rsvp_id, r.user_id, s.name AS spot_name,\n                    u.first_name, u.last_name, u.email, u.phone, r.contribution\n             FROM rsvps r\n             JOIN spots s ON s.id = r.spot_id\n             JOIN rsvp_sessions rs ON rs.id = r.session_id\n             LEFT JOIN users u ON u.id = r.user_id\n             WHERE rs.event_id = ? AND rs.user_id = ?\n               AND rs.status IN (?, ?)\n             ORDER BY r.created_at",
+  "describe": {
+    "columns": [
+      {
+        "name": "rsvp_id",
+        "ordinal": 0,
+        "type_info": "Integer"
+      },
+      {
+        "name": "user_id",
+        "ordinal": 1,
+        "type_info": "Integer"
+      },
+      {
+        "name": "spot_name",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "first_name",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "last_name",
+        "ordinal": 4,
+        "type_info": "Text"
+      },
+      {
+        "name": "email",
+        "ordinal": 5,
+        "type_info": "Text"
+      },
+      {
+        "name": "phone",
+        "ordinal": 6,
+        "type_info": "Text"
+      },
+      {
+        "name": "contribution",
+        "ordinal": 7,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": [
+      false,
+      true,
+      false,
+      true,
+      true,
+      true,
+      true,
+      false
+    ]
+  },
+  "hash": "fe154fdc6fa3fbb807b7b69d466728697892c95303df4d4712203c4800125099"
+}
diff --git a/frontend/styles/events/attendees.css b/frontend/styles/events/attendees.css
index 3c2d9dd..7c611bb 100644
--- a/frontend/styles/events/attendees.css
+++ b/frontend/styles/events/attendees.css
@@ -12,10 +12,11 @@
 
   .table-wrapper {
     @apply overflow-x-scroll;
+    scrollbar-color: theme(colors.lsd-charcoal) transparent;
   }
 
   table.attendees {
-    @apply w-full text-xs whitespace-nowrap;
+    @apply text-xs whitespace-nowrap ml-auto mr-auto;
     border-spacing: 1rem 0;
     border-collapse: separate;
   }
@@ -44,7 +45,7 @@
   }
 
   .actions {
-    @apply flex flex-wrap gap-2 text-xs;
+    @apply flex gap-2 text-xs;
     a {
       @apply flex items-center gap-2 p-2 py-1;
     }
diff --git a/frontend/styles/events/rsvp_manage.css b/frontend/styles/events/rsvp_manage.css
index fee092a..96cc214 100644
--- a/frontend/styles/events/rsvp_manage.css
+++ b/frontend/styles/events/rsvp_manage.css
@@ -4,7 +4,7 @@
   height: 240px;
   transition: height 0.15s ease;
   @media (min-width: 768px) {
-    @apply w-full max-w-3xl cursor-default;
+    @apply w-full max-w-3xl;
     height: 384px;
   }
 
@@ -47,7 +47,8 @@
     a,
     button {
       @apply grow cursor-pointer rounded-lg py-4 text-center;
-      &.edit {
+      &.edit,
+      &.add-guests {
         @apply bg-lsd-charcoal;
       }
       &.contact {
diff --git a/frontend/templates/events/attendees.html b/frontend/templates/events/attendees.html
index 7c3969f..8668c44 100644
--- a/frontend/templates/events/attendees.html
+++ b/frontend/templates/events/attendees.html
@@ -29,6 +29,7 @@ <h1>{{ event.title }}</h1>
           <th class="email">Email</th>
           <th class="guest-of">Guest of</th>
           <th class="spot">Spot</th>
+          <th class="reservation">Reservation #</th>
           <th class="created">Created</th>
           <th class="checkin">Checkin</th>
           <th class="actions"></th>
@@ -53,6 +54,7 @@ <h1>{{ event.title }}</h1>
                 (${{ rsvp.contribution }})
               {% endif %}
             </td>
+            <td class="reservation">{{ rsvp.session_token|unwrap_or_empty }}</td>
             <td class="created">
               <time datetime="{{ rsvp.created_at }}">
                 {{ rsvp.created_at | format_datetime("%m/%d %-I:%M%p") }}
@@ -93,7 +95,20 @@ <h1>{{ event.title }}</h1>
               {% endif %}
             </td>
             <td class="actions">
-              {% if rsvp.guest_of.is_none() && !rsvp.is_manual %}
+              <button class="delete" title="Delete attendee">
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  width="20"
+                  height="20"
+                  viewBox="0 0 48 48"
+                >
+                  <path
+                    fill="currentColor"
+                    d="M20 10.5v.5h8v-.5a4 4 0 1 0-8 0Zm-2.5.5v-.5a6.5 6.5 0 1 1 13 0v.5h8.75a1.25 1.25 0 1 1 0 2.5h-2.077l-2.027 23.315A6.25 6.25 0 0 1 28.914 42H19.086a6.25 6.25 0 0 1-6.232-5.685L10.827 13H8.75a1.25 1.25 0 1 1 0-2.5h8.75Zm3.75 8.25a1.25 1.25 0 1 0-2.5 0v16a1.25 1.25 0 1 0 2.5 0v-16Zm7.5-1.25a1.25 1.25 0 0 0-1.25 1.25v16a1.25 1.25 0 1 0 2.5 0v-16a1.25 1.25 0 0 0-1.25-1.25Z"
+                  />
+                </svg>
+              </button>
+              {% if !rsvp.is_manual %}
                 <button class="refund" title="Refund purchase">
                   <svg
                     xmlns="http://www.w3.org/2000/svg"
@@ -108,19 +123,6 @@ <h1>{{ event.title }}</h1>
                   </svg>
                 </button>
               {% endif %}
-              <button class="delete" title="Delete attendee">
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  width="20"
-                  height="20"
-                  viewBox="0 0 48 48"
-                >
-                  <path
-                    fill="currentColor"
-                    d="M20 10.5v.5h8v-.5a4 4 0 1 0-8 0Zm-2.5.5v-.5a6.5 6.5 0 1 1 13 0v.5h8.75a1.25 1.25 0 1 1 0 2.5h-2.077l-2.027 23.315A6.25 6.25 0 0 1 28.914 42H19.086a6.25 6.25 0 0 1-6.232-5.685L10.827 13H8.75a1.25 1.25 0 1 1 0-2.5h8.75Zm3.75 8.25a1.25 1.25 0 1 0-2.5 0v16a1.25 1.25 0 1 0 2.5 0v-16Zm7.5-1.25a1.25 1.25 0 0 0-1.25 1.25v16a1.25 1.25 0 1 0 2.5 0v-16a1.25 1.25 0 0 0-1.25-1.25Z"
-                  />
-                </svg>
-              </button>
             </td>
           </tr>
         {% endfor %}
@@ -140,7 +142,7 @@ <h1>{{ event.title }}</h1>
 
     /* ---------- CSV Download ------------------------------------------------ */
     ui.download.addEventListener("click", () => {
-      const headers = ["Name", "Email", "Guest of", "Spot", "Created"];
+      const headers = ["Name", "Email", "Guest of", "Spot", "Reservation #", "Created"];
       const rows = ui
         .rows()
         .map((row) => [
@@ -148,6 +150,7 @@ <h1>{{ event.title }}</h1>
           row.querySelector(".email").textContent.trim(),
           row.querySelector(".guest-of").textContent.trim(),
           row.querySelector(".spot").textContent.trim(),
+          row.querySelector(".reservation").textContent.trim(),
           row.querySelector(".created time").textContent.trim(),
         ]);
 
@@ -179,7 +182,7 @@ <h1>{{ event.title }}</h1>
       // Handle refund button
       if (btn.classList.contains("refund")) {
         const name = row.querySelector(".name").textContent.trim();
-        if (!confirm(`Are you sure you want to refund ${name}'s contribution?\n\nThis will issue a full Stripe refund.`)) return;
+        if (!confirm(`Are you sure you want to refund all RSVPs by ${name}?\n\nThis will issue full Stripe refunds for all associated reservations.`)) return;
         try {
           const resp = await fetch(
             `/events/${slug}/attendees/${userId}/refund`,
diff --git a/frontend/templates/events/rsvp_attendees.html b/frontend/templates/events/rsvp_attendees.html
index 0a5ee1a..db99074 100644
--- a/frontend/templates/events/rsvp_attendees.html
+++ b/frontend/templates/events/rsvp_attendees.html
@@ -35,7 +35,9 @@ <h1>Who will be <em>attending</em>?</h1>
         <div class="attendee" data-rsvp-id="{{ attendee.rsvp_id }}">
           <div class="header">
             <p class="index">Guest #{{ loop.index }}</p>
-            {% if mode == AttendeesMode::Create && attendees.len() > 1 %}
+            {% if is_adding_guests %}
+              <input type="hidden" name="is_me" value="false" />
+            {% else if mode == AttendeesMode::Create && attendees.len() > 1 %}
               <label class="is-me">
                 <input
                   class="ext/input radio"
@@ -151,7 +153,7 @@ <h1>Who will be <em>attending</em>?</h1>
         </button>
       {% else %}
         <button id="next" class="next">
-          <span>Update</span>
+          <span>Save</span>
           <span>&rarr;</span>
         </button>
       {% endif %}
@@ -232,6 +234,7 @@ <h1>Who will be <em>attending</em>?</h1>
     }
 
     /* ---------- Handle "Me" selection and autofill ----------------- */
+    const isAddingGuests = parseInt(`{% if is_adding_guests %}1{% else %}0{% endif %}`);
     const updateIsMe = () => {
       // If no user, nothing to do but the radio itself
       if (!user) return;
@@ -269,10 +272,12 @@ <h1>Who will be <em>attending</em>?</h1>
       email.disabled = true;
       phone.disabled = !!user.phone;
     };
-    ui.form.addEventListener("change", (e) => {
-      if (user && e.target.name == "is_me") updateIsMe();
-    });
-    updateIsMe();
+    if (!isAddingGuests) {
+      updateIsMe();
+      ui.form.addEventListener("change", (e) => {
+        if (user && e.target.name == "is_me") updateIsMe();
+      });
+    }
 
     /* ---------- Next button ------------------------------------------------ */
     ui.next.addEventListener("click", async () => {
diff --git a/frontend/templates/events/rsvp_manage.html b/frontend/templates/events/rsvp_manage.html
index 9c0311e..286e880 100644
--- a/frontend/templates/events/rsvp_manage.html
+++ b/frontend/templates/events/rsvp_manage.html
@@ -82,6 +82,11 @@ <h1>Thank you.</h1>
           >Edit guests</a
         >
       {% endif %}
+      {% if can_add_guests %}
+        <form action="/e/{{ event.slug }}/rsvp/add-guests?reservation={{ session.token }}" method="POST">
+          <button class="add-guests">Add guests</button>
+        </form>
+      {% endif %}
       <a
         class="contact"
         href="{{ "" | mailto }}?subject=Help%20with%20reservation%20{{ session.token }}"
diff --git a/frontend/templates/events/rsvp_selection.html b/frontend/templates/events/rsvp_selection.html
index fb77350..9b44936 100644
--- a/frontend/templates/events/rsvp_selection.html
+++ b/frontend/templates/events/rsvp_selection.html
@@ -9,9 +9,16 @@
 {% endblock progress %}
 
 {% block back %}
-  <a id="back" href="/e/{{ event.slug }}">
-    <span>&larr;</span>
-  </a>
+  {% match parent_token %}
+    {% when Some with (token) %}
+      <a id="back" href="/e/{{ event.slug }}/rsvp/manage?reservation={{ token }}">
+        <span>&larr;</span>
+      </a>
+    {% when None %}
+      <a id="back" href="/e/{{ event.slug }}">
+        <span>&larr;</span>
+      </a>
+  {% endmatch %}
 {% endblock back %}
 
 {% block content %}
diff --git a/frontend/templates/events/sessions.html b/frontend/templates/events/sessions.html
index 5a6734b..48efe64 100644
--- a/frontend/templates/events/sessions.html
+++ b/frontend/templates/events/sessions.html
@@ -11,6 +11,7 @@ <h1>RSVP Sessions</h1>
         <tr>
           <th>Event</th>
           <th>Reservation #</th>
+          <th>Parent</th>
           <th>Status</th>
           <th>User</th>
           <th>RSVPs</th>
@@ -25,6 +26,7 @@ <h1>RSVP Sessions</h1>
           <tr data-id="{{ s.id }}">
             <td><a href="/e/{{ s.event_slug }}">{{ s.event_title }}</a></td>
             <td>{{ s.token }}</td>
+            <td>{{ s.parent_token|unwrap_or_empty }}</td>
             <td>{{ s.status }}</td>
             <td>{{ s.user_email|unwrap_or_empty }}</td>
             <td class="rsvps">
diff --git a/migrations/0039_add_parent_session_id.sql b/migrations/0039_add_parent_session_id.sql
new file mode 100644
index 0000000..531ea28
--- /dev/null
+++ b/migrations/0039_add_parent_session_id.sql
@@ -0,0 +1 @@
+ALTER TABLE rsvp_sessions ADD COLUMN parent_session_id INTEGER REFERENCES rsvp_sessions(id);
diff --git a/migrations/0040_add_stripe_checkout_session_id.sql b/migrations/0040_add_stripe_checkout_session_id.sql
new file mode 100644
index 0000000..a75a811
--- /dev/null
+++ b/migrations/0040_add_stripe_checkout_session_id.sql
@@ -0,0 +1 @@
+ALTER TABLE rsvp_sessions ADD COLUMN stripe_checkout_session_id TEXT;
diff --git a/src/app/events.rs b/src/app/events.rs
index 4312588..92471f1 100644
--- a/src/app/events.rs
+++ b/src/app/events.rs
@@ -19,6 +19,7 @@ pub fn add_routes(router: AppRouter) -> AppRouter {
                 .route("/e/{slug}/rsvp/attendees", get(rsvp::attendees_page).post(rsvp::attendees_form))
                 .route("/e/{slug}/rsvp/contribution", get(rsvp::contribution_page).post(rsvp::contribution_form))
                 .route("/e/{slug}/rsvp/manage", get(rsvp::manage_page)) // REMOVEME .post(rsvp::temp_delete))
+                .route("/e/{slug}/rsvp/add-guests", post(rsvp::add_guests_form))
                 .route("/e/{slug}/rsvp/edit", get(rsvp::edit_guests_page).post(rsvp::edit_guests_form))
         })
         .restricted_routes(User::ADMIN, |r| {
@@ -132,7 +133,7 @@ mod read {
         ) {
             bail_invalid!();
         }
-        session.delete(&state.db).await?;
+        session.delete(&state.db, &state.stripe).await?;
         Ok(Json(()))
     }
 }
@@ -928,16 +929,19 @@ mod edit {
         State(state): State<SharedAppState>, Path(path): Path<AttendeePath>,
     ) -> JsonResult<()> {
         let event = Event::lookup_by_slug(&state.db, &path.slug).await?.ok_or_else(not_found)?;
-        let session = RsvpSession::lookup_active_by_user_and_event(&state.db, path.user_id, event.id)
-            .await?
-            .ok_or_else(not_found)?;
+        let sessions = RsvpSession::list_for_user(&state.db, path.user_id, event.id).await?;
+        if sessions.is_empty() {
+            bail_not_found!();
+        }
 
-        if let Some(ref payment_intent_id) = session.stripe_payment_intent_id {
-            let refund_id = state.stripe.refund(payment_intent_id).await?;
-            session.set_refund_id(&state.db, &refund_id).await?;
-            session.set_status(&state.db, RsvpSession::REFUND_PENDING).await?;
-        } else {
-            session.set_status(&state.db, RsvpSession::REFUND_CONFIRMED).await?;
+        for session in &sessions {
+            if let Some(payment_intent_id) = &session.stripe_payment_intent_id {
+                let refund_id = state.stripe.refund(payment_intent_id).await?;
+                session.set_refund_id(&state.db, &refund_id).await?;
+                session.set_status(&state.db, RsvpSession::REFUND_PENDING).await?;
+            } else {
+                session.set_status(&state.db, RsvpSession::REFUND_CONFIRMED).await?;
+            }
         }
 
         Ok(Json(()))
@@ -1006,7 +1010,7 @@ mod rsvp {
     use crate::db::rsvp::{AttendeeRsvp, ContributionRsvp, CreateRsvp, EventRsvp, Rsvp};
     use crate::db::rsvp_session::RsvpSession;
     use crate::db::user::CreateUser;
-    use crate::utils::sentry;
+    use crate::utils::{sentry, stripe};
 
     #[derive(Template, WebTemplate)]
     #[template(path = "error_simple.html")]
@@ -1030,7 +1034,7 @@ mod rsvp {
     ) -> HtmlResult {
         let event = Event::lookup_by_slug(&state.db, &slug).await?.ok_or_else(not_found)?;
         if !validate::registration_open(&event) {
-            return goto::error_registration_closed(&state.db, &None).await;
+            return goto::error_registration_closed(&state.db, &state.stripe, &None).await;
         }
 
         match event.guest_list_id {
@@ -1054,7 +1058,7 @@ mod rsvp {
     pub async fn guestlist_page(State(state): State<SharedAppState>, Path(slug): Path<String>) -> HtmlResult {
         let event = Event::lookup_by_slug(&state.db, &slug).await?.ok_or_else(not_found)?;
         if !validate::registration_open(&event) {
-            return goto::error_registration_closed(&state.db, &None).await;
+            return goto::error_registration_closed(&state.db, &state.stripe, &None).await;
         }
 
         let _guest_list_id = event.guest_list_id.ok_or_else(invalid)?;
@@ -1080,7 +1084,7 @@ mod rsvp {
         let event = Event::lookup_by_slug(&state.db, &slug).await?.ok_or_else(not_found)?;
         let guest_list_id = event.guest_list_id.ok_or_else(invalid)?;
         if !validate::registration_open(&event) {
-            return goto::error_registration_closed(&state.db, &None).await;
+            return goto::error_registration_closed(&state.db, &state.stripe, &None).await;
         }
 
         // If they're on the list, there must be a corresponding user.
@@ -1104,8 +1108,9 @@ mod rsvp {
                 );
 
                 // Check for conflicts
+                let exclude_ids: Vec<i64> = session.as_ref().map(|s| vec![s.id]).unwrap_or_default();
                 let other_users =
-                    Rsvp::list_reserved_users_for_event(&state.db, &event, session.as_ref()).await?;
+                    Rsvp::list_reserved_users_for_event(&state.db, &event, &exclude_ids).await?;
                 use validate::Conflict;
                 if let Some(Conflict::Guest { email, status } | Conflict::Primary { email, status }) =
                     validate::no_conflicts(&other_users, &primary_user, &[])
@@ -1134,10 +1139,9 @@ mod rsvp {
     ) -> HtmlResult {
         let event = Event::lookup_by_slug(&state.db, &slug).await?.ok_or_else(not_found)?;
         if !validate::registration_open(&event) {
-            return goto::error_registration_closed(&state.db, &Some(session)).await;
+            return goto::error_registration_closed(&state.db, &state.stripe, &Some(session)).await;
         }
 
-        let user = session.user(&state.db).await?;
         let spots = Spot::list_for_event(&state.db, event.id).await?;
 
         let our_rsvps = Rsvp::list_for_session(&state.db, session.id).await?;
@@ -1148,12 +1152,21 @@ mod rsvp {
             our_contributions.insert(rsvp.spot_id, rsvp.contribution);
         }
 
-        let other_rsvps = Rsvp::list_reserved_for_event(&state.db, &event, &session).await?;
-        let limits = event.compute_limits(&user, &spots, &other_rsvps);
+        let all_rsvps = Rsvp::list_reserved_for_event(&state.db, &event, &session).await?;
+        let user_rsvps = Rsvp::list_user_reserved_for_event(&state.db, &event, session.user_id).await?;
+        let limits = event.compute_limits(&spots, &all_rsvps, &user_rsvps);
         if limits.total_limit == 0 {
-            return goto::error_at_capacity(&state.db, &None).await;
+            return goto::error_at_capacity(&state.db, &state.stripe, &None).await;
         }
-        let stats = Spot::stats(&spots, &other_rsvps);
+        let stats = Spot::stats(&spots, &all_rsvps);
+
+        let parent_token = match session.parent_session_id {
+            Some(parent_id) => {
+                let parent = RsvpSession::lookup_by_id(&state.db, parent_id).await?.unwrap();
+                Some(parent.token)
+            }
+            None => None,
+        };
 
         #[derive(Template, WebTemplate)]
         #[template(path = "events/rsvp_selection.html")]
@@ -1164,8 +1177,12 @@ mod rsvp {
             our_contributions: HashMap<i64, i64>,
             limits: EventLimits,
             stats: SpotStats,
+            parent_token: Option<String>,
         }
-        Ok(SelectionHtml { event, spots, our_qtys, our_contributions, limits, stats }.into_response())
+        Ok(
+            SelectionHtml { event, spots, our_qtys, our_contributions, limits, stats, parent_token }
+                .into_response(),
+        )
     }
 
     // Handle submission of the "Choose a contribution" form
@@ -1179,10 +1196,9 @@ mod rsvp {
     ) -> HtmlResult {
         let event = Event::lookup_by_slug(&state.db, &slug).await?.ok_or_else(not_found)?;
         if !validate::registration_open(&event) {
-            return goto::error_registration_closed(&state.db, &Some(session)).await;
+            return goto::error_registration_closed(&state.db, &state.stripe, &Some(session)).await;
         }
 
-        let user = session.user(&state.db).await?;
         let spots = Spot::list_for_event(&state.db, event.id).await?;
 
         // Parse and validate form
@@ -1192,13 +1208,14 @@ mod rsvp {
         })?;
 
         // Verify limits
-        let other_rsvps = Rsvp::list_reserved_for_event(&state.db, &event, &session).await?;
-        let limits = event.compute_limits(&user, &spots, &other_rsvps);
+        let all_rsvps = Rsvp::list_reserved_for_event(&state.db, &event, &session).await?;
+        let user_rsvps = Rsvp::list_user_reserved_for_event(&state.db, &event, session.user_id).await?;
+        let limits = event.compute_limits(&spots, &all_rsvps, &user_rsvps);
         if limits.total_limit == 0 {
-            return goto::error_at_capacity(&state.db, &None).await;
+            return goto::error_at_capacity(&state.db, &state.stripe, &None).await;
         }
         if !validate::within_limits(&limits, &our_rsvps) {
-            return goto::error_spot_taken(&state.db, &session).await;
+            return goto::error_spot_taken(&state.db, &state.stripe, &session).await;
         }
 
         // Delete any old and create new RSVPs
@@ -1237,6 +1254,7 @@ mod rsvp {
         session: RsvpSession,
         attendees: Vec<AttendeeRsvp>,
         price: i64,
+        is_adding_guests: bool,
     }
     // Display the "Who will be attending?" page after submitting spots
     pub async fn attendees_page(
@@ -1245,13 +1263,14 @@ mod rsvp {
         let user = session.user(&state.db).await?;
         let event = Event::lookup_by_slug(&state.db, &slug).await?.ok_or_else(not_found)?;
         if !validate::registration_open(&event) {
-            return goto::error_registration_closed(&state.db, &Some(session)).await;
+            return goto::error_registration_closed(&state.db, &state.stripe, &Some(session)).await;
         }
 
+        let is_adding_guests = session.parent_session_id.is_some();
         let attendees = Rsvp::list_for_attendees(&state.db, session.id).await?;
         let price = attendees.iter().map(|r| r.contribution).sum::<i64>();
         let mode = AttendeesMode::Create;
-        Ok(AttendeesHtml { mode, event, user, session, attendees, price }.into_response())
+        Ok(AttendeesHtml { mode, event, user, session, attendees, price, is_adding_guests }.into_response())
     }
 
     // Handle submission of the "Who will be attending?" form
@@ -1265,66 +1284,90 @@ mod rsvp {
     ) -> HtmlResult {
         let event = Event::lookup_by_slug(&state.db, &slug).await?.ok_or_else(not_found)?;
         if !validate::registration_open(&event) {
-            return goto::error_registration_closed(&state.db, &Some(our_session)).await;
+            return goto::error_registration_closed(&state.db, &state.stripe, &Some(our_session)).await;
         }
 
         let user = our_session.user(&state.db).await?;
         let spots = Spot::list_for_event(&state.db, event.id).await?;
         let our_rsvps = Rsvp::list_for_session(&state.db, our_session.id).await?;
 
+        let is_adding_guests = our_session.parent_session_id.is_some();
+
         // Parse and validate form
         let (primary_attendee, guest_attendees) =
-            parse::attendees_form(&user, &our_rsvps, &form.attendees).await.map_err(|e| {
-                sentry::report(format!("attendees_form(): session={} form={form:?}: {e}", our_session.token));
-                invalid()
-            })?;
-        // Collect all users
-        let primary_user = primary_attendee.user.clone();
-        let guest_users = guest_attendees.iter().map(|a| a.user.clone()).collect::<Vec<_>>();
-        let mut all_users = guest_users.clone();
-        all_users.push(primary_user.clone());
+            parse::attendees_form(&user, &our_rsvps, &form.attendees, is_adding_guests)
+                .await
+                .map_err(|e| {
+                    sentry::report(format!(
+                        "attendees_form(): session={} form={form:?}: {e}",
+                        our_session.token
+                    ));
+                    invalid()
+                })?;
 
         // Check for conflicts
-        let other_users = Rsvp::list_reserved_users_for_event(&state.db, &event, Some(&our_session)).await?;
-        if let Some(conflict) = validate::no_conflicts(&other_users, &primary_user, &guest_users) {
-            use validate::Conflict;
-            match conflict {
-                // For guest conflicts, always show an error.
-                Conflict::Guest { email, status } => return goto::error_conflict(&email, &status),
-                // For primary conflicts...
-                Conflict::Primary { email, status } => match status.as_str() {
-                    // If in a draft status, "take it over" by deleting the conflicting session
-                    RsvpSession::ATTENDEES | RsvpSession::SELECTION => {
-                        our_session.takeover_for_event(&state.db, &event, &email).await?;
-                    }
-                    // If reserved or refunded, show an error.
-                    RsvpSession::CONTRIBUTION
-                    | RsvpSession::PAYMENT_PENDING
-                    | RsvpSession::PAYMENT_CONFIRMED
-                    | RsvpSession::REFUND_PENDING
-                    | RsvpSession::REFUND_CONFIRMED => {
-                        return goto::error_conflict(&email, &status);
-                    }
-                    _ => unreachable!(),
-                },
+        let other_users = Rsvp::list_reserved_users_for_event(&state.db, &event, &[our_session.id]).await?;
+        if is_adding_guests {
+            // First check new guests' emails/phones don't overlap with existing family attendees
+            let user_id = our_session.user_id.unwrap();
+            let family_attendees = Rsvp::list_family_attendees(&state.db, &event, user_id).await?;
+            if let Some(value) = validate::no_family_overlaps(&family_attendees, &guest_attendees) {
+                return goto::error_guest_conflict(&value);
+            }
+
+            // When adding guests, only check guest conflicts (parent user is already reserved)
+            let dummy_primary =
+                CreateUser { first_name: None, last_name: None, email: String::new(), phone: None };
+            let guest_users = guest_attendees.iter().map(|a| a.user.clone()).collect::<Vec<_>>();
+            if let Some(conflict) = validate::no_conflicts(&other_users, &dummy_primary, &guest_users) {
+                use validate::Conflict;
+                match conflict {
+                    Conflict::Guest { email, status } => return goto::error_conflict(&email, &status),
+                    Conflict::Primary { .. } => unreachable!(),
+                }
+            }
+        } else {
+            let primary_user = primary_attendee.as_ref().unwrap().user.clone();
+            let guest_users = guest_attendees.iter().map(|a| a.user.clone()).collect::<Vec<_>>();
+            if let Some(conflict) = validate::no_conflicts(&other_users, &primary_user, &guest_users) {
+                use validate::Conflict;
+                match conflict {
+                    Conflict::Guest { email, status } => return goto::error_conflict(&email, &status),
+                    Conflict::Primary { email, status } => match status.as_str() {
+                        RsvpSession::ATTENDEES | RsvpSession::SELECTION => {
+                            our_session.takeover_for_event(&state.db, &event, &email).await?;
+                        }
+                        RsvpSession::CONTRIBUTION
+                        | RsvpSession::PAYMENT_PENDING
+                        | RsvpSession::PAYMENT_CONFIRMED
+                        | RsvpSession::REFUND_PENDING
+                        | RsvpSession::REFUND_CONFIRMED => {
+                            return goto::error_conflict(&email, &status);
+                        }
+                        _ => unreachable!(),
+                    },
+                }
             }
         }
 
         // Verify limits in case of preemption since `selection_form()` submission.
         // Once we transition to CONTRIBUTION, our rsvps spots are held.
-        let other_rsvps = Rsvp::list_reserved_for_event(&state.db, &event, &our_session).await?;
-        let limits = event.compute_limits(&user, &spots, &other_rsvps);
+        let all_rsvps = Rsvp::list_reserved_for_event(&state.db, &event, &our_session).await?;
+        let user_rsvps = Rsvp::list_user_reserved_for_event(&state.db, &event, our_session.user_id).await?;
+        let limits = event.compute_limits(&spots, &all_rsvps, &user_rsvps);
         if limits.total_limit == 0 {
-            return goto::error_at_capacity(&state.db, &None).await;
+            return goto::error_at_capacity(&state.db, &state.stripe, &None).await;
         }
         if !validate::within_limits(&limits, &our_rsvps) {
-            return goto::error_spot_taken(&state.db, &our_session).await;
+            return goto::error_spot_taken(&state.db, &state.stripe, &our_session).await;
         }
 
         // Create and store primary user on RsvpSession and Rsvp
-        let primary_user = User::update_or_create(&state.db, &primary_user).await?;
-        our_session.set_user(&state.db, &primary_user).await?;
-        Rsvp::set_user(&state.db, primary_attendee.rsvp_id, &primary_user).await?;
+        if let Some(primary_attendee) = &primary_attendee {
+            let primary_user = User::update_or_create(&state.db, &primary_attendee.user).await?;
+            our_session.set_user(&state.db, &primary_user).await?;
+            Rsvp::set_user(&state.db, primary_attendee.rsvp_id, &primary_user).await?;
+        }
 
         // Create and store users on guest Rsvps
         for ParsedAttendee { rsvp_id, user } in guest_attendees {
@@ -1342,7 +1385,7 @@ mod rsvp {
     ) -> HtmlResult {
         let event = Event::lookup_by_slug(&state.db, &slug).await?.ok_or_else(not_found)?;
         if !validate::registration_open(&event) {
-            return goto::error_registration_closed(&state.db, &Some(session)).await;
+            return goto::error_registration_closed(&state.db, &state.stripe, &Some(session)).await;
         }
 
         // A user is guaranteed to exist, since either:
@@ -1362,12 +1405,12 @@ mod rsvp {
             }
 
             if session.stripe_client_secret.is_none() {
-                let stripe_client_secret = state
+                let stripe::CheckoutSession { id, client_secret } = state
                     .stripe
                     .create_session(session.id, &user.email, line_items, return_url)
                     .await?;
 
-                session.set_stripe_client_secret(&state.db, &stripe_client_secret).await?;
+                session.set_stripe_checkout_session(&state.db, &id, &client_secret).await?;
             }
         }
 
@@ -1396,7 +1439,7 @@ mod rsvp {
     ) -> HtmlResult {
         let event = Event::lookup_by_slug(&state.db, &slug).await?.ok_or_else(not_found)?;
         if !validate::registration_open(&event) {
-            return goto::error_registration_closed(&state.db, &Some(session)).await;
+            return goto::error_registration_closed(&state.db, &state.stripe, &Some(session)).await;
         }
 
         let rsvps = Rsvp::list_for_contributions(&state.db, session.id).await?;
@@ -1406,6 +1449,18 @@ mod rsvp {
             _ => bail_invalid!(),
         }
 
+        // For child sessions: clear child cookie and redirect to child manage
+        // (manage_page handles child → parent resolution and status transition)
+        if session.parent_session_id.is_some() {
+            let clear = Cookie::build(("rsvp_child_session", ""))
+                .max_age(cookie::time::Duration::ZERO)
+                .domain(&config().app.domain)
+                .path(format!("/e/{slug}"))
+                .to_string();
+            let redirect = Redirect::to(&format!("/e/{slug}/rsvp/manage?reservation={}", session.token));
+            return Ok(([(header::SET_COOKIE, clear)], redirect).into_response());
+        }
+
         // Send confirmation email
         let user_id = session.user_id.ok_or_else(invalid)?;
         let user = User::lookup_by_id(&state.db, user_id).await?.ok_or_else(invalid)?;
@@ -1477,10 +1532,39 @@ mod rsvp {
         user: Option<User>, State(state): State<SharedAppState>, Query(query): Query<SessionQuery>,
         Path(slug): Path<String>,
     ) -> HtmlResult {
+        let event = Event::lookup_by_slug(&state.db, &slug).await?.ok_or_else(not_found)?;
         let Some(session) = RsvpSession::lookup_by_token(&state.db, &query.reservation).await? else {
-            let error = ErrorHtml { user: user.clone(), message: "Reservation not found.".into() };
-            return Ok(error.into_response());
+            return goto::error_rsvp_not_found();
+        };
+
+        // Child session tokens resolve to parent (Stripe return_url may use child token)
+        let session = match session.parent_session_id {
+            Some(parent_id) => {
+                // First transition child state
+                match session.status.as_str() {
+                    RsvpSession::SELECTION => {
+                        return goto::selection_page(&state.db, &None, &Some(session), &event).await;
+                    }
+                    RsvpSession::ATTENDEES => return goto::attendees_page(&event),
+                    // If you get here, we hold your spot and assume payment is coming later via webhook.
+                    // This is technically exploitable, but we could check for still unpaid rsvps at event start.
+                    RsvpSession::CONTRIBUTION => {
+                        session.set_status(&state.db, RsvpSession::PAYMENT_PENDING).await?
+                    }
+                    RsvpSession::PAYMENT_PENDING | RsvpSession::PAYMENT_CONFIRMED => {}
+                    RsvpSession::REFUND_PENDING | RsvpSession::REFUND_CONFIRMED => {
+                        return goto::error_rsvp_refunded();
+                    }
+                    _ => unreachable!(),
+                }
+                // Then resolve to parent session, and proceed as normal
+                RsvpSession::lookup_by_id(&state.db, parent_id)
+                    .await?
+                    .expect("invalid parent_session_id")
+            }
+            None => session,
         };
+
         let Some(user_id) = session.user_id else {
             bail_invalid!()
         };
@@ -1488,9 +1572,7 @@ mod rsvp {
             bail_invalid!()
         };
 
-        let event = Event::lookup_by_slug(&state.db, &slug).await?.ok_or_else(not_found)?;
-        let flyer = EventFlyer::lookup(&state.db, event.id).await?;
-
+        // Transition state
         match session.status.as_str() {
             RsvpSession::SELECTION => {
                 return goto::selection_page(&state.db, &None, &Some(session), &event).await;
@@ -1499,12 +1581,15 @@ mod rsvp {
             // If you get here, we hold your spot and assume payment is coming later via webhook.
             // This is technically exploitable, but we could check for still unpaid rsvps at event start.
             RsvpSession::CONTRIBUTION => session.set_status(&state.db, RsvpSession::PAYMENT_PENDING).await?,
-            // If pending or confirmed, you're good.
             RsvpSession::PAYMENT_PENDING | RsvpSession::PAYMENT_CONFIRMED => {}
-            RsvpSession::REFUND_PENDING | RsvpSession::REFUND_CONFIRMED => {}
+            RsvpSession::REFUND_PENDING | RsvpSession::REFUND_CONFIRMED => {
+                return goto::error_rsvp_refunded();
+            }
             _ => unreachable!(),
         }
 
+        let flyer = EventFlyer::lookup(&state.db, event.id).await?;
+
         if !Email::have_sent_confirmation(&state.db, session.event_id, user_id).await? {
             let email = Email::create_confirmation(&state.db, session.event_id, user_id).await?;
             let flyer = EventFlyer::lookup(&state.db, event.id).await?;
@@ -1613,9 +1698,22 @@ mod rsvp {
             }
         }
 
-        let rsvps = Rsvp::list_for_contributions(&state.db, session.id).await?;
+        // Aggregate RSVPs from parent + all confirmed children
+        let user_id = session.user_id.unwrap();
+        let rsvps = Rsvp::list_family_contributions(&state.db, &event, user_id).await?;
         let price = rsvps.iter().map(|r| r.contribution).sum::<i64>();
 
+        // Check if user can add more guests
+        let can_add_guests = if validate::registration_open(&event) {
+            let spots = Spot::list_for_event(&state.db, event.id).await?;
+            let all_rsvps = Rsvp::list_all_reserved_for_event(&state.db, &event).await?;
+            let user_rsvps = Rsvp::list_user_reserved_for_event(&state.db, &event, session.user_id).await?;
+            let limits = event.compute_limits(&spots, &all_rsvps, &user_rsvps);
+            limits.total_limit > 0
+        } else {
+            false
+        };
+
         #[derive(Template, WebTemplate)]
         #[template(path = "events/rsvp_manage.html")]
         struct ManageHtml {
@@ -1625,9 +1723,62 @@ mod rsvp {
             flyer: Option<EventFlyer>,
             rsvps: Vec<ContributionRsvp>,
             price: i64,
+            can_add_guests: bool,
+        }
+        let mut response =
+            ManageHtml { user, session, event, flyer, rsvps, price, can_add_guests }.into_response();
+
+        // Always clear stale child cookie on manage page
+        let clear = Cookie::build(("rsvp_child_session", ""))
+            .max_age(cookie::time::Duration::ZERO)
+            .domain(&config().app.domain)
+            .path(format!("/e/{slug}"))
+            .to_string();
+        response.headers_mut().append(header::SET_COOKIE, clear.parse().unwrap());
+
+        Ok(response)
+    }
+
+    /// Handle "Add guests" form submission from the manage page.
+    /// Creates or resumes a child session and redirects into the checkout flow.
+    pub async fn add_guests_form(
+        State(state): State<SharedAppState>, Query(query): Query<SessionQuery>, Path(slug): Path<String>,
+    ) -> HtmlResult {
+        let event = Event::lookup_by_slug(&state.db, &slug).await?.ok_or_else(not_found)?;
+        if !validate::registration_open(&event) {
+            return goto::error_registration_closed(&state.db, &state.stripe, &None).await;
+        }
+
+        // Lookup parent session and validate it's confirmed
+        let parent = RsvpSession::lookup_by_token(&state.db, &query.reservation)
+            .await?
+            .ok_or_else(not_found)?;
+        match parent.status.as_str() {
+            RsvpSession::PAYMENT_PENDING | RsvpSession::PAYMENT_CONFIRMED => {}
+            _ => bail_invalid!(),
+        }
+
+        // Check capacity
+        let spots = Spot::list_for_event(&state.db, event.id).await?;
+        let all_rsvps = Rsvp::list_all_reserved_for_event(&state.db, &event).await?;
+        let user_rsvps = Rsvp::list_user_reserved_for_event(&state.db, &event, parent.user_id).await?;
+        let limits = event.compute_limits(&spots, &all_rsvps, &user_rsvps);
+        if limits.total_limit == 0 {
+            return goto::error_at_capacity(&state.db, &state.stripe, &None).await;
         }
-        Ok(ManageHtml { user, session, event, flyer, rsvps, price }.into_response())
+
+        // Delete any existing draft child
+        if let Some(draft_child) = RsvpSession::lookup_draft_child(&state.db, parent.id).await? {
+            draft_child.delete(&state.db, &state.stripe).await?;
+        }
+        // And create a new one
+        let child = RsvpSession::create_child(&state.db, &parent).await?;
+
+        let cookie = child.child_cookie(&format!("/e/{slug}"));
+        let redirect_to = format!("/e/{slug}/rsvp/selection");
+        Ok(([(header::SET_COOKIE, cookie)], Redirect::to(&redirect_to)).into_response())
     }
+
     // Show the "Manage your RSVP" page.
     #[allow(unused)]
     pub async fn temp_delete(
@@ -1636,7 +1787,7 @@ mod rsvp {
         let session = RsvpSession::lookup_by_token(&state.db, &query.reservation)
             .await?
             .ok_or_else(not_found)?;
-        session.delete(&state.db).await?;
+        session.delete(&state.db, &state.stripe).await?;
         Ok(Redirect::to(&format!("/e/{slug}")).into_response())
     }
 
@@ -1647,13 +1798,23 @@ mod rsvp {
     ) -> HtmlResult {
         let event = Event::lookup_by_slug(&state.db, &slug).await?.ok_or_else(not_found)?;
         let Some(session) = RsvpSession::lookup_by_token(&state.db, &query.reservation).await? else {
-            // A nonexistant session should never reach /edit, and a confirmed session should never be deleted.
             bail_not_found!();
         };
 
-        let rsvps = Rsvp::list_for_attendees(&state.db, session.id).await?;
+        // Load RSVPs from parent + all confirmed children
+        let user_id = session.user_id.unwrap();
+        let rsvps = Rsvp::list_family_attendees(&state.db, &event, user_id).await?;
         let mode = AttendeesMode::Edit;
-        Ok(AttendeesHtml { mode, event, user, session, attendees: rsvps, price: 0 }.into_response())
+        Ok(AttendeesHtml {
+            mode,
+            event,
+            user,
+            session,
+            attendees: rsvps,
+            price: 0,
+            is_adding_guests: false,
+        }
+        .into_response())
     }
     pub async fn edit_guests_form(
         State(state): State<SharedAppState>, Query(query): Query<SessionQuery>, Path(slug): Path<String>,
@@ -1664,21 +1825,31 @@ mod rsvp {
             .await?
             .ok_or_else(invalid)?;
         let user = session.user(&state.db).await?;
-        let our_rsvps = Rsvp::list_for_session(&state.db, session.id).await?;
+
+        // Collect rsvps from parent + all confirmed children for validation
+        let user_id = session.user_id.unwrap();
+        let our_rsvps = Rsvp::list_family_rsvps(&state.db, &event, user_id).await?;
 
         // Parse and validate form. NOTE that we only allow editing guest info.
         // The primary_attendee form is disabled on the frontend, and changes are ignored here.
         let (primary_attendee, guest_attendees) =
-            parse::attendees_form(&user, &our_rsvps, &form.attendees).await.map_err(|e| {
-                sentry::report(format!("edit_form(): session={} form={form:?}: {e}", session.token));
-                tracing::error!("{}", format!("edit_form(): session={} form={form:?}: {e}", session.token));
-                invalid()
-            })?;
+            parse::attendees_form(&user, &our_rsvps, &form.attendees, false)
+                .await
+                .map_err(|e| {
+                    sentry::report(format!("edit_form(): session={} form={form:?}: {e}", session.token));
+                    tracing::error!(
+                        "{}",
+                        format!("edit_form(): session={} form={form:?}: {e}", session.token)
+                    );
+                    invalid()
+                })?;
 
         // Check for conflicts
-        let primary_user = primary_attendee.user.clone();
+        let primary_user = primary_attendee.unwrap().user.clone();
         let guest_users = guest_attendees.iter().map(|a| a.user.clone()).collect::<Vec<_>>();
-        let other_users = Rsvp::list_reserved_users_for_event(&state.db, &event, Some(&session)).await?;
+        let family_sessions = RsvpSession::list_for_user(&state.db, user_id, event.id).await?;
+        let family_ids: Vec<i64> = family_sessions.iter().map(|s| s.id).collect();
+        let other_users = Rsvp::list_reserved_users_for_event(&state.db, &event, &family_ids).await?;
         use validate::Conflict;
         if let Some(Conflict::Guest { email, status } | Conflict::Primary { email, status }) =
             validate::no_conflicts(&other_users, &primary_user, &guest_users)
@@ -1699,13 +1870,24 @@ mod rsvp {
     #[rustfmt::skip]
     pub mod goto {
         use super::*;
+        use crate::utils::stripe::Stripe;
 
         pub fn guestlist_page(event: &Event) -> HtmlResult {
             Ok(Redirect::to(&format!("/e/{}/rsvp/guestlist", &event.slug)).into_response())
         }
         pub async fn selection_page(db: &Db, user: &Option<User>, session: &Option<RsvpSession>, event: &Event) -> HtmlResult {
-            let headers = RsvpSession::get_or_create(db, user, session, event.id).await?;
-            Ok((headers, Redirect::to(&format!("/e/{}/rsvp/selection", &event.slug))).into_response())
+            let redirect = Redirect::to(&format!("/e/{}/rsvp/selection", &event.slug));
+            match session {
+                Some(_) => Ok(redirect.into_response()),
+                None => {
+                    let session = RsvpSession::create(db, event.id, user).await?;
+
+                    let cookie = session.cookie(&format!("/e/{}", event.slug));
+                    let header = (header::SET_COOKIE, cookie);
+
+                    Ok(([header], redirect).into_response())
+                }
+            }
         }
         pub fn attendees_page(event: &Event) -> HtmlResult {
             Ok(Redirect::to(&format!("/e/{}/rsvp/attendees", &event.slug)).into_response())
@@ -1721,9 +1903,9 @@ mod rsvp {
             let error = ErrorHtml { user: None, message: "Sorry, you're not on the list.".into() };
             Ok(error.into_response())
         }
-        pub async fn error_at_capacity(db: &Db, session: &Option<RsvpSession>) -> HtmlResult {
+        pub async fn error_at_capacity(db: &Db, stripe: &Stripe, session: &Option<RsvpSession>) -> HtmlResult {
             if let Some(session) = session {
-                session.delete(db).await?;
+                session.delete(db, stripe).await?;
             }
             Ok(MessageHtml {
                 user: None,
@@ -1732,9 +1914,9 @@ mod rsvp {
             }
             .into_response())
         }
-        pub async fn error_registration_closed(db: &Db, session: &Option<RsvpSession>) -> HtmlResult {
+        pub async fn error_registration_closed(db: &Db, stripe: &Stripe, session: &Option<RsvpSession>) -> HtmlResult {
             if let Some(session) = session {
-                session.delete(db).await?;
+                session.delete(db, stripe).await?;
             }
             Ok(MessageHtml {
                 user: None,
@@ -1743,8 +1925,8 @@ mod rsvp {
             }
             .into_response())
         }
-        pub async fn error_spot_taken(db: &Db, session: &RsvpSession) -> HtmlResult {
-            session.delete(db).await?;
+        pub async fn error_spot_taken(db: &Db, stripe: &Stripe, session: &RsvpSession) -> HtmlResult {
+            session.delete(db, stripe).await?;
             Ok(ErrorHtml {
                 user: None,
                 message: "Sorry, a spot you selected was taken. Please try again.".to_string(),
@@ -1752,22 +1934,45 @@ mod rsvp {
             .into_response())
         }
         pub fn error_conflict(email: &str, status: &str) -> HtmlResult {
-            let wording = match status {
-                RsvpSession::SELECTION | RsvpSession::ATTENDEES | RsvpSession::CONTRIBUTION => "is currently in the process of RSVPing",
-                RsvpSession::PAYMENT_PENDING | RsvpSession::PAYMENT_CONFIRMED => "has already RSVPed",
-                RsvpSession::REFUND_PENDING | RsvpSession::REFUND_CONFIRMED => "has been refunded",
+            let message = match status {
+                RsvpSession::SELECTION | RsvpSession::ATTENDEES | RsvpSession::CONTRIBUTION =>
+                    format!("{email} is currently in the process of RSVPing for this event."),
+                RsvpSession::PAYMENT_PENDING | RsvpSession::PAYMENT_CONFIRMED =>
+                    format!("{email} has already RSVPed for this event."),
+                RsvpSession::REFUND_PENDING | RsvpSession::REFUND_CONFIRMED =>
+                    format!("{email} has already received a refund for this event."),
                 _ => unreachable!()
             };
             Ok(ErrorHtml {
-                message: format!("Someone {wording} for {email}."),
+                message,
                 user: None,
             }.into_response())
         }
+        pub fn error_guest_conflict(value: &str) -> HtmlResult {
+            Ok(ErrorHtml {
+                user: None,
+                message: format!("{value} is already in use by another guest in your reservation."),
+            }.into_response())
+        }
+        pub fn error_rsvp_not_found() -> HtmlResult {
+            let error = ErrorHtml {
+                user: None,
+                message: "Reservation not found.".into()
+            };
+            Ok(error.into_response())
+        }
+        pub fn error_rsvp_refunded() -> HtmlResult {
+            let error = ErrorHtml {
+                user: None,
+                message: "Your reservation has been refunded.".into()
+            };
+            Ok(error.into_response())
+        }
     }
 
     mod validate {
         use super::*;
-        use crate::db::rsvp::UserRsvp;
+        use crate::db::rsvp::{AttendeeRsvp, UserRsvp};
 
         pub fn registration_open(event: &Event) -> bool {
             !event.closed
@@ -1814,6 +2019,26 @@ mod rsvp {
             }
             None
         }
+
+        /// Check that new guests don't duplicate email/phone of existing family attendees.
+        /// Returns the conflicting value (email or phone) if found.
+        pub fn no_family_overlaps(
+            existing: &[AttendeeRsvp], new_guests: &[parse::ParsedAttendee],
+        ) -> Option<String> {
+            let emails: HashSet<&str> = existing.iter().filter_map(|a| a.email.as_deref()).collect();
+            let phones: HashSet<&str> = existing.iter().filter_map(|a| a.phone.as_deref()).collect();
+            for guest in new_guests {
+                if emails.contains(guest.user.email.as_str()) {
+                    return Some(guest.user.email.clone());
+                }
+                if let Some(ref phone) = guest.user.phone
+                    && phones.contains(phone.as_str())
+                {
+                    return Some(phone.clone());
+                }
+            }
+            None
+        }
     }
 
     mod parse {
@@ -1903,8 +2128,8 @@ mod rsvp {
             DuplicatePhone { phone: String },
         }
         pub async fn attendees_form(
-            session_user: &Option<User>, rsvps: &[EventRsvp], attendees: &str,
-        ) -> Result<(ParsedAttendee, Vec<ParsedAttendee>), ParseAttendeesError> {
+            session_user: &Option<User>, rsvps: &[EventRsvp], attendees: &str, is_adding_guests: bool,
+        ) -> Result<(Option<ParsedAttendee>, Vec<ParsedAttendee>), ParseAttendeesError> {
             type Error = ParseAttendeesError;
 
             #[derive(Debug, serde::Deserialize)]
@@ -1967,10 +2192,10 @@ mod rsvp {
                     guest_attendees.push(attendee);
                 }
             }
-            // Ensure exactle one primary attendee.
-            let Some(primary_attendee) = primary_attendee else {
+            // Ensure exactly one primary attendee (unless adding guests to an existing session).
+            if !is_adding_guests && primary_attendee.is_none() {
                 return Err(Error::MissingPrimary);
-            };
+            }
 
             // Ensure no remaining rsvps without an attendee specified
             if !remaining_rsvps.is_empty() {
@@ -1999,18 +2224,33 @@ mod rsvp {
 }
 
 pub fn add_middleware(router: AxumRouter, state: SharedAppState) -> AxumRouter {
-    /// Middleware layer to lookup add an `RsvpSession` to the request if an rsvp_session token is present.
-    /// Also blocks RSVP pages (except manage/edit) when registration is closed.
+    /// Middleware layer to resolve an `RsvpSession` from cookies and insert it into the request.
+    /// Prefers `rsvp_child_session` over `rsvp_session` so the add-guests flow takes priority.
+    /// Cleans up stale child cookies (session expired/deleted) by appending a Max-Age=0 Set-Cookie.
     pub async fn rsvp_session_middleware(
         State(state): State<SharedAppState>, cookies: CookieJar, mut request: Request, next: Next,
     ) -> HtmlResult {
-        let is_rsvp_path = request.uri().path().contains("/rsvp");
+        let path = request.uri().path().to_owned();
+        let is_rsvp_path = path.contains("/rsvp");
+        let mut stale_child_cookie = false;
+
+        // Try child session first (add-guests flow takes priority)
+        let mut resolved = false;
+        if let Some(token) = cookies.get("rsvp_child_session") {
+            match RsvpSession::lookup_by_token(&state.db, token.value()).await? {
+                Some(session) => {
+                    request.extensions_mut().insert(session);
+                    resolved = true;
+                }
+                None => stale_child_cookie = true,
+            }
+        }
 
-        if let Some(token) = cookies.get("rsvp_session")
+        // Fall back to main session
+        if !resolved
+            && let Some(token) = cookies.get("rsvp_session")
             && let Some(session) = RsvpSession::lookup_by_token(&state.db, token.value()).await?
         {
-            // Don't remove stale cookies if session is not found (e.g. it expired).
-            // They will be overwritten when a new session is created.
             request.extensions_mut().insert(session);
         }
 
@@ -2022,6 +2262,16 @@ pub fn add_middleware(router: AxumRouter, state: SharedAppState) -> AxumRouter {
                 .insert(header::CACHE_CONTROL, HeaderValue::from_static("no-store"));
         }
 
+        // Clean up stale child cookie (path must match the path it was set on)
+        if stale_child_cookie && let Some(slug) = path.strip_prefix("/e/").and_then(|s| s.split('/').next()) {
+            let clear = Cookie::build(("rsvp_child_session", ""))
+                .max_age(cookie::time::Duration::ZERO)
+                .domain(&config().app.domain)
+                .path(format!("/e/{slug}"))
+                .to_string();
+            res.headers_mut().append(header::SET_COOKIE, clear.parse().unwrap());
+        }
+
         Ok(res)
     }
     router.layer(axum::middleware::from_fn_with_state(state, rsvp_session_middleware))
diff --git a/src/db/event.rs b/src/db/event.rs
index d9408db..e95ad30 100644
--- a/src/db/event.rs
+++ b/src/db/event.rs
@@ -403,26 +403,37 @@ impl Event {
 
 impl Event {
     /// Calculate number of spots available of each type for this event.
-    pub fn compute_limits(&self, user: &Option<User>, spots: &[Spot], rsvps: &[EventRsvp]) -> EventLimits {
+    /// `all_rsvps` = all reserved RSVPs counted toward capacity (may or may not include current session).
+    /// `user_rsvps` = this user's reserved RSVPs across all their sessions (for per-person limits).
+    pub fn compute_limits(
+        &self, spots: &[Spot], all_rsvps: &[EventRsvp], user_rsvps: &[EventRsvp],
+    ) -> EventLimits {
         // Overall event limits
-        let capacity_limit = self.capacity - rsvps.len() as i64;
+        let capacity_limit = self.capacity - all_rsvps.len() as i64;
         let per_person_limit = self.spots_per_person.unwrap_or(i64::MAX);
-        let this_user_limit = user.as_ref().map(|_| i64::MAX).unwrap_or(i64::MAX); // TODO
-        let limit = capacity_limit.min(per_person_limit).min(this_user_limit);
+        let this_person_limit = per_person_limit - user_rsvps.len() as i64;
+        let limit = capacity_limit.min(this_person_limit);
 
         // Count rsvps per spot
         let mut spot_num_rsvps: HashMap<i64, i64> = Default::default();
-        for rsvp in rsvps {
+        for rsvp in all_rsvps {
             *spot_num_rsvps.entry(rsvp.spot_id).or_default() += 1;
         }
 
+        // Count user's own rsvps per spot
+        let mut user_spot_counts: HashMap<i64, i64> = Default::default();
+        for rsvp in user_rsvps {
+            *user_spot_counts.entry(rsvp.spot_id).or_default() += 1;
+        }
+
         // Per-spot limits
         let mut sum_spot_limits = 0;
         let mut spot_limits = HashMap::default();
         for spot in spots {
             let spot_total_limit = spot.qty_total - spot_num_rsvps.get(&spot.id).unwrap_or(&0);
             let spot_per_person_limit = spot.qty_per_person;
-            let spot_limit = spot_total_limit.min(spot_per_person_limit);
+            let spot_this_person_limit = spot_per_person_limit - user_spot_counts.get(&spot.id).unwrap_or(&0);
+            let spot_limit = spot_total_limit.min(spot_this_person_limit);
 
             sum_spot_limits += spot_limit;
             spot_limits.insert(spot.id, spot_limit);
diff --git a/src/db/rsvp.rs b/src/db/rsvp.rs
index 6698616..bcd850a 100644
--- a/src/db/rsvp.rs
+++ b/src/db/rsvp.rs
@@ -60,6 +60,12 @@ pub struct UserRsvp {
     pub email: String,
 }
 
+struct UserRsvpRow {
+    session_id: i64,
+    status: String,
+    email: String,
+}
+
 pub struct AdminAttendeesRsvp {
     pub user_id: i64,
     pub first_name: String,
@@ -75,6 +81,7 @@ pub struct AdminAttendeesRsvp {
     pub checkin_at: Option<NaiveDateTime>,
 
     pub session_id: i64,
+    pub session_token: Option<String>,
     pub status: String,
 }
 
@@ -102,6 +109,7 @@ impl Rsvp {
                 r.checkin_at,
 
                 rs.id AS "session_id!: i64",
+                rs.token AS session_token,
                 rs.status AS "status!"
             FROM rsvps r
             JOIN rsvp_sessions rs ON rs.id = r.session_id
@@ -128,6 +136,7 @@ impl Rsvp {
                 mr.checkin_at,
 
                 0 AS "session_id!: i64",
+                NULL AS session_token,
                 'manual' AS "status!"
             FROM manual_rsvps mr
             JOIN users u ON u.id = mr.user_id
@@ -159,21 +168,14 @@ impl Rsvp {
     pub async fn list_for_attendees(db: &Db, session_id: i64) -> Result<Vec<AttendeeRsvp>> {
         Ok(sqlx::query_as!(
             AttendeeRsvp,
-            r#"SELECT
-                r.id AS rsvp_id,
-                r.user_id,
-                s.name AS spot_name,
-                u.first_name,
-                u.last_name,
-                u.email,
-                u.phone,
-                r.contribution
-               FROM rsvps r
-               JOIN spots s ON s.id = r.spot_id
-               JOIN rsvp_sessions rs ON rs.id = r.session_id
-               LEFT JOIN users u ON u.id = r.user_id
-               WHERE rs.id = ?
-            "#,
+            r#"SELECT r.id AS rsvp_id, r.user_id, s.name AS spot_name,
+                    u.first_name, u.last_name, u.email, u.phone, r.contribution
+             FROM rsvps r
+             JOIN spots s ON s.id = r.spot_id
+             JOIN rsvp_sessions rs ON rs.id = r.session_id
+             LEFT JOIN users u ON u.id = r.user_id
+             WHERE rs.id = ?
+             ORDER BY r.created_at"#,
             session_id
         )
         .fetch_all(db)
@@ -183,25 +185,88 @@ impl Rsvp {
     pub async fn list_for_contributions(db: &Db, session_id: i64) -> Result<Vec<ContributionRsvp>> {
         Ok(sqlx::query_as!(
             ContributionRsvp,
-            r#"SELECT
-                s.name AS spot_name,
-                u.first_name AS "first_name!: String",
-                u.last_name AS "last_name!: String",
-                u.email,
-                u.phone,
-                r.contribution
-               FROM rsvps r
-               JOIN spots s ON s.id = r.spot_id
-               JOIN rsvp_sessions rs ON rs.id = r.session_id
-               JOIN users u ON u.id = r.user_id
-               WHERE rs.id = ?
-            "#,
+            r#"SELECT s.name AS spot_name,
+                    u.first_name AS "first_name!: String",
+                    u.last_name AS "last_name!: String",
+                    u.email, u.phone, r.contribution
+             FROM rsvps r
+             JOIN spots s ON s.id = r.spot_id
+             JOIN rsvp_sessions rs ON rs.id = r.session_id
+             JOIN users u ON u.id = r.user_id
+             WHERE rs.id = ?
+             ORDER BY r.created_at"#,
             session_id
         )
         .fetch_all(db)
         .await?)
     }
 
+    /// List attendee info for all RSVPs across a user's active sessions for an event.
+    pub async fn list_family_attendees(db: &Db, event: &Event, user_id: i64) -> Result<Vec<AttendeeRsvp>> {
+        Ok(sqlx::query_as!(
+            AttendeeRsvp,
+            r#"SELECT r.id AS rsvp_id, r.user_id, s.name AS spot_name,
+                    u.first_name, u.last_name, u.email, u.phone, r.contribution
+             FROM rsvps r
+             JOIN spots s ON s.id = r.spot_id
+             JOIN rsvp_sessions rs ON rs.id = r.session_id
+             LEFT JOIN users u ON u.id = r.user_id
+             WHERE rs.event_id = ? AND rs.user_id = ?
+               AND rs.status IN (?, ?)
+             ORDER BY r.created_at"#,
+            event.id,
+            user_id,
+            RsvpSession::PAYMENT_PENDING,
+            RsvpSession::PAYMENT_CONFIRMED,
+        )
+        .fetch_all(db)
+        .await?)
+    }
+
+    /// List contribution info for all RSVPs across a user's active sessions for an event.
+    pub async fn list_family_contributions(
+        db: &Db, event: &Event, user_id: i64,
+    ) -> Result<Vec<ContributionRsvp>> {
+        Ok(sqlx::query_as!(
+            ContributionRsvp,
+            r#"SELECT s.name AS spot_name,
+                    u.first_name AS "first_name!: String",
+                    u.last_name AS "last_name!: String",
+                    u.email, u.phone, r.contribution
+             FROM rsvps r
+             JOIN spots s ON s.id = r.spot_id
+             JOIN rsvp_sessions rs ON rs.id = r.session_id
+             JOIN users u ON u.id = r.user_id
+             WHERE rs.event_id = ? AND rs.user_id = ?
+               AND rs.status IN (?, ?)
+             ORDER BY r.created_at"#,
+            event.id,
+            user_id,
+            RsvpSession::PAYMENT_PENDING,
+            RsvpSession::PAYMENT_CONFIRMED,
+        )
+        .fetch_all(db)
+        .await?)
+    }
+
+    /// List all RSVPs for a user's family (parent + children) for an event.
+    pub async fn list_family_rsvps(db: &Db, event: &Event, user_id: i64) -> Result<Vec<EventRsvp>> {
+        Ok(sqlx::query_as!(
+            EventRsvp,
+            "SELECT r.id as rsvp_id, r.spot_id, r.contribution
+             FROM rsvps r
+             JOIN rsvp_sessions rs ON rs.id = r.session_id
+             WHERE rs.event_id = ? AND rs.user_id = ?
+               AND rs.status IN (?, ?)",
+            event.id,
+            user_id,
+            RsvpSession::PAYMENT_PENDING,
+            RsvpSession::PAYMENT_CONFIRMED,
+        )
+        .fetch_all(db)
+        .await?)
+    }
+
     /// List reserved spots for an event, excluding a specific session.
     /// Only includes rsvps from sessions at CONTRIBUTION status or later.
     pub async fn list_reserved_for_event(
@@ -225,31 +290,67 @@ impl Rsvp {
         .await?)
     }
 
-    pub async fn list_reserved_users_for_event(
-        db: &Db, event: &Event, session: Option<&RsvpSession>,
-    ) -> Result<Vec<UserRsvp>> {
-        let session_id = session.map(|s| s.id).unwrap_or(0);
+    /// List the user's reserved RSVPs for an event across all their sessions (for per-person limits).
+    /// Only includes rsvps from sessions at CONTRIBUTION status or later.
+    pub async fn list_user_reserved_for_event(
+        db: &Db, event: &Event, user_id: Option<i64>,
+    ) -> Result<Vec<EventRsvp>> {
+        let Some(user_id) = user_id else { return Ok(vec![]) };
         Ok(sqlx::query_as!(
-            UserRsvp,
-            r#"SELECT rs.status, u.email
-               FROM users u
-               JOIN rsvps r ON r.user_id = u.id
-               JOIN rsvp_sessions rs ON rs.id = r.session_id
-               WHERE rs.event_id = ?
-                 AND rs.id != ?
-            "#,
+            EventRsvp,
+            "SELECT r.id as rsvp_id, r.spot_id, r.contribution
+             FROM rsvps r
+             JOIN rsvp_sessions rs ON rs.id = r.session_id
+             WHERE rs.event_id = ? AND rs.user_id = ?
+               AND rs.status IN (?, ?, ?)",
             event.id,
-            session_id,
+            user_id,
+            RsvpSession::CONTRIBUTION,
+            RsvpSession::PAYMENT_PENDING,
+            RsvpSession::PAYMENT_CONFIRMED,
         )
         .fetch_all(db)
         .await?)
     }
 
-    // pub async fn lookup_by_id(db: &Db, id: i64) -> Result<Option<Rsvp>> {
-    //     Ok(sqlx::query_as!(Self, r#"SELECT * FROM rsvps WHERE id = ?"#, id)
-    //         .fetch_optional(db)
-    //         .await?)
-    // }
+    /// List all reserved spots for an event (no exclusion).
+    pub async fn list_all_reserved_for_event(db: &Db, event: &Event) -> Result<Vec<EventRsvp>> {
+        Ok(sqlx::query_as!(
+            EventRsvp,
+            "SELECT r.id as rsvp_id, r.spot_id, r.contribution
+             FROM rsvps r
+             JOIN rsvp_sessions rs ON rs.id = r.session_id
+             WHERE rs.event_id = ?
+               AND rs.status IN (?, ?, ?)",
+            event.id,
+            RsvpSession::CONTRIBUTION,
+            RsvpSession::PAYMENT_PENDING,
+            RsvpSession::PAYMENT_CONFIRMED,
+        )
+        .fetch_all(db)
+        .await?)
+    }
+
+    pub async fn list_reserved_users_for_event(
+        db: &Db, event: &Event, exclude_session_ids: &[i64],
+    ) -> Result<Vec<UserRsvp>> {
+        let rows = sqlx::query_as!(
+            UserRsvpRow,
+            r#"SELECT rs.id AS session_id, rs.status, u.email
+             FROM users u
+             JOIN rsvps r ON r.user_id = u.id
+             JOIN rsvp_sessions rs ON rs.id = r.session_id
+             WHERE rs.event_id = ?"#,
+            event.id,
+        )
+        .fetch_all(db)
+        .await?;
+        Ok(rows
+            .into_iter()
+            .filter(|r| !exclude_session_ids.contains(&r.session_id))
+            .map(|r| UserRsvp { status: r.status, email: r.email })
+            .collect())
+    }
 
     pub async fn create(db: &Db, rsvp: CreateRsvp) -> Result<i64> {
         let row = sqlx::query!(
diff --git a/src/db/rsvp_session.rs b/src/db/rsvp_session.rs
index ae48d1c..53bb999 100644
--- a/src/db/rsvp_session.rs
+++ b/src/db/rsvp_session.rs
@@ -4,7 +4,7 @@ use rand::rngs::OsRng;
 use crate::db::event::Event;
 use crate::db::rsvp::ContributionRsvp;
 use crate::prelude::*;
-use crate::utils::stripe;
+use crate::utils::stripe::{self, Stripe};
 
 #[derive(Debug, Clone, sqlx::FromRow, serde::Serialize)]
 pub struct RsvpSession {
@@ -15,7 +15,9 @@ pub struct RsvpSession {
 
     pub user_id: Option<i64>,
     pub user_version: Option<i64>,
+    pub parent_session_id: Option<i64>,
 
+    pub stripe_checkout_session_id: Option<String>,
     pub stripe_client_secret: Option<String>,
     pub stripe_payment_intent_id: Option<String>,
     pub stripe_charge_id: Option<i64>,
@@ -44,7 +46,7 @@ impl RsvpSession {
         age.num_minutes() >= Self::STRIPE_EXPIRY_MINUTES
     }
 
-    fn cookie(&self, path: &str) -> String {
+    pub fn cookie(&self, path: &str) -> String {
         Cookie::build(("rsvp_session", &self.token))
             .secure(config().acme.is_some())
             .http_only(true)
@@ -54,6 +56,16 @@ impl RsvpSession {
             .to_string()
     }
 
+    pub fn child_cookie(&self, path: &str) -> String {
+        Cookie::build(("rsvp_child_session", &self.token))
+            .secure(config().acme.is_some())
+            .http_only(true)
+            .same_site(cookie::SameSite::Strict)
+            .domain(&config().app.domain)
+            .path(path)
+            .to_string()
+    }
+
     pub async fn user(&self, db: &Db) -> Result<Option<User>> {
         Ok(match self.user_id {
             Some(id) => {
@@ -78,36 +90,36 @@ impl RsvpSession {
             .await?)
     }
 
-    pub async fn lookup_active_by_user_and_event(
-        db: &Db, user_id: i64, event_id: i64,
-    ) -> Result<Option<RsvpSession>> {
+    pub async fn lookup_draft_child(db: &Db, parent_id: i64) -> Result<Option<Self>> {
         Ok(sqlx::query_as!(
             Self,
             r#"SELECT * FROM rsvp_sessions
-               WHERE user_id = ? AND event_id = ?
-                 AND status IN ('payment_pending', 'payment_confirmed')
+               WHERE parent_session_id = ?
+                 AND status IN (?, ?, ?)
                LIMIT 1"#,
-            user_id,
-            event_id,
+            parent_id,
+            Self::SELECTION,
+            Self::ATTENDEES,
+            Self::CONTRIBUTION,
         )
         .fetch_optional(db)
         .await?)
     }
 
-    pub async fn get_or_create(
-        db: &Db, user: &Option<User>, session: &Option<RsvpSession>, event_id: i64,
-    ) -> Result<[(HeaderName, String); 1]> {
-        let session = match session {
-            Some(session) => session.clone(),
-            None => RsvpSession::create(db, event_id, user).await?,
-        };
-
-        let event = Event::lookup_by_id(db, event_id)
-            .await?
-            .ok_or_else(|| any!("RsvpSession::get_or_create(): no such event_id={event_id}"))?;
-        let path = format!("/e/{}", event.slug);
-
-        Ok([(header::SET_COOKIE, session.cookie(&path))])
+    /// List all sessions (parent + children) for a user.
+    pub async fn list_for_user(db: &Db, user_id: i64, event_id: i64) -> Result<Vec<Self>> {
+        Ok(sqlx::query_as!(
+            Self,
+            r#"SELECT * FROM rsvp_sessions
+               WHERE user_id = ? AND event_id = ?
+                 AND status IN (?, ?)"#,
+            user_id,
+            event_id,
+            Self::PAYMENT_PENDING,
+            Self::PAYMENT_CONFIRMED,
+        )
+        .fetch_all(db)
+        .await?)
     }
 
     pub async fn create(db: &Db, event_id: i64, user: &Option<User>) -> Result<Self> {
@@ -139,13 +151,46 @@ impl RsvpSession {
         Ok(session)
     }
 
-    pub async fn delete(&self, db: &Db) -> Result<()> {
+    pub async fn create_child(db: &Db, parent: &RsvpSession) -> Result<Self> {
+        let token = format!("{:08x}", OsRng.r#gen::<u64>());
+        let session = sqlx::query_as!(
+            Self,
+            r#"INSERT INTO rsvp_sessions
+               (event_id, token, status, user_id, user_version, parent_session_id)
+               VALUES (?, ?, ?, ?, ?, ?)
+               RETURNING *"#,
+            parent.event_id,
+            token,
+            Self::SELECTION,
+            parent.user_id,
+            parent.user_version,
+            parent.id,
+        )
+        .fetch_one(db)
+        .await?;
+
+        tracing::info!(
+            "Created child RSVP session with session_id={} parent_session_id={} event_id={}",
+            session.id,
+            parent.id,
+            parent.event_id,
+        );
+        Ok(session)
+    }
+
+    pub async fn delete(&self, db: &Db, stripe: &Stripe) -> Result<()> {
         tracing::info!(
             "Deleting RSVP session with session_id={} event_id={} status={:?}",
             self.id,
             self.event_id,
             self.status
         );
+
+        if let Some(checkout_session_id) = self.stripe_checkout_session_id.as_ref() {
+            tracing::info!("Expiring stripe_checkout_session_id={checkout_session_id}");
+            stripe.expire_session(checkout_session_id).await?;
+        }
+
         sqlx::query!("DELETE FROM rsvps WHERE session_id = ?", self.id)
             .execute(db)
             .await?;
@@ -254,17 +299,21 @@ impl RsvpSession {
         Ok(())
     }
 
-    pub async fn set_stripe_client_secret(&mut self, db: &Db, stripe_client_secret: &str) -> Result<()> {
+    pub async fn set_stripe_checkout_session(
+        &mut self, db: &Db, checkout_session_id: &str, client_secret: &str,
+    ) -> Result<()> {
         sqlx::query!(
             "UPDATE rsvp_sessions
-             SET stripe_client_secret = ?, updated_at = CURRENT_TIMESTAMP
+             SET stripe_checkout_session_id = ?, stripe_client_secret = ?, updated_at = CURRENT_TIMESTAMP
              WHERE id = ?",
-            stripe_client_secret,
+            checkout_session_id,
+            client_secret,
             self.id
         )
         .execute(db)
         .await?;
-        self.stripe_client_secret = Some(stripe_client_secret.into());
+        self.stripe_checkout_session_id = Some(checkout_session_id.into());
+        self.stripe_client_secret = Some(client_secret.into());
         Ok(())
     }
 
@@ -334,10 +383,12 @@ impl RsvpSession {
                 s.updated_at,
                 e.title AS event_title,
                 e.slug AS event_slug,
-                u.email AS user_email
+                u.email AS user_email,
+                ps.token AS parent_token
             FROM rsvp_sessions s
             JOIN events e ON e.id = s.event_id
             LEFT JOIN users u ON u.id = s.user_id
+            LEFT JOIN rsvp_sessions ps ON ps.id = s.parent_session_id
             WHERE e.start > datetime('now', '-24 hours')
             ORDER BY s.updated_at DESC"#
         )
@@ -377,6 +428,7 @@ impl RsvpSession {
                     event_title: s.event_title,
                     event_slug: s.event_slug,
                     user_email: s.user_email,
+                    parent_token: s.parent_token,
                     rsvps: rsvps_by_session.remove(&s.id).unwrap_or_default(),
                     expires_in,
                 }
@@ -394,6 +446,7 @@ struct DebugSessionRow {
     event_title: String,
     event_slug: String,
     user_email: Option<String>,
+    parent_token: Option<String>,
 }
 
 #[derive(Debug, serde::Serialize)]
@@ -406,6 +459,7 @@ pub struct DebugSession {
     pub event_title: String,
     pub event_slug: String,
     pub user_email: Option<String>,
+    pub parent_token: Option<String>,
     pub rsvps: Vec<DebugRsvp>,
     pub expires_in: i64,
 }
diff --git a/src/utils/stripe.rs b/src/utils/stripe.rs
index 9060cd4..392bb2a 100644
--- a/src/utils/stripe.rs
+++ b/src/utils/stripe.rs
@@ -9,6 +9,12 @@ pub struct Stripe {
     http: reqwest::Client,
 }
 
+#[derive(Debug)]
+pub struct CheckoutSession {
+    pub id: String,
+    pub client_secret: String,
+}
+
 #[derive(Debug)]
 pub struct LineItem {
     /// Item name.
@@ -28,10 +34,10 @@ impl Stripe {
         }
     }
 
-    /// Begin a stripe transaction, returning the client secret.
+    /// Begin a stripe transaction, returning (checkout_session_id, client_secret).
     pub async fn create_session(
         &self, session_id: i64, email: &str, line_items: Vec<LineItem>, return_path: String,
-    ) -> Result<String> {
+    ) -> Result<CheckoutSession> {
         let return_url = format!("{}{}", self.app_url, return_path);
 
         // Log line_items for debugging before we consume them
@@ -72,6 +78,7 @@ impl Stripe {
 
         #[derive(serde::Deserialize)]
         struct Response {
+            id: Option<String>,
             client_secret: Option<String>,
             error: Option<StripeError>,
         }
@@ -101,13 +108,57 @@ impl Stripe {
             bail!(msg);
         }
 
-        res.client_secret.ok_or_else(|| {
+        let id = res.id.ok_or_else(|| {
+            let msg = format!(
+                "Stripe::create_session(): response missing id, session_id={session_id}, email={email}, line_items={line_items_debug}"
+            );
+            crate::utils::sentry::report(msg.clone());
+            any!(msg)
+        })?;
+        let client_secret = res.client_secret.ok_or_else(|| {
             let msg = format!(
                 "Stripe::create_session(): response missing client_secret, session_id={session_id}, email={email}, line_items={line_items_debug}"
             );
             crate::utils::sentry::report(msg.clone());
             any!(msg)
-        })
+        })?;
+        Ok(CheckoutSession { id, client_secret })
+    }
+
+    /// Expire a checkout session so it can no longer be completed.
+    pub async fn expire_session(&self, checkout_session_id: &str) -> Result<()> {
+        let url = format!("https://api.stripe.com/v1/checkout/sessions/{checkout_session_id}/expire");
+
+        #[derive(serde::Deserialize)]
+        struct Response {
+            error: Option<StripeError>,
+        }
+
+        #[derive(serde::Deserialize)]
+        struct StripeError {
+            message: String,
+            #[serde(rename = "type")]
+            error_type: String,
+        }
+
+        #[rustfmt::skip]
+        let res: Response = self.http
+            .post(&url)
+            .header("Stripe-Version", API_VERSION)
+            .header(header::AUTHORIZATION, format!("Bearer {}", &self.secret_key))
+            .header(header::CONTENT_LENGTH, "0")
+            .send().await?.json().await?;
+
+        if let Some(err) = res.error {
+            // "resource_missing" or "invalid_request_error" for already-expired sessions is ok
+            tracing::warn!(
+                "Stripe::expire_session(): {} (type={}), checkout_session_id={checkout_session_id}",
+                err.message,
+                err.error_type
+            );
+        }
+
+        Ok(())
     }
 
     /// Issue a full refund for a payment intent. Returns the Stripe refund ID.