diff --git a/src/005-passages/slaveMarketPassages.js b/src/005-passages/slaveMarketPassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..9ea818ab7347c1648da5d39668e6af1a7ad1b56a
--- /dev/null
+++ b/src/005-passages/slaveMarketPassages.js
@@ -0,0 +1,12 @@
+new App.DomPassage("Market", () => App.Markets[V.market.slaveMarket](), ["jump-from-safe"]);
+
+new App.DomPassage("Buy Slaves",
+	() => {
+		V.nextButton = "Back";
+		V.nextLink = "Main";
+
+		return App.UI.market();
+	}, ["jump-from-safe", "jump-to-safe"]
+);
+
+new App.DomPassage("Bulk Slave Intro", () => App.Markets.bulkSlaveIntro());
diff --git a/src/markets/market.tw b/src/markets/market.tw
deleted file mode 100644
index 1e260c50450d4e4146b52024dd0ce6adb3d6e6cf..0000000000000000000000000000000000000000
--- a/src/markets/market.tw
+++ /dev/null
@@ -1,4 +0,0 @@
-:: Market [nobr jump-from-safe]
-<span id="slave-markets">
-    <<includeDOM App.Markets[V.market.slaveMarket]()>>
-</span>
\ No newline at end of file
diff --git a/src/uncategorized/bulkSlaveIntro.tw b/src/uncategorized/bulkSlaveIntro.tw
deleted file mode 100644
index 2d0e3e66ddb3bb1659dc68d30b3bac774c2527f0..0000000000000000000000000000000000000000
--- a/src/uncategorized/bulkSlaveIntro.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: Bulk Slave Intro [nobr]
-
-<<includeDOM App.Markets.bulkSlaveIntro()>>
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
deleted file mode 100644
index 953bee616f245ad277686f635dc994041f80c57e..0000000000000000000000000000000000000000
--- a/src/uncategorized/buySlaves.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Buy Slaves [nobr jump-to-safe jump-from-safe]
-
-<<set $nextButton = "Back">>
-<<set $nextLink = "Main">>
-
-<<includeDOM App.UI.market()>>