diff --git a/src/005-passages/interactPassages.js b/src/005-passages/interactPassages.js
index 84b0bcadad39b36ea42db7b7b1d70c1c7594cc54..67177809d720b45a1f3feff68d26ac6b18a69933 100644
--- a/src/005-passages/interactPassages.js
+++ b/src/005-passages/interactPassages.js
@@ -326,3 +326,11 @@ new App.DomPassage("Surgery Death",
 		return f;
 	}, ["jump-from-safe"]
 );
+
+new App.DomPassage("Walk Past List",
+	() => {
+		V.nextButton = "Back to Main";
+		V.nextLink = "Main";
+		return App.UI.walkPastAll();
+	}
+);
\ No newline at end of file
diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js
index dbf46941adc11a8ae61e6208584cfed13bff8b5e..3eb37aad594f6d6634219cbb924da72965edcc17 100644
--- a/src/interaction/main/walkPast.js
+++ b/src/interaction/main/walkPast.js
@@ -9353,13 +9353,3 @@ globalThis.walkPast = (function() {
 
 	return walkPast;
 })();
-
-/** generate the specified walkPast vignette for all slaves (for debugging purposes)
- * @param {string} fixedTarget
- * @returns {DocumentFragment}
- */
-globalThis.walkPastAll = function(fixedTarget) {
-	return App.UI.DOM.combineNodes(...V.slaves.map(
-		(s) => App.UI.DOM.makeElement("p", walkPast(s, fixedTarget))
-	));
-};
diff --git a/src/interaction/main/walkPastList.js b/src/interaction/main/walkPastList.js
new file mode 100644
index 0000000000000000000000000000000000000000..6816c3f884c2a9bbec18a37ed8812cc4e48df454
--- /dev/null
+++ b/src/interaction/main/walkPastList.js
@@ -0,0 +1,36 @@
+App.UI.walkPastAll = function() {
+	const node = new DocumentFragment();
+
+	App.UI.DOM.appendNewElement("p", node, `For testing purposes only, this page lists or can produce all of the "walk past" scenes."Vagina" will use ass if they lack one.`, "scene-intro");
+
+	const tabMap = new Map([
+		["Lips", "fLips"],
+		["Boobs", "fBoobs"],
+		["Butt", "fButt"],
+		["Anus", "fAnus"],
+		["Vagina", "fVagina"],
+		["Dick", "fDick"],
+		["Rival", "fRival"],
+		["Relation", "fRelation"],
+	]);
+
+	App.UI.DOM.appendNewElement("h2", node, `Choose target`);
+
+	const tabBar = new App.UI.Tabs.TabBar("Walkpastlist");
+	for (const [title, category] of tabMap) {
+		tabBar.addTab(title, title.toLowerCase(), walkPastCategory(category));
+	}
+	node.append(tabBar.render());
+
+	return node;
+
+	/** generate the specified walkPast vignette for all slaves (for debugging purposes)
+	 * @param {string} fixedTarget
+	 * @returns {DocumentFragment}
+	 */
+	function walkPastCategory(fixedTarget) {
+		return App.UI.DOM.combineNodes(...V.slaves.map(
+			(s) => App.UI.DOM.makeElement("p", walkPast(s, fixedTarget))
+		));
+	}
+};
diff --git a/src/uncategorized/walkPastList.tw b/src/uncategorized/walkPastList.tw
deleted file mode 100644
index 55abb594dccbbb86a87180349ab54ee9e6fbcec6..0000000000000000000000000000000000000000
--- a/src/uncategorized/walkPastList.tw
+++ /dev/null
@@ -1,54 +0,0 @@
-:: Walk Past List [nobr]
-
-<<set $nextButton = "Back to Main", $nextLink = "Main">>
-//For testing purposes only, this page lists or can produce all of the "walk past" scenes.//<br>
-
-<br>
-//<span id="walk">No scene has been selected yet.</span>//
-<br>
-
-<h2>Choose target</h2>
-<<link "Lips">>
-	<<replace "#wplist">>
-	<<includeDOM walkPastAll("fLips")>>
-	<</replace>>
-<</link>><br>
-<<link "Boobs">>
-	<<replace "#wplist">>
-	<<includeDOM walkPastAll("fBoobs")>>
-	<</replace>>
-<</link>><br>
-<<link "Butt">>
-	<<replace "#wplist">>
-	<<includeDOM walkPastAll("fButt")>>
-	<</replace>>
-<</link>> |
-<<link "Anus">>
-	<<replace "#wplist">>
-	<<includeDOM walkPastAll("fAnus")>>
-	<</replace>>
-<</link>> |
-<<link "Vagina">>
-	<<replace "#wplist">>
-	<<includeDOM walkPastAll("fVagina")>>
-	<</replace>>
-<</link>> //or ass if they lack one//<br>
-<<link "Dick">>
-	<<replace "#wplist">>
-	<<includeDOM walkPastAll("fDick")>>
-	<</replace>>
-<</link>><br>
-<<link "Rival">>
-	<<replace "#wplist">>
-	<<includeDOM walkPastAll("fRival")>>
-	<</replace>>
-<</link>><br>
-<<link "Relation">>
-	<<replace "#wplist">>
-	<<includeDOM walkPastAll("fRelation")>>
-	<</replace>>
-<</link>>
-
-<h2>Walk Past List</h2>
-
-<span id="wplist"></span>