diff --git a/src/facilities/fsPassage.js b/src/facilities/fsPassage.js
index 2c78a2cf36356eb35304dc7b0cd6d8b19c822e38..1a40865e49e8712e703f860d5666fecaac8f59d9 100644
--- a/src/facilities/fsPassage.js
+++ b/src/facilities/fsPassage.js
@@ -129,23 +129,23 @@ App.UI.FSPassage = function() {
 		const el = new DocumentFragment();
 		const r = [];
 		if (arc.FSSupremacist >= V.FSLockinLevel) {
-			r.push(`${arc.name} believes implicitly in arc.FSSupremacistRace superiority.`);
+			r.push(`${arc.name} believes implicitly in ${arc.FSSupremacistRace} superiority.`);
 		} else if (arc.FSSupremacist >= V.FSLockinLevel * 0.6) {
-			r.push(`${arc.name} agrees strongly with arc.FSSupremacistRace superiority.`);
+			r.push(`${arc.name} agrees strongly with ${arc.FSSupremacistRace} superiority.`);
 		} else if (arc.FSSupremacist >= V.FSLockinLevel * 0.3) {
-			r.push(`${arc.name} is sympathetic to arc.FSSupremacistRace superiority.`);
+			r.push(`${arc.name} is sympathetic to ${arc.FSSupremacistRace} superiority.`);
 		} else if (arc.FSSupremacist !== "unset") {
-			r.push(`${arc.name} is unconvinced of arc.FSSupremacistRace superiority.`);
+			r.push(`${arc.name} is unconvinced of ${arc.FSSupremacistRace} superiority.`);
 		}
 
 		if (arc.FSSubjugationist >= V.FSLockinLevel) {
-			r.push(`${arc.name} believes implicitly in the inferiority of arc.FSSubjugationistRace people.`);
+			r.push(`${arc.name} believes implicitly in the inferiority of ${arc.FSSubjugationistRace} people.`);
 		} else if (arc.FSSubjugationist >= V.FSLockinLevel * 0.6) {
-			r.push(`${arc.name} agrees strongly with the inferiority of arc.FSSubjugationistRace people.`);
+			r.push(`${arc.name} agrees strongly with the inferiority of ${arc.FSSubjugationistRace} people.`);
 		} else if (arc.FSSubjugationist >= V.FSLockinLevel * 0.3) {
-			r.push(`${arc.name} is sympathetic to the inferiority of arc.FSSubjugationistRace people.`);
+			r.push(`${arc.name} is sympathetic to the inferiority of ${arc.FSSubjugationistRace} people.`);
 		} else if (arc.FSSubjugationist !== "unset") {
-			r.push(`${arc.name} is unconvinced of the inferiority of arc.FSSubjugationistRace people.`);
+			r.push(`${arc.name} is unconvinced of the inferiority of ${arc.FSSubjugationistRace} people.`);
 		}
 
 		if (arc.FSRepopulationFocus >= V.FSLockinLevel) {
@@ -654,38 +654,7 @@ App.UI.FSPassage = function() {
 		let r;
 		let p;
 
-		const assistantMatching = new Map([
-			["FSSupremacist", ["amazon", "monstergirl", "succubus"]],
-			["FSSubjugationist", ["amazon", "businesswoman", "imp"]],
-			["FSGenderRadicalist", ["incubus", "monstergirl", "shemale", "succubus", "witch"]],
-			["FSGenderFundamentalist", ["angel", "cherub", "fairy", "goddess", "hypergoddess", "loli", "preggololi", "pregnant fairy", "schoolgirl", "succubus", "witch"]],
-			["FSDegradationist", ["businesswoman", "imp", "incubus", "monstergirl", "preggololi", "succubus"]],
-			["FSPaternalist", ["angel", "cherub", "fairy", "goddess", "hypergoddess", "loli", "preggololi", "pregnant fairy", "schoolgirl"]],
-			["FSBodyPurist", ["amazon", "angel", "fairy", "goddess", "incubus", "loli", "pregnant fairy", "succubus", "witch"]],
-			["FSTransformationFetishist", ["businesswoman", "ERROR_1606_APPEARANCE_FILE_CORRUPT", "incubus", "shemale", "succubus", "witch"]],
-			["FSYouthPreferentialist", ["angel", "cherub", "imp", "loli", "preggololi", "schoolgirl", "shemale", "succubus", "witch"]],
-			["FSMaturityPreferentialist", ["angel", "businesswoman", "goddess", "incubus", "succubus", "witch"]],
-			["FSSlimnessEnthusiast", ["cherub", "imp", "loli", "schoolgirl", "shemale", "succubus", "witch"]],
-			["FSAssetExpansionist", ["businesswoman", "hypergoddess", "incubus", "shemale", "succubus", "witch"]],
-			["FSPastoralist", ["goddess", "hypergoddess", "incubus", "shemale", "succubus", "witch"]],
-			["FSPhysicalIdealist", ["amazon", "incubus", "shemale", "succubus", "witch"]],
-			["FSHedonisticDecadence", ["goddess", "hypergoddess", "imp", "incubus", "preggololi", "succubus", "witch"]],
-			["FSChattelReligionist", ["angel", "cherub", "goddess", "imp", "incubus", "monstergirl", "succubus", "witch"]],
-			["FSNull", []],
-			["FSRomanRevivalist", ["amazon", "businesswoman", "incubus", "succubus"]],
-			["FSNeoImperialist", ["amazon", "businesswoman", "incubus", "shemale", "angel"]],
-			["FSEgyptianRevivalist", ["goddess", "incubus", "monstergirl", "succubus"]],
-			["FSEdoRevivalist", ["amazon", "incubus", "kitsune", "loli", "monstergirl", "succubus"]],
-			["FSArabianRevivalist", ["businesswoman", "incubus", "schoolgirl", "succubus"]],
-			["FSChineseRevivalist", ["incubus", "monstergirl", "schoolgirl", "succubus"]],
-			["FSAztecRevivalist", ["amazon", "businesswoman", "incubus", "succubus"]],
-			["FSRepopulationFocus", ["goddess", "hypergoddess", "preggololi", "pregnant fairy", "succubus", "witch"]],
-			["FSRestart", ["angel", "businesswoman", "goddess", "incubus", "loli", "schoolgirl", "succubus", "witch"]],
-			["FSIntellectualDependency", ["shemale", "succubus", "witch"]],
-			["FSSlaveProfessionalism", ["angel", "businesswoman", "incubus", "goddess", "schoolgirl", "succubus"]],
-			["FSPetiteAdmiration", ["cherub", "fairy", "imp", "incubus", "loli", "preggololi", "pregnant fairy", "schoolgirl", "succubus", "witch"]],
-			["FSStatuesqueGlorification", ["amazon", "goddess", "incubus", "succubus", "witch"]]
-		]);
+		// TODO: move to wider scope and use in fsDevelopments
 		function pursuit() {
 			return App.UI.DOM.makeElement("span", "You are pursuing", "bold");
 		}
@@ -719,7 +688,7 @@ App.UI.FSPassage = function() {
 
 			// Assistant
 			if (V.policies.publicPA === 1) {
-				if (assistantMatching.get(FS).includes(V.assistant.appearance)) {
+				if (App.Data.Assistant.appearanceForFS.get(FS).includes(V.assistant.appearance)) {
 					const {hisA} = getPronouns(assistant.pronouns().main).appendSuffix('A');
 					r.push(App.UI.DOM.makeElement("div", `With ${hisA} ${V.assistant.appearance} appearance, ${V.assistant.name} is a good public mascot for this goal.`, "note"));
 				}
diff --git a/src/personalAssistant/assistantData.js b/src/personalAssistant/assistantData.js
new file mode 100644
index 0000000000000000000000000000000000000000..03745b76e3e1d1fe74fc0d5b4b595a558caf81a8
--- /dev/null
+++ b/src/personalAssistant/assistantData.js
@@ -0,0 +1,34 @@
+App.Data.Assistant = {};
+
+App.Data.Assistant.appearanceForFS = new Map([
+	["FSSupremacist", ["amazon", "monstergirl", "succubus"]],
+	["FSSubjugationist", ["amazon", "businesswoman", "imp"]],
+	["FSGenderRadicalist", ["incubus", "monstergirl", "shemale", "succubus", "witch"]],
+	["FSGenderFundamentalist", ["angel", "cherub", "fairy", "goddess", "hypergoddess", "loli", "preggololi", "pregnant fairy", "schoolgirl", "succubus", "witch"]],
+	["FSDegradationist", ["businesswoman", "imp", "incubus", "monstergirl", "preggololi", "succubus"]],
+	["FSPaternalist", ["angel", "cherub", "fairy", "goddess", "hypergoddess", "loli", "preggololi", "pregnant fairy", "schoolgirl"]],
+	["FSBodyPurist", ["amazon", "angel", "fairy", "goddess", "incubus", "loli", "pregnant fairy", "succubus", "witch"]],
+	["FSTransformationFetishist", ["businesswoman", "ERROR_1606_APPEARANCE_FILE_CORRUPT", "incubus", "shemale", "succubus", "witch"]],
+	["FSYouthPreferentialist", ["angel", "cherub", "imp", "loli", "preggololi", "schoolgirl", "shemale", "succubus", "witch"]],
+	["FSMaturityPreferentialist", ["angel", "businesswoman", "goddess", "incubus", "succubus", "witch"]],
+	["FSSlimnessEnthusiast", ["cherub", "imp", "loli", "schoolgirl", "shemale", "succubus", "witch"]],
+	["FSAssetExpansionist", ["businesswoman", "hypergoddess", "incubus", "shemale", "succubus", "witch"]],
+	["FSPastoralist", ["goddess", "hypergoddess", "incubus", "shemale", "succubus", "witch"]],
+	["FSPhysicalIdealist", ["amazon", "incubus", "shemale", "succubus", "witch"]],
+	["FSHedonisticDecadence", ["goddess", "hypergoddess", "imp", "incubus", "preggololi", "succubus", "witch"]],
+	["FSChattelReligionist", ["angel", "cherub", "goddess", "imp", "incubus", "monstergirl", "succubus", "witch"]],
+	["FSNull", []],
+	["FSRomanRevivalist", ["amazon", "businesswoman", "incubus", "succubus"]],
+	["FSNeoImperialist", ["amazon", "businesswoman", "incubus", "shemale", "angel"]],
+	["FSEgyptianRevivalist", ["goddess", "incubus", "monstergirl", "succubus"]],
+	["FSEdoRevivalist", ["amazon", "incubus", "kitsune", "loli", "monstergirl", "succubus"]],
+	["FSArabianRevivalist", ["businesswoman", "incubus", "schoolgirl", "succubus"]],
+	["FSChineseRevivalist", ["incubus", "monstergirl", "schoolgirl", "succubus"]],
+	["FSAztecRevivalist", ["amazon", "businesswoman", "incubus", "succubus"]],
+	["FSRepopulationFocus", ["goddess", "hypergoddess", "preggololi", "pregnant fairy", "succubus", "witch"]],
+	["FSRestart", ["angel", "businesswoman", "goddess", "incubus", "loli", "schoolgirl", "succubus", "witch"]],
+	["FSIntellectualDependency", ["shemale", "succubus", "witch"]],
+	["FSSlaveProfessionalism", ["angel", "businesswoman", "incubus", "goddess", "schoolgirl", "succubus"]],
+	["FSPetiteAdmiration", ["cherub", "fairy", "imp", "incubus", "loli", "preggololi", "pregnant fairy", "schoolgirl", "succubus", "witch"]],
+	["FSStatuesqueGlorification", ["amazon", "goddess", "incubus", "succubus", "witch"]]
+]);