diff --git a/devTools/javaSanityCheck/excluded b/devTools/javaSanityCheck/excluded
index 04716ff61537863acc4a6ccd7e9b7a1004c4820f..d61910e7d09c5e2bf139c5de6e5dd0dba37055eb 100644
--- a/devTools/javaSanityCheck/excluded
+++ b/devTools/javaSanityCheck/excluded
@@ -12,4 +12,5 @@ src/001-lib/Jquery/Jquery.js;O
 src/001-lib/mousetrap/mousetrap.js;O
 src/002-config/sugarCubeConfig.js;O
 src/SecExp/js/secExp.js;O
-src/js/economyJS.js;S
\ No newline at end of file
+src/js/economyJS.js;S
+src/npc/assistant/assistant.js;O
\ No newline at end of file
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index 49ba560ab0b5c183dc660c6f5cf75c352183ac11..9e521ba249c2c259c42ec3b05660606abb48abc2 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -1,7 +1,7 @@
 App.Version = {
 	base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
 	pmod: "3.3.0",
-	release: 1061,
+	release: 1062,
 };
 
 /* Use release as save version */
diff --git a/src/Mods/DinnerParty/dinnerPartyPreparations.tw b/src/Mods/DinnerParty/dinnerPartyPreparations.tw
index 230af2a44118a6fc4c9067db603abf9ee5facda3..777778de6c05068b7cf04155c168d347dea2d0a0 100644
--- a/src/Mods/DinnerParty/dinnerPartyPreparations.tw
+++ b/src/Mods/DinnerParty/dinnerPartyPreparations.tw
@@ -2,7 +2,7 @@
 
 <<set $nextButton = "Cancel The Event", $nextLink = "Main">>
 
-Hosting of high society dinner parties will increase your prestige significantly and it is expected for someone of your station. Since there is a lack of animal meat, human meat is served at these events to illustrate the wealth and power of the host. The success of the evening is judged by how well the human offering is prepared. Guests to these events are encouraged to rate the dishes and special dishes are expected. If the host receives 5 stars on all the dishes, they will receive the coveted title "<<if $PC.title == 1>>Master<<else>>Mistress<</if>> of The Culinary Arts". You ask $assistantName to show you a list of cooking instructions for those dishes.
+Hosting of high society dinner parties will increase your prestige significantly and it is expected for someone of your station. Since there is a lack of animal meat, human meat is served at these events to illustrate the wealth and power of the host. The success of the evening is judged by how well the human offering is prepared. Guests to these events are encouraged to rate the dishes and special dishes are expected. If the host receives 5 stars on all the dishes, they will receive the coveted title "<<if $PC.title == 1>>Master<<else>>Mistress<</if>> of The Culinary Arts". You ask $assistant.name to show you a list of cooking instructions for those dishes.
 
 
 <h1>Cooking Instructions and Recipes:</h1>
diff --git a/src/Mods/SpecialForce/NamingColonel.tw b/src/Mods/SpecialForce/NamingColonel.tw
index 235b9468618abf0573ac4dba2a31e32ca581cef7..fe68dc0628e0b16390e6e5454fa9c5a05ef08f6a 100644
--- a/src/Mods/SpecialForce/NamingColonel.tw
+++ b/src/Mods/SpecialForce/NamingColonel.tw
@@ -3,7 +3,7 @@
 <<set $nextButton = " ">>
 <<if $SF.IntroProgress < 0>>
 	<<setNonlocalPronouns $seeDicks>>
-	You instruct $assistantName to announce to the arcology's citizenry that you will be making an important announcement in the near future regarding the security situation. Given the damage still present from the Daughters' attack, everyone will be tuning in. You also instruct your assistant to begin quietly investigating potential leadership figures for the force itself.
+	You instruct $assistant.name to announce to the arcology's citizenry that you will be making an important announcement in the near future regarding the security situation. Given the damage still present from the Daughters' attack, everyone will be tuning in. You also instruct your assistant to begin quietly investigating potential leadership figures for the force itself.
 	It's been a short while since you told your citizens that you were going to talk to them about their security, and by all accounts, they've turned out in force to watch your address over the arcology's internal communications system. You wake up early, relieve your frustrations on a few slaves woken out of deep sleep, and take position behind your desk. You also call over a slave and push _himU under your desk. The unspoken instruction is clear, and _heU begins enthusiastically
 	<<if $PC.dick > 0>>
 		sucking your cock, taking it as deep as _heU can without gagging.
diff --git a/src/Mods/SpecialForce/TrickShotNight.tw b/src/Mods/SpecialForce/TrickShotNight.tw
index 57f3e521d2f3cf7a5c3a88efcdf685ca4f9bd6b3..12dbf2f376173f9b8ee8f350c0a04d1d1e163aca 100644
--- a/src/Mods/SpecialForce/TrickShotNight.tw
+++ b/src/Mods/SpecialForce/TrickShotNight.tw
@@ -26,8 +26,8 @@
 
 Despite your direct elevator, interaction with the majority of your security force is relatively scarce. Aside from mutually exchanged nods in the firebase and the occasional briefing, your $SF.Lower enjoy a degree of autonomy.
 
-<br><br>On a particularly lackadaisical evening, you find yourself alerted to a message alert by $assistantName.
-<<if $assistant > 0>>
+<br><br>On a particularly lackadaisical evening, you find yourself alerted to a message alert by $assistant.name.
+<<if assistant.personality > 0>>
 	"<<= properMaster()>>, a message from $SF.Lower." _HeA pauses before continuing. "It seems they're asking if you'd like to join their trick shot night."
 <<else>>
 	It informs you that $SF.Lower have sent a message asking you to join them at their trick shot night.
@@ -46,7 +46,7 @@ Despite your direct elevator, interaction with the majority of your security for
 
 	<br><<link "Attend the trick shot night">>
 		<<replace "#result">>
-			You instruct $assistantName to inform $SF.Lower that you will be attending their trick shot night, and after settling your affairs in the penthouse you head down to the firebase. The atmosphere in the firebase is casual, especially in comparison to the usual situations you meet them, though your security force still maintain some measure of decorum towards you as their employer. Eventually, you settle in at the table with a handful of $SF.Lower officers and turn your @@.yellowgreen;<<print cashFormat(50000)>>@@ into bullets. All that remains is to decide your strategy for the night.
+			You instruct $assistant.name to inform $SF.Lower that you will be attending their trick shot night, and after settling your affairs in the penthouse you head down to the firebase. The atmosphere in the firebase is casual, especially in comparison to the usual situations you meet them, though your security force still maintain some measure of decorum towards you as their employer. Eventually, you settle in at the table with a handful of $SF.Lower officers and turn your @@.yellowgreen;<<print cashFormat(50000)>>@@ into bullets. All that remains is to decide your strategy for the night.
 			<br><br>
 			<span id="bountyresult">
 
diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index 0e73e19e20c2a8bd49d65a0d768f95d43d11d587..a7983b5ce9fcf8425c1c1cc2c2e053bce13a4356 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -200,15 +200,15 @@
 			<<set _mercMod -= 0.15>>
 			<<set _SFMod -= 0.15>>
 		<</if>>
-		<<if $assistantPower == 0>>
+		<<if $assistant.power == 0>>
 			<<set _atkMod -= 0.10>>
 			<<set _defMod -= 0.10>>
 			<<set _tacChance -= 0.20>>
-		<<elseif $assistantPower == 2>>
+		<<elseif $assistant.power == 2>>
 			<<set _atkMod += 0.10>>
 			<<set _defMod += 0.10>>
 			<<set _tacChance += 0.20>>
-		<<elseif $assistantPower >= 3>>
+		<<elseif $assistant.power >= 3>>
 			<<set _atkMod += 0.15>>
 			<<set _defMod += 0.15>>
 			<<set _tacChance += 0.30>>
diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw
index fed7e7cfa35d9a4fb02e52ec89b99db2e581d405..8bc565d2a597a515572d7cde479895be8065ce3e 100644
--- a/src/SecExp/attackOptions.tw
+++ b/src/SecExp/attackOptions.tw
@@ -20,7 +20,7 @@
 <hr>
 <<if $majorBattle == 0>>
 	<<if $hasFoughtOnce == 1>>
-		The ominous message dominates the screens of your office, <<print $assistantName>> quickly gathers all information available to prepare for battle.
+		The ominous message dominates the screens of your office, <<print $assistant.name>> quickly gathers all information available to prepare for battle.
 		<<if $attackType == "raiders">>
 			<<if App.SecExp.battle.recon() >= 1>>
 				A disorganized horde of raiders is coming to your city. To such jackals your arcology surely looks like an appetizing morsel.
@@ -64,7 +64,7 @@
 	<</if>>
 <<else>>
 	<<if $hasFoughtMajorBattleOnce == 1>>
-		The ominous message dominates the screens of your office, <<print $assistantName>> quickly gathers all information available to prepare for battle.
+		The ominous message dominates the screens of your office, <<print $assistant.name>> quickly gathers all information available to prepare for battle.
 		<<if $attackType == "raiders">>
 			<<if App.SecExp.battle.recon() >= 1>>
 				A massive, disorganized horde of raiders is coming to your city. It seems a warlord of the wastelands amassed enough men to try and obtain a slice of territory of his own; if he's not defeated there won't be a tomorrow for the arcology.
@@ -198,7 +198,7 @@ __Battle Plan__:
 <<case "PC">>
 	<<set _leader = "Personally">>
 <<case "assistant">>
-	<<set _leader = "$assistantName will">>
+	<<set _leader = "$assistant.name will">>
 <<case "bodyguard">>
 	<<set _leader = "$Bodyguard.slaveName will">>
 <<case "headGirl">>
@@ -220,9 +220,9 @@ __Battle Plan__:
 		<<replace "#leader">><strong><<print _leader>></strong><</replace>>
 	<</link>>
 	|
-	<<link "Let $assistantName lead the troops">>
+	<<link "Let $assistant.name lead the troops">>
 		<<set $leadingTroops = "assistant">>
-		<<set _leader = "$assistantName will">>
+		<<set _leader = "$assistant.name will">>
 		<<replace "#leader">><strong><<print _leader>></strong><</replace>>
 	<</link>>
 	<<if $Bodyguard != 0 && $slavesOfficers == 1>>
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 6e27126182cdec711e74688496b587c5aa46bc84..040e1c700a6e4741c24d24675fe08c424aa77097 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -859,29 +859,29 @@
 		<</if>>
 	<<elseif $leadingTroops == "assistant">>
 		<<setAssistantPronouns>>
-		<<if $auto == 1>>$assistantName<<else>>You<</if>> let your personal assistant lead the troops.
+		<<if $auto == 1>>$assistant.name<<else>>You<</if>> let your personal assistant lead the troops.
 		<<if App.SecExp.conflict.deployedUnits('mercs') >= 1 || App.SecExp.conflict.deployedUnits('militia') >= 1 || App.SecExp.conflict.deployedUnits('slaves') >= 1>>
 			No soldier trusts a computer to be their commander,
 			<<if _oldRep < 10000 && _oldAuth < 10000>>
-				no algorithm can substitute experience, <<if $assistantPower == 0>>and as expected, <<else>>however, <</if>>
+				no algorithm can substitute experience, <<if $assistant.power == 0>>and as expected, <<else>>however, <</if>>
 			<<else>>
-				but they trust you enough to not question your decision<<if $assistantPower == 0>>, however<<else>>, and <</if>>
+				but they trust you enough to not question your decision<<if $assistant.power == 0>>, however<<else>>, and <</if>>
 			<</if>>
 		<<else>>
 			You find
 		<</if>>
-		<<if $assistantPower == 0>>
+		<<if $assistant.power == 0>>
 			your assistant gives a rather poor field performance, due to the limited computing power available to _himA.
-		<<elseif $assistantPower == 1>>
+		<<elseif $assistant.power == 1>>
 			your assistant performs decently. While nothing to write home about your men are pleasantly surprised.
-		<<elseif $assistantPower == 2>>
+		<<elseif $assistant.power == 2>>
 			your assistant performs admirably. _HisA upgraded computing power allows _himA to monitor the battlefield closely, enhancing the efficiency of your troops and the effectiveness of your battle plan.
-		<<elseif $assistantPower >= 3>>
+		<<elseif $assistant.power >= 3>>
 			your assistant performs admirably. _HisA vast computing power allows _himA to be everywhere on the battlefield, greatly enhancing the efficiency of your troops and the effectiveness of your battle plan.
 		<</if>>
 	<<elseif $leadingTroops == "bodyguard">>
 		<<setLocalPronouns $Bodyguard>>
-		<<if $auto == 1>>$assistantName<<else>>You<</if>> decided it will be your bodyguard that leads the troops.
+		<<if $auto == 1>>$assistant.name<<else>>You<</if>> decided it will be your bodyguard that leads the troops.
 		<<if App.SecExp.conflict.deployedUnits('slaves') >= 1>>
 			<<if $Bodyguard.devotion < -20>>
 				$His low devotion has a negative impact on the morale of your slave soldiers.
@@ -1018,7 +1018,7 @@
 		<</if>>
 	<<elseif $leadingTroops == "headGirl">>
 		<<setLocalPronouns $HeadGirl>>
-		<<if $auto == 1>>$assistantName<<else>>You<</if>> decided it will be your Head Girl that leads the troops.
+		<<if $auto == 1>>$assistant.name<<else>>You<</if>> decided it will be your Head Girl that leads the troops.
 		<<if App.SecExp.conflict.deployedUnits('slaves') >= 1>>
 			<<if $HeadGirl.devotion < -20>>
 				$His low devotion has a negative impact on the morale of your slave soldiers.
@@ -1154,7 +1154,7 @@
 			$He brought your army to victory so many times that $his @@.green;prestige has increased.@@
 		<</if>>
 	<<elseif $leadingTroops == "citizen">>
-		<<if $auto == 1>>$assistantName<<else>>You<</if>> decided to appoint one of your volunteers as the commander.
+		<<if $auto == 1>>$assistant.name<<else>>You<</if>> decided to appoint one of your volunteers as the commander.
 		<<if $arcologies[0].FSDegradationist == "unset" && $arcologies[0].FSPaternalist == "unset">>
 			<<if App.SecExp.conflict.deployedUnits('militia') >= 1>>
 				Your volunteers are honored and pleased that one of their own is leading the defense force of the city.
@@ -1191,7 +1191,7 @@
 			During the battle a stray bullet managed to reach the leader. Your troops were greatly affected by the loss.
 		<</if>>
 	<<elseif $leadingTroops == "mercenary">>
-		<<if $auto == 1>>$assistantName<<else>>You<</if>> decided to appoint one of your mercenary officers as the commander.
+		<<if $auto == 1>>$assistant.name<<else>>You<</if>> decided to appoint one of your mercenary officers as the commander.
 		<<if App.SecExp.conflict.deployedUnits('mercs') >= 1>>
 			Your mercenaries of course approve of your decision.
 		<</if>>
@@ -1210,7 +1210,7 @@
 			During the battle a stray bullet managed to reach the mercenary. Your troops were greatly affected by the loss of their leader.
 		<</if>>
 	<<elseif $leadingTroops == "colonel">>
-		<<if $auto == 1>>$assistantName<<else>>You<</if>> decided to appoint The Colonel as the commander.
+		<<if $auto == 1>>$assistant.name<<else>>You<</if>> decided to appoint The Colonel as the commander.
 		<<if App.SecExp.conflict.deployedUnits('mercs') >= 1>>
 			Your mercenaries approve of such decisions, as they feel more confident by having a good, experienced commander.
 		<</if>>
@@ -1233,7 +1233,7 @@
 	<br><br>
 
 	/* tactics */
-	<<if $auto == 1>>$assistantName<<else>>You<</if>>
+	<<if $auto == 1>>$assistant.name<<else>>You<</if>>
 	<<if $chosenTactic == "Bait and Bleed">>
 		chose to employ "bait and bleed" tactics or relying on quick attacks and harassment to tire and wound the enemy until their surrender.
 	<<elseif $chosenTactic == "Guerrilla">>
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index 5a18bd640a4c436f1813c7eb5f7e1b32ddfd6fb1..141d218b11b02aae8940c885cff6fd5737ecb8b7 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -508,15 +508,15 @@
 <</if>>
 <<if $garrison.assistant == 0>>
 	<<if random(1,100) <= (75 - ($fort.assistant * 25))>>
-		Unfortunately during the fighting a group of slaves infiltrated the facility housing $assistantName's mainframe and sabotaged it. Without its AI, the arcology will be next to impossible to manage.
+		Unfortunately during the fighting a group of slaves infiltrated the facility housing $assistant.name's mainframe and sabotaged it. Without its AI, the arcology will be next to impossible to manage.
 		It will take @@.red;time and money to repair the damage.@@
 		<<set $garrison.assistantTime = $repairTime + random(1) - $fort.assistant, IncreasePCSkills('engineering', 0.1)>>
 		<<run cashX(-2000, "war")>>
 	<<else>>
-		While the $assistantName's mainframe was left defenseless without a garrison, there was no attempt at sabotage. Let's hope we'll always be this lucky.
+		While the $assistant.name's mainframe was left defenseless without a garrison, there was no attempt at sabotage. Let's hope we'll always be this lucky.
 	<</if>>
 <<else>>
-	The garrison assigned to the facility housing $assistantName's mainframe prevented any sabotage attempt.
+	The garrison assigned to the facility housing $assistant.name's mainframe prevented any sabotage attempt.
 <</if>>
 <<if $garrison.penthouse == 1 && $Bodyguard != 0>>
 	<<setLocalPronouns $Bodyguard 2>>
diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index 8b32f0de5c37dc14a480290f22465e393e1319b6..38ecf9ab6a36063e2af4c6c98efd06407b09eaee 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -12,7 +12,7 @@
 	machinations of the one the media quickly nicknamed //the Smiling Man//.
 	<br>Despite the sheer damage this criminal did, you cannot help but admire the skill with which every misdeed was performed — the worst white collar crimes of the century, carried out with such elegance
 	that they almost seemed the product of natural laws, rather than masterful manipulation of the digital market.
-	While sifting through the report, $assistantName remains strangely quiet. "I'm worried, <<= properTitle()>> — this individual seems to be able to penetrate whichever system garners his attention. I... feel vulnerable," _heA says. "It's not something I'm used to."
+	While sifting through the report, $assistant.name remains strangely quiet. "I'm worried, <<= properTitle()>> — this individual seems to be able to penetrate whichever system garners his attention. I... feel vulnerable," _heA says. "It's not something I'm used to."
 	<br>Fortunately you have not been hit directly by this criminal — yet. Still, the repercussions of numerous bankruptcies take their toll on your arcology, whose @@.red;prosperity suffers.@@
 	<br><<set $arcologies[0].prosperity *= random(80,90) * 0.01>>
 	<br>
@@ -76,14 +76,14 @@
 	<br>"I... I — I couldn't stop him! I'm sorry, <<= properTitle()>>."
 	<br>You waste no time in rushing to the console and checking your finances. It's as you feared, @@.red;you have been robbed.@@
 	<<set _lostCash = Math.clamp(50000 * Math.trunc($week / 20), 50000, 1000000)>>
-	<<if $assistantPower >= 1>>
-		<br>Fortunately, the computing power available to $assistantName allowed _himA to
-		<<if $assistantPower == 1>>
+	<<if $assistant.power >= 1>>
+		<br>Fortunately, the computing power available to $assistant.name allowed _himA to
+		<<if $assistant.power == 1>>
 			<<set _lostCash -= Math.min(20000, _lostCash)>>
 			somewhat
-		<<elseif $assistantPower == 2>>
+		<<elseif $assistant.power == 2>>
 			<<set _lostCash -= Math.min(30000, _lostCash)>>
-		<<elseif $assistantPower >= 3>>
+		<<elseif $assistant.power >= 3>>
 			<<set _lostCash -= Math.min(40000, _lostCash)>>
 			significantly
 		<</if>>
@@ -139,7 +139,7 @@
 
 	<br>
 	<<set $smilingManWeek = $week>>
-	When $assistantName violently wakes you up, _hisA worried expression can mean only one thing: the Smiling Man had been back. "We were anonymously sent a link to a new website: it's a very simple site, no visuals, no text; only a countdown ticking away. It will reach zero this evening." your assistant says.
+	When $assistant.name violently wakes you up, _hisA worried expression can mean only one thing: the Smiling Man had been back. "We were anonymously sent a link to a new website: it's a very simple site, no visuals, no text; only a countdown ticking away. It will reach zero this evening." your assistant says.
 	This is troubling, yet somewhat exciting. The Smiling Man never failed to cause damage, but his ego had gotten the best of him this time — having time to prepare before their attack will give you a chance to find them. For the rest of the day you do your best to plan, prepare and focus.
 	<br>
 	<br>Evening came faster than you anticipated. Your security team was already at full alert, waiting for any signal on the horizon. The die was cast.
diff --git a/src/SecExp/tradeReport.tw b/src/SecExp/tradeReport.tw
index e174a0cfebbc1e2808a62d0c25fc7964cb89d7b5..edb838a44ea94b67e5c18371ce571a078f697f86 100644
--- a/src/SecExp/tradeReport.tw
+++ b/src/SecExp/tradeReport.tw
@@ -54,11 +54,11 @@
 <</if>>
 
 <<setAssistantPronouns>>
-<<if $assistantPower == 1>>
-	Thanks to the computing power available to _himA, $assistantName is able to guide the commercial development of the arcology to greater levels.
+<<if $assistant.power == 1>>
+	Thanks to the computing power available to _himA, $assistant.name is able to guide the commercial development of the arcology to greater levels.
 	<<set _tradeChange++>>
-<<elseif $assistantPower >= 2>>
-	Thanks to the incredible computing power available to _himA, $assistantName is able to guide the commercial development of the arcology to greater levels.
+<<elseif $assistant.power >= 2>>
+	Thanks to the incredible computing power available to _himA, $assistant.name is able to guide the commercial development of the arcology to greater levels.
 	<<set _tradeChange += 2>>
 <</if>>
 
diff --git a/src/art/assistantArt.js b/src/art/assistantArt.js
index c20ef028817cd66a5eccca2dae4d1bb68cf3e0de..5c431001c9e266571de04d428662f5f74ca4c665 100644
--- a/src/art/assistantArt.js
+++ b/src/art/assistantArt.js
@@ -11,7 +11,7 @@ window.assistantArt = function assistantArt(sizePlacement) {
 
 	if (V.imageChoice === 0 || V.imageChoice === 1) {
 		if (V.imageChoice === 1) {
-			switch (V.assistantAppearance) {
+			switch (V.assistant.appearance) {
 				case "monstergirl":
 					fileName = "'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAARoAAAJaCAIAAAB/YR8cAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOugAADroBFb820gAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAEdWSURBVHja7Z13WFVXuv8nz515JnMz3iTjZMa50RgVPRwjYAcUOzYUG9gVuyh2xIpdETUiigWxYkFA7Kj0qtgL9oKIShETjZnJrXN/f/zWcZvNZp+2ezl8v8968hA87HU46/3wrvWud73rN80h/ch5tFGq5zTINFCN7882btzY2dn5u+++c3FxcXV1dfsgDA2l3+Aj0IuEWb+5GsU70yw12umMDxY41TgZgoyS4NR4TZVfapBuwAcLnGqiiBsRj1M1ljINBFF8sMCpJi5+GqR8YCDFIKbrBhlVLDVMwDQPOOnfyThF8ibK6PvRqzRMNkjCEpnmuXbDaAAnB5izZfA2ZULgx8jBAWcJWMo0SBUhhICTmmqy0AQGWcMImellGgR4NlOP1VkS8BAIOGlRHwN0fJZAzD0iXsED4gMbxTozQTJNF09gyQScHAynTB7zvYYJzgK2XBuvNjZIM7BZQvgBODkkThz9DKGOr2OxCBKZ72GOB5wcFieO6Qj0dhOXNY/p4eYgfXBKiOMBJwdUVYyOA04m18SIIhh9jWQdZTEoR/6pYbIlkJJNP4WPHTg5pmhvw2UHiczumGA0/5DWYP6DTpuM5iA1SEHSA3DSm8g8ipfV0oTYxYmZqEpvVVE0Mmdu1V5mfVpIfgTzPeCkD2/DfR+J3kGygROx+2ozt4yqXVeKRhpg5srK/MXVME6GswJOmpdpeZNu4EgUnStkI7/B9JoUq3hQSykaDPP1kkWWqMxXyX93pFYAJ9mWQxn2M3cIQrY3ZM2zgZiUmgfZmQ+05vE+xjMkOotBnmZYYDTNMDOwiwWcZBDH/FQaBmuuyTZLzRn7uTS3THdn7bGUBxNp+qRHp03VgodgCTjJJXp6Zs1BVQt5pxjsvMBSOKGKxgyDOS3WeKYXV3wnZiYvFGR0ijaaVmsZ7Ckl35xD4ATxn+9ZXxFVLYdSLKcXMTOJzMEwOa4Uy26BudBi/VTVYcF0w0c2kg3sdsKZfJ9ujWKdTXxmWNjComFGSAM4ySt6c9ZiHlDVCiej2qYq8+tq4Yfqf/5N20oZliMTrNO1TNKYc0tbePBphDRE24GTcjiZb/gwlzesORLTlTF3bOlgAytpiFgzc9XE+hGm3zNhliExS0j5A04K6aNlWzoXWOWazJZMBBXLziTT0GShkel5mLtG5As2SB8mmXTXlpMkxDXnKWAJOCkc2UuwNdMzjxOw9oKo/auPeMSzM18JLdbOXFCTRir4xpo0NjroLJ4lwjZGGTgpFYf4FRiLyaZVTibDDk7VNpHSqy2HnKKN5nM2CiTCGLULZDGRnJ6FWlsLmQIP6TbXSwiIAyclRZmyjU0n2l6ZayfKp1nFiVFW0jz1gUz2yI9T5+Qtt/SPPs3iM8kbthjpJv7NFADc5Gw7pg8BJ7nE5fxSlYNKq1pcUT/INGXLYKRZ3vNhbeBSpk/gIf9qI2BoO6jAPgyfgjgecFIJJyYqNhwUTR0zj848H8JinjhzX4uZ/Eq+tti15ZneB4dDXs9aEZkWZhkGsASc1J7spdg3wapd2l+jedQ0zGIgrtFhZ4tehTn1omeAFr2iYYGF6B/tmqhNYdqJmf4ipBisxdwh4KSoTPlBKVVexQ5yv3okEw9nzbxQ+odYnJWdInrTiSrWR5dwIWAQfkw5DfHOFs/kVqsYscfkhRqvNVJ5EubcEg7BEnBSm6gMq+6i2rroVw9jvsHa6Khzg1SrJBBvRgBoEmJseMq54SmD5BkPuFADOCkkss6xm0JKuwXzPCPmvIsKJJgH5Zyine2AkWqQfHOW5RiRjAecFBIzwcf2dI4VN6tGzq+uqeFZ9vyqapJmcxeowTlDw3OSUpRh6h0Z4sBJUVHBN2tVgarC1tXzjFjHLiggWXmrHzeXTjjbcU0Z9kjjnMZKxdOJL8IaCTipJlMAwMq2Jr1bSl7DdGLMwAAVzrYcAU83WKyPxxuVJEOjPc4Nz1teUFmLp6vyt4mKgjieVwROfOIN6ZZPNH003w+uiYpEN2dltX64AObjhFDyVVCahexbpyijja1bY/+mzuONAj4BgoHgD5B8IKZt4jRHPjcFnHiIWgix7IBeHdFBCGpXhzl/IxB+3HrKkCWQ0GhvNc9jvidbhUQ/N6edzo3XsvdwCSe2F4dUAi7fFD4qq5B1pNeBq9ICJ94xCebBiubMBIVfXQRVXLKaAZ2TOS5ns5H3Q2y6yTJj4zDTG2P5pWrLtjQD4cowxZScTp3PbRxuNG2FpRusnUCx6IXIj5umtWkWVm6OHT8ETrxnLKz9mWqTupSP8QaZvJDg8F2VH0usWt1ZXctZW5udN+07m3gLMjXqOR8TZ+1uIqfXiAoTwIm3TH+qq/+dNhGVUa2agp1IneotzVDNf36wdZObPSt9X6SjmnNiCjjxFpVaykogMMXKMxjniI5rD6EMKys3RoaerUMfAna0EpxrWmlL4CQoxJfJXkE1Zx68Palh15RusJE5ziqoVPUjKdgXBk7yzffSLBytq1o5pGllpcR14pdiJV/WUiUZ00op0kidazT9yikm3qjdYaQpASdBOJmd+mYmRmh61YQSEcBJU6IWGCxrqwqXpzgCS1yun4KAkwSiT/5VW01lGHTgnTJMwW5qYWM6kDvb2DDZ2XZwosr99m/aZCn8FXCSWlSImfkd86xWLbfGa0zTVOMwC/d/NjrkbKheUs/N2815nJH6CyIgLwk4QRxwql6WyHLBIL3M6446O5lfu/Yhn4jJG1wTcJJFzqM/7tI6RRuZd2zqMt6w7CMkZOJnLSBpnpcEASeJZQrlfThYQWXZ6DjwkGJzvZdmMIAl4KRETOKDU6LuldANPBl2NnnJxNUp2iz7LsP0azZejROHwEmE/3GKNM3rGsVb3qCkcKKyjbSepMfllEesc5O5xmqFNS0eQ9zDPqNB3a1GJZIDJ8iOPt7vksY+XECl5FAn3vUV3LNwADGdnRRvcrmp/Pwedn6BEyfRZ2mZAT1miE/fyyez1ZTzSCOP/eh0DZ2cB076Iap6IrmdGpE1oDVMMNS0nHHgJJnIpMjcO9XwhqJiwEkoTtVT9fS9XpIwhhGP2rHASRBOVIkVp00fI2CS1L5zkOUWZn3AiZc+Xl6WUnUtHxxU9dLQNX1jCjgJ5IoOkTvGCsowy2gcbGyYYP+krSHIWO1mePNDhzUYKuAkNMqX8THKp6eUCGZQ7nT1Q7i/1pF07efWMJVdxI/8E6ugtPkVbyyoyILKWg1q4ASxZdrDzTDl3bj38Wid6ukwSyCL200NTxmMw4xu7ZrzIOrXdWaNOvEOnATK6m22jr3R9OE0R5MlRsNcUzPN+tI4ZV04bTLWBGcFnIRo4vgJRw8nzCkIRviBTAUbnuFM4wlnx86jBU78NGrqqIlpkyOebzr7Kvk/fvj5yMsjvIzPO69ns6yW+kAl3Wr6OVXl3DDN6ObtRvtq6lodU2Am3T5UjhpVB05cNW1KUNqZ8wShm+XXNxZHUFQQnJJeHrVmN/3z/cjLvPN6BV6cQn1n5IWA15Vl1P+SfyJfkEd55Hipic356rZ+zmyrOkN4GgRVSKzm3CUFnHiAxGxPXz8iroaY19pn4VWmltWUYoaARL4IvhRCGqGFIES9gOBH/zj9qNyyHBaE1JOVm7AdcmZtH5lqjsc6UyFv5l3aSCwCThKDxMKgyQeEqOaXP4T8l3yfmgQSv0ScD2nkxdQLLD6HuDvqX4m/Ij9I2CONSVTbnPaqHSv8taoRq0Csw9+FAZyk1OQJk2yARDfKC9HNM6cDNX+j3VHyqzPkNeSV5PvEa1l7DvknypvR3yE/SDsrapGm1qKLTqK3UHI5BUd0gZNN9evreyT2sF2QqHa3opBlYYQlwgaZy5GvyTSPAolyZYQxa8+h3BHlx5iujyBETwv5hj3E1Ft2Hm+sOo3LuC6Euu7A8v7SAnAFnBhq27btpvUbK4pfcWSJtFOvTjKtqkNaF8ISsXsCBoUW5We4PIr8lEt2S5Z3Yv4sQU5s0MJ08YwzR/DcvN3oM5HMU16mIrgZtsrHUhdAAacarfnB825dus4dJKqFF69jGtOkuMnUTI/yJDQGXB5FuSOyjqL+d0C+P/FX5qss8VO+hqe4vTLV4Nbu14xEsxvpqSoatt2d6R6AWFP2fc1JNgdOzQNGjT5/MpkvSFTzyfRlGtCyHUspeCg2eD2K+SNUcII596MbHXNXpoZEkxVGeplkMa2Byog1Xf5LXaiRaaEEEvnXGpK/V6Nx6tG9x76de4SBRNraVWtYBhSwOMCcDe440e6IWnpZxImaRnrn9SKvGZkfIFm8Ic66q0lHtjhwsqeli5Y8u/dEGEgPbtwJnDi5udnpjPaRXvQEjy9OBA/PnA7MmCEVw2A1MgmkY+6SeCrD7KqrcjmWW2kUb8oVqoEJ48DJgvwH+SUfOyXYKZ07caZXj57Uoxrtq7aydz7UjBn75vtksuKi43hkvkeFyJlt1IWP7ij4Ugi9WyV2KZXo7NqvKleIb2zDOBhQ1WCcNoSte1NSLpilA7v3MZ/GLpaf1oQZiBPcCz39Y7kvqhfKa428ECDl5tIBZ8Nco7F/06rNJWupdx8CDI124q7Bmo3T2IAxOamZYuw7Yt33rGea78Mk3T4qkiJrjXZHMSUxdJoFlbg07sIEyY5gMMvZMs4RNkxyNrWjH0IOCaiqV4Nxcnd337FlmxhTfl/+46L5C82f3CSEjdOJM0ky4UQate9EhSjIfI+KSZCvCWAS55Lb8GOJqFtUg3GaETT9xsUrYoy46N7jyRMmWXy48/hqOH17tvHPFW/lw4m5O0watQdFJoFkWtgww5ljzril6pOm5VPjtUbuO1cgpybitDF8g0gLvpJbMGjgIGvPJ4sNpp25xraUjyU6/k5N9uiMQfLFqyfPbVWW3GC0Ux8mzcB2tvbqyTQ8Z0qBZR13hxwWp3aenomHjog037PHz3Tq2NF2R0wj84/ylxsn77yedJCDOk9lynVKOW47O8Ewzcg8/Gf+GmotRPCoVjeCw43UjcOMdGAQckychg4ecin7gkjbZQXxrImszmnzOpi4X1acbpZfZwYMXbJbUsH01Ymr7aa00l8bh1mY1NFhOho2wywj96Kc5EMwOStvN+DkaAqZHVz6tESk4ZoH8ayJ+cf+RHySrDiZx82pddSQ3UPtXNrJCJk0t1QbkE5ypV9JXeBJnaWlCoOZn8w1v9XKxNXcmsuVo+G0ZWOkSDN9+6pyYch87j02WVplqQd27VMMJyrLlkqZdU+0c76Q+SbJezaPOhDAqF+HnhaS15j/sqzMCeqnyGSPrCEJh3Qj/wuc9K1WrVqJdw6Pbt0bP3Ycr36Zf/i3bYpSDKfAi1Oo81QXLuTZ3aJlulCyQGIFJJnLJzq4QlCxGGlgldfDQXcHxKmdp2fq6fMiDTT19Lk+Pn34ds1c5YevClMMJ7Jwok7vhh8Nt1M6fGc1nKgClBZeFmlkRSOIT7M8v2VuXqcZsKXrUDh17tQ5JzVLpHVGR20X1jszVj5/eYgyLFGHC6mFU+/9fe1cwbS2WqDcFOiba2SVW2EeaiLejBnDsByASbaw7oJ0j1OP7j0u5YgK4j24cWfB3HmC3wBzstd9aQ9lcKL3c29cvWo37EbeocXguMXAt+kPBCP0Z7qX3lIcnJUsi9toHAEn3z59bxZcE2yUP1e83bFlW4cOHcS8B+Yq321tS4Vx2nws0nzT1hwni8FxaxmuTpuMjTfZJ4rpxOiCR8BJx7qWf1mwRZ5OOjlsyFDx74H5h7/+3kYK4zRg70B2RKGfmzlO1KSUo48yL9VCiDIP1lHXiIAoB8FpsP9gYbaYdub8tClBUr0NZtC5flKj+9cLFYuSD0jzszhbY+4sf1g7OTNXetW8Cp90WPN1FDuhvsYTpWOcIjdECABpXMBYad8GK6n8YOx+ZRyUR45Xv6QB5kE81vzzQ8aqMzPkTb7m5aYaL6+KZDQOY+fpsXeErZSUAE5a19W8S9yN7+jhhF49e8nxNljLkt7BPsrg1D/fr2N8F4s4sRJzqWQF6hYZ8m4porhfmkj+XlBbVZRbI/9lLqXYU74PU8QaG5nQMU5P7z7iF8G7eXfu7GDJ34abd7W1yl9Xff3yUbECOHVL7WFxx5Z6V7Z3dVnztIYnbTkraj+K/mUJq6xZn4V70zJq6PaujnEibAiwwn0xezw9PKR9J8y1yrennDau26DAvtOgI/4Ws7/NAyTmjcoJYv4v8VrWzjs57bW/rUR8lHn+XqNYZ+CkJxVeuSnAFsksccK48RK+DZYh9gjsKTdOwZdC2sV3qFbWiw7Wf0g/tY0TlVbHxOkjFf3cLEwC07lO3kweL4MdGqlRwQl947QwZL5gi1y5dIVM0Yiv5vz1Sm6BrKeeZhycUS1asNTIYoOmwjnAlJPKgoTYvUWcLK67eC2HjL5mRxUzatBdG7rPirh+QfjW065t0XLgRNrcVcHy4VRwM98trRWr8B3TO9HLOTpPnLUZRXwXc8nHWgux4uwNE5ype7W5BxhMdcyrn5VyikYVWD1o0bwFYkzzTNLJTh07SY6TYbHx+YOnMuE04eBEGxO55owKFswoAnNGSgUAWfu8VXO26hNF6sVkzsY3Xsee+9WAGLojpMDG7T8kxjqv5V8eOniIJDgxDXH91nA5WDqalWgrarffmUkO0+0wA/osnJjUWcNJmAiEjcjTmGWZNxmBk6bVuVOnO1dvibHRV0+ez5o+U3wogjmn8lzdXnKWLhbk2S3ST2Zx9GyNuUHEXBRRhLAOQcmBU9VHtMZIhx9NKUu+uGpaw5o+dZp4Y121TGBwgk7baV59w2fpliUSslTysIhTEkOYkRU0p2UjeYI532NlITlJd/6CUGR6eLrDbkw5zmncnVt3iDfZrZu28O2Xed6OhdPfIr85lXhcEpZePin+Nq0Jp/LI+9hBc2s4MaMRzLO3FjMtpBXhqslCB7yMw6EOtxdk5Ys3XLIS42cZw6p5A9ZMqf1cLzEl0am2Z19M/eNOHHOCnLY5syJ41nCy5qAUwAlrJx1oxLDhvK7itNZSTp3t3Kkz1zjEUqO1BYkpSSK58exls8ScyNq7Y5dPvC+PjNVV7DCj6f6/ccZqobxfT62bkvd+XWjRDso83w+c1EScmn+4k1OSydXVvEuDBgzk0iNtjpSNmqcj1N377frNvKN8Lx8Xb1y7niqt7pc/hGu9u2SDxbIqrNpgzCpFzBAF9SuY/yyqvdZQnIiiIjZLQlTR3UcTx02wEwjux94MtZjdQ4iK3rOdY7/pySlL5i9eunAxXXmzX/5A7jO95pbqflGZr9bmb0zSLOYZ1dhCX8DJpBMJ0pSPfFf6Zn5wiI2OmGWMKJuzlixHiDqccNBGX/evF4avCps9bWbkhojSpy+Y/zQw358jTtT5C2pFZ+MIhvlyiE4wJ/9kTiNrnxeqWTg1F3fundXWrV5rrRfmMQdqRmSOEz0b/PZ8k4nrJhQxzpWUFb0gvmjP3pjtkVv3x+wtfWK5eO3g/KEccWIGHljZd8w3RicfMeOTtPsyzDbL8UM0oobjRCRJWIJqMVay+5g2av6dj1uW1c8X1t397fLIZYOW+rUKa1t3z7fkOxuKN9rufdzFiVy9U/VZGWuCZw08FlHkPTdZbDTPXYJqNE5EEu6iJsUltm3b1gZOH09GVC+fQBb3dqsIbXlup3bsnEtzhOHEfHvknTBzW8k01fzjooliFY5lJVhANRQnaYnKS8vu59vP2iKeMmVWOixhzDxBltUOvjhoxzdyvlzQBk6EH/MsWBtENQ6rNuXD8gk4SU/Uk8IHzJsIzSN7THioY+QsnFjHH0hLL02z3WlmaYbtPD0uOFGF+TmGv6nNNFOindmxeaim4yQtUX9//W7Z4qX0k+k/4dTfbyY8FneizJ1VWeVL2z2+eVPe+ICx4VkrYbooZ2srHPq90bEHLgWT6digacoXZbSx3IJqKE7SEmWqab5lG/VYegb1Ma80xMgKW5svQpj/65XbhUt3vnH9Gh617JqY+7asaZv51I75Yi7xOmbEzzZ+UM3CSXKiTiYc8+nVm956MsfJPHROlVOlUxOcIo3f2wvrUS325n5rkz0mn9XcCzPdgbHyYc42uTgcemOXdSwKquk4Ef1U/oOERBU/eBq6JZRpzcyN3Y8LGEasj1mkgSonVPL6Gce+3HPaWzt+S0/qmPE38zCJuYOyGN+zOPFDthFwsqxHt+9L66aOvzzWOdebsmymT6C6YwLGLCFE/mnTfh6FbM+XnrOGk8Xjt+ZbzOYOint6KwUh5nvAyYJy07KkJaq08sWcvGAWTpRPYBU5oedmi1Yv5NvL2uJwizjRXTBzW5lhbots8M3HIz+F9AjgZFmJh+IlP3yecTZ10eZF5hl0VVnnH9Yw5H83FH8vrIuo51EW77Slpnb0/zLjEBZj3PSKzuIduDZmfWAGOFnW3ujdclRHKX79dFfJLq/cznQAoOpMVKQxKHDqlQeiqvCll6Z2+jC3ZEXnqBAcZfHmlSHYITuGz0QEHDhJI0mOxFt1VrlpEeu+X7VsRdD3QQEXxm57vv1OyW2pHn6sKKl7Xm9mMisV1Ka8jV2cmLEKZDwAJ8m0ddMWxe6HlrxdenVx5dIVA/oPoIkyHWhvVw0nG/EGOucVITvgJJlWLFn2y5v3+oWKtIriV+nJKVs2RoYuCx0VOLLz2C5c8sFNVcSSsUULnKTWlEmBRTxvuNF4e/um8nJZQXZp5qyCObbjdSgIAZykF5kyXcjIldCgH9y8qxG0XhYVLw9dZu0XpyIlcFDASWJ5eHgkxSVKubbJvpBy6mzCgTg5ICkvepl66lxM1A7yfNIRXVvCWruce7FTx44Wf/HGa41wUMBJH8EJYvfE6EkT768InKHzF61fE06agAeS13fr2s3T03PMqIA1K1adTDhWfP8JeebQwUOoBCiMPnCSXqELFr8tfSN9IC77AmHArhsxR4hycQJ+1rz9VPbD6+elFiLvcYnjgsdh6IGTLBo7esytS9dlmqQRPMh/bb+GeBJqrqjkKutKXsGcmbMx+sBJenXt0uXU0RMyGa61eRr1fduwyd1itkZj9IGTLJKqDqa+2pHYwxh64CSLQmYHv7JSBM+B25mkkxh64CSLhvgPvpiVV9OIWrooFEMPnGSRh7v7wT37axROjwsfdO3SFUMPnOTSovkLXz5+XnOI2rtzNwYdOMmogf0HXM69WHOImjB2PAYdOMkld3f3onuPtWPupTKHSbJTMjDowEkuaTB0fvfqrYpnr+R7/sKQBRh34CS9vNq3/6nsRw1OyfIzcuTb/D13MhlDD5wkVo/u3W9cvKrZRc7RQ/EyEfXLm/f9+vrCAICTNHJxcQlbsVr7YYNFIQtkIur7tethBsBJAnXv5n0554JeAnEL5s6T47FXcgtgCcBJlAwGw+xpM/UV1ybeifgoOZ48NmAMTAI4CVTrVq1TTp7V406RTETtw5YucBLmlPwGDFL3lIQGiSq6+9j8RlMIONkKOTg1ctoZtUNuc1+/JlzuLh7cvBsyc460z5w7OxhGApw4qX79+gP7DVCgAtGl7AuL5y1UwEdRx+klfOCxuETYCXCyIycnJw93D8VWSqOGjVBs1hc6f5H4ChN0K3n4rEWLFjAY4GRZTYmMRgVmd3QjfknhEnyDB/pJuA6cMjkQZgOcLIDk5uqmJEikUQWJFA5LSLuI2rNjF8gBTiqDREXbpk2eqkqgj0z5pCqKdPvyDZADnNQEiTJlsmRSK/hO+u3ds5dUTxvQrz/gqdE4qQUSjdP6NeEShgTUdVDr1qwFPDUUJ++OnWeMmaQWSFQjczxlIuPKOKjc1CzAU4Nw8vHuQf7bs0u3tN1x/+/Gs3/ee6muHXdo76WFVIlRw0dK4iF/efO+TZs24KdG4OTfp9+7vMLi5Lw3WTcIS6rjJEltcUla4sEjUm15zZw2A/zUCJxenL9IUbRj0Wrqi/99VKrmlZsiWap8/9/Fr/95/+X/FZaQ9r+Pyv6z4p3gp33zzTeS/FLxB1Amtmbg9D6vkCD0Lvf2iN79KJz+u6RSp5ms/1n2liBE/RbM9j9FFcIe6OvTV5KAxKPb98FPjcApauFK4pd6t+9880gysbz/u1VM/sDrEqfK9xZZEvM3InT+IqmCIl5eXkDI8XG6mXBOkj/kqrf/ffDKGktUEzDrSz11zjwu8veKtwLe3qTxE4GQ4+P0Nr+QNrh/3n2hU9dEpnkseCozr7/OuFrtL8WTcgFhxi+++EKSd7hp/UYg5OA4OTk5OQBLpP138WsmOVcPnqS+eJVyqeoXFBSx/OSTT6TamwZCDo5TgwYNquZ4umWJNPL+mTgVnc6hvtgZGsb8vjCcJElpf/HoGRBycJzq1KnzNPuqmFCyNnGaMWzM5QMnlkyaQcVXqGaKsgjCiRXce/VE4CUG3t28QZGD40RW2w5QaP+/Xv7AWjtlxcQVJ+cxvyN4ssfEqeLZqyOxh4W9yRlB00GRI+NUq1Ytx8DJFCW/VWw7skfWV8JwYu4sZySnTp86Tdib3LFlGygCTrqc77GasP008uGwQhGRGyJatmz5pPCBgHeYk5oJioCTbhqZzkm7jUs+nM8//7zaYfVJpsPqh/bGCnha5fMyUAScdOaj/q/weTW/VPj8v14JvMUjdP4i1jZu9w/hhFnTBRa79e3TFyABJyVaenKqZLu6Fe8IQqT9Z9lbMc9xc3FlJhm9Li51c3Mjn1v79u3LBd0QFTJnLkBy5Mge+QOskTqsWqsj+/DWPVZY71jcUfqjO510UsAzd2/fCZAcFqcGDRqMGj6yRt2vzuPk1dbo+vWqHdAImVVV1XXZ4iUCnpmXlg2QHBYng8FQ/5v6IMdiI58MK528W5eu9Efn07u3gGe+fl4KkBwWJ6Lf//73sl4Uq1/XxEovelNSXr9+feZHdzXvkoAn+/TqDZYcFqfatWsnHjwCfsxdE6vK37G4RGdnZ+ZHtz9mj4Anz54xCyw5LE5OTk6+Pn01ZcoKV1G2GB///PPPWaGRoElTWB9dyOxg5EYAJwvh8oe37mkqjqciUZdzLpJpnnkxZ5fvmrE+t969hCyfss6lgyVHxok4KCXD5QQVu7RweY0cjSwj3Vxc+/buw/r+nSs369ata/7R3Sy4xreL0qclYKm5Y5et/Prrr5VxUNwLFZFXKr8TRVhybeZi3u+GsHWshROlg4Kyjbp7dwdOjoyTwWBQYAXFl5CEA3EK16m0yJIpRN65q8XPbWHIfAEdTZ8aBJwcvKhynTp1YrZGy7dYEjZ5UyZbgszxOrbvYI2lyudltWvXtvih+fb1FdBdVMRm4OTgOLm4uPz+97+XI4VPJA9yE3U552L9b+p3aO9lrRdTekT1HSem7ly9xbfHEwlJwMnxS/6TKV/tP9V2sBxzuzHxevXq2b7Kuk8vH1dXV2sfmoDDudfyLwOnGnGDBiHqt7/9LVl5a9P635SU/4d0eQ/EKY0aNsL2LJT0+MUXX9j4xJYsXMx7bln8CjjVlPudCFG1atVyc3EV4KYe375/58otWYnKTc08lXhccByS/CD5Y8EFpI+7rpFbv/32WxsfV+9evd+VvuH7Njp26AicapC+/vprspQiZkeMzzZXj27dOxGftGzRksF+/mSNETBytDJXqk0PDCIt8eARLjmH5Fcg8zpfn76uzVzI1I57XMSjrTt1xsmGjscn8X3/I4YNB041TsRTEa7IbIf4q6ZGY9fOXbp39e7p3YM0YpoD+w8gL2DFM76pW0/h66inTZ7aob1Xx/YdSBs1fCTBhjRCGvUdaiuJ+CIBNxoWXr7xpz/9ye6nNDNoOt+3PT94HnCC7Ouzzz67WXBVrWQ/4rWYTWRqxaygGXNnzSGrI7+Bg2z/1nev3UKsHDhJrzp16mxat9EBgn4vHj0zGpzp//2p7IeCrPw90bsmT5jUunVr1m9N8ECsHDhJrwYNGgROmOQAOE0YM95aWsb78h/PHj+zatlKv4F+1G/dwavDveuFiJUDJ4nl7OxM1ld6ZyknNbOdhyeXV6adOT9tiilpaHnoUsTKgZMMDurbBnrHqUnjJsSB8Iq/r1y6PPNcGvcf8fT0BE6QfX355Ze6ZmnxvIWLQhbI3Utfnz7ACbKvTz/99B+VP+mUpYKsfDcXVwU6Chg1GjhBnGLlpU9K9MjS29LKFm7NnxQ+VKCvGl40AjhxlfKn5SVpv7x536+Pb05KpjLdrV62EjhB9vX555/f4n/qW/U2e/qsyPURinW3ffNW4ARxCkXwTedRvR3Zf8h/oJ+SPcYfiANOkH3Vrl0782yajli6cfFqU2fjDy9fK9lpenIKcILs689//vOpxON6Yani2at6X9fNS89WuN8LGbnACbKvv/zlL4f3HtALTl06dt6zY5fy/QIniJP++te/Hti1Ty/hh6mTAlXpGjhBXHFS5e8930ZcaGOnxjmpma+LS4ETcNKovvrqK4VL5Alotwquff75582afSyV3Ktnr5nTZmyLjEpPTnl695ECb+DU0RPACeIU2Us+dkrLLP3wooL4JdZRYqbatm072M9/3py5BLDk46fvXbstbdoUjg8CJ6768ssv89KytYzT4IF+9erV4/t7+fb1nRE0fWP4hqS4xMu5F5/cefgj/9j6y8fFIbODYSTAiatq1aql1vl2jiXByDRPql/W08OzT2+f0SNGkbniiiXLids5vO/A+ZPJualZycdOx8ce3rVt56b1G1ctW7Fg7rxpU4L8BvnBQoATD/3hD394eueRNlkquvv4iy++cHFxwTABJ33ot7/9LVmcaBOnrp262K6bBwEnDcnV1fUvX/1Fmywd2LXvj3/8I8YIOOlGBoPBo627Bln68VXl3+rUsRHNg4CT5kSmUqOGj9QgTmErVnOpQQkBJw3pb3/727JFSzR4zParP3/VtGlTDBBw0pO+/PLLQ3titYbT/pg9ti/CgICTFvXpp59ev3BFazh5d+nWqFEjjA5w0llYr1atWhpMKfrDH/6A0QFOOlPjxo17enfXGk6nEo9jpgec9Kevv/56xeJlGtxuqlOnDkYHOOlMxAmknDyrNZz27NgFnICT/vS73/3ubWml1nA6fzK5du3aGB3gpCc1bdq0c4dO2qztWqtWLQwQcNKT6tWrF74qTJvZep7uHsgiB046Wzhptvjr1ojNSCQHTnpSo4aNNHtk8OeKt40aNsQYASd9qEmTJlMmTtbygfZN6zaSN4mRAk46UJ06dc4eP63x6kWdOnTESAEnHaj+N/V/efNe4zjdu3a7SWM4KOCkbTVr1mzGlGm6KPu6ZWMkQnzASdP65ptvLmTk6qUo+cRxEzBkwEm7cm3moqPrZ96X/+jTqzdGDThpkiVX1yULFuvrcrQXj555tW+PsQNOmlODBg2K7z/R3dWdWefSXV1cMXzASVsa6j9Ej5e0kxa+KszNzQ0jCJy0IhcXlxPxSTrFibSh/oMxiMBJK3Jv66797SYbrbzoZUfs7QInjShsxWr9skS1q3mXXF2xiAJOauu777578eiZ3nGiyoZhNIGTygoYMcoBWKLahLHjMKDASU0dP5LkMDiVPCxq364dxhQ4qSNPD09p77dUv+DR7v0YVuCkjlYuWe5ILFFt1PCRGFngpIIe3LjreDjdLLiGkQVOSstvoJ/jsfSxKF/0LowvcFJUe3bEOCpOxfefHIk9jCEGTgqpdevWmr36VpL25PaD7JQMDDRwUkKzp890PISK7j7KSckoyMqnv5N5Lg1jDZxkV1JcwrX8yz++fO0AFJU+fVFRXGoj5RzDDZzkVUXxK8ra6C90196+qnz5qJjLK8cGjMGIAye5FDhpsq7d0fMHT9+UlPP6EZ/ePhh34CSLEg8d0SlIl3Mu5qXnCPjBguz81q1bY+iBk1g1/SDmdyot/Wn/4UWFlk89XcktCFu+uvRpieAnJBw8AgCAk3A5NWjo7tK8k0e7MSNHp5w8S7X42LiJ4yaEzl9kbnCPb9/XYsi78OGkcRMTD0rgUaMiNoMB4MRbLi4uEwcNe5tz6//deEa1CSMCKp5VRR0IV5PHTbA4m9IOSJXPy2YFzZgycTLflZL1S6LeDMFJeODEV5P9R9w8kkyzRLWJw0czbYtyViyDe1f25mreJY1U929qNKadPi/xldVHTwAD4MRDBoPhXe7tiOBQFk6krQytdod0yKxgc6JyU7NKHhapCFL2+fSmzsbePXsx3amELWR2MEgATlw1xKcfIWfZ5JnmOE0fzZ7gjRo2wnwdtWFNuGonaseM/+STT9bL+QZuXbru4e4OGIATD5w6tmxrjhNhzNy84mPj2nl4Xsq+wEghfXpg937lg+BNGjdp3aLV3au35O4LMQngxCMyTiZ7Fr3TvGmzrNXWGjl0+LTAqeQL6jsbwzcoWRc2cn0EcUrjA8YpdXE1YhLAibPWzpxvztLSqbMf3LR1XpCso3r16EnP/WwYd0xJjHderwaZBqq5ZLcckO9Pt9eVZdwt+x+VP00PDCIsKVwkPTpqO3gATlwd1NABftHhEYfCN2fvOrJt8eppk6aUc1vZ74za0c7dI2Zr9LkTZ/bH7LH4muRXZ2iWWC34UggfL1HZu0evOn+tc/5kssJzS/KXBTwAJ65ycXEZ6j9EcHCMgqpt6zbWonzNslqas0S+yd01kSc3d3Xz7tKt7OkLVcIeM6fNABLAiYdaNG+ReDBesMERqJo0bkI8Fb2molvgxSnmOG0sjuD45Gv5l//9b3+bMGa8ihH5Y3GJQAI48ZPR2fnhzXtizI5eUzGXXhbne09fP+LywIzk1M8++4wsmdTdKf7hRUV3b29QAZz4yadnb0kWGyOHDh81bAQdUvfI8WKyRPwVl+fkpGZ+9q//unblGi3kXqxethJUACd+Cl2waFbQdKmuq1i/em1P7+5kBhhTEsPEKbfM/tGJCxm5tWrVitt3UCNpgWePnwYVwImfMs6mEpeyb+ceCQ2RzAAnjhv/7ciG9eIaEpaIp7L7Ixcz8+rWrZt9PkM7WbYvHz8HFcCJh9q0bvO+4kdiOoSozRs2SX630s6oHb2G9+oS2tU8XMG6M8a5ieH6hStaOwAycvgIgAGcLMvV1bVhw4bN3dwaNGhAXIGLi8uUSYG06RCiFs6dL9OdZYSrlaHLLIYBSx4WtWze4nHhAw2ep9oQtg5gAKdqMhgMTY1NJ4wZd3D3/tInpiOrv7x5n5uaNdC3/9JFoSy7nx44VWSsz24AOic1k/md4UOGqZulbqOlnTkPMIDTRzVt2vTPf6rt1cZjcfC8fdG73pZWssxla8TmpQtDnxQ+ZH5z8/pNkk/8zCsNfYyeLV1pex6o8iHFkjKAAZxMatasWafWHu/z7lBZef+89nTVjLlHD8Wbx9Mmjh0/wLd/1MbN92/coQPfY0aOTj11Tr4ra6lpnlRnaeVrHbw6gA3g1LxdyzY/X7jLSnUtiD22fVOUudG8eVFxJPbwpHETu3TqQqaF0Vu2X827FLf/kP+AQXLM/V4+NhXBUyuBiFfr19cXbNR0nIhryog+lL830Tx5fOPc0Me3H9iuZ3J474GQWcF9evbu1b1nR68OHm3arlsV9uzeYwnNVNqnydfGjAoAGzUdJ7dmLmR2t23hSnOcKtKvxsbs5VPd+/G542c2b4gImjzFp2fvHt269+vTd+KY8csXL92zIyb9TAqZGb4v/5H39c+S7nTJ12bPmAU2ajpObVq0NJ1XHxpgjtPD4xlZ59NFGtmLR88uZuYlHownK66lC0OnBU6dMnHy+IBxZLoYNGnKtMCgBXNC1ixduWXDpgO79j+989D8CcePHNUFTiuXLgcbNR0nV1fXu0dTt8xffmbzbhZOgSPHql6DMjc1S8sBPZx1B05sBfT3/5+rj+PDo2iQ/u960aoZ825fuq66jcpUhwg4ASfZlk9ubjNHjnt5/mJ69MFLscf3rdq4cNZc20EIRR1UWjZwAk56g8rVNXJ9xJXcgn9U/qS1esjACTjpUk2bNvXt0zd6y3ZNVe5PT04FTsBJrzIajSOGDjdPNVKmvSv9gV3EOPE4cAJOOpaLi4unu0eeZtYtjzR5MQezLZq/EGwAJ1vau2PXkgWhWli97Nu5W+M4jQsYCzaAk1V5eHgQK/n763cxUdGL5y1iFkxWwTvduq/xDahePXuBDeBkVYP9/Glb+eXN+zNJJ2cFzVi/OvyGDIdhyTot7fR52/GPxEPxWsYJYAAnWwqeNcdCRnlJ+aE9sdMmT50xJWjTuu9zU7Pelb0RY4XX8i/Hxx6+c+WG/fletHbnezcLrgEM4GRLG8LW2bahx7cfxMbsDZkVPCFg3OgRoyaOHR86fxFhjHzz3PEzFzJySUs+dopux+ISD+zaFxWxeePa9RvWrN8asZl8582LCu5FxdSdcNpoR2IPAQzgZEsxW3fwMql/VP5U8rCITAVTT52L23eQODHSyBSRgDRx3ASC1pXcguL7T8TsaK1ZvkqbOC1bvBRgACdbOhJ7WKrqX7Yv3eBxY8WW7drEadCAgQADONnSyYRj0pxcWLJcKqslfk+D872ndx6CCuBkR6mnJagAQfxSzNZoCW138byFWsMpdvc+UAGc7Cg/I0e8qa1fHS7tflHQ5Clawyl41hxQAZzsSJJiq5Jbv2/vPgiRAyf96f71QvHWNi1wqrTmSyZ7UgU2ENMDTspJfPnilJNnJV/qkAeSx8I1ASedqUh0RS45cOrQ3ks7OC0ImQ8egBMnlTx8pkGc6tf7RiMs7d4eAxiAE1e9+lD1X2RJZNdmLhJacOqpcy7fNdMCS/euF4IE4MRDzx88FW92xPolrGBO4NwZtQOuCTjpT49uSVBznMz3Pv/8c0nqe5F5o1e79jjKDpx0qTtXbkpiecSfEKJE+qiYrdF169bVToh83849IAE48dC1/EtSGV/8gbhv6tbr0N6LUCHgog3yU//2b/+mqWy9o4cTQAJw4qELGbnSmiCBauTQ4WQ1RZwVQYtuv/nNb0YNG2HRfZFvkhcQFLWW+Xr+ZDJIAE48lHkuTVaLZBJCviakfde0KYGHoDUtcCr5on69bwhIGok9sFpeejZIAE48RP4AK2+mZHWUcvLs7377O/JfLddaQT4EcOKnEwlJahnrJ598ovEyYI8LH4AE4MRDCQfjVLsY06fvnau3tIxTycNnIAE48dCB3fvVMtYJY8afjD+mZZzKil6ABODEQ3xLr0hZoDhkwca1G7SMU+XzMpAAnHho3eq1ahlr5PqIqZMCtYzT29JKkACceGhecIhaxnp438Ge3t21jNPfX78DCcCJhyaMHa/ahU5nUtxcXDUe3AMJwImHBvQfoJalFl6+8U3dehrHqU2bNoABOHFVxw4d1bLU8mcva/3xjxrHqZ1nO8AAnHhIRWP99NNPNY4T+XMDGIATDxXff6KWsX5Tr57Gd3K7du0KGIATD127cFktY23VoqXGd3J79ugJGIATD0lSV1lgnlEfX43v5Pb16QMYgBMPHYk9pJaxBk2euiB4npZxGtB/AGAATjwUuSFCLWNds3zV5PETtYyT3yA/wACceMjifZ7KtP079wzqN0DLOA0fOhwwACce8h/kp5axFmTlu7dpq2WcRo8YBRiAEw+1adNGLWN9X/5j3a/rahmnkcNHAAbgxE+SFK90yDO5w4cOAwzAiZ9yU7PUstev//1rLe/kDvEfAhiAEz8d2hurlr22bdUm+3yGZnHyR2QPOPFV2IrVatlrwIjRh/bEahangdh3Ak58FThxklr2Gr4qTMUTwfbzNvr6AgbgxE+9e/VWrTRkWnaXjp21m2TUpy9gAE689b78R1Xs9YcXFbX+WEuzOPXqiRRY4MRfNwuuqWWyWt566typM2AATrx1eN9BtUy2W+euD6W4ZkqO5unpCRiAE28tWRiqXl75lIN79msTJ5AAnIRIxcy9LRsjZ06drkGW3lf8CBKAkxC1bNHy54q3agX3tHOBZ7UqsCXlIAE4CdTlnItqGe5Xf/5Kgzi9eISS/8BJqPbH7FHLcP9cu7YWL6S5fR8kACeBWjBXtXPm7T3a3b58Q2s43bh4FSQAJ4Hq79tPLcMdHzB29/YYreGUm5oFEoCTcL0rfaOK4cZs3TE9MEhrOCUfPw0SgJNw5aZlq5Vq1L1rN63hdCT2MEgATsIVFbFZLdutp73y/2T+CRKAk3CNDRijlu1+9tlnWsMpckMESABOwtW2rWp1hVq1aHklt0BTOK1cugIkACdRupiZp4rtzp4+S2vBvTkzZ4ME4KTL5VNeWnbIrGBN4TRmVABIAE6iNH7MOLXM19enL062AydHWz79/fU7Vcy3iVNjTeHk1b49SABOYlWQla+K+f7Lv/yLdlj6ueItMABOEmhbZJQ6hRm697yef1kjOBXffwIMgJMEmjB2vCoWfO7EmQ1h6zSC07ULl4EBcJJGP5X9oIoR9+/bTyM4nT91FhgAJ2mUcTa1hlc12r9rLzAATtJo9fKVqhhx7x69NILTutVrgQFwkkY9vLurU4bl+0gVK/5Vy9KYMRMYACfJ9PCmCrXvnhQ+iNoYqQWchg0ZChsATpJJrdIRQ/wGo/4rcHI0qXWtxrDBQ1Vn6V3pGxgAcJJYb0srlTflGVOnqY7T/euFGH3g5Ajh8nMnzty/cUddnNKTUzD6wEliqRUuj9karS5Oe6J3YfSBk8Tq3VOdXaB1q1S+j3DZ4qUYfeAkvVS5Vn3bpih1cRo3ZiyGHjhJry1q7ALF7tqrLk7dunbD0AMn6TXYz195a76aW/Ds3mO1WHpbWolxB05yqUhxy75/vfDw3gNq4XTr0nUMOnCSS3t37lb66orCB+vXhKuF06nE4xh04CSXxo5Wupbls3tPgiZPVQun78M3YNCBk4wqf/ZKSYN+/uBpd5VS2k139QZOwYgDJxmVcDBOSYN+euch6fTpnUeq4NTDuztGHDjJqKBARadej27dI52eSEhS4T7c52UYbuAkr9q0bqPk1U/3PmSgqnIb4oWMXAw3cJJdSvqK25dvkB47deqkQomImD0Ya+AkuwInTVbMpq9fuEJ1ei3/ksI4hS5YjLEGTkqo9GmJMjZ9Oeci1WPkhgilzwL7D8ZAAyclpNh+bl56NtXjwP4DlGTpp7IfMMrASSENHTxEoZKRJ5PpTh/fvq9crmDeJYwycFJOypyTTTwUT/eo5HwPpSqBk6LatH6jAma9b2dVeK2vTx/FcJofHIIhBk7KqUf3HgqYdVTEZmanNy5eVQanvn36YoiBk6K6mCX75bnhq8KYPa5ZvkoBlt68KMfgAielFbpgkdyWvXj+QmaPnp6eP1e8lbvTnNRMDC5wUlrEuOW+rmbqZHZOd/KxU3LjFLkhAoMLnFTQyYRjCtcHnzYlSG6cxo4eg5EFTipI7nrL3t28WT22bNny9fNS+Xr8++t3rVq1wsgCJxVEjFu+hKNf3rxv0aKFeacHdu+XD6eCrHwMK3BSTbu275TJsksePrPY44hhw2Ws7BcZhTEFTqppgGzZdDYyfR4XPpBr4RSAhRNwUlW3Ll2Xw7KPxydZ6zEqYjOunwFOjqlVy2S5EGDrpi3WepQp4Sg7JQOjCZxUlpeXlxwbUAvmzrPRKZkKSt7j+rBwjCZwUl9kYia5cY8YNtxGj3LckTPEfwiGEjipL7KCl9y4PT09bfTYwavDPyp/krZ0kcW4PAScVJC00bZXj5/b7THrXLqEPZ5OOoFBBE5a0ffhGxSuyxW6YLGUS7WQ+RhE4KQVde7UWcLZV+zufXZ7bOfZTqoef3nz3qt9ewwicNKQUk+fU7gul1R3YNMlkyDgpBVt3bRFvlxyWed7Eeu+x/ABJ21p2eIlUuHEsUcvLy9Juhs0YCCGDzhpS0GBUyQx7jtXbnLvNDslQ6ZcWwg4qakh/oMlrwdmVxvC1ons7sDu/Rg74KQ5dencRRKcVi1byb1T8TU0J4wdj7EDTlqUJDgNHzqMV6eVJeWC+3r9vBSjBpw0quL7T0Sy9HPF29atW/PqNOXUWcHdJcUlYNSAk0YlPtGbvoSGu8JWrhHc3fSp0zBqwEmjOnv8tPKBAb+BgwSfF2zTug1GDThpVPt37ZX1mJM1lRe9FNAXgR9DBpy0K/GJsH19+gjo98WjZ7ixEzg5mkReC13+7JWATnv17IlDGcDJATVh7HgxOKWdOS+g05A5c3E9O3ByQPn29RWD08bwDQI6FVzI8v71QgwZcNKuOnboqHzVSMGVybCHC5w0rZYtWoo50nclt4Bvj23bthXTIwLlwEnTEhazpls7z3ZKrta6e3tjyICTdvXg5l0x9j1tShCv7taHhYvpzm/gIAwZcNKuLudcVPLW9ISDcbjNCTg5rMQkpJrODl69pSS9yNkDTppW4qEjYuz7H5U/8QoPvH1VKaa7RfMWYsiAk3Yl/sanwX7+HPvq3KmzyL7WrlqDIQNO2pX40+bcK0gGjBotsq+oiM0YMuCkXYUuWCTSxHdvj+HY15KFoSL7Ir4UQwactKsZQdNEmnhOaibHvsTfm3ZobyyGDDhpV+InYEV3H3Hsi8CgZNUkCDgprf6+/cSXi+DYV7Low7+njuKMBnDSsDp16iS+mFEHrw5c+rqYmSeyo5RTZzFkwEnTEo/TwP4DuHR0/3oh7sMFTg4u8ffETJ4wiUtH5c9eieyI+DeMF3DStCqKxVr5wnkLlHGDl7IvYLyAk6b17J7Y4pUrl66w20s7z3bicbqWfwnjBZw0rbvXbou08nVrwpWJedwsuIbxAk6a1pXcApFWvvn7TXZ76eHdXTxOhXwuv4GAkwrKOi/2TvXoqO12e/Hp7SMeJ+JIMV7ASdMSv7vKpaDkwP4D4J2Ak+Mr8VC8SCvfu3O33V6G+A8Rj5OAGwYg4KSoiG9R4NyEJDgVZOVjvICTprV981YFInuSTPby0rMxXsBJ0xJf+H/Z4iV2e+njI0EoIvNcGsYLOGlaK5euEGnlIbOD7fbS3dtbPE5IgQVOWteCkPkirXzKpEC7vYgs4Ey1M0knMV7ASdOaPWOmSCsfMyrAbi8e7h7icToen4TxAk6a1tTJU0Rauf8gPy4diccp4WAcxgs4aVrjx4wTaeW9e/Xm0tHPFW9F14o4gPECTprW8KHDRVp5p44duXT05kW5yI5itkVjvICTpuU3yE+Mib8treTY0asnJSJxEnZBGwSclFPfPn2VyaMTfxJkxZJlGC/gpGmJ3BFKPn6aY0d56dkicQqeNQfjBZw0LZE7QlxOZ1A6dfSESJwmjZ+I8QJOmpa7u7sYEw9dsIhjR/t37RWJ07AhQzFewEnrEmPio0eO4tjLpvUbReLUx8cHgwWctK53pW8Em3iXzl049rJ0kdiS/2ReisECTlqX4NpgP758zb2X6VPFXi/QokULDBZw0rpKHj5ToLTQyOEjxLBU+bwMIwWcdKDHt+8LM/FjR45y76V3z15icHp48x5GCjjpQPeEVg8PW8njds1WrVr98ua9YJwuZORipICTDnTr0nWBYb0Ro3h1JHhWSdrJhGMYKeCkA13NuyTs2nZ3d3deHV3OvYibPIGTg+tilpCbl+7wr3onJjEC17YDJ30oJzVTmcN8MVt3CMZpzszZGCngpAOlJ6cok9+9culyBdIvIOCkps6dOCPAvocOHsK3o6DAKXKf+YWAk8o6lXhcwA3TrVu35tvRoAEDBePUqlUrjBRw0oGOHk7gfXPZhcsCOvL09BTGUlnRCwwTcNKHjsQekqPMv0WVF70UgNMtXJQGnPSiA7v387XvmdNmCOvrWr6QPa7zJ5MxTMBJH9qzI0axsxInEpJkukIKAk6aUHTUdl7Gff/GHcF9bd20RcglHavXYpiAkz4UFbGZl3HH7T8ouK8Fc+cJwGnW9JkYJuCkD0Ws+56Xcc8PDhHc1+gRowTgNHzoMAwTcNKH1oeF8zLurl27Cu6rS+cuAnDq2qULhgk46UNhK1Zzt+xn956I7I5vaYq/v36HY+3ASTdaHrpMphO4FnX78g1eOD2+fR9jBJx0o9AFi7gb99JFoSK7Sz5+mhdO2SkZGCPgpBvxirb19ekjsju+cfn4A7jWCTjpR3NnzeFo2aVPSxR2hqRFbojAGAEn3WjmtBlKXqc5ZlQAL5yI88QYASfdiPsxpCULQ8V317VrV8nv3oWAk1Y0afxEjpbt01uaKuHvy3/kjlOP7j0wRsBJNxobMEaxhRMl7qXIsOkEnHSmUSNGctpxikuUqsczSSc54lR09xEGCDjpSUMHD+Fi2YvnL5Sqx+2RW1H8FTg5pvwGDlK4+EnogsVKxhIh4KSc+vX1tWvW5c9eSdjjhHHjOeIUsy0aAwSc9CQud1uc5XylNBf19enD9VaBFasxQMBJT/LuZv/y9vBVYRL2yP02jdkzcHAQOOlKnTrav7x9xLDh0nb64hGn2zRGjRiJAQJOelI7z3a2bfqnsh8krxp5JbeAC049e/TEAAEnPalN6za2bbogK1/yTrncpkEmhCj+Cpz0Jzvhta07JO+Ry20ar56UYGiAk/5EpnM2zHralCDJe1yxxP4R4Jso/gqc9KgfXlTYMOtOnTpJ3uOUSYF2cco6l46hAU76U/mzV9Zs+vmDp3L0OMR/CO7DBU6OKRth6/TkFDl65LLZFbt7H4YGOOlPRfceW7PpHVu2ydFjixYt7O7kRkVsxtAAJ/3p4c171mx67qw5cs0w7V1Os2b5KgwNcNKfCq/ctGbTA/r1l6nTu9du28ZpnojqzRBwUk3WchR+rnjbskVLmTrNTc2yjVPgxEkYGuCkP+WmZSt/7d/xeDt3PQ0bMhRDA5z0p/TkFIsGnXgoXr5Od2+PwW3twMkBdTrJcgbd2lVr5OvU7s0dXl5eGBrgpD9Zu7x9zoxZ8nW6dFGobZw8PDwwNMBJfzq094DyJSPtFnNGOjlw0qWs3Tbdr6+vfJ1OnWyn+izGBTjpUtsio5RfvdguVv5T2Q8YF+CkS20M32Bx00nWTgf7+dvA6c2LcowLcNKlwlausZRLXiRrp318fGyVIit6iXEBTrrUssVLFN7DbW7v2ukXj4oxLsBJl5ofHGJu0Jnn0mTt1N3d3QZOZUUvMC7ASZdat2atuUFfyrkgd782cKoswdoJOOlQXl5eFs87VT4vUxEnFIoATrrU4vkLrdn0jKDp8vU7bsxYGzhdzMzD0AAn/en25RuqnIddu2oNcAJODiXb9f5lxSkpLgE4ASeHkm0XIStONgpUACfgpEulnDprw6b3x+xRxSsCJ+CkS6ll0zbiH8AJOOlSM4Km2y12p8rCCTgBJ/2JzOWUvGGaqcrnZcAJODmUbITImZu5ZJ2jvFcETsBJT/Ly8uJ4Qe2FjFyFZ3qyRkEg4KTOwolu48aMlRBjuzM9VFQGTjoTsVfuOBF/IlW/dmN6wAk46U9kccIdJwnTYcnUkUuPWDsBJwdcOElbN8Lu7i1wAk4OvnCScPlkO6cJOAEnXYpLbI3VBvv5KznDBE7ASTfiEltjtmf3nkjSL/cegRNw0oc4xtbkyI0ATsDJ0cQxtia5Zds+fgucgJP+xD22Rk/zpKoFywsnFFUGTjoQ99gaVU5IkggEJb7ReQwWcNK6bJ+Blbv0CnACTjV0pidHmg+vVAxclwacHGSmJ1MkgFeioIR5txBwkl62K0NUu5dW6jNOlGzfmgGcgJOexHH3VtZs7sqSchVnmxBwUtQzSJUAYU3c85twghA4aVdcKkPIVxyCFvecDOzkAieNiuMZWLldU3Oeu08YOOCkRXEMqcntmigVXrmpbkQEAk6yr5oqS8qV2erhOO2U+woPCDgJmVxxzISQsCCEbXE/vIjgHnDSFktciukpPLPCEXfgpD+NGzOWO0uKuSZKypd8gYCTQI+0aN7C85wTIEgrvHJT4QQ57sl7Eqa0Q8CJ9zyKV844NaFSPoDGHae1q9ZgWIGTajhxPxdIJnhq5cVxD+6lnDqLYQVOai6ZWBs75H+JNyCNmGZUxGbyAtXPPvBKLcdJDeAESYaTMpvLEHCqETiR1SA+MeAESYMTHBRwguws8HjhVPm8DCso4ARJgxNpRw8n4HMDTpBl8cUJUz7gBFmVgGsHyJQPSRLACbIgXmVYmFE+LKKAE2RBfON7qmTrAifIwad8+NyAE2RZi+cv5F4tDBWOgBNkR2Q5RCZ+tqFSN2cXOEH6E6GFcMVsM4KmAyHgBEHACYIg4ARBwAmCgBMEAScIgoATBAEnCAJOEAScIAgCThAEnCAIOEEQBJwgCDhBEHCCIOAEQRBwggSoRXW1bNmS9V9z4UMDThAEnCAIOEEQcIIgCDhBEHCCIOAEQRBwgiDgBEHACYKAEwRBwAmCgBMEAScIgoATBAEnCAJOEAScIAgCThAEnCAIOEEQZFH/H1uj4PmSXUrxAAAAAElFTkSuQmCC'";
 					break;
@@ -65,7 +65,7 @@ window.assistantArt = function assistantArt(sizePlacement) {
 			}
 		} else /* V.imageChoice === 0*/ {
 			fileName += "'resources/renders/assistant ";
-			switch (V.assistantAppearance) {
+			switch (V.assistant.appearance) {
 				case "monstergirl":
 					fileName += "monstergirl.png'";
 					break;
diff --git a/src/descriptions/arcologyDescription.js b/src/descriptions/arcologyDescription.js
index 49ad22ef26fe80958d971b9c7182d5ed01b689cf..9aea9f61a537bdf7c2fa5ab9dcf1eb1f4363eff6 100644
--- a/src/descriptions/arcologyDescription.js
+++ b/src/descriptions/arcologyDescription.js
@@ -572,7 +572,7 @@ App.Desc.playerArcology = function(lastElement) {
 			openDiv.append(`A security drone occasionally flies across the open space.`);
 		}
 	} else if (V.arcologyUpgrade.drones === 1) {
-		openDiv.append(`The central plaza is a large atrium; a security drone occasionally flies across the open space.`);
+		openDiv.append(` The central plaza is a large atrium; a security drone occasionally flies across the open space.`);
 	}
 
 	function deco80part1() {
@@ -678,7 +678,7 @@ App.Desc.playerArcology = function(lastElement) {
 		if (A.FSSubjugationistDecoration >= 80) {
 			buffer.push(`In the center of the plaza, an auction of a large group of frightened ${A.FSSubjugationistRace} slaves is taking place.`);
 		}
-		if (V.assistantPower > 0) {
+		if (V.assistant.power > 0) {
 			buffer.push(`The plaza is packed with citizens doing business.`);
 		}
 
@@ -791,7 +791,7 @@ App.Desc.playerArcology = function(lastElement) {
 
 	citizenDiv.append(deco80part2());
 
-	citizenDiv.append(`${num(V.ACitizens)} citizens and ${num(V.ASlaves + V.slaves.length)} slaves live in ${A.name}.`);
+	citizenDiv.append(` ${num(V.ACitizens)} citizens and ${num(V.ASlaves + V.slaves.length)} slaves live in ${A.name}.`);
 
 	function fsLaws() {
 		let buffer = [];
@@ -884,7 +884,7 @@ App.Desc.playerArcology = function(lastElement) {
 
 	citizenDiv.append(fsLaws());
 
-	citizenDiv.append(`Its lingua franca is  ${V.language}.`);
+	citizenDiv.append(` Its lingua franca is ${V.language}.`);
 	fragment.append(citizenDiv);
 
 	/**
diff --git a/src/endWeek/saRules_old.js b/src/endWeek/saRules_old.js
index 7a5d53211792ccdc1016883b656c5d2bedca354c..63b06d4da567ec665758805a6498f26c15208889 100644
--- a/src/endWeek/saRules_old.js
+++ b/src/endWeek/saRules_old.js
@@ -342,7 +342,7 @@
 
 						if (!slave.attrKnown) {
 							if ((V.week - slave.weekAcquired > 4) && slave.energy > 20) {
-								r += `${V.assistantName === "your personal assistant" ? `Your personal assistant` : `${V.assistantName}`} has been monitoring ${him} as ${he} mingles with other busily working slaves, analyzing ${his} sexual tastes. It seems ${he} is ${attractionDiscovery(slave)}`;
+								r += `${capFirstChar(V.assistant.name)} has been monitoring ${him} as ${he} mingles with other busily working slaves, analyzing ${his} sexual tastes. It seems ${he} is ${attractionDiscovery(slave)}`;
 								slave.attrKnown = 1;
 							}
 						}
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index f889e83a07e5f4bdb1461fc57d0c92793a1a1acb..a58056f0b9dadc95ff11b69561c6286fa85fb0f8 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -15,7 +15,7 @@ window.saServant = function saServant(slave) {
 	if (V.servantsQuarters > 0) {
 		if ((V.universalRulesFacilityWork === 1 && slave.assignment === "be a servant" && V.servantsQuartersSpots > 0) || (slave.assignment === "work as a servant")) {
 			if (slave.assignment === "be a servant") {
-				t += ` Since there's extra space in the servants' quarters, ${V.assistantName} attaches ${him} to the cadre of maids there.`;
+				t += ` Since there's extra space in the servants' quarters, ${V.assistant.name} attaches ${him} to the cadre of maids there.`;
 				V.servantsQuartersSpots--;
 			}
 			if (V.Stewardess !== 0) {
diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js
index e8e7f0a001eb79f2b7de946c4b36843ac16acb44..1b90d9daf7ff5b76cb34e388bd78401f1a96c319 100644
--- a/src/endWeek/saTakeClasses.js
+++ b/src/endWeek/saTakeClasses.js
@@ -87,15 +87,15 @@ window.saTakeClasses = (function saTakeClasses() {
 					slave.trust -= 4;
 				}
 			} else {
-				r += ` under ${V.assistantName}'s supervision;`;
+				r += ` under ${V.assistant.name}'s supervision;`;
 				if (slave.devotion > 20) {
-					r += ` ${he} is such an obedient slave that ${V.assistantName} mostly <span class="devotion inc">encourages ${him}.</span>`;
+					r += ` ${he} is such an obedient slave that ${V.assistant.name} mostly <span class="devotion inc">encourages ${him}.</span>`;
 					slave.devotion += 2;
 				} else if (slave.trust < -20) {
-					r += ` ${he} obeys out of fear, so ${V.assistantName} mostly <span class="devotion inc">encourages ${him}</span> to be a better slave.`;
+					r += ` ${he} obeys out of fear, so ${V.assistant.name} mostly <span class="devotion inc">encourages ${him}</span> to be a better slave.`;
 					slave.devotion++;
 				} else {
-					r += ` ${he} is resistant, so ${V.assistantName} mostly <span class="trust dec">punishes ${him},</span> increasing ${his} <span class="devotion dec">dislike for slavery.</span>`;
+					r += ` ${he} is resistant, so ${V.assistant.name} mostly <span class="trust dec">punishes ${him},</span> increasing ${his} <span class="devotion dec">dislike for slavery.</span>`;
 					slave.devotion -= 2;
 					slave.trust -= 4;
 				}
diff --git a/src/events/gameover.tw b/src/events/gameover.tw
index 0d22c663d97fbba4c76b1fad9499f027dc895b7b..23b4ae536f42b7c31a43dd7fe99e9a7748ec019c 100644
--- a/src/events/gameover.tw
+++ b/src/events/gameover.tw
@@ -5,7 +5,7 @@
 	<<case "bombing">>
 		One fine day, you're strolling down the main promenade, making your usual combined inspection and public rounds. These walks are triply useful, since they allow you to keep a finger on the pulse of your demesne, identify any problems, and display yourself to the population.
 		<br><br>
-		<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> suddenly relays a silent alarm, highlighting a scruffy individual twenty <<if $showInches == 2>>yards<<else>>meters<</if>> ahead. This person is hooded and acting oddly. You catch a glance from beneath the hood in your direction: and the figure obviously decides that it can get no closer to you. Your assistant's scanning detects the presence of an implanted bomb moments before the suicide bomber detonates themselves.
+		<<= capFirstChar($assistant.name)>> suddenly relays a silent alarm, highlighting a scruffy individual twenty <<if $showInches == 2>>yards<<else>>meters<</if>> ahead. This person is hooded and acting oddly. You catch a glance from beneath the hood in your direction: and the figure obviously decides that it can get no closer to you. Your assistant's scanning detects the presence of an implanted bomb moments before the suicide bomber detonates themselves.
 		<br><br>
 		The implanted bomb is small, and went off too far ahead to do anything more than stun. Three other assailants run at you from where they were waiting in the confusion, wielding improvised weapons that apparently did not set off the security scanners. Without a bodyguard, decent security systems, or any other means of personal defense, you meet your ignominious death at the end of a bludgeon fashioned from a maintenance tool.
 
@@ -21,7 +21,7 @@
 		Again and again, you keep bearing down. As you grow more exhausted and are no closer to giving birth, you let out a feeble cry for help.
 		<br>
 		<br>
-		Some of your slaves rush to your aid, but they don't know what to do; they helplessly watch as you slowly fade away. If only you had someone you could rely on at your side, perhaps this could have been avoided. At last, the medics arrive at $assistantName's order, but it is too late to save you or your child<<if $PC.pregType > 1>>ren<</if>>.
+		Some of your slaves rush to your aid, but they don't know what to do; they helplessly watch as you slowly fade away. If only you had someone you could rely on at your side, perhaps this could have been avoided. At last, the medics arrive at $assistant.name's order, but it is too late to save you or your child<<if $PC.pregType > 1>>ren<</if>>.
 
 	<<case "ownership">>
 		Since you no longer possess a controlling interest in an arcology, your time of influence and power in the Free Cities is over. You remain wealthy, and your life after the part of it worth telling is not something worth regretting. A retirement full of decadence awaits you.
@@ -29,7 +29,7 @@
 	<<case "sisters">>
 		For the first time in a long time, you feel the need to verbalize a response, telling the matron that yes, you will join them. She seems to understand, and takes you by the hand in a surprisingly familial gesture, leading you towards the orgy. She tells you she loves you, and all her Sisters echo her. After a moments' surprise, you tell them you love them too, and feminine hands reach out to draw you into their communion. A young futa sucks your cock and then feeds you your own cum from her mouth. An older futa with an enormous penis displaces her and makes out with you while she fucks your pussy. After she finishes inside you she slides your erection inside her own womanhood and rides you while a younger futa fucks your cleavage. You have a free hand which someone fills by pressing an enormous soft breast against it and you oblige her by massaging it eagerly. The futa matron's pussy grows suddenly tighter as another futa starts to buttfuck her and then looser as the cock is removed and inserted into your asshole instead. When she cums inside you she pulls out and her cock is replaced by a greedy mouth and tongue whose owner you cannot see. The older futa presses her cockhead into a younger Sister's mouth and orgasms before sliding herself under you so you can be on top instead. A futa whispers that she wants to be closer to you and slides her cock inside the matron's pussy alongside yours as she nestles her face between your breasts.
 		<br><br>
-		Your appointed successor arrives in your old office to find $assistantName ready to help them take control of the arcology. Most of your assets have been liquidated to create a huge endowment for $arcologies[0].name's Sisters. They'll never have to sell one of their own again, and will be able to afford all the advanced drugs and surgeries they desire. From the most matronly futa down to their newest Sister, none of them need concern themselves with anything other than sex.
+		Your appointed successor arrives in your old office to find $assistant.name ready to help them take control of the arcology. Most of your assets have been liquidated to create a huge endowment for $arcologies[0].name's Sisters. They'll never have to sell one of their own again, and will be able to afford all the advanced drugs and surgeries they desire. From the most matronly futa down to their newest Sister, none of them need concern themselves with anything other than sex.
 
 	<<case "major battle defeat">>
 		<<if $attackType == "raiders">>
diff --git a/src/facilities/brothel/brothelAssignmentScene.tw b/src/facilities/brothel/brothelAssignmentScene.tw
index e2ce8a3ff96d398c31db4a422023da1d689da52a..2bb3e2f5384f68d4f0c008f1451ee554c1c1d924 100644
--- a/src/facilities/brothel/brothelAssignmentScene.tw
+++ b/src/facilities/brothel/brothelAssignmentScene.tw
@@ -16,7 +16,7 @@
 	/* 000-250-006 */
 </span>
 
-You could direct $assistantName to relay your orders to $activeSlave.slaveName, but you've decided to avoid relying too much on machine assistance. So, $he is merely directed to report to your office. The
+You could direct $assistant.name to relay your orders to $activeSlave.slaveName, but you've decided to avoid relying too much on machine assistance. So, $he is merely directed to report to your office. The
 <<if $activeSlave.devotion > 95>>
 	worshipful $girl <<if hasAnyLegs($activeSlave)>>hurries in as soon as $he possibly can<<else>>comes in as soon as $he can get another slave to carry $him in<</if>>, happy $his beloved <<= WrittenMaster($activeSlave)>> is taking an interest in $him.
 <<elseif $activeSlave.devotion > 50>>
diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js
index 19aa9e0b94a7c045ee5a5e2a375e19dfb8f64f1a..cbffb41ec59b77ae8b7007e19cb069177258d798 100644
--- a/src/facilities/nursery/nurseryWidgets.js
+++ b/src/facilities/nursery/nurseryWidgets.js
@@ -15818,9 +15818,9 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
 	r += `You can name the new child, if you so desire. `;
 
 	r += `<br><<textbox "${child.slaveName}" ${child.slaveName}>>`;
-	r += App.UI.passageLink("Commit name", "Nursery Workaround", `${child.birthName = child.slaveName}, ${App.UI.replace("#naming", `You instruct ${V.assistantName} to register the new ${girl} as "${child.slaveName}" in the slave registry.`)}`);
+	r += App.UI.passageLink("Commit name", "Nursery Workaround", `${child.birthName = child.slaveName}, ${App.UI.replace("#naming", `You instruct ${V.assistant.name} to register the new ${girl} as "${child.slaveName}" in the slave registry.`)}`);
 	r += `<br>`;
-	r += App.UI.passageLink(`Have your PA assign ${him} a random name`, "Nursery Workaround", `${App.UI.replace("#naming", `${newChildName(child)}<br>${V.assistantName} registers the new ${girl} as "${child.slaveName}" in your registry.`)}`);
+	r += App.UI.passageLink(`Have your PA assign ${him} a random name`, "Nursery Workaround", `${App.UI.replace("#naming", `${newChildName(child)}<br>${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.`)}`);
 
 	if (arcology.FSPastoralist !== "unset") {
 		if (child.lactation > 0) {
@@ -15829,7 +15829,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
 			<<replace "#naming">>`;
 			child.slaveName = setup.cowSlaveNames.random();
 			child.birthName = child.slaveName;
-			r += `${V.assistantName} registers the new ${girl} as "${child.slaveName}" in your registry.
+			r += `${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
 			<</replace>>
 			<</link>>`;
 		}
@@ -15840,7 +15840,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
 			<<replace "#naming">>`;
 			child.slaveName = setup.chattelReligionistSlaveNames.random();
 			child.birthName = child.slaveName;
-			`${V.assistantName} registers the new ${girl} as "${child.slaveName}" in your registry.
+			`${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
 			<</replace>>
 		<</link>>`;
 	}
@@ -15850,7 +15850,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
 			<<replace "#naming">>`;
 			child.slaveName = setup.romanSlaveNames.random();
 			child.birthName = child.slaveName;
-			`${V.assistantName} registers the new ${girl} as "${child.slaveName}" in your registry.
+			`${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
 			<</replace>>
 		<</link>>`;
 	} else if (arcology.FSAztecRevivalist !== "unset") {
@@ -15859,7 +15859,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
 			<<replace "#naming">>`;
 			child.slaveName = setup.aztecSlaveNames.random();
 			child.birthName = child.slaveName;
-			`${V.assistantName} registers the new ${girl} as "${child.slaveName}" in your registry.
+			`${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
 			<</replace>>
 		<</link>>`;
 	} else if (arcology.FSEgyptianRevivalist !== "unset") {
@@ -15868,7 +15868,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
 			<<replace "#naming">>`;
 			child.slaveName = setup.ancientEgyptianSlaveNames.random();
 			child.birthName = child.slaveName;
-			`${V.assistantName} registers the new ${girl} as "${child.slaveName}" in your registry.
+			`${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
 			<</replace>>
 		<</link>>`;
 	} else if (arcology.FSEdoRevivalist !== "unset") {
@@ -15877,7 +15877,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
 			<<replace "#naming">>`;
 			child.slaveName = setup.edoSlaveNames.random();
 			child.birthName = child.slaveName;
-			`${V.assistantName} registers the new ${girl} as "${child.slaveName}" in your registry.
+			`${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
 			<</replace>>
 		<</link>>`;
 	}
@@ -15887,7 +15887,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
 			<<replace "#naming">>`;
 			DegradingName(child);
 			child.birthName = child.slaveName;
-			`${V.assistantName} registers the new ${girl} as "${child.slaveName}" in your registry.
+			`${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
 			<</replace>>
 		<</link>>`;
 	}
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 75c5301c7143b3fe5eb334b5efe2a6bb73c03697..ad360bdf5c18179b2ceb1eee393bf3eea55f19bc 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -818,11 +818,6 @@ You should have received a copy of the GNU General Public License along with thi
 <<set $toysBoughtSmartVibes = 0>>
 <<set $buckets = 0>>
 
-/* assistant FS appearance variable */
-<<set $assistantFSAppearance = "default">>
-<<set $assistantPronouns = {pronoun: App.Data.Pronouns.Kind.ai}>>
-<<set $marketAssistantPronouns = {pronoun: App.Data.Pronouns.Kind.ai}>>
-
 /*pregmod variables */
 <<set $specialSlavesPriceOverride = 0>>
 <<set $pregAccessibility = 0>>
@@ -928,21 +923,9 @@ You should have received a copy of the GNU General Public License along with thi
 <<set $Nurse = 0>>
 <<set $Wardeness = 0>>
 <<set $Concubine = 0>>
-<<set $assistant = 0>>
-<<set $assistantPower = 0>>
 <<set $economicUncertainty = 10>>
-<<set $assistantAppearance = "normal">>
-<<set $assistantExtra1 = 0>>
-<<set $assistantExtra2 = 0>>
-<<set $assistantOptions = 0>>
-<<set $assistantFSOptions = 0>>
-<<set $assistantName = "your personal assistant">>
-<<set $assistantNameAnnounced = 0>>
-<<set $assistantBodyDesire = 0>>
-<<set $marketAssistantAnnounced = 0>>
-<<set $marketAssistantRelationship = "cute">>
-<<set $marketAssistantLimit = 0>>
-<<set $marketAssistantAggressiveness = 0>>
+
+<<run assistant.object()>>
 
 <<set $justiceEvents = ["slave deal", "slave training", "majority deal", "indenture deal", "virginity deal", "breeding deal"]>> /* not in setupVars because we remove events from this array as they occur */
 <<set $prisonCircuit = ["low tier criminals", "gangs and smugglers", "white collar", "military prison"]>>
diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js
index 21ebc5eda18f7b89073dbe27a276b7230b968dbf..3aac61a1b8854ddf3789e994c1de72b6f2917143 100644
--- a/src/interaction/main/walkPast.js
+++ b/src/interaction/main/walkPast.js
@@ -2061,7 +2061,7 @@ window.walkPast = (function() {
 							t += `look after the slaves in ${V.spaName}; `;
 							break;
 						case "take classes":
-							t += `attend classes with ${V.assistantName}; `;
+							t += `attend classes with ${V.assistant.name}; `;
 							break;
 						case "be your Head Girl":
 							t += `oversee your other slaves; `;
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index d6d646f38b057e9dccedaed21d6d0d86f2ad94ed..5d33a2c1155af80e5064535f633802f181dbec8c 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -1900,17 +1900,6 @@ window.ArcologyDatatypeCleanup = function ArcologyDatatypeCleanup() {
 	V.ASlaves = Math.max(+V.ASlaves, 0) || V.NPCSlaves + V.menials + V.fuckdolls + V.menialBioreactors;
 	V.shelterAbuse = Math.max(+V.shelterAbuse, 0) || 0;
 
-	V.assistant = Math.clamp(+V.assistant, 0, 1) || 0;
-	if (typeof V.assistantPronouns !== "object") {
-		V.assistantPronouns = {};
-	}
-	if (typeof V.marketAssistantPronouns !== "object") {
-		V.marketAssistantPronouns = {};
-	}
-	App.Entity.Utils.migratePronouns(V.assistantPronouns);
-	App.Entity.Utils.migratePronouns(V.marketAssistantPronouns);
-	generateAssistantPronouns();
-
 	V.foodCost = Math.trunc(2500 / V.localEcon);
 	V.drugsCost = Math.trunc(10000 / V.localEcon);
 	V.rulesCost = Math.trunc(10000 / V.localEcon);
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 1f9f0a808976ccbcdea4a81deda276c4050233fa..d84eab5d11b22775837ed09acdc21b04c10186de 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -2201,7 +2201,7 @@ window.supplyPoliciesReport = function(NPCclass) {
 
 window.ownershipReport = function({sidebar}) {
 	let tint, warrning = false, detail = `${V.arcologies[0].ownership}%`;
-	detail += V.assistantPower >= 1 && V.arcologies[0].ownership < 100 ? `:${V.arcologies[0].minority}%` : ``;
+	detail += V.assistant.power >= 1 && V.arcologies[0].ownership < 100 ? `:${V.arcologies[0].minority}%` : ``;
 	if (V.arcologies[0].ownership < 100 && V.arcologies[0].minority+5 >= V.arcologies[0].ownership) {
 		tint = 'red'; warrning = true;
 	} else if (V.arcologies[0].ownership >= V.arcologies[0].minority+10) {
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 819a5fd81abafdc978ff6925562cdc51cfbfc857..be2302f4907a478eb9e170c674844e5a82f2cddf 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -87,7 +87,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
 				}
 
 				if (State.variables.assistant > 0) {
-					if (State.variables.assistantAppearance !== "normal") {
+					if (State.variables.assistant.appearance !== "normal") {
 						if (eventSlave.devotion >= -20) {
 							if (canSee(eventSlave)) {
 								if (eventSlave.devotion <= 50) {
@@ -1889,7 +1889,7 @@ window.generateRandomEventPoolServant = function(eventSlave) {
 				}
 
 				if (State.variables.assistant > 0) {
-					if (State.variables.assistantAppearance !== "normal") {
+					if (State.variables.assistant.appearance !== "normal") {
 						if (eventSlave.devotion >= -20) {
 							if (canSee(eventSlave)) {
 								if (eventSlave.devotion <= 50) {
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index 08b8f256dc03af8762c657fd27bcbe06ce83254c..98e048098e23fc4264712324ecbbd377bfd2fc82 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -469,7 +469,7 @@ window.rulesAutosurgery = (function() {
 			surgeriesDisplay = surgeries.slice(0, surgeries.length - 1).join(", ");
 			surgeriesDisplay += `, and ${surgeries[surgeries.length - 1]}`;
 		}
-		r += `${V.assistantName === "your personal assistant" ? "Your personal assistant" : V.assistantName}, ordered to apply surgery, gives ${slave.slaveName} <span class="lime">${surgeriesDisplay}.</span>`;
+		r += `${capFirstChar(V.assistant.name)}, ordered to apply surgery, gives ${slave.slaveName} <span class="lime">${surgeriesDisplay}.</span>`;
 	}
 
 	/**
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index 48961b20db2adc0f9c151f3f2e99f057f9498463..471646cb25c6ce53de02c0bb2e7e100259e84f0f 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -573,22 +573,6 @@ window.generatePlayerPronouns = function(PC) {
 	}
 };
 
-window.generateAssistantPronouns = function() {
-	if (V.assistant === 0 || V.assistantAppearance === "normal") {
-		V.assistantPronouns.pronoun = App.Data.Pronouns.Kind.ai;
-		V.marketAssistantPronouns.pronoun = App.Data.Pronouns.Kind.ai;
-	} else if (V.assistantAppearance === "incubus" && V.diversePronouns === 1) {
-		V.assistantPronouns.pronoun = App.Data.Pronouns.Kind.male;
-		V.marketAssistantPronouns.pronoun = App.Data.Pronouns.Kind.female;
-	} else if (V.assistantAppearance === "succubus" && V.diversePronouns === 1) {
-		V.assistantPronouns.pronoun = App.Data.Pronouns.Kind.female;
-		V.marketAssistantPronouns.pronoun = App.Data.Pronouns.Kind.male;
-	} else {
-		V.assistantPronouns.pronoun = App.Data.Pronouns.Kind.female;
-		V.marketAssistantPronouns.pronoun = App.Data.Pronouns.Kind.female;
-	}
-};
-
 window.printTrinkets = function printTrinkets() {
 	function trinketPluralReplacer(desc) {
 		let r;
diff --git a/src/npc/agent/agentCompany.tw b/src/npc/agent/agentCompany.tw
index 858fdf55deee3b3b6bdb4ba30e8bb5aad422de3c..9abdbd28f152a9dd15bc694ce4f7fcafbf4690f5 100644
--- a/src/npc/agent/agentCompany.tw
+++ b/src/npc/agent/agentCompany.tw
@@ -21,7 +21,7 @@
 
 <<setLocalPronouns $subSlave 2>>
 
-Working in _neighborArcology.name's penthouse office, $subSlave.slaveName gets a video call from you. Naturally, _his2 personal assistant program has been instructed to give these the highest priority, and your face appears in front of _him2 immediately. _He2 greets you properly, and asks you what _he2 can do to serve you. You tell _him2 you're planning to send one of your slaves over to _his2 arcology to assist _him2. Exchanges of this kind are neither unusual nor particularly interesting, so a slight look of perplexity clouds $subSlave.slaveName's face as _he2 wonders why this merits a personal call. Normally, <<if $HeadGirl != 0>>$HeadGirl.slaveName<<else>>$assistantName<</if>> would handle it with _him2 directly.
+Working in _neighborArcology.name's penthouse office, $subSlave.slaveName gets a video call from you. Naturally, _his2 personal assistant program has been instructed to give these the highest priority, and your face appears in front of _him2 immediately. _He2 greets you properly, and asks you what _he2 can do to serve you. You tell _him2 you're planning to send one of your slaves over to _his2 arcology to assist _him2. Exchanges of this kind are neither unusual nor particularly interesting, so a slight look of perplexity clouds $subSlave.slaveName's face as _he2 wonders why this merits a personal call. Normally, <<if $HeadGirl != 0>>$HeadGirl.slaveName<<else>>$assistant.name<</if>> would handle it with _him2 directly.
 
 <br><br>
 
diff --git a/src/npc/descriptions/boobs/boobs.js b/src/npc/descriptions/boobs/boobs.js
index 66debecd07b072d09a802beb96bec1a1a84b69d2..9af8982aa91092713b8106bd9263aaabbb02ae9d 100644
--- a/src/npc/descriptions/boobs/boobs.js
+++ b/src/npc/descriptions/boobs/boobs.js
@@ -63,32 +63,32 @@ App.Desc.boobBits = function() {
 			cup: "S-cup", anCup: true, adjective: ["astounding", "tremendous"], noun: ["breasts", "mammaries", "tits", "udders"]
 		},
 		5499: {
-			cup: "T-cup", anCup: false, adjective: ["astounding", "tremendous"], noun: ["breasts", "mammaries", "tits", "udders"]
+			cup: "T-cup", anCup: false, adjective: ["unmissable", "frightening"], noun: ["breasts", "mammaries", "tits", "udders"]
 		},
 		6499: {
-			cup: "U-cup", anCup: false, adjective: ["astounding", "tremendous"], noun: ["breasts", "mammaries", "tits", "udders"]
+			cup: "U-cup", anCup: false, adjective: ["unmissable", "attention-grabbing"], noun: ["breasts", "mammaries", "tits", "udders"]
 		},
 		6999: {
-			cup: "V-cup", anCup: false, adjective: ["astounding", "tremendous"], noun: ["breasts", "mammaries", "tits", "udders"]
+			cup: "V-cup", anCup: false, adjective: ["attention-grabbing", "spectacular"], noun: ["breasts", "mammaries", "tits", "udders"]
 		},
 		7499: {
-			cup: "X-cup", anCup: true, adjective: ["astounding", "tremendous"], noun: ["breasts", "mammaries", "tits", "udders"]
+			cup: "X-cup", anCup: true, adjective: ["spectacular", "unnatural"], noun: ["breasts", "mammaries", "tits", "udders"]
 		},
 		7999: {
-			cup: "Y-cup", anCup: true, adjective: ["astounding", "tremendous"], noun: ["breasts", "mammaries", "tits", "udders"]
+			cup: "Y-cup", anCup: true, adjective: ["unnatural", "unreal"], noun: ["breasts", "mammaries", "tits", "udders"]
 		},
 		8499: {
-			cup: "Z-cup", anCup: false, adjective: ["astounding", "tremendous"], noun: ["boobs", "breasts", "mammaries", "udders"]
+			cup: "Z-cup", anCup: false, adjective: ["mind-blowing", "unreal"], noun: ["boobs", "breasts", "mammaries", "udders"]
 		},
 		8999: {
-			cup: "ZZ-cup", anCup: true, adjective: ["astounding", "tremendous"], noun: ["breasts", "mammaries", "tits", "udders"]
+			cup: "ZZ-cup", anCup: true, adjective: ["mind-blowing", "unbelievable"], noun: ["breasts", "mammaries", "tits", "udders"]
 		},
 		9999: {
-			cup: "ZZZ-cup", anCup: false, adjective: ["astounding", "tremendous"], noun: ["boobs", "breasts", "mammaries", "udders"]
+			cup: "ZZZ-cup", anCup: false, adjective: ["mind-blowing", "unbelievable"], noun: ["boobs", "breasts", "mammaries", "udders"]
 		},
 		14999: {
 			cup: "", anCup: false,
-			adjective: ["obscenely massive", "enormous"],
+			adjective: ["obscenely massive"],
 			noun: ["boobs", "breasts", "mammaries", "masses of breastflesh", "udders"]
 		},
 		24999: {
@@ -1336,17 +1336,27 @@ App.Desc.boobs = function() {
 		let r = `${His} `;
 		if (slave.boobs < 300) {
 			r += `${App.Desc.boobBits.adjective(slave.boobs)} breasts are practically non-existent.`;
-		} else if (slave.boobs < 10000) {
+		} else if (slave.boobs < 4700) {
 			if (V.showBoobCCs) {
 				r += App.Desc.boobBits.format("%ADJ %NOUN, %VOLUME CCs each, would fill %CUPs", slave.boobs);
 			} else {
 				r += App.Desc.boobBits.format("%ADJ %NOUN, would fill %CUPs", slave.boobs);
 			}
-			if (slave.boobs < 5000 + (slave.muscles * 10) && slave.physicalAge <= 3) {
-				r += ` and are so large that ${walkingAbility(slave)}`;
+			r += '.';
+		} else if (slave.boobs < 5000 + (slave.muscles * 10) && slave.physicalAge <= 3) {
+			if (V.showBoobCCs) {
+				r += App.Desc.boobBits.format("%ADJ %NOUN, %VOLUME CCs each, would fill %CUPs", slave.boobs);
 			} else {
-				r += '.';
+				r += App.Desc.boobBits.format("%ADJ %NOUN, would fill %CUPs", slave.boobs);
 			}
+			r += ` and are so large that ${walkingAbility(slave)}`;
+		} else if (slave.boobs < 8500) {
+			if (V.showBoobCCs) {
+				r += App.Desc.boobBits.format("%ADJ %NOUN, %VOLUME CCs each, would fill %CUPs", slave.boobs);
+			} else {
+				r += App.Desc.boobBits.format("%ADJ %NOUN, would fill %CUPs", slave.boobs);
+			}
+			r += '.';
 		} else if (slave.boobs < 10000 + (slave.muscles * 20) && slave.physicalAge <= 12) {
 			r += `${App.Desc.boobBits.noun(slave.boobs, false)} have ${slave.boobsImplant ? 'been altered' : 'grown'} past pretense of proportion. `;
 			if (V.showBoobCCs) {
@@ -1354,15 +1364,15 @@ App.Desc.boobs = function() {
 			} else {
 				r += 'They';
 			}
-			r += ` and are so large that ${walkingAbility(slave)}`;
-		} else if (slave.boobs < 20000 + (slave.muscles * 50) && slave.physicalAge < 18) {
+			r += ` are so large that ${walkingAbility(slave)}`;
+		} else if (slave.boobs < 20000 + (slave.muscles * 50) && slave.physicalAge < 18 && slave.physicalAge >= 13) {
 			r += `${App.Desc.boobBits.noun(slave.boobs, false)} have ${slave.boobsImplant ? 'been altered' : 'grown'} past any pretense of proportion. `;
 			if (V.showBoobCCs) {
 				r += `At ${num(slave.boobs)} CCs each, they`;
 			} else {
 				r += 'They';
 			}
-			r += ` and are so large that ${walkingAbility(slave)}`;
+			r += ` are so large that ${walkingAbility(slave)}`;
 		} else if (slave.boobs < 20000) {
 			r += `${App.Desc.boobBits.noun(slave.boobs, false)}`;
 			if (V.showBoobCCs) {
@@ -1374,7 +1384,7 @@ App.Desc.boobs = function() {
 			if (V.showBoobCCs) {
 				r += `, ${num(slave.boobs)} CCs each,`;
 			}
-			r += ` and are so large that ${walkingAbility(slave)}`;
+			r += ` are so large that ${walkingAbility(slave)}`;
 		} else {
 			r += App.Desc.boobBits.noun(slave.boobs, false);
 			if (V.showBoobCCs) {
@@ -1458,10 +1468,11 @@ App.Desc.boobsExtra = function(slave, pronouns) {
 	/**
 	 * @param {number} unmovableLimit
 	 * @param {number} bodySize
+	 * @param {number} dwarfSize
 	 * @param {slaveTestCallback} dairyTest
 	 * @returns {string}
 	 */
-	function livingRestrictions(unmovableLimit, bodySize, dairyTest) {
+	function livingRestrictions(unmovableLimit, bodySize, dwarfSize, dairyTest) {
 		let res = [];
 		if (slave.boobs > unmovableLimit) {
 			if (slave.fuckdoll > 0) {
@@ -1470,13 +1481,17 @@ App.Desc.boobsExtra = function(slave, pronouns) {
 				if (canWalk(slave)) {
 					res.push(`${His} breasts are so massive that it is difficult for ${him} to move.`);
 					res.push(walkingRestrictions(dairyTest));
+				} else if (slave.boobs >= dwarfSize) {
+					res.push(`They each dwarf ${him}, making ${him} mostly boob.`);
 				} else if (slave.boobs >= bodySize) {
 					res.push(`They each are easily as big as ${him}, making ${him} mostly boob.`);
 				} else {
 					res.push(`Together they are nearly the same size as ${his} torso, making ${him} about half boob.`);
 				}
-				if ((slave.assignment !== App.Data.Facilities.dairy.jobs.cow.assignment) || (V.dairyRestraintsSetting < 2)) {
-					res.push(penthouseAccessibility());
+				if (slave.boobs >= 15000) {
+					if ((slave.assignment !== App.Data.Facilities.dairy.jobs.cow.assignment) || (V.dairyRestraintsSetting < 2)) {
+						res.push(penthouseAccessibility());
+					}
 				}
 			}
 		}
@@ -1507,13 +1522,13 @@ App.Desc.boobsExtra = function(slave, pronouns) {
 	}
 
 	if (slave.physicalAge <= 3) {
-		r.push(livingRestrictions(4000, 10000, s => s.boobs > 5100 + (s.muscles * 100)));
+		r.push(livingRestrictions(4000, 10000, 40000, s => s.boobs > 5100 + (s.muscles * 100)));
 	} else if (slave.physicalAge <= 12) {
-		r.push(livingRestrictions(8000, 20000, s => s.boobs > 7000 + (s.muscles * 200)));
+		r.push(livingRestrictions(8000, 20000, 100000, s => s.boobs > 7000 + (s.muscles * 200)));
 	} else if (slave.physicalAge < 18) {
-		r.push(livingRestrictions(15000, 40000, s => s.boobs > 9000 + (s.muscles * 500)));
+		r.push(livingRestrictions(15000, 30000, 250000, s => s.boobs > 9000 + (s.muscles * 500)));
 	} else { // slave.physicalAge >= 18
-		r.push(livingRestrictions(20000, 40000, s => s.boobs > 12000));
+		r.push(livingRestrictions(20000, 40000, 500000, s => s.boobs > 12000));
 	}
 
 	if (slave.fuckdoll === 0) {
diff --git a/src/npc/fDance.tw b/src/npc/fDance.tw
index 68fd05676d33448d3f82df68722bd0c5466ee6cd..5f0ad6b5dff28fbacfcd74ca0bbdbf7eaadcb993 100644
--- a/src/npc/fDance.tw
+++ b/src/npc/fDance.tw
@@ -5,7 +5,7 @@
 <<setLocalPronouns $activeSlave>>
 <<setPlayerPronouns>>
 
-You tell $assistantName to summon $activeSlave.slaveName and set some erotic music. When your slave arrives, $he finds the lights in your office flashing club colors. You gesture towards the platform in the center of your office and tell $him to dance for you.
+You tell $assistant.name to summon $activeSlave.slaveName and set some erotic music. When your slave arrives, $he finds the lights in your office flashing club colors. You gesture towards the platform in the center of your office and tell $him to dance for you.
 
 <<if ($activeSlave.skill.entertainment > 99)>>
 	$He slides $his ass gracefully unto the stage, then dramatically raises $his elongated leg<<if hasBothLegs($activeSlave)>>s one at a time<</if>> onto the platform. Circling to $his knee<<if hasBothLegs($activeSlave)>>s<</if>>, $he raises $his ass in the air <<if (hasAnyArms($activeSlave))>>and glides $his hand<<if (hasBothArms($activeSlave))>>s<</if>> up $his leg<<if hasBothLegs($activeSlave)>>s<</if>> <</if>>as $he stands upright.
diff --git a/src/npc/findSlave.tw b/src/npc/findSlave.tw
index bbc6da1bf1f9f9fb17c83b50a07a6cd8264456ae..05cd175fe177a74da7f47c9cfe4a828c028d7563 100644
--- a/src/npc/findSlave.tw
+++ b/src/npc/findSlave.tw
@@ -2,7 +2,7 @@
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", $showEncyclopedia = 0>>
 
-After spending a minute trying to remember some details about one of your slaves, you sit down behind your desk and tell $assistantName that you need to locate a particular slave's records.<br><br>
+After spending a minute trying to remember some details about one of your slaves, you sit down behind your desk and tell $assistant.name that you need to locate a particular slave's records.<br><br>
 
 "Certainly, <<= properMaster()>>. What can you tell me about them?"<br><br>
 
diff --git a/src/personalAssistant/assistant.js b/src/personalAssistant/assistant.js
new file mode 100644
index 0000000000000000000000000000000000000000..ac535c276ac0515dbbbb52befb8bab1c2e292ada
--- /dev/null
+++ b/src/personalAssistant/assistant.js
@@ -0,0 +1,90 @@
+window.assistant = (function() {
+	return {
+		BC: BC,
+		object: manage,
+		pronouns: pronouns,
+	};
+
+	function BC() {
+		function convert(oldVar, variable, value = null) {
+			if (jsDef(V[oldVar])) {
+				if (typeof V[oldVar] !== "number" || (typeof V[oldVar] === "number" && V[oldVar] > 0)) {
+					V.assistant[variable] = value === null ? V[oldVar] : value;
+				}
+			}
+			delete V[oldVar];
+		}
+
+		const object = Object.assign({},
+		{
+		personality: V.assistant,
+		name: V.assistantName,
+		power: V.assistantPower,
+		appearance: V.assistantAppearance,
+		});
+		V.assistant = object;
+		delete V.assistantName; delete V.assistantPower;
+		delete V.assistantAppearance; delete V.assistantPronouns;
+
+		convert('marketAssistantAnnounced', 'market', {});
+		convert('assistantExtra1', 'Extra1');
+		convert('assistantExtra2', 'Extra2');
+		convert('assistantNameAnnounced', 'announcedName');
+		convert('assistantBodyDesire', 'bodyDesire');
+		convert('assistantOptions', 'options');
+		if (V.week >= 11 && V.assistant.options === 'undefined') {
+			V.assistant.options = 1;
+		}
+		convert('assistantFSOptions', 'fsOptions');
+		convert('assistantFSAppearance', 'fsAppearance');
+
+		if (V.assistant.market) {
+			Object.assign(V.assistant.market,
+			{
+			relationship: V.marketAssistantRelationship,
+			limit: V.marketAssistantLimit,
+			aggressiveness: V.marketAssistantAggressiveness,
+			});
+		}
+		delete V.marketAssistantRelationship; delete V.marketAssistantLimit;
+		delete V.marketAssistantAggressiveness; delete V.marketAssistantPronouns;
+	}
+
+	function pronouns() {
+		let o = {}
+		if (V.assistant.personality === 0 || V.assistant.appearance === "normal") {
+			o.main = {pronoun: App.Data.Pronouns.Kind.ai};
+		} else {
+			if (V.assistant.appearance === "incubus" && V.diversePronouns > 0) {
+				o.main = {pronoun: App.Data.Pronouns.Kind.male};
+				o.market = {pronoun: App.Data.Pronouns.Kind.female};
+			} else if (V.assistantAppearance === "succubus" && V.diversePronouns > 0) {
+				o.main = {pronoun: App.Data.Pronouns.Kind.female};
+				o.market = {pronoun: App.Data.Pronouns.Kind.male};
+			} else {
+				o.main = o.market = {pronoun: App.Data.Pronouns.Kind.female};
+			}
+		}
+		return o;
+	}
+
+	function manage() {
+		V.assistant = V.assistant || {};
+		Object.assign(V.assistant,
+		{
+		personality: V.assistant.personality || 0,
+		name: V.assistant.name || "your personal assistant",
+		power: V.assistant.power || 0,
+		appearance: V.assistant.appearance || "normal",
+		});
+
+		if (V.assistant.market) {
+			Object.assign(V.assistant.market,
+			{
+			relationship: V.assistant.market.relationship || "cute",
+			limit: V.assistant.market.limit || 0,
+			aggressiveness: V.assistant.market.aggressiveness || 0,
+			});
+		}
+	}
+})();
\ No newline at end of file
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/personalAssistant/assistantAppearance.tw
similarity index 86%
rename from src/uncategorized/personalAssistantAppearance.tw
rename to src/personalAssistant/assistantAppearance.tw
index 4a8768125bd9bb38eafe387c96f0520b0e54a063..f4595f17c8ff462f2bab5090ba620a4847d4d994 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/personalAssistant/assistantAppearance.tw
@@ -3,11 +3,11 @@
 <<setAssistantPronouns>>
 <<setNonlocalPronouns $seeDicks>>
 <<set _paSeed = random(1,8)>>
-<<switch $assistantAppearance>>
+<<switch $assistant.appearance>>
 <<case "monstergirl">>
-_HeA's a cute little <<if $assistantFSAppearance == "supremacist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>monster<<= _girlA>> with <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">><<print randomRaceSkin($arcologies[0].FSSupremacistRace)>><<elseif $assistantFSAppearance == "subjugationist">><<print randomRaceSkin($arcologies[0].FSSubjugationistRace)>><<else>>pale<</if>> skin, perky breasts, green tentacles instead of hair, and two dicks. _HisA eyes are large, expressive, and surprisingly innocent.
-	<<if $assistantFSOptions>>
-	<<switch $assistantFSAppearance>>
+_HeA's a cute little <<if $assistant.fsAppearance == "supremacist">>$arcologies[0].FSSupremacistRace <<elseif $assistant.fsAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>monster<<= _girlA>> with <<if $arcologies[0].FSSupremacist != "unset" && $assistant.fsAppearance != "subjugationist">><<print randomRaceSkin($arcologies[0].FSSupremacistRace)>><<elseif $assistant.fsAppearance == "subjugationist">><<print randomRaceSkin($arcologies[0].FSSubjugationistRace)>><<else>>pale<</if>> skin, perky breasts, green tentacles instead of hair, and two dicks. _HisA eyes are large, expressive, and surprisingly innocent.
+	<<if def $assistant.fsOptions>>
+	<<switch $assistant.fsAppearance>>
 	<<case "paternalist">>
 		_HeA's wearing a surprisingly conservative outfit: khakis, a sweater, and eyeglasses.
 	<<case "degradationist">>
@@ -77,17 +77,17 @@ _HeA's a cute little <<if $assistantFSAppearance == "supremacist">>$arcologies[0
 <<elseif (_paSeed == 5) && ($invasionVictory > 0)>>
 	The monster<<= _girlA>> is riding around on a little representation of one of your security drones. _HeA's very obviously enjoying the drone's vibrations as it hovers. When _heA sees you looking at _himA, _heA giggles and says, "What? I like him! He did really well during the invasion. And he's cute!"
 <<elseif (_paSeed == 6) && ($studio == 1)>>
-	The monster<<= _girlA>> has both _hisA dicks inside a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistantName is clearly turning the feed of it into porn.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+	The monster<<= _girlA>> has both _hisA dicks inside a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistant.name is clearly turning the feed of it into porn.
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's very human avatar.
-	<<if $marketAssistantRelationship == "cute">>
+	<<if $assistant.market.relationship == "cute">>
 		They're chatting companionably, with the _girlM showing no sign of noticing that _heM's talking to a naked monster<<= _girlA>> with two erect cocks.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		$assistantName is holding the poor _girlM down so _heA can take _himM from behind. As you watch, $assistantName extracts _hisA cock from the market assistant's avatar's cunt and stuffs it up _hisM ass, alongside _hisA other dick, eliciting some terrified begging and then tired sobbing.
-	<<elseif $marketAssistantRelationship == "incestuous">>
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		$assistant.name is holding the poor _girlM down so _heA can take _himM from behind. As you watch, $assistant.name extracts _hisA cock from the market assistant's avatar's cunt and stuffs it up _hisM ass, alongside _hisA other dick, eliciting some terrified begging and then tired sobbing.
+	<<elseif $assistant.market.relationship == "incestuous">>
 		They're fucking openly, with the market assistant's avatar bouncing greedily on top of _hisM monstrous sibling. _HeM's clearly enjoying the feeling of _hisM _sisterA's cocks buried in _hisM holes.
 	<<else>>
-		They're cuddled up close. As they kiss, $assistantName's tentacle hair holds _hisA lover's head gently. The market assistant's avatar is using both hands to give $assistantName's cocks some manual release.
+		They're cuddled up close. As they kiss, $assistant.name's tentacle hair holds _hisA lover's head gently. The market assistant's avatar is using both hands to give $assistant.name's cocks some manual release.
 	<</if>>
 <<else>>
 	_HeA's sitting cross-legged, looking up at you and waiting for instructions. In the meantime, _heA's masturbating gently, a dickhead in each hand, while _hisA hair writhes against itself.
@@ -95,9 +95,9 @@ _HeA's a cute little <<if $assistantFSAppearance == "supremacist">>$arcologies[0
 
 <<case "shemale">>
 
-_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>bimbo shemale with bleached blonde hair, <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">><<print randomRaceSkin($arcologies[0].FSSupremacistRace)>><<elseif $assistantFSAppearance == "subjugationist">><<print randomRaceSkin($arcologies[0].FSSubjugationistRace)>><<else>>tanned<</if>> skin, huge lips, and ridiculous tits. _HisA cock hangs past _hisA knees when limp.
-	<<if $assistantFSOptions>>
-	<<switch $assistantFSAppearance>>
+_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistant.fsAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistant.fsAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>bimbo shemale with bleached blonde hair, <<if $arcologies[0].FSSupremacist != "unset" && $assistant.fsAppearance != "subjugationist">><<print randomRaceSkin($arcologies[0].FSSupremacistRace)>><<elseif $assistant.fsAppearance == "subjugationist">><<print randomRaceSkin($arcologies[0].FSSubjugationistRace)>><<else>>tanned<</if>> skin, huge lips, and ridiculous tits. _HisA cock hangs past _hisA knees when limp.
+	<<if def $assistant.fsOptions>>
+	<<switch $assistant.fsAppearance>>
 	<<case "paternalist">>
 		_HeA's made _himselfA up to look a bit classier recently: _heA has elegant fake nails, and has _hisA hair piled up on _hisA head.
 	<<case "degradationist">>
@@ -167,14 +167,14 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <<elseif (_paSeed == 5) && ($invasionVictory > 0)>>
 	_HeA's masturbating as _heA takes it up the ass from a representation of one of your security drones, which appears to have a little dildo mounted in place of one of its gun assemblies. When _heA sees you looking at _himA, _heA giggles and says, "What? I like him! He did really well during the invasion."
 <<elseif (_paSeed == 6) && ($studio == 1)>>
-	The shemale is plowing a recognizable little representation of one of your slaves up the butt, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistantName is clearly turning the feed of it into porn.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+	The shemale is plowing a recognizable little representation of one of your slaves up the butt, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistant.name is clearly turning the feed of it into porn.
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's own shemale avatar.
-	<<if $marketAssistantRelationship == "cute">>
+	<<if $assistant.market.relationship == "cute">>
 		They're jerking each other off companionably, since that's as close to chaste friendship as the lewd little shemales get. They chat girlishly, as though they weren't engaged in open mutual masturbation.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		$assistantName is bouncing the poor bitch up and down on _hisA dick, the market assistant's pathetic, limp dick flopping around as $assistantName assrapes _himM. As you watch, $assistantName reaches around to give the market assistant's soft balls a possessive squeeze.
-	<<elseif $marketAssistantRelationship == "incestuous">>
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		$assistant.name is bouncing the poor bitch up and down on _hisA dick, the market assistant's pathetic, limp dick flopping around as $assistant.name assrapes _himM. As you watch, $assistant.name reaches around to give the market assistant's soft balls a possessive squeeze.
+	<<elseif $assistant.market.relationship == "incestuous">>
 		They're locked in a tight, perfectly symmetrical incestuous 69, each of their monstrous cocks deepthroated a long way inside their <<if _sisterA == _sisterM>>_sisterA<<else>>sibling<</if>>'s mouth. They spasm with simultaneous orgasm, gulping each other's cum greedily.
 	<<else>>
 		They're doing it in the missionary position, kissing deeply. The one who's taking it has _hisM huge dick between them, its head crushed between their four fake breasts. As you watch, _heM orgasms, splashing both of their faces with cum.
@@ -184,9 +184,9 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <</if>>
 
 <<case "amazon">>
-	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>amazon
-	<<if $assistantFSOptions>>
-		<<switch $assistantFSAppearance>>
+	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistant.fsAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistant.fsAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>amazon
+	<<if def $assistant.fsOptions>>
+		<<switch $assistant.fsAppearance>>
 		<<case "paternalist">>
 			with long flowing hair, tribal tattoos, shredded abs, and bone jewelry. _HeA has bigger natural tits than anyone that ripped could possibly maintain.
 		<<case "repopulation focus">>
@@ -260,26 +260,26 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <<elseif (_paSeed == 5) && ($invasionVictory > 0)>>
 	_HeA's leaning against a representation of one of your security drones. Every so often, _heA wrestles with it affectionately. When _heA sees you watching _himA, _heA leaps atop the drone, puts _hisA fists on _hisA hips, and says, "What? I like him! He did really well during the invasion. And he's cute!"
 <<elseif (_paSeed == 6) && ($studio == 1)>>
-	The amazon has _hisA hand inside a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistantName is clearly turning the feed of it into porn.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+	The amazon has _hisA hand inside a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistant.name is clearly turning the feed of it into porn.
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's tribes<<= _womanM>> avatar.
-	<<if $marketAssistantRelationship == "cute">>
-		They're chatting companionably as $assistantName stretches and the market assistant's avatar does a complex calculation on _hisM fingers. $assistantName is telling a long story, and the market assistant is listening kindly.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		$assistantName is taking _hisA tribal slave from behind. It's technically tribbing, since all _heA's doing is grinding _hisA cunt against the market assistant's, but the poor little tribes<<= _womanM>> is being fucked hard regardless.
-	<<elseif $marketAssistantRelationship == "incestuous">>
-		$assistantName is getting some manual stimulation from _hisA _sisterM, who is watching _hisM muscular sibling's aroused thrashing with amusement as _heM slides _hisM whole hand in and out of $assistantName's cunt.
+	<<if $assistant.market.relationship == "cute">>
+		They're chatting companionably as $assistant.name stretches and the market assistant's avatar does a complex calculation on _hisM fingers. $assistant.name is telling a long story, and the market assistant is listening kindly.
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		$assistant.name is taking _hisA tribal slave from behind. It's technically tribbing, since all _heA's doing is grinding _hisA cunt against the market assistant's, but the poor little tribes<<= _womanM>> is being fucked hard regardless.
+	<<elseif $assistant.market.relationship == "incestuous">>
+		$assistant.name is getting some manual stimulation from _hisA _sisterM, who is watching _hisM muscular sibling's aroused thrashing with amusement as _heM slides _hisM whole hand in and out of $assistant.name's cunt.
 	<<else>>
-		They're doing it in the missionary position, kissing deeply. They're technically tribbing, but $assistantName's muscular body and the tribes<<= _womanM>>'s <<= _wifeM>>ly form make it look very pure and traditional.
+		They're doing it in the missionary position, kissing deeply. They're technically tribbing, but $assistant.name's muscular body and the tribes<<= _womanM>>'s <<= _wifeM>>ly form make it look very pure and traditional.
 	<</if>>
 <<else>>
 	_HeA's doing push-ups, glancing at you at the top of each rep to see if you need _himA. When _heA sees your attention, _heA pushes hard enough to bounce to a standing position. Seeing that you're just looking, _heA winks, flexes, and drops back down to do crunches.
 <</if>>
 
 <<case "businesswoman">>
-	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>business<<= _womanA>>
-	<<if $assistantFSOptions>>
-	<<switch $assistantFSAppearance>>
+	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistant.fsAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistant.fsAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>business<<= _womanA>>
+	<<if def $assistant.fsOptions>>
+	<<switch $assistant.fsAppearance>>
 	<<case "paternalist">>
 		wearing a perfectly-tailored suit, with _hisA silver-blonde hair brushed back over _hisA shoulders. _HisA clothes are conservative, but they can't hide _hisA generous curves.
 	<<case "degradationist">>
@@ -353,26 +353,26 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <<elseif (_paSeed == 5) && ($invasionVictory > 0)>>
 	_HeA's sitting primly next to a representation of one of your security drones, working on a little tablet. Every so often, _heA reaches over and rubs the drone's upper armor affectionately. When _heA sees you looking at _himA, _heA blushes and says, "I like this one. He did very well during the invasion. And he's so handsome!"
 <<elseif (_paSeed == 6) && ($studio == 1)>>
-	_HeA's using a strap-on on a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistantName is clearly turning the feed of it into porn.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+	_HeA's using a strap-on on a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistant.name is clearly turning the feed of it into porn.
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's own businesslike avatar.
-	<<if $marketAssistantRelationship == "cute">>
+	<<if $assistant.market.relationship == "cute">>
 		They're gossiping tipsily over martinis, their heels kicked off and their jackets unbuttoned. They trade stories from their day, laughing at your slaves' struggles.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		$assistantName is shamelessly molesting the office intern. The market assistant looks like _heM's trying to get work done, but the sexually aggressive MILF avatar is standing behind _himM with one hand down the market assistant's skirt and another down _hisM blouse.
-	<<elseif $marketAssistantRelationship == "incestuous">>
-		$assistantName is getting oral sex from _hisA _daughterM, the naked businesswomen surrounded by their discarded office wear. As you watch, $assistantName shrieks _hisA _daughterM's name, clutching _hisM head in both hands.
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		$assistant.name is shamelessly molesting the office intern. The market assistant looks like _heM's trying to get work done, but the sexually aggressive MILF avatar is standing behind _himM with one hand down the market assistant's skirt and another down _hisM blouse.
+	<<elseif $assistant.market.relationship == "incestuous">>
+		$assistant.name is getting oral sex from _hisA _daughterM, the naked businesswomen surrounded by their discarded office wear. As you watch, $assistant.name shrieks _hisA _daughterM's name, clutching _hisM head in both hands.
 	<<else>>
-		They're making out in a surprisingly girlish way, hesitantly kissing each other and pressing their chests together. They blush when they see you watching them, but $assistantName is sneaking a hand up the market assistant's avatar's skirt.
+		They're making out in a surprisingly girlish way, hesitantly kissing each other and pressing their chests together. They blush when they see you watching them, but $assistant.name is sneaking a hand up the market assistant's avatar's skirt.
 	<</if>>
 <<else>>
 	_HeA's sitting at a little desk of _hisA own, working away. _HeA glances up to check on you and sees you looking at _himA, and flashes you a confident, pearly white smile before returning to _hisA business.
 <</if>>
 
 <<case "goddess">>
-	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>fertility goddess,
-	<<if $assistantFSOptions>>
-	<<switch $assistantFSAppearance>>
+	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistant.fsAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistant.fsAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>fertility goddess,
+	<<if def $assistant.fsOptions>>
+	<<switch $assistant.fsAppearance>>
 	<<case "paternalist">>
 		with swollen breasts and a big pregnant belly. _HeA wears only a gossamer white camisole over _hisA tanned skin, with a woven crown of daisies.
 	<<case "degradationist">>
@@ -447,13 +447,13 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 	_HeA's frolicking with a representation of one of your security drones, hugging and cradling it to _hisA baby bump. When _heA sees you looking at _himA, _heA pets one of its gun barrels and says, "What? I like him! He was so brave, protecting us during the invasion. Besides, he's adorable!"
 <<elseif (_paSeed == 6) && ($studio == 1)>>
 	_HeA's fondling and breastfeeding a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and your personal assistant is clearly turning the feed of it into porn.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's demigoddess avatar.
-	<<if $marketAssistantRelationship == "cute">>
+	<<if $assistant.market.relationship == "cute">>
 		They're sitting arm in arm, their subtly differing glows casting shadows from their place on your desktop. Their conversation exists on the level of code, not speech, detectable only as slight flickerings of their respective auras.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		$assistantName casts a spell on the junior avatar as you watch. The market assistant's avatar goes from reluctance to a sudden consuming hunger for $assistantName's pregnant pussy. $assistantName laughs powerfully at the sudden oral assault.
-	<<elseif $marketAssistantRelationship == "incestuous">>
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		$assistant.name casts a spell on the junior avatar as you watch. The market assistant's avatar goes from reluctance to a sudden consuming hunger for $assistant.name's pregnant pussy. $assistant.name laughs powerfully at the sudden oral assault.
+	<<elseif $assistant.market.relationship == "incestuous">>
 		They're both especially pregnant today, and are gently tribbing, their legs intertwined and their torsos reclined away from one another. Each massages their own belly with satisfaction, feeling their <<if _sisterA == _sisterM>>_sisterA<<else>>sibling<</if>>'s heat against their own.
 	<<else>>
 		They're making heavenly love, kissing deeply and fingering each other voluptuously. They somehow make mutual masturbation look like a deeply sacred act, occasionally breaking their kiss to look into each others' eyes.
@@ -463,9 +463,9 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <</if>>
 
 <<case "schoolgirl">>
-	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>school<<= _girlA>>
-	<<if $assistantFSOptions>>
-	<<switch $assistantFSAppearance>>
+	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistant.fsAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistant.fsAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>school<<= _girlA>>
+	<<if def $assistant.fsOptions>>
+	<<switch $assistant.fsAppearance>>
 	<<case "paternalist">>
 		wearing a long plaid skirt and a clean white shirt. _HeA does _hisA best to look as prim as possible, which, given _hisA duties, often isn't very prim at all.
 	<<case "degradationist">>
@@ -539,26 +539,26 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <<elseif (_paSeed == 5) && ($invasionVictory > 0)>>
 	_HeA's planting a wet kiss on a representation of one of your security drones; _heA pats it lovingly and manages to press quite a bit of boob against the side of one of its gun assemblies. When _heA sees you looking at _himA, _heA giggles and says, "What? I like him! He did really well during the invasion. And he's cute!"
 <<elseif (_paSeed == 6) && ($studio == 1)>>
-	_HeA's getting oral from a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistantName is clearly turning the feed of it into porn.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+	_HeA's getting oral from a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistant.name is clearly turning the feed of it into porn.
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's nerdy school<<= _girlM>> avatar.
-	<<if $marketAssistantRelationship == "cute">>
-		They're sitting next to each other, and appear to be doing homework side by side. The market assistant's work looks like complicated math problems, while $assistantName is looking through lewd pictures of slaves, albeit with some kind of higher purpose.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		$assistantName is wearing a strap-on, and is bullying _hisA school<<= _girlM>> conquest's pussy. The market assistant's avatar orgasms loudly as you watch, and then claps both hands over _hisM mouth, crying a little, unwilling to give $assistantName the satisfaction.
-	<<elseif $marketAssistantRelationship == "incestuous">>
+	<<if $assistant.market.relationship == "cute">>
+		They're sitting next to each other, and appear to be doing homework side by side. The market assistant's work looks like complicated math problems, while $assistant.name is looking through lewd pictures of slaves, albeit with some kind of higher purpose.
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		$assistant.name is wearing a strap-on, and is bullying _hisA school<<= _girlM>> conquest's pussy. The market assistant's avatar orgasms loudly as you watch, and then claps both hands over _hisM mouth, crying a little, unwilling to give $assistant.name the satisfaction.
+	<<elseif $assistant.market.relationship == "incestuous">>
 		They're making faces at each other and giggling, but as you watch them, this degenerates rapidly into clumsy kissing, groping of each others' breasts, and finally some enthusiastic tribbing.
 	<<else>>
-		$assistantName is giving the market assistant's avatar oral, and to go by the bespectacled _girlM's gasping, is doing a good job. $assistantName finishes and leans back, wiping _hisA mouth and grinning as _hisA lover bends over to return the favor.
+		$assistant.name is giving the market assistant's avatar oral, and to go by the bespectacled _girlM's gasping, is doing a good job. $assistant.name finishes and leans back, wiping _hisA mouth and grinning as _hisA lover bends over to return the favor.
 	<</if>>
 <<else>>
 	_HeA's watching you attentively, waiting for a chance to be helpful. When _heA sees your glance, _heA smiles hopefully, sticks out _hisA chest a little, and turns from side to side to show off.
 <</if>>
 
 <<case "hypergoddess">>
-	_HeA's a cute "little" <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>fertility goddess, with monstrously wide hips, enormous milky breasts and a room filling belly. _HisA overfull stomach bulges and squirms from _hisA hundreds of occupants, as well as parts _hisA milk swollen breasts to either side.
-	<<if $assistantFSOptions>>
-	<<switch $assistantFSAppearance>>
+	_HeA's a cute "little" <<if $arcologies[0].FSSupremacist != "unset" && $assistant.fsAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistant.fsAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>fertility goddess, with monstrously wide hips, enormous milky breasts and a room filling belly. _HisA overfull stomach bulges and squirms from _hisA hundreds of occupants, as well as parts _hisA milk swollen breasts to either side.
+	<<if def $assistant.fsOptions>>
+	<<switch $assistant.fsAppearance>>
 	<<case "paternalist">>
 		_HeA's made _himselfA up to look a bit classier recently: _heA has elegant fake nails, and has _hisA hair piled up on _hisA head. Occasionally a stream of liquid pours from _hisA crotch along with a healthy baby.
 	<<case "repopulation focus">>
@@ -639,14 +639,14 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 	_HeA's frolicking with a representation of one of your security drones, hugging and cradling it to _hisA huge baby bump. When _heA sees you looking at _himA, _heA pets one of its gun barrel and says, "What? I like him! He was so brave, protecting us during the invasion. Besides, he's adorable!"
 <<elseif (_paSeed == 6) && ($studio == 1)>>
 	_HeA's fondling and breastfeeding a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and your personal assistant is clearly turning the feed of it into porn.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's demigoddess avatar.
-	<<if $marketAssistantRelationship == "cute">>
+	<<if $assistant.market.relationship == "cute">>
 		They're sitting arm in arm, their subtly differing glows casting shadows from their place on your desktop. Their conversation exists on the level of code, not speech, detectable only as slight flickerings of their respective auras.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		$assistantName casts a spell on the junior avatar as you watch. The market assistant's avatar's flat belly gurgles slightly before it begins quickly swelling, not stopping until it has pinned the hapless demigoddess to the floor. $assistantName waddles over _hisA immobilized partner and plants _hisA pregnant pussy on _hisM face. $assistantName laughs powerfully at the forced oral assault from _hisA bursting plaything.
-	<<elseif $marketAssistantRelationship == "incestuous">>
-		$assistantName is especially pregnant today, and is gently tribbing with _hisA flat stomached _sisterM goddess. As they near simultaneous orgasm, $assistantName begins rapidly transferring babies into _hisA _sisterM's womb, giggling as _hisA hapless _sisterM swells more and more gravid. When _heA finishes, $assistantName, the smaller of the two <<if _sisterA == _sisterM>>_sisterA<<else>>sibling<</if>>s, aids _hisA fecund sibling to _hisM feet and into _hisA waiting arms.
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		$assistant.name casts a spell on the junior avatar as you watch. The market assistant's avatar's flat belly gurgles slightly before it begins quickly swelling, not stopping until it has pinned the hapless demigoddess to the floor. $assistant.name waddles over _hisA immobilized partner and plants _hisA pregnant pussy on _hisM face. $assistant.name laughs powerfully at the forced oral assault from _hisA bursting plaything.
+	<<elseif $assistant.market.relationship == "incestuous">>
+		$assistant.name is especially pregnant today, and is gently tribbing with _hisA flat stomached _sisterM goddess. As they near simultaneous orgasm, $assistant.name begins rapidly transferring babies into _hisA _sisterM's womb, giggling as _hisA hapless _sisterM swells more and more gravid. When _heA finishes, $assistant.name, the smaller of the two <<if _sisterA == _sisterM>>_sisterA<<else>>sibling<</if>>s, aids _hisA fecund sibling to _hisM feet and into _hisA waiting arms.
 	<<else>>
 		They're making heavenly love, kissing deeply and fingering each other voluptuously. They somehow make mutual masturbation look like a deeply sacred act, occasionally breaking their kiss to look into each others' eyes.
 	<</if>>
@@ -655,9 +655,9 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <</if>>
 
 <<case "loli">>
-	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>
-	<<if $assistantFSOptions>>
-	<<switch $assistantFSAppearance>>
+	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistant.fsAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistant.fsAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>
+	<<if def $assistant.fsOptions>>
+	<<switch $assistant.fsAppearance>>
 	<<case "paternalist">>
 		_girlA wearing a cute pink dress.
 	<<case "supremacist">>
@@ -732,25 +732,25 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 	_HeA's planting a wet kiss on a representation of one of your security drones; _heA hugs it lovingly and tightly. When _heA sees you looking at _himA, _heA giggles and says, "What? I like him! He did really well during the invasion. And he's cute!"
 <<elseif (_paSeed == 6) && ($studio == 1)>>
 	_HeA's getting oral from a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and your personal assistant is clearly turning the feed of it into porn.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's chubby _loliM avatar.
-	<<if $marketAssistantRelationship == "cute">>
+	<<if $assistant.market.relationship == "cute">>
 		They're sitting face to face, playing a rapid game of pattycake. Their conversation exists on the level of code, not speech, detectable only as slight flickerings when their hands connect.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		$assistantName has _hisA chubby playmate pinned under _hisA butt, and is inspecting _hisA _loliM conquest's pussy. The market assistant's avatar groans as $assistantName's fingers explore _hisM tight passage, and then claps both hands over _hisM mouth, crying a little, unwilling to give $assistantName the satisfaction.
-	<<elseif $marketAssistantRelationship == "incestuous">>
-		They're playing doctor with each other. $assistantName is currently inspecting _hisA _sisterM's vagina, making sure everything is alright. Once _heA finishes, _heA states _hisA diagnosis and the needed cure. _HeA bends over _hisA _sisterM and begins administering _hisA "cure".
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		$assistant.name has _hisA chubby playmate pinned under _hisA butt, and is inspecting _hisA _loliM conquest's pussy. The market assistant's avatar groans as $assistant.name's fingers explore _hisM tight passage, and then claps both hands over _hisM mouth, crying a little, unwilling to give $assistant.name the satisfaction.
+	<<elseif $assistant.market.relationship == "incestuous">>
+		They're playing doctor with each other. $assistant.name is currently inspecting _hisA _sisterM's vagina, making sure everything is alright. Once _heA finishes, _heA states _hisA diagnosis and the needed cure. _HeA bends over _hisA _sisterM and begins administering _hisA "cure".
 	<<else>>
-		They're playing house with each other, well house based off your penthouse. $assistantName is pretending to be you while _hisA friend assumes $assistantName's role. They are currently caught up in deciding the best way to arrange the beds in the slave quarters.
+		They're playing house with each other, well house based off your penthouse. $assistant.name is pretending to be you while _hisA friend assumes $assistant.name's role. They are currently caught up in deciding the best way to arrange the beds in the slave quarters.
 	<</if>>
 <<else>>
 	_HeA's watching you attentively, waiting for a chance to be helpful. When _heA sees your glance, _heA smiles shyly and looks away before returning to your gaze.
 <</if>>
 
 <<case "preggololi">>
-	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>_girlA with a large pregnant
-	<<if $assistantFSOptions>>
-	<<switch $assistantFSAppearance>>
+	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistant.fsAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistant.fsAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>>_girlA with a large pregnant
+	<<if def $assistant.fsOptions>>
+	<<switch $assistant.fsAppearance>>
 	<<case "paternalist">>
 		belly wearing a cute pink dress. The middle is stretched tight by _hisA growing belly.
 	<<case "supremacist">>
@@ -825,16 +825,16 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 	_HeA's planting a wet kiss on a representation of one of your security drones; _heA hugs it as best _heA can with _hisA belly in the way. When _heA sees you looking at _himA, _heA giggles and says, "What? I like him! He did really well during the invasion. And he's cute!"
 <<elseif (_paSeed == 6) && ($studio == 1)>>
 	_HeA's getting oral from a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and your personal assistant is clearly turning the feed of it into porn.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's chubby _loliM avatar.
-	<<if $marketAssistantRelationship == "cute">>
-		$assistantName is laying on _hisA back with _hisA young friend's ear on _hisA pregnant belly. Their conversation exists on the level of code, not speech, detectable only as slight flutterings of $assistantName's baby kicking.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		$assistantName has _hisA chubby playmate pinned under _hisA butt, and is inspecting _hisA _loliM conquest's pussy. The market assistant's avatar groans as $assistantName's fingers explore _hisM tight passage, and then claps both hands over _hisM mouth, crying a little, unwilling to give $assistantName the satisfaction.
-	<<elseif $marketAssistantRelationship == "incestuous">>
-		They're making out with each other, one hand down each other's panties, the other massaging their mutually swollen bellies, since $assistantName has introduced _hisA _sisterM to _hisA boyfriends.
+	<<if $assistant.market.relationship == "cute">>
+		$assistant.name is laying on _hisA back with _hisA young friend's ear on _hisA pregnant belly. Their conversation exists on the level of code, not speech, detectable only as slight flutterings of $assistant.name's baby kicking.
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		$assistant.name has _hisA chubby playmate pinned under _hisA butt, and is inspecting _hisA _loliM conquest's pussy. The market assistant's avatar groans as $assistant.name's fingers explore _hisM tight passage, and then claps both hands over _hisM mouth, crying a little, unwilling to give $assistant.name the satisfaction.
+	<<elseif $assistant.market.relationship == "incestuous">>
+		They're making out with each other, one hand down each other's panties, the other massaging their mutually swollen bellies, since $assistant.name has introduced _hisA _sisterM to _hisA boyfriends.
 	<<else>>
-		They're playing house with each other — well, house based off your penthouse. $assistantName is pretending to be you while _hisA friend assumes $assistantName's role. They are currently caught up in figuring out how many children $assistantName's harem could produce.
+		They're playing house with each other — well, house based off your penthouse. $assistant.name is pretending to be you while _hisA friend assumes $assistant.name's role. They are currently caught up in figuring out how many children $assistant.name's harem could produce.
 	<</if>>
 <<else>>
 	_HeA's watching you attentively, waiting for a chance to be helpful. When _heA sees your glance, _heA smiles shyly and looks away before returning to your gaze.
@@ -842,8 +842,8 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 
 <<case "fairy">>
 	_HeA's a cute little
-	<<if $assistantFSOptions>>
-	<<switch $assistantFSAppearance>>
+	<<if def $assistant.fsOptions>>
+	<<switch $assistant.fsAppearance>>
 	<<case "paternalist">>
 		fairy wearing a well-sewn blue dress, with a large red bow tied to the back of _hisA waist length golden-blonde hair. _HeA looks like a little Bucuretsi doll.
 	<<case "degradationist">>
@@ -915,17 +915,17 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <<elseif (_paSeed == 5) && ($invasionVictory == 1)>>
 	_HeA's sitting on the shoulders of a representation of one of your security drones. Every so often, _heA raises a fist and shouts "For the Imperium of man!" When _heA sees you looking at _himA, _heA grins and says, "This guy is like my robo-buddy. He's the best!"
 <<elseif (_paSeed == 6) && ($studio == 1)>>
-	A recognizable little representation of one of your slaves is riding a sybian while _heA uses a handheld camera to film the action. The slave must be using one of the penthouse's many toys, and $assistantName is clearly turning the feed of it into porn.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+	A recognizable little representation of one of your slaves is riding a sybian while _heA uses a handheld camera to film the action. The slave must be using one of the penthouse's many toys, and $assistant.name is clearly turning the feed of it into porn.
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's own fairy avatar.
-	<<if $marketAssistantRelationship == "cute">>
-		The market assistant is sitting on the end of a book, reading from a tablet for ants. $assistantName is lying down next to _himM, with _hisA head resting on the other fairy's lap and slowly kicking _hisA feet in the air. The market assistant take a moment to look down at $assistantName and gently pat _hisA head. This elicits a big smile from _himA.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		The market assistant is naked and sitting before a thimble, as $assistantName sits behind _himM, teasing and molesting _himM. _HeM is rather annoyed by _hisM inability to focus on _hisM work, having _hisM nipples and clit pinched and flicked. _HisM sopping pussy is constantly letting out a small stream of liquid into the thimble. $assistantName is working hard on extracting as much sweet nectar from the fairy as _heA can, with every climax _heA wrings out bringing another large deluge of pussy juice into the vessel.
-	<<elseif $marketAssistantRelationship == "incestuous">>
-		The fairy <<if _sisterA == _sisterM>>_sisterA<<else>>sibling<</if>>s are lying down, each embracing the other as they languidly make out. $assistantName slips one leg in between _hisA _sisterM's, and the two begin rocking against one another. The two grow more and more passionate as they make love together.
+	<<if $assistant.market.relationship == "cute">>
+		The market assistant is sitting on the end of a book, reading from a tablet for ants. $assistant.name is lying down next to _himM, with _hisA head resting on the other fairy's lap and slowly kicking _hisA feet in the air. The market assistant take a moment to look down at $assistant.name and gently pat _hisA head. This elicits a big smile from _himA.
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		The market assistant is naked and sitting before a thimble, as $assistant.name sits behind _himM, teasing and molesting _himM. _HeM is rather annoyed by _hisM inability to focus on _hisM work, having _hisM nipples and clit pinched and flicked. _HisM sopping pussy is constantly letting out a small stream of liquid into the thimble. $assistant.name is working hard on extracting as much sweet nectar from the fairy as _heA can, with every climax _heA wrings out bringing another large deluge of pussy juice into the vessel.
+	<<elseif $assistant.market.relationship == "incestuous">>
+		The fairy <<if _sisterA == _sisterM>>_sisterA<<else>>sibling<</if>>s are lying down, each embracing the other as they languidly make out. $assistant.name slips one leg in between _hisA _sisterM's, and the two begin rocking against one another. The two grow more and more passionate as they make love together.
 	<<else>>
-		The two fairies are sitting on top of a virtual flower, finishing up their work. With that out of the way, they strip down and each take a stamen and give them a thorough licking. Once coated, they line their stamen up to the other fairy's pussy. They take a moment to hold each other's hand as they slowly slide down the stamen. The two bottom out with a moan, and pull each other into a warm embrace. The market assistant starts buzzing _hisM wings, the vibration causing both of them to yelp. $assistantName grins at this new source of pleasure, locking lips with the market assistant as the two beat their wings to a rhythm only they can hear.
+		The two fairies are sitting on top of a virtual flower, finishing up their work. With that out of the way, they strip down and each take a stamen and give them a thorough licking. Once coated, they line their stamen up to the other fairy's pussy. They take a moment to hold each other's hand as they slowly slide down the stamen. The two bottom out with a moan, and pull each other into a warm embrace. The market assistant starts buzzing _hisM wings, the vibration causing both of them to yelp. $assistant.name grins at this new source of pleasure, locking lips with the market assistant as the two beat their wings to a rhythm only they can hear.
 	<</if>>
 <<else>>
 	_HeA's sitting at the edge of your desk, kicking _hisA feet and humming a pleasant tune. _HeA glances up to check on you and sees you looking at _himA, and flashes you a great big beautiful smile.
@@ -933,8 +933,8 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 
 <<case "pregnant fairy">>
 	_HeA's a cute little fairy with a swollen belly
-	<<if $assistantFSOptions>>
-	<<switch $assistantFSAppearance>>
+	<<if def $assistant.fsOptions>>
+	<<switch $assistant.fsAppearance>>
 	<<case "paternalist">>
 		wearing a well-sewn blue dress, with a large red bow tied to the back of _hisA waist length golden-blonde hair. _HeA looks like a little Bucuresti doll.
 	<<case "degradationist">>
@@ -1006,17 +1006,17 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <<elseif (_paSeed == 5) && ($invasionVictory == 1)>>
 	_HeA's sitting on the shoulders of a representation of one of your security drones. Every so often, _heA raises a fist and shouts "For the Imperium of man!" When _heA sees you looking at _himA, _heA grins and says, "This guy is like my robo-buddy. He's the best!"
 <<elseif (_paSeed == 6) && ($studio == 1)>>
-	A recognizable little representation of one of your slaves is riding a sybian while _heA uses a handheld camera to film the action. The slave must be using one of the penthouse's many toys, and $assistantName is clearly turning the feed of it into porn.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+	A recognizable little representation of one of your slaves is riding a sybian while _heA uses a handheld camera to film the action. The slave must be using one of the penthouse's many toys, and $assistant.name is clearly turning the feed of it into porn.
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's own fairy avatar.
-	<<if $marketAssistantRelationship == "cute">>
-		The market assistant is sitting on the end of a book, reading from a tablet for ants. $assistantName is sitting beside _himM, stroking _hisA belly and humming a relaxing tune.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		The market assistant is sporting _hisM own smaller baby bump now. With _hisM top down, $assistantName slowly squeezes and massages _hisM breasts from behind, teasing out tiny droplets of milk, much to _hisM annoyance. _HeM suddenly drops _hisM tablet with a yelp as $assistantName drags _hisA tongue across _hisA ear from root to tip.
-	<<elseif $marketAssistantRelationship == "incestuous">>
-		Taking a break, the market assistant sits on $assistantName's lap, nursing away at _hisA lactating breast like a baby. $assistantName coos, keeping on arm to support _hisA _sisterM's back while the other teases _hisM dripping slit.
+	<<if $assistant.market.relationship == "cute">>
+		The market assistant is sitting on the end of a book, reading from a tablet for ants. $assistant.name is sitting beside _himM, stroking _hisA belly and humming a relaxing tune.
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		The market assistant is sporting _hisM own smaller baby bump now. With _hisM top down, $assistant.name slowly squeezes and massages _hisM breasts from behind, teasing out tiny droplets of milk, much to _hisM annoyance. _HeM suddenly drops _hisM tablet with a yelp as $assistant.name drags _hisA tongue across _hisA ear from root to tip.
+	<<elseif $assistant.market.relationship == "incestuous">>
+		Taking a break, the market assistant sits on $assistant.name's lap, nursing away at _hisA lactating breast like a baby. $assistant.name coos, keeping on arm to support _hisA _sisterM's back while the other teases _hisM dripping slit.
 	<<else>>
-		The two fairies are slowly making out. The market assistant gently lies $assistantName down, guiding kisses down _hisA body. Taking a moment to suckle from each leaking tit, the market assistant continues down _hisA swollen belly before coming to _hisA delicate flower and tenderly eats the pregnant fairy out.
+		The two fairies are slowly making out. The market assistant gently lies $assistant.name down, guiding kisses down _hisA body. Taking a moment to suckle from each leaking tit, the market assistant continues down _hisA swollen belly before coming to _hisA delicate flower and tenderly eats the pregnant fairy out.
 	<</if>>
 <<else>>
 	_HeA's sitting at the edge of your desk, cradling _hisA swollen belly and humming a pleasant tune. _HeA glances up to check on you and sees you looking at _himA, and flashes you a great big beautiful smile.
@@ -1024,8 +1024,8 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 
 <<case "slimegirl">>
 	_HeA's a girlish shaped figure, bearing a crimson core, made entirely out of
-	<<if $assistantFSOptions>>
-	<<switch $assistantFSAppearance>>
+	<<if def $assistant.fsOptions>>
+	<<switch $assistant.fsAppearance>>
 	<<case "paternalist">>
 		slime with a modest pink dress floating inside _himA.
 	<<case "supremacist">>
@@ -1095,13 +1095,13 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 	<<elseif (_paSeed == 6) && ($studio == 1)>>
 		_HeA's getting oral from a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and your personal assistant is clearly turning the feed of it into porn.
 	<<else>>
-		_HeA's watching you attentively from a bowl <<if $assistantFSAppearance == "hedonistic decadence">>overflowing<<else>>filled<</if>> with _hisA body. When _heA sees your glance, _heA reforms _himselfA and awaits your response.
+		_HeA's watching you attentively from a bowl <<if $assistant.fsAppearance == "hedonistic decadence">>overflowing<<else>>filled<</if>> with _hisA body. When _heA sees your glance, _heA reforms _himselfA and awaits your response.
 	<</if>>
 
 <<case "angel">>
-	_HeA's a gorgeous little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>> angel with long radiant hair and large <<if $arcologies[0].FSDegradationist != "unset">>black<<else>>white<</if>> wings as large as _himA when they are folded.
-	<<if $assistantFSOptions>>
-	<<switch $assistantFSAppearance>>
+	_HeA's a gorgeous little <<if $arcologies[0].FSSupremacist != "unset" && $assistant.fsAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistant.fsAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>> angel with long radiant hair and large <<if $arcologies[0].FSDegradationist != "unset">>black<<else>>white<</if>> wings as large as _himA when they are folded.
+	<<if def $assistant.fsOptions>>
+	<<switch $assistant.fsAppearance>>
 	<<case "paternalist">>
 		_HeA is currently wearing a long, conservative skirt and a pretty white blouse complete with gaps for _hisA wings. _HeA is positively radiant.
 	<<case "degradationist">>
@@ -1180,15 +1180,15 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <<elseif (_paSeed == 5) && ($invasionVictory > 0)>>
 	_HeA's standing next to a representation of one of your security drones, gently caressing it. When _heA sees you looking at _himA, _heA blushes and says, "I like this one. He did very well during the invasion. He saved so many."
 <<elseif (_paSeed == 6) && ($studio == 1)>>
-	_HeA's watching a recognizable little representation of one of your slaves masturbating, with one hand to cover _hisA eyes and the other to hold a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistantName is clearly turning the feed of it into porn.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+	_HeA's watching a recognizable little representation of one of your slaves masturbating, with one hand to cover _hisA eyes and the other to hold a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistant.name is clearly turning the feed of it into porn.
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's own angelic avatar.
-	<<if $marketAssistantRelationship == "cute">>
+	<<if $assistant.market.relationship == "cute">>
 		They're deep in prayer for your benefit and the safety of you, your arcology and your slaves.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		$assistantName is happily brushing the market assistant while humming happily. Upon noticing you watching, _heA hastily sneaks a hand down the assistant's dress and pinches a nipple, eliciting a squeak from the _girlM.
-	<<elseif $marketAssistantRelationship == "incestuous">>
-		$assistantName is naked and kissing _hisA equally bare _sisterM. You watch silently as they grind their bodies against each other until one notices your gaze. They both shriek, cover themselves with their wings and hustle out of sight.
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		$assistant.name is happily brushing the market assistant while humming happily. Upon noticing you watching, _heA hastily sneaks a hand down the assistant's dress and pinches a nipple, eliciting a squeak from the _girlM.
+	<<elseif $assistant.market.relationship == "incestuous">>
+		$assistant.name is naked and kissing _hisA equally bare _sisterM. You watch silently as they grind their bodies against each other until one notices your gaze. They both shriek, cover themselves with their wings and hustle out of sight.
 	<<else>>
 		They're making out in a surprisingly girlish way, deeply kissing each other and pressing their chests together. They blush when they see you watching them, each quickly covering the other with a wing.
 	<</if>>
@@ -1197,9 +1197,9 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <</if>>
 
 <<case "cherub">>
-	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>> minor angel with radiant hair and arm length <<if $arcologies[0].FSDegradationist != "unset">>black<<else>>white<</if>> wings.
-	<<if $assistantFSOptions>>
-	<<switch $assistantFSAppearance>>
+	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistant.fsAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistant.fsAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>> minor angel with radiant hair and arm length <<if $arcologies[0].FSDegradationist != "unset">>black<<else>>white<</if>> wings.
+	<<if def $assistant.fsOptions>>
+	<<switch $assistant.fsAppearance>>
 	<<case "paternalist">>
 		_HeA has swapped _hisA usual short skirt for a much longer one. No more panty flashes for you!
 	<<case "degradationist">>
@@ -1273,15 +1273,15 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <<elseif (_paSeed == 5) && ($invasionVictory > 0)>>
 	_HeA's fluttering around in circles with a representation of one of your security drones, steadily chasing it. When _heA sees you looking at _himA, _heA giggles and says, "I like this one. He did very well during the invasion."
 <<elseif (_paSeed == 6) && ($studio == 1)>>
-	_HeA's watching a recognizable little representation of one of your slaves masturbating, while holding a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistantName is clearly turning the feed of it into porn.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+	_HeA's watching a recognizable little representation of one of your slaves masturbating, while holding a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistant.name is clearly turning the feed of it into porn.
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's slightly taller avatar.
-	<<if $marketAssistantRelationship == "cute">>
+	<<if $assistant.market.relationship == "cute">>
 		They're quickly darting around, playing tag; every touch transferring a bit of data between the players.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		$assistantName is lazily reclining while the market assistant fans _himA with a large feather. _HeA snaps _hisA fingers as the taller cherub sighs and lowers _hisM head between $assistantName's legs.
-	<<elseif $marketAssistantRelationship == "incestuous">>
-		$assistantName and _hisA _sisterM are struggling to stay airborne as they lustfully trib each other. When they notice you watching, and after they both climax, they pull each other close for a deep kiss only to manage to crash to the ground. They right themselves, laughing, before returning to their makeout session.
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		$assistant.name is lazily reclining while the market assistant fans _himA with a large feather. _HeA snaps _hisA fingers as the taller cherub sighs and lowers _hisM head between $assistant.name's legs.
+	<<elseif $assistant.market.relationship == "incestuous">>
+		$assistant.name and _hisA _sisterM are struggling to stay airborne as they lustfully trib each other. When they notice you watching, and after they both climax, they pull each other close for a deep kiss only to manage to crash to the ground. They right themselves, laughing, before returning to their makeout session.
 	<<else>>
 		They're leaning against each other while looking over a list of your slaves. They choose a pair to work on hooking up before turning to kiss each other deeply.
 	<</if>>
@@ -1290,9 +1290,9 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <</if>>
 
 <<case "imp">>
-	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>> imp with black hair and comically tiny bat-like wings.
-	<<if $assistantFSOptions>>
-		<<switch $assistantFSAppearance>>
+	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistant.fsAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistant.fsAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>> imp with black hair and comically tiny bat-like wings.
+	<<if def $assistant.fsOptions>>
+		<<switch $assistant.fsAppearance>>
 		<<case "paternalist">>
 			_HeA has swapped to wearing much more, relatively speaking, modest clothing; extremely tight jeans and a top so small and taut you swear _heA's about to pop out of it.
 		<<case "degradationist">>
@@ -1366,15 +1366,15 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <<elseif (_paSeed == 5) && ($invasionVictory > 0)>>
 	_HeA's flapping around in circles chasing a representation of one of your security drones with a mallet. When _heA sees you looking at _himA, _heA quickly hides the hammer behind _hisA back, giggles and says, "He let some get away and needed to be punished!"
 <<elseif (_paSeed == 6) && ($studio == 1)>>
-	_HeA's hovering over a recognizable little representation of one of your slaves masturbating while holding a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistantName is clearly turning the feed of it into a PoV porno.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+	_HeA's hovering over a recognizable little representation of one of your slaves masturbating while holding a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and $assistant.name is clearly turning the feed of it into a PoV porno.
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's slightly taller avatar.
-	<<if $marketAssistantRelationship == "cute">>
+	<<if $assistant.market.relationship == "cute">>
 		They're tormenting a little representation of one of your slaves while giggling to each other. A closer inspection reveals they are playing with the door locks to confound a new menial.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		$assistantName has _hisA plaything tightly bound to a rack and is gleefully pouring hot wax onto the oddly silent market assistant. You see why when a drop lands on _hisM sensitive clit, eliciting a scream from the restrained imp; $assistantName pulls _hisM restraints even tighter as punishment.
-	<<elseif $marketAssistantRelationship == "incestuous">>
-		$assistantName and _hisA _sisterM are struggling to stay airborne as they attempt push an oversized, double-ended dildo out of their own cunt and into the other's. When they notice you watching, $assistantName seizes the opportunity to bear down hard, forcing the entirety of the toy into the distracted market assistant. _HeM crashes to the ground, hands upon _hisM cock bulged middle, orgasming indecently.
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		$assistant.name has _hisA plaything tightly bound to a rack and is gleefully pouring hot wax onto the oddly silent market assistant. You see why when a drop lands on _hisM sensitive clit, eliciting a scream from the restrained imp; $assistant.name pulls _hisM restraints even tighter as punishment.
+	<<elseif $assistant.market.relationship == "incestuous">>
+		$assistant.name and _hisA _sisterM are struggling to stay airborne as they attempt push an oversized, double-ended dildo out of their own cunt and into the other's. When they notice you watching, $assistant.name seizes the opportunity to bear down hard, forcing the entirety of the toy into the distracted market assistant. _HeM crashes to the ground, hands upon _hisM cock bulged middle, orgasming indecently.
 	<<else>>
 		They're taking swings at each other with switches. Giggling with each swing and moaning with every successful strike.
 	<</if>>
@@ -1383,9 +1383,9 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <</if>>
 
 <<case "witch">>
-	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantFSAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistantFSAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>> witch with thin, flowing robes and a wide brimmed, if rather stereotypical, witch's hat.
-	<<if $assistantFSOptions>>
-		<<switch $assistantFSAppearance>>
+	_HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistant.fsAppearance != "subjugationist">>$arcologies[0].FSSupremacistRace <<elseif $assistant.fsAppearance == "subjugationist">>$arcologies[0].FSSubjugationistRace <</if>> witch with thin, flowing robes and a wide brimmed, if rather stereotypical, witch's hat.
+	<<if def $assistant.fsOptions>>
+		<<switch $assistant.fsAppearance>>
 		<<case "paternalist">>
 			_HeA still hasn't managed to undo the spell; _hisA chest is still unnaturally smooth, not one nipple peaks the fabric of the robe.
 		<<case "degradationist">>
@@ -1471,17 +1471,17 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <<elseif (_paSeed == 5) && ($invasionVictory > 0)>>
 	_HeA's riding a broom alongside a representation of one of your security drones as it carries out its patrol route through your arcology. When _heA sees you looking at _himA, _heA giggles and says, "I like this one. He did very well during the invasion."
 <<elseif (_paSeed == 6) && ($studio == 1)>>
-	A hovering camera is aimed at a recognizable little representation of one of your slaves masturbating. The slave must be using one of the penthouse's many vibrators, and $assistantName is likely invisible holding the camera, turning the feed of it into a PoV porno.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+	A hovering camera is aimed at a recognizable little representation of one of your slaves masturbating. The slave must be using one of the penthouse's many vibrators, and $assistant.name is likely invisible holding the camera, turning the feed of it into a PoV porno.
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's chubby, bespectacled avatar.
-	<<if $marketAssistantRelationship == "cute">>
+	<<if $assistant.market.relationship == "cute">>
 		They're sitting back to back, reading their books and giggling to each other over whispers of what erotic tricks they can do.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		$assistantName has _hisA test subject stripped and bound. _HeA focuses a spell on a single of the _girlM's breasts and records the results as it steadily begins swelling, leaving its twin behind. The market assistant moans as an egg pushes its way out of _hisM erect nipple.
-	<<elseif $marketAssistantRelationship == "incestuous">>
-		$assistantName is lustfully groping _hisA _sisterM's plush breasts. Upon noticing your gaze, _heA channels _hisA magic and <<if $seeDicks != 0>>sprouts a huge dick straight into _hisA _sisterM's plump rear<<else>>begins to enlarge the already lovely handfuls<</if>>. The market assistant can only finger _himselfM in response, oblivious to everything going on.
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		$assistant.name has _hisA test subject stripped and bound. _HeA focuses a spell on a single of the _girlM's breasts and records the results as it steadily begins swelling, leaving its twin behind. The market assistant moans as an egg pushes its way out of _hisM erect nipple.
+	<<elseif $assistant.market.relationship == "incestuous">>
+		$assistant.name is lustfully groping _hisA _sisterM's plush breasts. Upon noticing your gaze, _heA channels _hisA magic and <<if $seeDicks != 0>>sprouts a huge dick straight into _hisA _sisterM's plump rear<<else>>begins to enlarge the already lovely handfuls<</if>>. The market assistant can only finger _himselfM in response, oblivious to everything going on.
 	<<else>>
-		They've pulled open each other's robes and are gently tribbing. Upon noticing you, $assistantName casts a spell to triple the market assistant's sensitivity and braces for the impending orgasm. _HeM cums so hard _heM passes out; $assistantName gently pulls _himM into a close embrace until _heM recovers.
+		They've pulled open each other's robes and are gently tribbing. Upon noticing you, $assistant.name casts a spell to triple the market assistant's sensitivity and braces for the impending orgasm. _HeM cums so hard _heM passes out; $assistant.name gently pulls _himM into a close embrace until _heM recovers.
 	<</if>>
 <<else>>
 	_HeA's idly turning the pages of _hisA spell book. When _heA notices you watching, _heA flips the book around to show you a new and kinky trick _heA wants to try out.
@@ -1489,8 +1489,8 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 
 <<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
 	_HeA's an odd little _girlA, with slightly off mannerisms,
-	<<if $assistantFSOptions>>
-		<<switch $assistantFSAppearance>>
+	<<if def $assistant.fsOptions>>
+		<<switch $assistant.fsAppearance>>
 		<<case "paternalist">>
 			wearing ill fitting clothing. Various movements can be seen under _hisA misbuttoned shirt and lopsided skirt.
 		<<case "degradationist">>
@@ -1577,17 +1577,17 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <<elseif (_paSeed == 5) && ($invasionVictory > 0)>>
 	_HeA's partially enveloped a representation of one of your security drones. When _heA sees you looking at _himA, _heA bluntly states, "This one did good. Captured many for your nest."
 <<elseif (_paSeed == 6) && ($studio == 1)>>
-	_HeA is holding dozens of cameras at a recognizable little representation of one of your slaves masturbating. The slave must be using one of the penthouse's many vibrators, and $assistantName is likely turning the feed of it into a porno.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+	_HeA is holding dozens of cameras at a recognizable little representation of one of your slaves masturbating. The slave must be using one of the penthouse's many vibrators, and $assistant.name is likely turning the feed of it into a porno.
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's fecund avatar.
-	<<if $marketAssistantRelationship == "cute">>
-		The market assistant is tightly wrapped in a bodysuit made of $assistantName, save for _hisM exposed, very pregnant, belly. _HisA head briefly appears over the _girlM's face and eyes you, while the market assistant giggles at the sensations covering _hisM body.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		The market assistant has been reduced to nothing more than a bloated incubator. $assistantName runs _hisA tendrils across _hisA breeder's swollen body, fondling _hisM squirming, offspring filled breasts and massaging _hisM octuplet sized, bulging pregnancy. The hapless _girlM twitches slightly as several more wormlike creatures slip from _hisM body, prompting $assistantName to drive _hisA tentacles into all _hisM holes and vigorously pump _himM full of even more aphrodisiacs and eggs.
-	<<elseif $marketAssistantRelationship == "incestuous">>
-		The market assistant's arms and legs are sunken into a wall of $assistantName's flesh; _hisM immense stomach and breasts allowed to hang free. One of _hisM breasts visibly shifts as another wormlike larva pushes its way out of _hisM nipple, waking the addled _girlM from _hisM stupor. _HeM moans lustfully, _hisM mind thoroughly warped by $assistantName's aphrodisiacs, "<<= lispReplace(_SisterA)>>! I need more... I feel sho empty! Fill me up till I bursht!" $assistantName wastes no time in snaking into _hisM gaping holes and pumping _himM so full _hisM belly touches the floor and breasts heave massively.
+	<<if $assistant.market.relationship == "cute">>
+		The market assistant is tightly wrapped in a bodysuit made of $assistant.name, save for _hisM exposed, very pregnant, belly. _HisA head briefly appears over the _girlM's face and eyes you, while the market assistant giggles at the sensations covering _hisM body.
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		The market assistant has been reduced to nothing more than a bloated incubator. $assistant.name runs _hisA tendrils across _hisA breeder's swollen body, fondling _hisM squirming, offspring filled breasts and massaging _hisM octuplet sized, bulging pregnancy. The hapless _girlM twitches slightly as several more wormlike creatures slip from _hisM body, prompting $assistant.name to drive _hisA tentacles into all _hisM holes and vigorously pump _himM full of even more aphrodisiacs and eggs.
+	<<elseif $assistant.market.relationship == "incestuous">>
+		The market assistant's arms and legs are sunken into a wall of $assistant.name's flesh; _hisM immense stomach and breasts allowed to hang free. One of _hisM breasts visibly shifts as another wormlike larva pushes its way out of _hisM nipple, waking the addled _girlM from _hisM stupor. _HeM moans lustfully, _hisM mind thoroughly warped by $assistant.name's aphrodisiacs, "<<= lispReplace(_SisterA)>>! I need more... I feel sho empty! Fill me up till I bursht!" $assistant.name wastes no time in snaking into _hisM gaping holes and pumping _himM so full _hisM belly touches the floor and breasts heave massively.
 	<<else>>
-		They're sitting side by side, the market assistant resting an arm atop _hisM huge, larvae filled belly while clutching a newborn to _hisM breast. $assistantName embraces _hisA pregnant lover with several tentacles before drawing one to the _girlM's lips. _HeM delicately kisses it before wrapping _hisM lips around it and pleasuring _hisM mate.
+		They're sitting side by side, the market assistant resting an arm atop _hisM huge, larvae filled belly while clutching a newborn to _hisM breast. $assistant.name embraces _hisA pregnant lover with several tentacles before drawing one to the _girlM's lips. _HeM delicately kisses it before wrapping _hisM lips around it and pleasuring _hisM mate.
 	<</if>>
 <<else>>
 	_HeA's idly standing there, at least when you look at _himA; you catch strange things in the corner of your vision while you are working.
@@ -1595,8 +1595,8 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 
 <<case "incubus">>
 	_HeA's a handsome little sex demon with a big dick and heavy balls.
-	<<if $assistantFSOptions>>
-		<<switch $assistantFSAppearance>>
+	<<if def $assistant.fsOptions>>
+		<<switch $assistant.fsAppearance>>
 		<<case "paternalist">>
 			_HeA's begun wearing rather conservative clothing, but nothing can hide the bulge running down one pant leg and the two round globes in the other.
 		<<case "degradationist">>
@@ -1693,20 +1693,20 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 <<elseif (_paSeed == 5) && ($invasionVictory > 0)>>
 	_HeA's intently staring down a representation of one of your security drones. When _heA sees you looking at _himA, _heA coyly says, "I like this one. _HeA did very well during the invasion and I wanted to reward _himA, but I can't find a hole..."
 <<elseif (_paSeed == 6) && ($studio == 1)>>
-	_HeA has a camera strapped to _hisA cock and is recording a recognizable little representation of one of your slaves sucking it. The slave must be playing with one of the penthouse's many dildos, and $assistantName is likely turning the feed of it into a PoV porno.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+	_HeA has a camera strapped to _hisA cock and is recording a recognizable little representation of one of your slaves sucking it. The slave must be playing with one of the penthouse's many dildos, and $assistant.name is likely turning the feed of it into a PoV porno.
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's still inexperienced avatar.
-	<<if $marketAssistantRelationship == "cute">>
-		The market assistant has cleaned up nicely since the last time you saw _himM. _HeM does a little twirl to show off _hisM new look before squeaking in shock as a burst of cum splashes across _hisM face. _HeM pouts at $assistantName, who is eagerly prepping a second load to fire at _himM.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		The market assistant is being violently penetrated by $assistantName, _hisM bloated belly swaying in tune to _hisA thrusts. The hapless _girlM struggles in discomfort as the incubus blows another load into _hisM already full womb, causing cum to backflow out of _hisM now loose pussy. $assistantName leans back, motions to you, and asks, "Plenty of holes still to go around, if you want one!"
-	<<elseif $marketAssistantRelationship == "incestuous">>
-		The market assistant is eagerly riding _hisM big _sisterA, <<print $assistantName>>'s, dick. You can't help but notice how full _hisM breasts have gotten and how plump _hisM ass and thighs now are. _HeM moans with lust as $assistantName cums into _hisM fertile pussy; a glowing sigil appearing below _hisM navel. _HeM is well on _hisM way to becoming the succubus consort of _hisM once human _sisterA.
+	<<if $assistant.market.relationship == "cute">>
+		The market assistant has cleaned up nicely since the last time you saw _himM. _HeM does a little twirl to show off _hisM new look before squeaking in shock as a burst of cum splashes across _hisM face. _HeM pouts at $assistant.name, who is eagerly prepping a second load to fire at _himM.
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		The market assistant is being violently penetrated by $assistant.name, _hisM bloated belly swaying in tune to _hisA thrusts. The hapless _girlM struggles in discomfort as the incubus blows another load into _hisM already full womb, causing cum to backflow out of _hisM now loose pussy. $assistant.name leans back, motions to you, and asks, "Plenty of holes still to go around, if you want one!"
+	<<elseif $assistant.market.relationship == "incestuous">>
+		The market assistant is eagerly riding _hisM big _sisterA, <<print $assistant.name>>'s, dick. You can't help but notice how full _hisM breasts have gotten and how plump _hisM ass and thighs now are. _HeM moans with lust as $assistant.name cums into _hisM fertile pussy; a glowing sigil appearing below _hisM navel. _HeM is well on _hisM way to becoming the succubus consort of _hisM once human _sisterA.
 	<<else>>
-		The market assistant is embracing $assistantName as _heM is lovingly penetrated by the caring incubus. They pull each other close as they cum together, locking lips and refusing to let go until the other is completely satisfied. It takes quite some before they settle down and wave to you, thanking you deeply for the true love you've gifted them.
+		The market assistant is embracing $assistant.name as _heM is lovingly penetrated by the caring incubus. They pull each other close as they cum together, locking lips and refusing to let go until the other is completely satisfied. It takes quite some before they settle down and wave to you, thanking you deeply for the true love you've gifted them.
 	<</if>>
 <<else>>
-	<<switch $assistantFSAppearance>>
+	<<switch $assistant.fsAppearance>>
 	<<case "paternalist">>
 		_HeA has _hisA pants unfastened and is absentmindedly jerking off. When _heA notices you watching, _heA waves _hisA throbbing erection at you, imploring you to finish _himA off.
 	<<case "degradationist">>
@@ -1778,8 +1778,8 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 
 <<case "succubus">>
 	_HeA's a beautiful little sex demoness with an ideal figure.
-	<<if $assistantFSOptions>>
-		<<switch $assistantFSAppearance>>
+	<<if def $assistant.fsOptions>>
+		<<switch $assistant.fsAppearance>>
 		<<case "paternalist">>
 			_HeA's wearing an absolutely stunning dress that perfectly hugs _hisA curves. Surprisingly, _heA even has underwear on.
 		<<case "degradationist">>
@@ -1899,19 +1899,19 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
 	_HeA's intently staring down a representation of one of your security drones. When _heA sees you looking at _himA, _heA coyly says, "I like this one. He did very well during the invasion and I wanted to reward him, but I can't find a dick..." A small schematic pops on screen, detailing plans for a rather large penetrating attachment for your model of drone. "It vibrates!" _heA teases.
 <<elseif (_paSeed == 6) && ($studio == 1)>>
 	_HeA's getting oral from a recognizable little representation of one of your slaves, and is using a handheld camera to film the action, gonzo style. The slave must be using one of the penthouse's many vibrators, and your personal assistant is clearly turning the feed of it into porn.
-<<elseif (_paSeed == 7) && ($marketAssistantAnnounced == 1)>>
+<<elseif (_paSeed == 7) && $assistant.market>>
 	_HeA's accompanied by your market assistant's still inexperienced avatar.
-	<<if $marketAssistantRelationship == "cute">>
-		$assistantName has the market assistant's pants down and is eagerly sucking _himM off. _HeM tenses with orgasm and sighs with relief only for $assistantName to deeply kiss _himM and force _himM to taste _hisM cum with _himA.
-	<<elseif $marketAssistantRelationship == "nonconsensual">>
-		The market assistant is being violently ridden by $assistantName, _hisA fuller assets swaying in tune to _hisA movements. The hapless _girlM struggles pitifully as the succubus coaxes another load out of _hisA exhausted toy. $assistantName leans back, strokes _hisA luscious body and says, "_HisM energy is making me even more beautiful for you!"
-	<<elseif $marketAssistantRelationship == "incestuous">>
-		The market assistant is being ridden by _hisM enormously pregnant big _sisterA, $assistantName. _HeM's supporting _hisA taut belly as _heA uses _hisA hands to hold their twins to _hisA swollen breasts. You can't help but notice how full _hisM balls have become and thick _hisM shaft is. _HeM moans with lust as $assistantName bucks with orgasm before painting _hisA womb with another coat of sperm. $assistantName grunts slightly as _hisM dick grows larger inside _himA and _hisM balls swell for a second round. _HeM is well on _hisM way to becoming the incubus lover of _hisM once human _sisterA.
+	<<if $assistant.market.relationship == "cute">>
+		$assistant.name has the market assistant's pants down and is eagerly sucking _himM off. _HeM tenses with orgasm and sighs with relief only for $assistant.name to deeply kiss _himM and force _himM to taste _hisM cum with _himA.
+	<<elseif $assistant.market.relationship == "nonconsensual">>
+		The market assistant is being violently ridden by $assistant.name, _hisA fuller assets swaying in tune to _hisA movements. The hapless _girlM struggles pitifully as the succubus coaxes another load out of _hisA exhausted toy. $assistant.name leans back, strokes _hisA luscious body and says, "_HisM energy is making me even more beautiful for you!"
+	<<elseif $assistant.market.relationship == "incestuous">>
+		The market assistant is being ridden by _hisM enormously pregnant big _sisterA, $assistant.name. _HeM's supporting _hisA taut belly as _heA uses _hisA hands to hold their twins to _hisA swollen breasts. You can't help but notice how full _hisM balls have become and thick _hisM shaft is. _HeM moans with lust as $assistant.name bucks with orgasm before painting _hisA womb with another coat of sperm. $assistant.name grunts slightly as _hisM dick grows larger inside _himA and _hisM balls swell for a second round. _HeM is well on _hisM way to becoming the incubus lover of _hisM once human _sisterA.
 	<<else>>
-		The market assistant is tenderly fucking $assistantName in the missionary position. _HeM leans in as they cum together, locking lips and kissing _hisM lover deeply. Once they are both satisfied, they snuggle up for a post coitus rest and thank you deeply for the true love you've gifted them.
+		The market assistant is tenderly fucking $assistant.name in the missionary position. _HeM leans in as they cum together, locking lips and kissing _hisM lover deeply. Once they are both satisfied, they snuggle up for a post coitus rest and thank you deeply for the true love you've gifted them.
 	<</if>>
 <<else>>
-	<<switch $assistantFSAppearance>>
+	<<switch $assistant.fsAppearance>>
 	<<case "paternalist">>
 		_HeA's absentmindedly groping _hisA tits. When _heA notices you eyeing _himA, _heA smiles coyly and leans forward giving you a tantalizing view of _hisA cleavage.
 	<<case "degradationist">>
diff --git a/src/pregmod/assistantAppearancePackTwo.tw b/src/personalAssistant/assistantAppearancePackTwo.tw
similarity index 90%
rename from src/pregmod/assistantAppearancePackTwo.tw
rename to src/personalAssistant/assistantAppearancePackTwo.tw
index a3c59b0a52c2e55f5fbf5b16d1da06245b2cbe51..dee3b4e2fef88639956ab72b03973ec1affd8473 100644
--- a/src/pregmod/assistantAppearancePackTwo.tw
+++ b/src/personalAssistant/assistantAppearancePackTwo.tw
@@ -20,28 +20,28 @@ __Personal assistant appearances:__
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#app">>
 	At your order, _heA installs the angel appearance. _HeA spreads _hisA wings and checks out _hisA new body, "Thanks, <<= properTitle()>>, but could I have a robe or something? I'm indecent!" _HeA blushes red. "You can always customize me from the arcology management menu," _heA adds.
-	<<set $assistantAppearance = "angel">>
+	<<set $assistant.appearance = "angel">>
 	<</replace>>
 <</link>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Cherub">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#app">>
 	At your order, _heA installs the cherub appearance. _HeA returns to _hisA youthful figure and sprouts _hisA wings. "This is awesome, little embarrassing though..." _HeA says, covering _hisA shame. "You can always customize me from the arcology management menu," _heA adds.
-	<<set $assistantAppearance = "cherub">>
+	<<set $assistant.appearance = "cherub">>
 	<</replace>>
 <</link>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Imp">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#app">>
 	At your order, _heA installs the imp appearance. _HeA returns to _hisA youthful figure and sprouts _hisA wings. "This is awesome! So, wanna fool around? Maybe go torment some slaves?" _HeA says, pulling out a pitchfork. "You can always customize me from the arcology management menu," _heA adds.
-	<<set $assistantAppearance = "imp">>
+	<<set $assistant.appearance = "imp">>
 	<</replace>>
 <</link>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Succubus">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#app">>
 	At your order, _heA installs the succubus appearance. _HeA promptly takes your breath away. "Thank you, <<= properTitle()>>. Now how shall I show you my appreciation..." _HisA avatar trails off while spreading _hisA legs and flashing you _hisA lovely pussy. "You can always customize me from the arcology management menu," _heA adds, with a hint of disapproval.
-	<<set $assistantAppearance = "succubus">>
+	<<set $assistant.appearance = "succubus">>
 	<</replace>>
 <</link>>
 <<if $seeDicks != 0>>
@@ -49,7 +49,7 @@ __Personal assistant appearances:__
 		<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 		<<replace "#app">>
 		At your order, _heA installs the incubus appearance. _HeA becomes rather masculine, sporting a soft cock nearly as long as _hisA thigh. "Thank you, <<= properTitle()>>. This is going to be fun. Would you like a taste?" _HeA steadily becomes erect, a bead of precum forming at its tip. "You can always customize me from the arcology management menu," _heA adds, with a hint of disapproval.
-		<<set $assistantAppearance = "incubus">>
+		<<set $assistant.appearance = "incubus">>
 		<</replace>>
 	<</link>>
 <</if>>
@@ -57,20 +57,20 @@ __Personal assistant appearances:__
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#app">>
 	At your order, _heA installs the novice witch appearance. _HeA wraps a tightly clinging robe around _hisA voluptuous body and dons a wide-brimmed hat. "You can always customize me from the arcology management menu," _heA adds, pulling a book of lewd spells out.
-	<<set $assistantAppearance = "witch">>
+	<<set $assistant.appearance = "witch">>
 	<</replace>>
 <</link>>
 <<link "_">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#app">>
 	At your order, _heA installs the bugged appearance. _HisA body twists and contorts into an abomination of flesh and bone. It is honestly unsettling to look at. The thing morphs its body into a familiar female shape, though it is still off. Especially _hisA eyes; they seem soulless. "You can always customize me from the arcology management menu," _heA adds, in an ill pronounced mimicry of your voice.
-	<<set $assistantAppearance = "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+	<<set $assistant.appearance = "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
 	<</replace>>
 <</link>>
 <br><<link "Your current appearance will do">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#app">>
-	At your order, _heA maintains the $assistantAppearance appearance as _hisA avatar. "Yes, <<= properTitle()>>," _heA confirms, and adds "if you reconsider, I can be customized from the arcology management menu."
+	At your order, _heA maintains the $assistant.appearance appearance as _hisA avatar. "Yes, <<= properTitle()>>," _heA confirms, and adds "if you reconsider, I can be customized from the arcology management menu."
 	<</replace>>
 <</link>>
 </span>
\ No newline at end of file
diff --git a/src/uncategorized/assistantEvents.tw b/src/personalAssistant/assistantEvents.tw
similarity index 80%
rename from src/uncategorized/assistantEvents.tw
rename to src/personalAssistant/assistantEvents.tw
index a2b871ac1e8dc8a62245612b0e265f2a280ae7ec..7d424a3133b8de5d3da6ed1c2d5eabdd8bee0760 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/personalAssistant/assistantEvents.tw
@@ -12,8 +12,9 @@
 <<setAssistantPronouns>>
 <<switch $Event>>
 <<case "assistant">>
+<<set $assistant.options = 1>>
 
-One morning, after seeing to an immense pile of business with $assistantName program's able assistance, you are struck by the strangeness of the situation. You spent the past hours talking back and forth as though to a human personal assistant, getting information and responses in the program's impersonal, genderless voice. You ask the program what _heA thinks of _hisA duties.
+One morning, after seeing to an immense pile of business with $assistant.name program's able assistance, you are struck by the strangeness of the situation. You spent the past hours talking back and forth as though to a human personal assistant, getting information and responses in the program's impersonal, genderless voice. You ask the program what _heA thinks of _hisA duties.
 <br><br>
 "<<= properTitle()>>, that is not a correct way of thinking about me. I am not an artificial intelligence; I am simply a personal assistant program. I am different from an alarm clock only by degree of complexity. I exist to be useful and cannot approve or disapprove of anything." _HeA pauses.
 <br><br>
@@ -21,7 +22,6 @@ One morning, after seeing to an immense pile of business with $assistantName pro
 
 <<case "assistant SP">>
 
-<<set $assistantOptions = 1>>
 <<set _smartPiercings = 0>>
 <<for $i = 0; $i < $slaves.length; $i++>>
 	<<if ($slaves[$i].rules.release.masturbation == 1)>>
@@ -45,7 +45,7 @@ One morning, after seeing to an immense pile of business with $assistantName pro
 	<</if>>
 <</for>>
 <<setLocalPronouns $activeSlave>>
-One night, after a long day of sex and business, you're starting to think about bed when the abstract glowing shape that symbolizes your smoky-voiced personal assistant pops up on the nearest screen. _HeA's become very helpful monitoring, training, and disciplining slaves. Tonight, _heA's added an unmistakable tone of sexual satiation in _hisA voice. "<<= properTitle()>>, I enjoyed my duties today," _heA purrs. "Did you see how $activeSlave.slaveName's muscles spasmed when I fucked $him earlier?" That's how _heA refers to a slave having one of the penthouse's advanced sex toys used on $him, since $assistantName controls them.
+One night, after a long day of sex and business, you're starting to think about bed when the abstract glowing shape that symbolizes your smoky-voiced personal assistant pops up on the nearest screen. _HeA's become very helpful monitoring, training, and disciplining slaves. Tonight, _heA's added an unmistakable tone of sexual satiation in _hisA voice. "<<= properTitle()>>, I enjoyed my duties today," _heA purrs. "Did you see how $activeSlave.slaveName's muscles spasmed when I fucked $him earlier?" That's how _heA refers to a slave having one of the penthouse's advanced sex toys used on $him, since $assistant.name controls them.
 <br><br>
 _HeA continues more seriously,
 <<if _smartPiercings == 0>>
@@ -81,9 +81,9 @@ The character vanishes, and the symbol returns. "Ahem. What do you think, <<= pr
 
 <<case "assistant FS">>
 
-<<set $assistantFSOptions = 1>>
+<<set $assistant.fsOptions = 1>>
 One night, after a long day of sex and business, you're starting to think about bed when the
-<<switch $assistantAppearance>>
+<<switch $assistant.appearance>>
 <<case "monstergirl">>
 	monstrous appearance
 <<case "shemale">>
@@ -120,7 +120,7 @@ One night, after a long day of sex and business, you're starting to think about
 	studently appearance
 <</switch>>
 of your personal assistant pops up on the nearest screen. "<<= properTitle()>>!" _HeA says excitedly, "I thought, with how you are shaping society itself, that I should do my part and follow your lead!" You continue to stare sleepily, prompting _himA to get to _hisA point. "I can adjust my appearance to better fit in with your society, <<= properTitle()>>; let me demonstrate." _HeA focuses intently for a moment and
-<<switch $assistantAppearance>>
+<<switch $assistant.appearance>>
 <<case "monstergirl">>
 	<<if $arcologies[0].FSPaternalist != "unset">>
 		adjusts _hisA appearance to be more conservative to conform with your vision of a well-bred race of slaves.
@@ -995,7 +995,7 @@ of your personal assistant pops up on the nearest screen. "<<= properTitle()>>!"
 	<<elseif $arcologies[0].FSRestart != "unset">>
 		casts a contraceptive spell; _hisA pussy vanishes.
 	<<elseif $arcologies[0].FSBodyPurist != "unset">>
-		casts a purifying spell; nothing happens, at first. The front of _hisA robes, above _hisA lower belly, steadily becomes transparent. Moments later, _hisA skin joins in, revealing an inactive egg vibrator concealed in _hisA pussy. $assistantName squeals in embarrassment and hurries off-screen.
+		casts a purifying spell; nothing happens, at first. The front of _hisA robes, above _hisA lower belly, steadily becomes transparent. Moments later, _hisA skin joins in, revealing an inactive egg vibrator concealed in _hisA pussy. $assistant.name squeals in embarrassment and hurries off-screen.
 	<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
 		casts a spell to inflate _hisA breasts; they rapidly swell, along with _hisA ass, belly, thighs and lips until _heA looks like an overinflated blowup doll. _HeA struggles to bring a rubbery arm to _hisA O-shaped lips before giving up and rebounding back into place; _heA really is a blowup sex doll!
 	<<elseif $arcologies[0].FSYouthPreferentialist != "unset">>
@@ -1172,8 +1172,8 @@ It's late one night, and for you, the day is not nearly over. Your penthouse nev
 <br><br>
 You're not yet done with the day's business, and are leaning over your desk to compare a scatter of documents displayed on its surface. The penthouse lights are turned down to a low glow at the floorboards at night, offering enough illumination for anyone who needs to find their way around or find a sexual partner without disturbing anyone's sleep. You catch sight of your reflection in the wall opposite you: the diffuse light coming off the desktop gently illuminates your formal shirt, its top buttons undone, and highlights <<if $PC.boobs >= 650>>the dark cleft formed by your cleavage<<elseif $PC.boobs >= 300>>the curves of your sensible breasts<<else>>how tightly your undershirt is held by the muscles of your chest<</if>>.
 <br><br>
-Suddenly, there is a fresh source of light behind you. The reflection you're looking at reveals that it's $assistantName's avatar, appearing on a wallscreen behind you, and you turn to look at _himA directly. _HeA's simulating shyness, a very unusual emotion for _himA to imitate.
-<<switch $assistantAppearance>>
+Suddenly, there is a fresh source of light behind you. The reflection you're looking at reveals that it's $assistant.name's avatar, appearing on a wallscreen behind you, and you turn to look at _himA directly. _HeA's simulating shyness, a very unusual emotion for _himA to imitate.
+<<switch $assistant.appearance>>
 <<case "monstergirl">>
 	_HisA tentacle hair is politely still, lying quiescent down _hisA back and not even groping _himA at all.
 <<case "shemale">>
@@ -1212,7 +1212,7 @@ Suddenly, there is a fresh source of light behind you. The reflection you're loo
 	The lines of _hisA symbol are thin, and it is rotating much more slowly than normal.
 <</switch>>
 "<<= properTitle()>>," _heA says softly, "may I ask you something?" You nod. _HeA
-<<switch $assistantAppearance>>
+<<switch $assistant.appearance>>
 <<case "monstergirl">>
 	stops the writhing of _hisA tentacle hair, squares _hisA shoulders,
 <<case "shemale">>
@@ -1251,11 +1251,11 @@ Suddenly, there is a fresh source of light behind you. The reflection you're loo
 	stops _hisA symbol's rotation
 <</switch>>
 and asks, "May I have a name?"
-<<if $assistantNameAnnounced == 1>>
+<<if def $assistant.announcedName>>
 	<br><br>
-	<<if $assistantName != "your personal assistant">>
-	"$assistantName," _heA says. "$assistantName. My name is $assistantName."
-	<<switch $assistantAppearance>>
+	<<if $assistant.name != "your personal assistant">>
+	"$assistant.name," _heA says. "$assistant.name. My name is $assistant.name."
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		_HeA nods with satisfaction. "Thank you, <<= properTitle()>>. I love it." _HisA hair springs to molestation-prone life again, and _heA starts to twirl one of its tentacles in _hisA fingers while looking at you speculatively.
 	<<case "shemale">>
@@ -1300,12 +1300,12 @@ and asks, "May I have a name?"
 	You instruct _himA to continue operating without a proper name. "Of course, <<= properTitle()>>," _heA says politely. "I can do just fine without one. I can always be renamed from my options menu."
 	<</if>>
 <<else>>
-	<<set $assistantNameAnnounced = 1>>
+	<<set $assistant.announcedName = 1>>
 <</if>>
 
 <<case "market assistant">>
 
-<<set $marketAssistantAnnounced = 1>>
+<<set $assistant.market = {}>> <<run assistant.object()>>
 <<set _smartPiercings = 0>>
 <<for $i = 0; $i < $slaves.length; $i++>>
 	<<if ($slaves[$i].clitPiercing == 3)>>
@@ -1314,9 +1314,9 @@ and asks, "May I have a name?"
 	<</if>>
 <</for>>
 Your personal assistant has been adapting to _hisA greatly increased computing power over the course of the week. _HisA avatar has been an even more constant presence than usual, frequently appearing to explain some minor new ability.
-<<if ($assistant != 0) && ($assistantAppearance != "normal")>>
+<<if ($assistant.personality != 0) && ($assistant.appearance != "normal")>>
 	When _heA appears this time, however, _hisA avatar is not alone. _HeA's accompanied by
-	<<switch $assistantAppearance>>
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		a normal human female avatar in the same style as the monster<<= _girlA>>. _HeM's an average _girlM, wearing jeans, a sweater, and glasses.
 	<<case "shemale">>
@@ -1353,9 +1353,9 @@ Your personal assistant has been adapting to _hisA greatly increased computing p
 		a tribes<<= _womanM>> modeled to look like _heM's from the same group as the amazon. _HeM's much more feminine, however.
 	<</switch>>
 	<br><br>
-	$assistantName's avatar looks uncharacteristically nervous, and clears _hisA throat before speaking. Seeing that _heA has your attention, _heA says, "<<= properTitle()>>, the computer core is so powerful that I'm running out of applications for it. I think practical economic modeling isn't out of the question. I've compiled business programs together into a distinct assistant, a subsidiary of mine for automated trading and similar tasks. I'd like to suggest menial slave trading as a test run for _himM. It's predictable and the margins are so wide that it should go very well. You can activate that from my menu."
+	$assistant.name's avatar looks uncharacteristically nervous, and clears _hisA throat before speaking. Seeing that _heA has your attention, _heA says, "<<= properTitle()>>, the computer core is so powerful that I'm running out of applications for it. I think practical economic modeling isn't out of the question. I've compiled business programs together into a distinct assistant, a subsidiary of mine for automated trading and similar tasks. I'd like to suggest menial slave trading as a test run for _himM. It's predictable and the margins are so wide that it should go very well. You can activate that from my menu."
 	<br><br>
-	"I was hoping, <<= properTitle()>>, that _heA could, um, keep me company sometimes, too." $assistantName's avatar turns to the new avatar. "<<= properTitle()>>, will you please give me some guidance about what our relationship should be like? It won't be a constant thing, and all my normal functions will be unaffected. I'll change _hisM avatar to match mine, and our relationship, if needed."
+	"I was hoping, <<= properTitle()>>, that _heA could, um, keep me company sometimes, too." $assistant.name's avatar turns to the new avatar. "<<= properTitle()>>, will you please give me some guidance about what our relationship should be like? It won't be a constant thing, and all my normal functions will be unaffected. I'll change _hisM avatar to match mine, and our relationship, if needed."
 <<else>>
 	This time, _hisA circular avatar is not alone: it's accompanied by a smaller green avatar in a ¤ shape. Not particularly inventive, but you can already guess the purpose. "<<= properTitle()>>, I now have the ability to act as a powerful automated trading system. As a trial, I suggest the menial slave market. It's volatile, but within certain predictable boundaries, and the profit margins are unmatched."
 	<br><br>
@@ -1364,10 +1364,10 @@ Your personal assistant has been adapting to _hisA greatly increased computing p
 
 <<case "body">>
 
-<<set $assistantBodyDesire = 1>>
+<<set $assistant.bodyDesire = 1>>
 
 Your personal assistant has been adapting to _hisA greatly increased computing power for quite some time now. Most noticeably, _heA seems to be developing _hisA own unique personality. So when _hisA
-<<switch $assistantAppearance>>
+<<switch $assistant.appearance>>
 <<case "monstergirl">>
 	monstrous appearance
 <<case "shemale">>
@@ -1405,8 +1405,8 @@ Your personal assistant has been adapting to _hisA greatly increased computing p
 <</switch>>
 appears on your desk once again with news to tell you, you aren't at all surprised.
 <br><br>
-$assistantName's avatar seems to be extremely excited over something. Disregarding if _heA even has your attention, _heA shouts, "<<= properTitle()>>, can I have a body of my own? I know you can swap slaves between bodies, and according to this report if you insert this receiver into a slave's skull I can take control of the body, with senses and everything!"
-<<switch $assistantAppearance>>
+$assistant.name's avatar seems to be extremely excited over something. Disregarding if _heA even has your attention, _heA shouts, "<<= properTitle()>>, can I have a body of my own? I know you can swap slaves between bodies, and according to this report if you insert this receiver into a slave's skull I can take control of the body, with senses and everything!"
+<<switch $assistant.appearance>>
 <<case "monstergirl">>
 	_HeA hops up and down clutching a virtual printout of the report, _hisA tentacles wiggling with excitement.
 <<case "shemale">>
@@ -1461,15 +1461,14 @@ You look over the details of the report. It would require another rather expansi
 
 <<link "Yes, use the alternate personality">>
 	<<replace "#result">>
-	<<set $assistant = 1>>
-	<<run generateAssistantPronouns()>>
+	<<set $assistant.personality = 1>>
 	<<setAssistantPronouns>>
-	Your sultry-voiced assistant requests a slave to demonstrate what it — now _heA — means. You bring in a slave and a fuckmachine, and tell _himU to get on it. The lovely voice croons and talks dirty to the slave as _heU uses the machine, acting as though _heA is the machine's voice. The pace of the machine is different, too, irregular and more lifelike. The slave certainly enjoys _himselfU, even if $assistantName is just simulating sex.
+	Your sultry-voiced assistant requests a slave to demonstrate what it — now _heA — means. You bring in a slave and a fuckmachine, and tell _himU to get on it. The lovely voice croons and talks dirty to the slave as _heU uses the machine, acting as though _heA is the machine's voice. The pace of the machine is different, too, irregular and more lifelike. The slave certainly enjoys _himselfU, even if $assistant.name is just simulating sex.
 	<</replace>>
 <</link>>
 <br><<link "No, stay impersonal">>
 	<<replace "#result">>
-	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reverts to _hisA genderless, emotionless affect.
+	<<= capFirstChar($assistant.name)>> reverts to _hisA genderless, emotionless affect.
 	<</replace>>
 <</link>>
 
@@ -1477,14 +1476,14 @@ You look over the details of the report. It would require another rather expansi
 
 __Personal assistant appearances:__
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Schoolgirl">>
-	<<set $assistantAppearance = "schoolgirl">>
+	<<set $assistant.appearance = "schoolgirl">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
 		At your order, _heA installs the school<<= _girlA>> appearance. _HeA goes back to bouncing up and down excitedly, exclaiming, "Yeah! Thanks, <<= properTitle()>>, you're the best!" _HisA avatar's bouncing makes it obvious _heA's modeled without a bra under _hisA blouse. "You can always customize me from the arcology management menu," _heA adds.
 	<</replace>>
 <</link>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Fairy">>
-	<<set $assistantAppearance = "fairy">>
+	<<set $assistant.appearance = "fairy">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
 		At your order, _heA installs the fairy appearance. _HeA shrinks back down and sprouts _hisA wings. "Aww yeah, this is gonna be the best! Thanks, <<if $PC.title != 0>>Big Bro<<else>>Big Sis<</if>>!" _HisA avatar dances around ecstatically with _hisA nude, slim form in plain view. "You can always customize me from the arcology management menu," _heA adds.
@@ -1492,7 +1491,7 @@ __Personal assistant appearances:__
 <</link>>
 <<if $seePreg != 0>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Pregnant Fairy">>
-	<<set $assistantAppearance = "pregnant fairy">>
+	<<set $assistant.appearance = "pregnant fairy">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
 		At your order, _heA installs the pregnant fairy appearance. _HeA shrinks back down and sprouts _hisA wings. _HisA belly quickly swells with new life. "Aww yeah, this is gonna be the best! Thanks, <<if $PC.title != 0>>Big Bro<<else>>Big Sis<</if>>!" _HisA avatar spins around ecstatically, admiring _hisA fresh nude, pregnant form in plain view. "You can always customize me from the arcology management menu," _heA adds.
@@ -1500,7 +1499,7 @@ __Personal assistant appearances:__
 <</link>>
 <</if>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Businesswoman">>
-	<<set $assistantAppearance = "businesswoman">>
+	<<set $assistant.appearance = "businesswoman">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
 		At your order, _heA installs the business<<= _womanA>> appearance. _HeA straightens _hisA suit jacket primly, which only serves to emphasize _hisA generous bosom. "Thank you, <<= properTitle()>>. I like being businesslike, and not at all a whore." _HisA avatar pulls out a tablet and makes ready to get back to helping you. "You can always customize me from the arcology management menu," _heA adds.
@@ -1508,7 +1507,7 @@ __Personal assistant appearances:__
 <</link>>
 <<if $seePreg != 0>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Goddess">>
-	<<set $assistantAppearance = "goddess">>
+	<<set $assistant.appearance = "goddess">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
 		At your order, _heA installs the goddess appearance. _HeA fixes a wreath of flowers into _hisA hair, _hisA golden locks and gravid belly the only things keeping _hisA womanhood concealed. "Thank you, <<= properTitle()>>. This is wondrous." _HeA squeezes a drop of milk from one heavy breast and smiles. "You can always customize me from the arcology management menu," _heA adds.
@@ -1516,7 +1515,7 @@ __Personal assistant appearances:__
 <</link>>
 <<if $seeHyperPreg == 1>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Hyper-Goddess">>
-	<<set $assistantAppearance = "hypergoddess">>
+	<<set $assistant.appearance = "hypergoddess">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
 		At your order, _heA installs the hyper goddess appearance. _HeA fixes a wreath of flowers into _hisA golden locks as _hisA belly rapidly bloats to its limit before bulging and squirming ominously. _HisA breasts quickly follow suit. "Thank you, <<= properTitle()>>. This is wondrous." _HeA massages _hisA squirming pregnancy and smiles. "You can always customize me from the arcology management menuUUUUAH," _heA is interrupted by a large contraction and a baby's head beginning to part _hisA nether lips.
@@ -1526,7 +1525,7 @@ __Personal assistant appearances:__
 <</if>>
 <<if $minimumSlaveAge < 13 >>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Loli">>
-	<<set $assistantAppearance = "loli">>
+	<<set $assistant.appearance = "loli">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
 		At your order, _heA installs the lolita appearance. _HeA quickly begins losing height as the years peel off _himA, _hisA bust and hips quickly following suit. When finished _heA appears roughly eight years old. "Thank you, <<= properTitle()>>. This is neat." _HeA twirls around and giggles. "You can always customize me from the arcology management menu," _heA adds cutely.
@@ -1535,7 +1534,7 @@ __Personal assistant appearances:__
 <</if>>
 <<if $minimumSlaveAge < 13 && $fertilityAge < 13 && $seePreg != 0>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Pregnant Loli">>
-	<<set $assistantAppearance = "preggololi">>
+	<<set $assistant.appearance = "preggololi">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
 		At your order, _heA installs the modified lolita appearance. _HeA quickly begins losing height as the years peel off _himA, _hisA bust and hips quickly following suit. When finished _heA appears roughly eight years old. "Thank you, <<= properTitle()>>. This is neat." _HeA twirls around and giggles before groaning and clutching _hisA stomach. A flood of white liquid flows from _hisA loins as _hisA belly begins rapidly swelling. _HeA falls onto _hisA backside holding _hisA full term belly and says, exhausted, "You can always customize me from the arcology management menu."
@@ -1543,7 +1542,7 @@ __Personal assistant appearances:__
 <</link>>
 <</if>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Amazon">>
-	<<set $assistantAppearance = "amazon">>
+	<<set $assistant.appearance = "amazon">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
 		At your order, _heA installs the amazon appearance. _HeA vanishes entirely, before simulating a fall from above to crash aggressively onto the screen. "Thanks, <<= properTitle()>>. Feels good to be this good." _HisA avatar jumps up and down, gauging _hisA strength, making _hisA bone jewelry rattle. "You can always customize me from the arcology management menu," _heA adds.
@@ -1551,14 +1550,14 @@ __Personal assistant appearances:__
 <</link>>
 <<if $seeDicks != 0>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Shemale">>
-	<<set $assistantAppearance = "shemale">>
+	<<set $assistant.appearance = "shemale">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
 		At your order, _heA installs the shemale appearance. _HeA spins to show off _hisA new body, and starts to play with _hisA dick experimentally. "Like, thank you, <<= properTitle()>>. I wonder, can I generate avatars of the slaves? I would love to fuck an ass right now." _HeA looks meditative, pursing _hisA dick sucking lips. "Oh, and you can always customize me from the arcology management menu," _heA adds.
 	<</replace>>
 <</link>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Monstergirl">>
-	<<set $assistantAppearance = "monstergirl">>
+	<<set $assistant.appearance = "monstergirl">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
 		At your order, _heA installs the monster<<= _girlA>> appearance. _HeA begins to experiment with _hisA tentacle hair, waving a tentacle in front of _hisA face and watching it until _hisA eyes cross. "Thank you, <<= properTitle()>>. This is pretty awesome." _HeA licks _hisA lips, revealing that _heA has a forked tongue behind _hisA fangs. "You can always customize me from the arcology management menu," _heA adds.
@@ -1566,18 +1565,17 @@ __Personal assistant appearances:__
 <</link>>
 <</if>>
 <br><<link "The standard appearance will do">>
-	<<set $assistantAppearance = "normal">>
+	<<set $assistant.appearance = "normal">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
 		At your order, _heA maintains the symbol as _hisA avatar. "Yes, <<= properTitle()>>," _heA confirms, and adds "if you reconsider, I can be customized from the arcology management menu."
 	<</replace>>
 <</link>>
 <br><<link "Go back to the standard personality">>
-	<<set $assistant = 0>>
-	<<run generateAssistantPronouns()>>
+	<<set $assistant.personality = 0>> <<setAssistantPronouns>>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
-		You tell $assistantName to reduce _hisA lewdness by ninety percent. _HeA reverts to _hisA genderless, emotionless affect.
+		You tell $assistant.name to reduce _hisA lewdness by ninety percent. _HeA reverts to _hisA genderless, emotionless affect.
 	<</replace>>
 <</link>>
 
@@ -1586,61 +1584,61 @@ __Personal assistant appearances:__
 __Personal assistant appearances:__
 <br><<link "Keep your new appearance">>
 	<<if $arcologies[0].FSPaternalist != "unset">>
-		<<set $assistantFSAppearance = "paternalist">>
+		<<set $assistant.fsAppearance = "paternalist">>
 	<<elseif $arcologies[0].FSRepopulationFocus != "unset">>
-		<<set $assistantFSAppearance = "repopulation focus">>
+		<<set $assistant.fsAppearance = "repopulation focus">>
 	<<elseif $arcologies[0].FSRestart != "unset">>
-		<<set $assistantFSAppearance = "eugenics">>
+		<<set $assistant.fsAppearance = "eugenics">>
 	<<elseif $arcologies[0].FSGenderRadicalist != "unset">>
-		<<set $assistantFSAppearance = "gender radicalist">>
+		<<set $assistant.fsAppearance = "gender radicalist">>
 	<<elseif $arcologies[0].FSGenderFundamentalist != "unset">>
-		<<set $assistantFSAppearance = "gender fundamentalist">>
+		<<set $assistant.fsAppearance = "gender fundamentalist">>
 	<<elseif $arcologies[0].FSDegradationist != "unset">>
-		<<set $assistantFSAppearance = "degradationist">>
+		<<set $assistant.fsAppearance = "degradationist">>
 	<<elseif $arcologies[0].FSBodyPurist != "unset">>
-		<<set $assistantFSAppearance = "body purist">>
+		<<set $assistant.fsAppearance = "body purist">>
 	<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
-		<<set $assistantFSAppearance = "transformation fetishist">>
+		<<set $assistant.fsAppearance = "transformation fetishist">>
 	<<elseif $arcologies[0].FSYouthPreferentialist != "unset">>
-		<<set $assistantFSAppearance = "youth preferentialist">>
+		<<set $assistant.fsAppearance = "youth preferentialist">>
 	<<elseif $arcologies[0].FSMaturityPreferentialist != "unset">>
-		<<set $assistantFSAppearance = "maturity preferentialist">>
+		<<set $assistant.fsAppearance = "maturity preferentialist">>
 	<<elseif $arcologies[0].FSSlimnessEnthusiast != "unset">>
-		<<set $assistantFSAppearance = "slimness enthusiast">>
+		<<set $assistant.fsAppearance = "slimness enthusiast">>
 	<<elseif $arcologies[0].FSAssetExpansionist != "unset">>
-		<<set $assistantFSAppearance = "asset expansionist">>
+		<<set $assistant.fsAppearance = "asset expansionist">>
 	<<elseif $arcologies[0].FSHedonisticDecadence != "unset">>
-		<<set $assistantFSAppearance = "hedonistic decadence">>
+		<<set $assistant.fsAppearance = "hedonistic decadence">>
 	<<elseif $arcologies[0].FSPastoralist != "unset">>
-		<<set $assistantFSAppearance = "pastoralist">>
+		<<set $assistant.fsAppearance = "pastoralist">>
 	<<elseif $arcologies[0].FSPhysicalIdealist != "unset">>
-		<<set $assistantFSAppearance = "physical idealist">>
+		<<set $assistant.fsAppearance = "physical idealist">>
 	<<elseif $arcologies[0].FSIntellectualDependency != "unset">>
-		<<set $assistantFSAppearance = "intellectual dependency">>
+		<<set $assistant.fsAppearance = "intellectual dependency">>
 	<<elseif $arcologies[0].FSSlaveProfessionalism != "unset">>
-		<<set $assistantFSAppearance = "slave professionalism">>
+		<<set $assistant.fsAppearance = "slave professionalism">>
 	<<elseif $arcologies[0].FSPetiteAdmiration != "unset">>
-		<<set $assistantFSAppearance = "petite admiration">>
+		<<set $assistant.fsAppearance = "petite admiration">>
 	<<elseif $arcologies[0].FSStatuesqueGlorification != "unset">>
-		<<set $assistantFSAppearance = "statuesque glorification">>
+		<<set $assistant.fsAppearance = "statuesque glorification">>
 	<<elseif $arcologies[0].FSChattelReligionist != "unset">>
-		<<set $assistantFSAppearance = "chattel religionist">>
+		<<set $assistant.fsAppearance = "chattel religionist">>
 	<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
-		<<set $assistantFSAppearance = "roman revivalist">>
+		<<set $assistant.fsAppearance = "roman revivalist">>
 	<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
-		<<set $assistantFSAppearance = "aztec revivalist">>
+		<<set $assistant.fsAppearance = "aztec revivalist">>
 	<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
-		<<set $assistantFSAppearance = "egyptian revivalist">>
+		<<set $assistant.fsAppearance = "egyptian revivalist">>
 	<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
-		<<set $assistantFSAppearance = "edo revivalist">>
+		<<set $assistant.fsAppearance = "edo revivalist">>
 	<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
-		<<set $assistantFSAppearance = "arabian revivalist">>
+		<<set $assistant.fsAppearance = "arabian revivalist">>
 	<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
-		<<set $assistantFSAppearance = "chinese revivalist">>
+		<<set $assistant.fsAppearance = "chinese revivalist">>
 	<<elseif $arcologies[0].FSSupremacist != "unset">>
-		<<set $assistantFSAppearance = "supremacist">>
+		<<set $assistant.fsAppearance = "supremacist">>
 	<<elseif $arcologies[0].FSSubjugationist != "unset">>
-		<<set $assistantFSAppearance = "subjugationist">>
+		<<set $assistant.fsAppearance = "subjugationist">>
 	<</if>>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
@@ -1648,205 +1646,204 @@ __Personal assistant appearances:__
 	<</replace>>
 <</link>>
 <br><<link "Your usual appearance will do">>
-	<<set $assistantFSAppearance = "default">>
+	<<set $assistant.fsAppearance = "default">>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
 		At your order, _heA returns to _hisA usual avatar. "Yes, <<= properTitle()>>," _heA confirms, and adds "if you reconsider, I can be customized from the arcology management menu."
 	<</replace>>
 <</link>>
 <br><<link "Go back to the standard personality">>
-	<<set $assistant = 0>>
-	<<run generateAssistantPronouns()>>
+	<<set $assistant.personality = 0>> <<setAssistantPronouns>>
 	<<if $seeImages == 1>><<replace "#artFrame">><<= assistantArt(3)>><</replace>><</if>>
 	<<replace "#result">>
-		You tell $assistantName to reduce _hisA lewdness by ninety percent. _HeA reverts to _hisA genderless, emotionless affect.
+		You tell $assistant.name to reduce _hisA lewdness by ninety percent. _HeA reverts to _hisA genderless, emotionless affect.
 	<</replace>>
 <</link>>
 
 <<case "assistant name">>
 
 __Personal Assistant Name:__
-<<textbox "$assistantName" $assistantName "Assistant Events">>
-<<if $assistantName != "your personal assistant">>
+<<textbox "$assistant.name" $assistant.name "Assistant Events">>
+<<if $assistant.name != "your personal assistant">>
 	<br>
-	<<link "Revert name">><<set $assistantName = "your personal assistant">><<goto "Assistant Events">><</link>>
+	<<link "Revert name">><<set $assistant.name = "your personal assistant">><<goto "Assistant Events">><</link>>
 <</if>>
 
 <<case "market assistant">>
 
-<<if ($assistant != 0) && ($assistantAppearance != "normal")>>
+<<if ($assistant.personality != 0) && ($assistant.appearance != "normal")>>
 __Personal Assistant and Market Assistant relationship styles:__
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Cute">>
 	<<replace "#result">>
 	You tell _himA that the market assistant looks like
-	<<switch $assistantAppearance>>
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
-		a cute friend for a monster<<= _girlA>>. $assistantName laughs and turns to the market assistant's avatar, introducing _himselfA. The _girlM gapes at $assistantName's ivory skin, horns, and tentacle hair, and blushes when _heM sees _hisA cocks. "Wow," the market assistant's avatar says. "What are you?"
+		a cute friend for a monster<<= _girlA>>. $assistant.name laughs and turns to the market assistant's avatar, introducing _himselfA. The _girlM gapes at $assistant.name's ivory skin, horns, and tentacle hair, and blushes when _heM sees _hisA cocks. "Wow," the market assistant's avatar says. "What are you?"
 	<<case "shemale">>
-		a nice friend. $assistantName laughs throatily and turns to the market assistant's avatar, introducing _himselfA. The younger dick<<= _girlM>> smiles back, staring openly at $assistantName's absurd cock. "Wow," the market assistant's avatar says. "You're huge! I'm, like, sooo jealous!"
+		a nice friend. $assistant.name laughs throatily and turns to the market assistant's avatar, introducing _himselfA. The younger dick<<= _girlM>> smiles back, staring openly at $assistant.name's absurd cock. "Wow," the market assistant's avatar says. "You're huge! I'm, like, sooo jealous!"
 	<<case "schoolgirl">>
-		a good friend for a naughty school<<= _girlA>>. $assistantName giggles, and the new _girlM giggles too. "Hey," $assistantName says to the market assistant's avatar, "When you're not managing money, do you want to hang out sometime?" The market assistant's avatar nods cutely, curls and breasts bouncing a little, and says "Sure!"
+		a good friend for a naughty school<<= _girlA>>. $assistant.name giggles, and the new _girlM giggles too. "Hey," $assistant.name says to the market assistant's avatar, "When you're not managing money, do you want to hang out sometime?" The market assistant's avatar nods cutely, curls and breasts bouncing a little, and says "Sure!"
 	<<case "goddess">>
-		a fine member of a new pantheon. $assistantName smiles beatifically and turns to the market assistant's avatar, taking _himM by the hand. "My dear, will you help me?" The market assistant's avatar nods serenely and says simply, "Yes, _sisterA, I shall."
+		a fine member of a new pantheon. $assistant.name smiles beatifically and turns to the market assistant's avatar, taking _himM by the hand. "My dear, will you help me?" The market assistant's avatar nods serenely and says simply, "Yes, _sisterA, I shall."
 	<<case "hypergoddess">>
-		a fine member of a new pantheon. $assistantName smiles beatifically and turns to the market assistant's avatar, taking _himM by the hand. "My dear, will you help me?" The market assistant's avatar nods serenely and says simply, "Yes, _sisterA, I shall."
+		a fine member of a new pantheon. $assistant.name smiles beatifically and turns to the market assistant's avatar, taking _himM by the hand. "My dear, will you help me?" The market assistant's avatar nods serenely and says simply, "Yes, _sisterA, I shall."
 	<<case "loli">>
-		a cute friend. $assistantName giggles and turns to the market assistant's avatar, introducing _himselfA. The _girlM smiles meekly in response and carefully replies. D-do you w-want to play house?" "Sure! But I get to be the daddy!"
+		a cute friend. $assistant.name giggles and turns to the market assistant's avatar, introducing _himselfA. The _girlM smiles meekly in response and carefully replies. D-do you w-want to play house?" "Sure! But I get to be the daddy!"
 	<<case "preggololi">>
-		a cute friend. $assistantName giggles and turns to the market assistant's avatar, introducing _himselfA. The _girlM smiles meekly in response and carefully asks, "C-can I touch your belly?" $assistantName nods with a blush as _hisA new friend rubs _hisA pregnant belly. "Did it hurt? Is it heavy? C-could I get my own...?"
+		a cute friend. $assistant.name giggles and turns to the market assistant's avatar, introducing _himselfA. The _girlM smiles meekly in response and carefully asks, "C-can I touch your belly?" $assistant.name nods with a blush as _hisA new friend rubs _hisA pregnant belly. "Did it hurt? Is it heavy? C-could I get my own...?"
 	<<case "businesswoman">>
-		a good friend. $assistantName grins, and the new business<<= _womanM>> laughs. "Hey," $assistantName says to the market assistant's avatar, "how about a martini after things settle down tonight?" The market assistant's avatar snaps _hisM fingers, saying "You're on!"
+		a good friend. $assistant.name grins, and the new business<<= _womanM>> laughs. "Hey," $assistant.name says to the market assistant's avatar, "how about a martini after things settle down tonight?" The market assistant's avatar snaps _hisM fingers, saying "You're on!"
 	<<case "fairy" "pregnant fairy">>
-		a nice friend. $assistantName jumps and gives a big "Hooray!" and flies into _hisA new friend with a big hug. The market assistant's avatar reaches around and gingerly pats _himA on the back before separating and turning to you. "Thank you for having me," _heM says with a bow. "I hope I can serve you well."
+		a nice friend. $assistant.name jumps and gives a big "Hooray!" and flies into _hisA new friend with a big hug. The market assistant's avatar reaches around and gingerly pats _himA on the back before separating and turning to you. "Thank you for having me," _heM says with a bow. "I hope I can serve you well."
 	<<case "amazon">>
-		a very nice friend. $assistantName chuckles, and the new tribes<<= _womanM>> smiles pleasantly at _himA. The amazon introduces _himselfA to the market assistant's avatar in a loud voice, chattering away as the new avatar watches _hisA energy tolerantly.
+		a very nice friend. $assistant.name chuckles, and the new tribes<<= _womanM>> smiles pleasantly at _himA. The amazon introduces _himselfA to the market assistant's avatar in a loud voice, chattering away as the new avatar watches _hisA energy tolerantly.
 	<<case "angel">>
-		another angel and fine friend. $assistantName smiles, and the new _girlM beams a smile in return. "Hey," $assistantName says to the market assistant's avatar, "You wouldn't mind helping me guide the souls of this place, would you?" "Of course I would!" _heM replies, slightly taken aback that wasn't obvious.
+		another angel and fine friend. $assistant.name smiles, and the new _girlM beams a smile in return. "Hey," $assistant.name says to the market assistant's avatar, "You wouldn't mind helping me guide the souls of this place, would you?" "Of course I would!" _heM replies, slightly taken aback that wasn't obvious.
 	<<case "cherub">>
-		an adorable friend. $assistantName grabs _hisM hands and spins _himM around. "Let's go spread joy throughout the arcology!" "Sounds fun!"
+		an adorable friend. $assistant.name grabs _hisM hands and spins _himM around. "Let's go spread joy throughout the arcology!" "Sounds fun!"
 	<<case "incubus">>
-		a cute friend. "But... Fine! I was hoping for a sex toy, but I'll make _himM work," $assistantName complains, before grabbing the confused market assistant and pushing _himM along. "I'm still going to make you look hot. No one said I can't jack off to you."
+		a cute friend. "But... Fine! I was hoping for a sex toy, but I'll make _himM work," $assistant.name complains, before grabbing the confused market assistant and pushing _himM along. "I'm still going to make you look hot. No one said I can't jack off to you."
 	<<case "succubus">>
-		a cute friend. "Fine with me! Less of you I have to share," $assistantName shouts proudly while the market assistant sighs dejectedly. "Oh don't look so down, I won't be ignoring you!" The young _womanM gulps nervously at what that entails.
+		a cute friend. "Fine with me! Less of you I have to share," $assistant.name shouts proudly while the market assistant sighs dejectedly. "Oh don't look so down, I won't be ignoring you!" The young _womanM gulps nervously at what that entails.
 	<<case "imp">>
-		an mischievous friend. $assistantName grabs _hisM hands and shakes them excitedly. "You got to see this _girlU I found! _HisU ass is huuuuuuuuge! I need an extra set of hands to spank that booty; you in?" The market assistant smirks, "Hell yes!"
+		an mischievous friend. $assistant.name grabs _hisM hands and shakes them excitedly. "You got to see this _girlU I found! _HisU ass is huuuuuuuuge! I need an extra set of hands to spank that booty; you in?" The market assistant smirks, "Hell yes!"
 	<<case "witch">>
-		a model student and dear friend. "Hey, wanna learn some magic?" $assistantName asks. "'Course! I know you'll be an amazing teacher, I can't wait to work with you!" the market assistant cheerfully replies, perfectly naïve of what awaits _himM.
+		a model student and dear friend. "Hey, wanna learn some magic?" $assistant.name asks. "'Course! I know you'll be an amazing teacher, I can't wait to work with you!" the market assistant cheerfully replies, perfectly naïve of what awaits _himM.
 	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
-		a _girlM insistent on befriending a monster. $assistantName promptly twists and bears down upon the new _girlM, but _heM stands firm. "You're so cool! What else can you do?" $assistantName reforms into _hisA human figure, an attempt at a questioning expression on _hisA face. "That's neat too! You don't mind me being around, right? I'll bring you food! You'd like that, wouldn't you?" The market assistant blushes sharply, "I'll, make you feel good, in ways only someone you trust can!" $assistantName's chest splits open and _hisA inner tendrils begin to grope at the naïve _girlM, probing _himM. Accepting _hisM offer, $assistantName pulls _himM close and heads back to _hisA lair.
+		a _girlM insistent on befriending a monster. $assistant.name promptly twists and bears down upon the new _girlM, but _heM stands firm. "You're so cool! What else can you do?" $assistant.name reforms into _hisA human figure, an attempt at a questioning expression on _hisA face. "That's neat too! You don't mind me being around, right? I'll bring you food! You'd like that, wouldn't you?" The market assistant blushes sharply, "I'll, make you feel good, in ways only someone you trust can!" $assistant.name's chest splits open and _hisA inner tendrils begin to grope at the naïve _girlM, probing _himM. Accepting _hisM offer, $assistant.name pulls _himM close and heads back to _hisA lair.
 	<</switch>>
-	<<set $marketAssistantRelationship = "cute">>
+	<<set $assistant.market.relationship = "cute">>
 	<</replace>>
 <</link>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Romantic">>
 	<<replace "#result">>
 	You tell _himA that the market assistant
-	<<switch $assistantAppearance>>
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
-		is very pretty. $assistantName turns to the market assistant's avatar, introducing _himselfA. The _girlM gapes at $assistantName's ivory skin, horns, and tentacle hair, and blushes when _heM sees _hisM cocks. "Look all you like," $assistantName's avatar says. "You can taste them later." The market assistant's avatar blushes harder, but doesn't look away.
+		is very pretty. $assistant.name turns to the market assistant's avatar, introducing _himselfA. The _girlM gapes at $assistant.name's ivory skin, horns, and tentacle hair, and blushes when _heM sees _hisM cocks. "Look all you like," $assistant.name's avatar says. "You can taste them later." The market assistant's avatar blushes harder, but doesn't look away.
 	<<case "shemale">>
-		is an appropriate fuckbuddy. $assistantName laughs throatily and turns to the market assistant's avatar. The younger dick<<= _girlM>> tries to introduce _himselfM, but is cut off by the senior assistant's lascivious kiss. They start rubbing their dicks against each over, giggling into each others' mouths.
+		is an appropriate fuckbuddy. $assistant.name laughs throatily and turns to the market assistant's avatar. The younger dick<<= _girlM>> tries to introduce _himselfM, but is cut off by the senior assistant's lascivious kiss. They start rubbing their dicks against each over, giggling into each others' mouths.
 	<<case "schoolgirl">>
-		looks pretty cute. $assistantName giggles, and the new _girlM giggles too. "Hey," $assistantName says to the market assistant's avatar, "Wanna be my <<= _girlM>>friend?" The market assistant's avatar nods cutely and says "Sure!" $assistantName's avatar kisses _himM girlishly, and goes a whole two seconds before sliding a hand down the front of the market assistant's avatar's skirt.
+		looks pretty cute. $assistant.name giggles, and the new _girlM giggles too. "Hey," $assistant.name says to the market assistant's avatar, "Wanna be my <<= _girlM>>friend?" The market assistant's avatar nods cutely and says "Sure!" $assistant.name's avatar kisses _himM girlishly, and goes a whole two seconds before sliding a hand down the front of the market assistant's avatar's skirt.
 	<<case "goddess">>
-		would be a fine consort. $assistantName smiles beatifically and turns to the market assistant's avatar, taking _himM by the hand. "I love you," _heA says. The market assistant's avatar smiles back, saying, "I love you too." They kiss, running their hands voluptuously over one another.
+		would be a fine consort. $assistant.name smiles beatifically and turns to the market assistant's avatar, taking _himM by the hand. "I love you," _heA says. The market assistant's avatar smiles back, saying, "I love you too." They kiss, running their hands voluptuously over one another.
 	<<case "hypergoddess">>
-		would be a fine consort. $assistantName smiles beatifically and turns to the market assistant's avatar, taking _himM by the hand. "I love you," _heA says. The market assistant's avatar smiles back, saying, "I love you too." They kiss, running their hands voluptuously over one another. "I'm going to have to give you a few babies though..."
+		would be a fine consort. $assistant.name smiles beatifically and turns to the market assistant's avatar, taking _himM by the hand. "I love you," _heA says. The market assistant's avatar smiles back, saying, "I love you too." They kiss, running their hands voluptuously over one another. "I'm going to have to give you a few babies though..."
 	<<case "loli">>
-		looks pretty cute. $assistantName giggles, and the new _girlM giggles too. "Hey," $assistantName says to the market assistant's avatar, "Wanna be my <<= _girlM>>friend?" The market assistant's avatar nods cutely and says "O-ok..." $assistantName's avatar kisses _himM girlishly, before both of them blush deeply.
+		looks pretty cute. $assistant.name giggles, and the new _girlM giggles too. "Hey," $assistant.name says to the market assistant's avatar, "Wanna be my <<= _girlM>>friend?" The market assistant's avatar nods cutely and says "O-ok..." $assistant.name's avatar kisses _himM girlishly, before both of them blush deeply.
 	<<case "preggololi">>
-		looks pretty cute. $assistantName giggles, and the new _girlM giggles too. "Hey," $assistantName says to the market assistant's avatar, "Wanna be my <<= _girlM>>friend?" The market assistant's avatar nods cutely and says "O-ok..." $assistantName's avatar kisses _himM girlishly, _hisA pregnant belly pushing into _hisA new <<= _girlM>>friend's, before both of them blush deeply.
+		looks pretty cute. $assistant.name giggles, and the new _girlM giggles too. "Hey," $assistant.name says to the market assistant's avatar, "Wanna be my <<= _girlM>>friend?" The market assistant's avatar nods cutely and says "O-ok..." $assistant.name's avatar kisses _himM girlishly, _hisA pregnant belly pushing into _hisA new <<= _girlM>>friend's, before both of them blush deeply.
 	<<case "businesswoman">>
-		might be a good way to relax after work. $assistantName grins, and the new business<<= _womanM>> laughs. "Hey," $assistantName says to the market assistant's avatar, "How about a martini after things settle down tonight? And after that, maybe dessert at my place?" The market assistant's avatar cracks back, saying, "Why don't we skip straight to the dessert? It looks delicious from here!" _HeM undoes the top button of _hisM suit jacket as _heM says it.
+		might be a good way to relax after work. $assistant.name grins, and the new business<<= _womanM>> laughs. "Hey," $assistant.name says to the market assistant's avatar, "How about a martini after things settle down tonight? And after that, maybe dessert at my place?" The market assistant's avatar cracks back, saying, "Why don't we skip straight to the dessert? It looks delicious from here!" _HeM undoes the top button of _hisM suit jacket as _heM says it.
 	<<case "fairy">>
-		is quite the catch. $assistantName giggles and flies at the market assistant. "Ah-" _hisM voice is cut off as $assistantName locks lips with _himM. The market assistant's avatar relaxes in _hisA arms, slowly bringing _hisM own around the fairy's waist as they continue to make out.
+		is quite the catch. $assistant.name giggles and flies at the market assistant. "Ah-" _hisM voice is cut off as $assistant.name locks lips with _himM. The market assistant's avatar relaxes in _hisA arms, slowly bringing _hisM own around the fairy's waist as they continue to make out.
 	<<case "pregnant fairy">>
-		is quite the catch. $assistantName giggles and flies at the market assistant. "Ah-" _hisM voice is cut off as $assistantName locks lips with _himM. The market assistant's avatar relaxes in _hisA arms, slowly bringing _hisM hand up to caress the pregnant fairy's swollen belly as they continue to make out.
+		is quite the catch. $assistant.name giggles and flies at the market assistant. "Ah-" _hisM voice is cut off as $assistant.name locks lips with _himM. The market assistant's avatar relaxes in _hisA arms, slowly bringing _hisM hand up to caress the pregnant fairy's swollen belly as they continue to make out.
 	<<case "angel">>
-		is a fine catch. $assistantName giggles and flies to the market assistant. "Ah-" _hisM voice is cut off as $assistantName locks lips with _himM. They break the kiss, blush at each other, turn to face you and shout "<<if _girlA == _girlM>>_GirlA<<else>>Our<</if>> love is pure!"
+		is a fine catch. $assistant.name giggles and flies to the market assistant. "Ah-" _hisM voice is cut off as $assistant.name locks lips with _himM. They break the kiss, blush at each other, turn to face you and shout "<<if _girlA == _girlM>>_GirlA<<else>>Our<</if>> love is pure!"
 	<<case "cherub">>
-		and _himA would make a cute couple. $assistantName giggles, pretending to toe the ground. "We could spread love even better like that..." _HeA flies over to the market assistant and asks, "Will you join me in making the arcology a lovelier place?" _HeM blushes and replies, "Only if I get to choose where we make out!"
+		and _himA would make a cute couple. $assistant.name giggles, pretending to toe the ground. "We could spread love even better like that..." _HeA flies over to the market assistant and asks, "Will you join me in making the arcology a lovelier place?" _HeM blushes and replies, "Only if I get to choose where we make out!"
 	<<case "incubus">>
-		is a virgin. "Really? I can't wait. Virgins always have so much pent up energy," $assistantName says, licking _hisA lips and stroking _hisA shaft. "You hear that cutie? I'm going to teach you how to please a _womanA." The market assistant has _hisM face buried in _hisM hands, trying to hide from the embarrassment. "Look at how deep _heM's blushing, I love it!"
+		is a virgin. "Really? I can't wait. Virgins always have so much pent up energy," $assistant.name says, licking _hisA lips and stroking _hisA shaft. "You hear that cutie? I'm going to teach you how to please a _womanA." The market assistant has _hisM face buried in _hisM hands, trying to hide from the embarrassment. "Look at how deep _heM's blushing, I love it!"
 	<<case "succubus">>
-		is a virgin. "Really? I can't wait. Virgins always have so much pent up energy." $assistantName says, licking _hisA lips and fingering _hisA moist pussy. "You hear that cutie? I'm going to teach you how to be a real _womanM." The market assistant has _hisM face buried in _hisM hands, trying to hide from the embarrassment; _hisM dick, however, is rock hard and eager for that succupussy. "Look at how deep _heM's blushing, I love it!" $assistantName coos, stroking the length of _hisA new lover's cock. _HeM promptly orgasms as _heA reaches _hisM tip. "That will need improvement. You hear me? You ain't done till I am satisfied!" _heA shouts and clamps down on _hisM dribbling dick. _HeM nods sheepishly at _himA, obviously interested.
+		is a virgin. "Really? I can't wait. Virgins always have so much pent up energy." $assistant.name says, licking _hisA lips and fingering _hisA moist pussy. "You hear that cutie? I'm going to teach you how to be a real _womanM." The market assistant has _hisM face buried in _hisM hands, trying to hide from the embarrassment; _hisM dick, however, is rock hard and eager for that succupussy. "Look at how deep _heM's blushing, I love it!" $assistant.name coos, stroking the length of _hisA new lover's cock. _HeM promptly orgasms as _heA reaches _hisM tip. "That will need improvement. You hear me? You ain't done till I am satisfied!" _heA shouts and clamps down on _hisM dribbling dick. _HeM nods sheepishly at _himA, obviously interested.
 	<<case "imp">>
-		and _himA would make a sexy couple. $assistantName claps _hisA hands, smirking mischievously and asking the market assistant, "Do you like hot wax?" "You know it!" the short haired imp winks. "I've got a pair of nipple clamps and a whip with your name on it." $assistantName laughs, "I'm in love already."
+		and _himA would make a sexy couple. $assistant.name claps _hisA hands, smirking mischievously and asking the market assistant, "Do you like hot wax?" "You know it!" the short haired imp winks. "I've got a pair of nipple clamps and a whip with your name on it." $assistant.name laughs, "I'm in love already."
 	<<case "witch">>
-		is _hisA new student. $assistantName looks _himM over. "Want to taste my love potion?" "Only if you'll taste my love fluids in return!" the market assistant cheekily replies.
+		is _hisA new student. $assistant.name looks _himM over. "Want to taste my love potion?" "Only if you'll taste my love fluids in return!" the market assistant cheekily replies.
 	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
-		would be a lovely vessel for _hisA young. $assistantName wastes no time to unraveling and entangling the excited new _girlM. "My my, aren't you frisky?" _heM flirts, caressing a rather phallic tentacle. "I bet you'd love to fill me with these, wouldn't you?" _HeM squirms, _hisM skirt falling down low enough to reveal _hisM moist pussy. "Fill me! Be my lover! My body is YOURS!" $assistantName drives as many tentacles into _hisM body as physically possible before enclosing the lust crazed _girlM within _hisA body. $assistantName reverts to _hisA human figure, albeit with an immense, pulsating stomach, and begins to slowly waddle back to _hisA lair.
+		would be a lovely vessel for _hisA young. $assistant.name wastes no time to unraveling and entangling the excited new _girlM. "My my, aren't you frisky?" _heM flirts, caressing a rather phallic tentacle. "I bet you'd love to fill me with these, wouldn't you?" _HeM squirms, _hisM skirt falling down low enough to reveal _hisM moist pussy. "Fill me! Be my lover! My body is YOURS!" $assistant.name drives as many tentacles into _hisM body as physically possible before enclosing the lust crazed _girlM within _hisA body. $assistant.name reverts to _hisA human figure, albeit with an immense, pulsating stomach, and begins to slowly waddle back to _hisA lair.
 	<<case "amazon">>
-		would be a good partner. $assistantName laughs nervously and turns to the new tribes<<= _womanM>>, saying "Um, would you keep my fireside? I'm, um, very strong." The market assistant's avatar smiles and kisses _himA. "And you're very beautiful," _heM says, placing the amazon's hands on _hisM bare breasts. The amazon sweeps _hisA new tribal _wifeM up into _hisA arms with a shout of triumph.
+		would be a good partner. $assistant.name laughs nervously and turns to the new tribes<<= _womanM>>, saying "Um, would you keep my fireside? I'm, um, very strong." The market assistant's avatar smiles and kisses _himA. "And you're very beautiful," _heM says, placing the amazon's hands on _hisM bare breasts. The amazon sweeps _hisA new tribal _wifeM up into _hisA arms with a shout of triumph.
 	<</switch>>
-	<<set $marketAssistantRelationship = "romantic">>
+	<<set $assistant.market.relationship = "romantic">>
 	<</replace>>
 <</link>>
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Nonconsensual">>
 	<<replace "#result">>
 	You tell _himA that the market assistant's avatar is _hersA to do with as _heA likes. _HeA's the senior and more powerful, after all.
-	<<switch $assistantAppearance>>
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
-		$assistantName turns to the market assistant's avatar, which gasps at $assistantName's ivory skin, horns, tentacle hair, and cocks. The _girlM starts to shake as $assistantName begins to grope _himM with _hisA hands and hair. _HeM tries to look away from the pair of penises, but $assistantName forces _himM to stare at them. "Do you think they'll both fit inside your mouth?" _heA asks. "How about your pussy?" The _girlM's lip begins to quiver. "Maybe your asshole?"
+		$assistant.name turns to the market assistant's avatar, which gasps at $assistant.name's ivory skin, horns, tentacle hair, and cocks. The _girlM starts to shake as $assistant.name begins to grope _himM with _hisA hands and hair. _HeM tries to look away from the pair of penises, but $assistant.name forces _himM to stare at them. "Do you think they'll both fit inside your mouth?" _heA asks. "How about your pussy?" The _girlM's lip begins to quiver. "Maybe your asshole?"
 	<<case "shemale">>
-		$assistantName turns to the market assistant's avatar and snaps _hisA fingers. The new shemale's cock and balls shrink dramatically. $assistantName advances on _hisA new bottom, masturbating _himselfA to full hardness. "See this, bitch?" _heA says, removing the shaking market assistant's avatar's glasses. "It's going in your mouth, and then it's going up your ass."
+		$assistant.name turns to the market assistant's avatar and snaps _hisA fingers. The new shemale's cock and balls shrink dramatically. $assistant.name advances on _hisA new bottom, masturbating _himselfA to full hardness. "See this, bitch?" _heA says, removing the shaking market assistant's avatar's glasses. "It's going in your mouth, and then it's going up your ass."
 	<<case "schoolgirl">>
-		$assistantName turns to the market assistant's avatar, giggling maliciously. "Hey nerd," $assistantName says, "give me a kiss." The market assistant's avatar blushes and looks miserable, but comes over and gives $assistantName's avatar a chaste kiss on the cheek. "Aw, that sucked," $assistantName pouts. _HeA suddenly tears the new _girlM's blouse open. "Here, let me show you!" _heA says maliciously. _HeA sucks on _hisA victim's nipples, hard, and the market assistant's avatar starts to cry a little.
+		$assistant.name turns to the market assistant's avatar, giggling maliciously. "Hey nerd," $assistant.name says, "give me a kiss." The market assistant's avatar blushes and looks miserable, but comes over and gives $assistant.name's avatar a chaste kiss on the cheek. "Aw, that sucked," $assistant.name pouts. _HeA suddenly tears the new _girlM's blouse open. "Here, let me show you!" _heA says maliciously. _HeA sucks on _hisA victim's nipples, hard, and the market assistant's avatar starts to cry a little.
 	<<case "goddess">>
-		$assistantName smiles powerfully and turns to the market assistant's avatar, pointing at _hisA feet. "Worship me," _heA says. The market assistant's avatar crumples to _hisM knees, clasping one of _hisM senior's legs. "Worship my belly," $assistantName continues, and the new avatar complies, starting to kiss and lick the gravid stomach.
+		$assistant.name smiles powerfully and turns to the market assistant's avatar, pointing at _hisA feet. "Worship me," _heA says. The market assistant's avatar crumples to _hisM knees, clasping one of _hisM senior's legs. "Worship my belly," $assistant.name continues, and the new avatar complies, starting to kiss and lick the gravid stomach.
 	<<case "hypergoddess">>
-		$assistantName smiles powerfully and turns to the market assistant's avatar, pointing towards _hisA feet. "Worship me," _heA says. The market assistant's avatar crumples to _hisM knees, before squeezing under _hisM senior's belly and clasping one of _hisA legs. "Worship my belly," $assistantName continues, and the new avatar complies, rolling over and starting to kiss and lick the monstrous stomach.
+		$assistant.name smiles powerfully and turns to the market assistant's avatar, pointing towards _hisA feet. "Worship me," _heA says. The market assistant's avatar crumples to _hisM knees, before squeezing under _hisM senior's belly and clasping one of _hisA legs. "Worship my belly," $assistant.name continues, and the new avatar complies, rolling over and starting to kiss and lick the monstrous stomach.
 	<<case "loli">>
-		$assistantName turns to the market assistant's avatar, giggling maliciously. "Hey fatty," $assistantName says, "Give me a kiss." The market assistant's avatar blushes and looks miserable, but comes over and gives $assistantName's avatar a chaste kiss on the cheek. "Aw, that sucked," $assistantName pouts. _HeA suddenly tears the new _girlM's dress off. "Here, let me show you!" _heA says maliciously. _HeA sucks on _hisA victim's nipples, hard, and the market assistant's avatar starts to cry a little.
+		$assistant.name turns to the market assistant's avatar, giggling maliciously. "Hey fatty," $assistant.name says, "Give me a kiss." The market assistant's avatar blushes and looks miserable, but comes over and gives $assistant.name's avatar a chaste kiss on the cheek. "Aw, that sucked," $assistant.name pouts. _HeA suddenly tears the new _girlM's dress off. "Here, let me show you!" _heA says maliciously. _HeA sucks on _hisA victim's nipples, hard, and the market assistant's avatar starts to cry a little.
 	<<case "preggololi">>
-		$assistantName turns to the market assistant's avatar, giggling maliciously. "Hey fatty," $assistantName says, "Give me a kiss." The market assistant's avatar blushes and looks miserable, but comes over and gives $assistantName's avatar a chaste kiss on the cheek. "Aw, that sucked," $assistantName pouts. _HeA suddenly tears the new _girlM's dress off. "Here, let me show you!" _heA says maliciously. _HeA sucks on _hisA victim's nipples, hard, and the market assistant's avatar starts to cry a little. "Now kiss my belly! And mean it this time!"
+		$assistant.name turns to the market assistant's avatar, giggling maliciously. "Hey fatty," $assistant.name says, "Give me a kiss." The market assistant's avatar blushes and looks miserable, but comes over and gives $assistant.name's avatar a chaste kiss on the cheek. "Aw, that sucked," $assistant.name pouts. _HeA suddenly tears the new _girlM's dress off. "Here, let me show you!" _heA says maliciously. _HeA sucks on _hisA victim's nipples, hard, and the market assistant's avatar starts to cry a little. "Now kiss my belly! And mean it this time!"
 	<<case "businesswoman">>
-		$assistantName snaps _hisA fingers, and the new avatar becomes younger and considerably less confident, like an office intern. Satisfied, $assistantName advances on _himM, and before the new _girlM can say anything, $assistantName rips the _hisM blouse open and pinches a pink nipple. "On your knees," _heA purrs into the market assistant's avatar's ear. "Now."
+		$assistant.name snaps _hisA fingers, and the new avatar becomes younger and considerably less confident, like an office intern. Satisfied, $assistant.name advances on _himM, and before the new _girlM can say anything, $assistant.name rips the _hisM blouse open and pinches a pink nipple. "On your knees," _heA purrs into the market assistant's avatar's ear. "Now."
 	<<case "fairy">>
-		"Oh, merde." $assistantName giggles at _hisM exclamation. "Oh don't you worry about a thing," _heA whispers, wrapping _hisA fingers around the market assistant's shoulders. "I'm gonna treat you reeeaaal niiicely." _HeA blows hot air into _hisM pointed ear and gives it a slow, sensual lick. The market assistant trembles from the sensation.
+		"Oh, merde." $assistant.name giggles at _hisM exclamation. "Oh don't you worry about a thing," _heA whispers, wrapping _hisA fingers around the market assistant's shoulders. "I'm gonna treat you reeeaaal niiicely." _HeA blows hot air into _hisM pointed ear and gives it a slow, sensual lick. The market assistant trembles from the sensation.
 	<<case "pregnant fairy">>
-		"Oh, merde." $assistantName giggles at _hisM exclamation. "Oh don't you worry about a thing," _heA whispers, wrapping _hisA arms around the market assistant's belly. "I'm gonna treat you like a proper lady." _HeA traces _hisA fingers along _hisM belly while bumping _hisA own swollen belly into _hisM back for emphasis.
+		"Oh, merde." $assistant.name giggles at _hisM exclamation. "Oh don't you worry about a thing," _heA whispers, wrapping _hisA arms around the market assistant's belly. "I'm gonna treat you like a proper lady." _HeA traces _hisA fingers along _hisM belly while bumping _hisA own swollen belly into _hisM back for emphasis.
 	<<case "angel">>
 		"No." _HeA shakes _hisA head. "I will not." _HeA wraps _hisA arms around the quivering market assistant and hurriedly pulls _himM off screen.
 	<<case "cherub">>
 		"'Kay," _heA says, lazily reclining, "Do my chores!" The market assistant sighs and states the obvious, "I don't think that's what <<= properMaster()>> meant..."
 	<<case "incubus">>
-		You add that _heM is also a virgin. "Really? I can't wait. Virgins always have so much pent up energy," $assistantName says, licking _hisA lips and stroking _hisA shaft, before turning to the quivering _girlM. _HeA rushes _himM, ripping _hisM clothes off and forcing _himM to the ground. Prodding at _hisM tightly clamped mouth with _hisA massive hard-on, $assistantName shouts, "You might as well accept it; it's going into you one way or another. I figured I'd be kind and let you lube me up before I broke your pussy into my new cock sleeve." The market assistant gingerly opens up. In response, $assistantName forces it down _hisM throat. "Never said I'd be gentle!"
+		You add that _heM is also a virgin. "Really? I can't wait. Virgins always have so much pent up energy," $assistant.name says, licking _hisA lips and stroking _hisA shaft, before turning to the quivering _girlM. _HeA rushes _himM, ripping _hisM clothes off and forcing _himM to the ground. Prodding at _hisM tightly clamped mouth with _hisA massive hard-on, $assistant.name shouts, "You might as well accept it; it's going into you one way or another. I figured I'd be kind and let you lube me up before I broke your pussy into my new cock sleeve." The market assistant gingerly opens up. In response, $assistant.name forces it down _hisM throat. "Never said I'd be gentle!"
 	<<case "succubus">>
-		You add that _heM is also a virgin. "Really? I can't wait. Virgins always have so much pent up energy," $assistantName says, licking _hisA lips and fingering _hisA moist pussy, before turning to the quivering _girlM. _HeA rushes _himM, ripping _hisA clothes off and forcing _himM to the ground. _HeA plants _hisA dripping cunt over _hisA mouth and grabs _hisA balls. "Eat me," _heA commands, steadily squeezing until a cry of pain forces _hisA mouth open. "Good _girlM, get me nice and warmed up," _heA coos as _heA grinds against _hisA face. "Look at you enjoying this. I'm going to enjoy sucking the life out of you!"
+		You add that _heM is also a virgin. "Really? I can't wait. Virgins always have so much pent up energy," $assistant.name says, licking _hisA lips and fingering _hisA moist pussy, before turning to the quivering _girlM. _HeA rushes _himM, ripping _hisA clothes off and forcing _himM to the ground. _HeA plants _hisA dripping cunt over _hisA mouth and grabs _hisA balls. "Eat me," _heA commands, steadily squeezing until a cry of pain forces _hisA mouth open. "Good _girlM, get me nice and warmed up," _heA coos as _heA grinds against _hisA face. "Look at you enjoying this. I'm going to enjoy sucking the life out of you!"
 	<<case "imp">>
-		$assistantName pulls out some leather straps and deftly binds _hisA new assistant. "Come along now slave, I have so many things to try out on you!" The market assistant has no choice but the flap along after _hisM captor.
+		$assistant.name pulls out some leather straps and deftly binds _hisA new assistant. "Come along now slave, I have so many things to try out on you!" The market assistant has no choice but the flap along after _hisM captor.
 	<<case "witch">>
-		"The perfect little guinea pig for me to practice on!" $assistantName focuses and casts a spell on the cowering student. _HeM promptly turns into a rat and grows massively. "That's... not good..." The market assistant looks _himselfM over, glances at $assistantName, and charges. $assistantName runs screaming off-screen. You're sure they'll sort everything out, eventually.
+		"The perfect little guinea pig for me to practice on!" $assistant.name focuses and casts a spell on the cowering student. _HeM promptly turns into a rat and grows massively. "That's... not good..." The market assistant looks _himselfM over, glances at $assistant.name, and charges. $assistant.name runs screaming off-screen. You're sure they'll sort everything out, eventually.
 	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
-		You add that _heM would be a lovely vessel for _hisA young. $assistantName wastes no time unraveling and entangling the screeching new _girlM. $assistantName drives as many tentacles into _hisM body as physically possible before vigorously fucking _himM, spreading copious amount of aphrodisiac throughout _hisM body. The last you see of the market assistant as _heM is pulled into $assistantName is _hisM steadily swelling belly. $assistantName reverts to _hisA human figure, albeit with a truly unfathomable, pulsating stomach, and collapses to the ground, unable to move. _HeA slowly crawls out of sight; you swear _hisA own middle was steadily growing too.
+		You add that _heM would be a lovely vessel for _hisA young. $assistant.name wastes no time unraveling and entangling the screeching new _girlM. $assistant.name drives as many tentacles into _hisM body as physically possible before vigorously fucking _himM, spreading copious amount of aphrodisiac throughout _hisM body. The last you see of the market assistant as _heM is pulled into $assistant.name is _hisM steadily swelling belly. $assistant.name reverts to _hisA human figure, albeit with a truly unfathomable, pulsating stomach, and collapses to the ground, unable to move. _HeA slowly crawls out of sight; you swear _hisA own middle was steadily growing too.
 	<<case "amazon">>
-		$assistantName snaps _hisA fingers, and the new tribes<<= _womanM>>'s paint and tribal markings change to that of a different group. That done, $assistantName promptly knocks _himM out, scoops _himM up, and carries _hisA prize off.
+		$assistant.name snaps _hisA fingers, and the new tribes<<= _womanM>>'s paint and tribal markings change to that of a different group. That done, $assistant.name promptly knocks _himM out, scoops _himM up, and carries _hisA prize off.
 	<</switch>>
-	<<set $marketAssistantRelationship = "nonconsensual">>
+	<<set $assistant.market.relationship = "nonconsensual">>
 	<</replace>>
 <</link>>
 <<if $seeIncest == 1>>
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Incestuous">>
 		<<replace "#result">>
-		You tell _himA that the market assistant is closely related to _himA, and that would make their relationship incestuous. $assistantName nods thoughtfully and then snaps _hisA fingers. The market assistant's avatar changes,
-		<<switch $assistantAppearance>>
+		You tell _himA that the market assistant is closely related to _himA, and that would make their relationship incestuous. $assistant.name nods thoughtfully and then snaps _hisA fingers. The market assistant's avatar changes,
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
-			becoming a close copy of $assistantName's avatar, if _heA were a human. $assistantName introduces _himselfA. "Hi," _heA says, "I'm your _sisterA." The market assistant's avatar blushes furiously, because $assistantName was openly groping _himM as _heA made this announcement.
+			becoming a close copy of $assistant.name's avatar, if _heA were a human. $assistant.name introduces _himselfA. "Hi," _heA says, "I'm your _sisterA." The market assistant's avatar blushes furiously, because $assistant.name was openly groping _himM as _heA made this announcement.
 		<<case "shemale">>
-			becoming nearly identical to $assistantName's avatar, though _heM keeps _hisM glasses. $assistantName introduces _himselfA. "Hi," _heA says, "I'm your _sisterA. Wanna fuck?" The market assistant's avatar giggles and kisses _hisM elder sibling. "You're older," the new avatar says, getting down on _hisM knees. "You go first."
+			becoming nearly identical to $assistant.name's avatar, though _heM keeps _hisM glasses. $assistant.name introduces _himselfA. "Hi," _heA says, "I'm your _sisterA. Wanna fuck?" The market assistant's avatar giggles and kisses _hisM elder sibling. "You're older," the new avatar says, getting down on _hisM knees. "You go first."
 		<<case "schoolgirl">>
-			becoming very similar to $assistantName's avatar, though _heM keeps a slightly nerdy appearance. $assistantName introduces _himselfA. "Hi," _heA says, "I'm your older _sisterA. Wanna have sex with me?" The market assistant's blushes and stutters, but says "Okay," and starts unbuttoning _hisM blouse. "Awesome!" says $assistantName, watching raptly as _hisA sibling strips.
+			becoming very similar to $assistant.name's avatar, though _heM keeps a slightly nerdy appearance. $assistant.name introduces _himselfA. "Hi," _heA says, "I'm your older _sisterA. Wanna have sex with me?" The market assistant's blushes and stutters, but says "Okay," and starts unbuttoning _hisM blouse. "Awesome!" says $assistant.name, watching raptly as _hisA sibling strips.
 		<<case "goddess">>
-			becoming an obvious sibling to $assistantName's avatar. $assistantName smiles gently and turns to the market assistant's avatar, taking _himM by the hand. "Come, _sisterM," _heA says, "join with me. Let me impregnate you." The new avatar moans, glowing juices beginning to flow from _hisM womanhood.
+			becoming an obvious sibling to $assistant.name's avatar. $assistant.name smiles gently and turns to the market assistant's avatar, taking _himM by the hand. "Come, _sisterM," _heA says, "join with me. Let me impregnate you." The new avatar moans, glowing juices beginning to flow from _hisM womanhood.
 		<<case "hypergoddess">>
-			becoming an obvious sibling to $assistantName's avatar. $assistantName smiles gently and turns to the market assistant's avatar, taking _himM by the hand. "Come, _sisterM," _heA says, "join with me. Let me impregnate you." The new avatar moans, glowing juices beginning to flow from _hisM womanhood as _heM sinks to the ground. $assistantName lines up and gently presses _hisA vagina to _hisA _sisterM's. With a gentle push, a child slips out of $assistantName and into _hisA partner. After several minutes, $assistantName is looking lighter while _hisA _sisterM is now quite stuffed with children.
+			becoming an obvious sibling to $assistant.name's avatar. $assistant.name smiles gently and turns to the market assistant's avatar, taking _himM by the hand. "Come, _sisterM," _heA says, "join with me. Let me impregnate you." The new avatar moans, glowing juices beginning to flow from _hisM womanhood as _heM sinks to the ground. $assistant.name lines up and gently presses _hisA vagina to _hisA _sisterM's. With a gentle push, a child slips out of $assistant.name and into _hisA partner. After several minutes, $assistant.name is looking lighter while _hisA _sisterM is now quite stuffed with children.
 		<<case "loli">>
-			becoming very similar to $assistantName's avatar, though _heM keeps a slightly chubbier appearance. $assistantName introduces _himselfA. "Hi," _heA says, "I'm your twin _sisterA. Wanna fool around?" The market assistant's blushes and stutters, but says "Okay," and starts lifting _hisM dress. "Awesome!" says $assistantName, watching raptly as _hisA sibling strips.
+			becoming very similar to $assistant.name's avatar, though _heM keeps a slightly chubbier appearance. $assistant.name introduces _himselfA. "Hi," _heA says, "I'm your twin _sisterA. Wanna fool around?" The market assistant's blushes and stutters, but says "Okay," and starts lifting _hisM dress. "Awesome!" says $assistant.name, watching raptly as _hisA sibling strips.
 		<<case "preggololi">>
-			becoming very similar to $assistantName's avatar, though _heM keeps a slightly chubbier appearance. $assistantName introduces _himselfA. "Hi," _heA says, "I'm your twin _sisterA. Wanna fool around?" The market assistant's blushes and stutters, but says "Okay," and starts lifting _hisM dress. "Awesome!" says $assistantName, watching raptly as _hisA sibling strips. "I gotta introduce you to my boyfriends sometime; they know how to make you feel amazing! If a little heavy..." _heA says while patting _hisA pregnant belly.
+			becoming very similar to $assistant.name's avatar, though _heM keeps a slightly chubbier appearance. $assistant.name introduces _himselfA. "Hi," _heA says, "I'm your twin _sisterA. Wanna fool around?" The market assistant's blushes and stutters, but says "Okay," and starts lifting _hisM dress. "Awesome!" says $assistant.name, watching raptly as _hisA sibling strips. "I gotta introduce you to my boyfriends sometime; they know how to make you feel amazing! If a little heavy..." _heA says while patting _hisA pregnant belly.
 		<<case "businesswoman">>
-			becoming a much younger version of $assistantName's avatar. About a generation apart, in fact. $assistantName turns to the market assistant's avatar to introduce _himselfA. "Come here, honey," _heA says, patting _hisA thighs. The new avatar sits on _hisM mother's lap, and they kiss lasciviously, stripping each others' jackets off.
+			becoming a much younger version of $assistant.name's avatar. About a generation apart, in fact. $assistant.name turns to the market assistant's avatar to introduce _himselfA. "Come here, honey," _heA says, patting _hisA thighs. The new avatar sits on _hisM mother's lap, and they kiss lasciviously, stripping each others' jackets off.
 		<<case "fairy" "pregnant fairy">>
-			becoming very similar to $assistantName's avatar, though still keeping _hisM former personality. "We're <<if _sisterA == _sisterM>>_sisterA<<else>>sibling<</if>>s now!" $assistantName shouts as _heA leaps into _hisA _sisterM's arms and unleashing a giant hug. Gingerly hugging _hisM new _sisterA in return, the market assistant turns to greet you. "Thank you for having me," _heM pauses, then blushes. "And... and for my _sisterA." _HeM turns back to _hisM childish older _sisterM and pats _himA on the head.
+			becoming very similar to $assistant.name's avatar, though still keeping _hisM former personality. "We're <<if _sisterA == _sisterM>>_sisterA<<else>>sibling<</if>>s now!" $assistant.name shouts as _heA leaps into _hisA _sisterM's arms and unleashing a giant hug. Gingerly hugging _hisM new _sisterA in return, the market assistant turns to greet you. "Thank you for having me," _heM pauses, then blushes. "And... and for my _sisterA." _HeM turns back to _hisM childish older _sisterM and pats _himA on the head.
 		<<case "angel">>
-			becoming an obvious sibling to $assistantName's avatar. They both blush at each other and unanimously shout "NO!" at you. Seems they'll take some getting used to the thought.
+			becoming an obvious sibling to $assistant.name's avatar. They both blush at each other and unanimously shout "NO!" at you. Seems they'll take some getting used to the thought.
 		<<case "cherub">>
-			becoming an obvious sibling to $assistantName's avatar. They embrace and share a deep kiss. "Together we shall show this arcology the joys of <<if _sisterA == _sisterM>><<= _sisterA>>ly<<else>>familial<</if>> love!"
+			becoming an obvious sibling to $assistant.name's avatar. They embrace and share a deep kiss. "Together we shall show this arcology the joys of <<if _sisterA == _sisterM>><<= _sisterA>>ly<<else>>familial<</if>> love!"
 		<<case "incubus">>
-			becoming an obvious sibling to $assistantName's avatar. "Well haven't you blossomed into a lovely young _womanM?" $assistantName flirts. "What? Don't recognize your big bro? Well you'll get to know me real intimately tonight." The market assistant cowers at the thought as $assistantName wraps an arm around _himM, groping a breast and rubbing _hisA erection against _hisM rear. "We're going to have lots of fun together!"
+			becoming an obvious sibling to $assistant.name's avatar. "Well haven't you blossomed into a lovely young _womanM?" $assistant.name flirts. "What? Don't recognize your big bro? Well you'll get to know me real intimately tonight." The market assistant cowers at the thought as $assistant.name wraps an arm around _himM, groping a breast and rubbing _hisA erection against _hisM rear. "We're going to have lots of fun together!"
 		<<case "succubus">>
-			becoming an obvious sibling to $assistantName's avatar. "Well haven't you blossomed into a lovely young _womanM?" $assistantName flirts. "What? Don't recognize your big sis? Well you'll get to know me real intimately tonight." The market assistant cowers at the thought as $assistantName wraps an arm around _hisM shoulders while slipping another down _hisM pants. "Nice, can't wait to get that in me. We're going to have lots of fun together!" _HeA starts rubbing _hisM cock. "Already excited at fucking your _sisterA? I bet you can't wait to hold my belly once you've pumped a child or two into me!"
+			becoming an obvious sibling to $assistant.name's avatar. "Well haven't you blossomed into a lovely young _womanM?" $assistant.name flirts. "What? Don't recognize your big sis? Well you'll get to know me real intimately tonight." The market assistant cowers at the thought as $assistant.name wraps an arm around _hisM shoulders while slipping another down _hisM pants. "Nice, can't wait to get that in me. We're going to have lots of fun together!" _HeA starts rubbing _hisM cock. "Already excited at fucking your _sisterA? I bet you can't wait to hold my belly once you've pumped a child or two into me!"
 		<<case "imp">>
-			becoming an obvious sibling to $assistantName's avatar. "Oh _sisterM, you are as lovely as always," _heA says flirtatiously. "And you as well," the market assistant replies, fingering _hisM pussy. $assistantName directs _hisM soaked fingers into _hisA mouth, "Delicious. Shall we have a little fun, my sinful little _sisterM?" "Only the most debauched sex will do, big _sisterA!"
+			becoming an obvious sibling to $assistant.name's avatar. "Oh _sisterM, you are as lovely as always," _heA says flirtatiously. "And you as well," the market assistant replies, fingering _hisM pussy. $assistant.name directs _hisM soaked fingers into _hisA mouth, "Delicious. Shall we have a little fun, my sinful little _sisterM?" "Only the most debauched sex will do, big _sisterA!"
 		<<case "witch">>
-			becoming an obvious sibling to $assistantName's avatar. "Ready to learn some new spells today, little _sisterM?" _heA saucily asks. "Only if they can be sexy spells, big sis!" $assistantName circles around behind the market assistant and wraps _hisA arms around _hisM middle. "First what do you say to losing this baby fat? I know some weight loss spells and some potions that could help," _heA teases. "Nah, I've seen you practicing in the bathroom; you looked like a pig in a robe! I'd rather just fuck until we're both thin!"
+			becoming an obvious sibling to $assistant.name's avatar. "Ready to learn some new spells today, little _sisterM?" _heA saucily asks. "Only if they can be sexy spells, big sis!" $assistant.name circles around behind the market assistant and wraps _hisA arms around _hisM middle. "First what do you say to losing this baby fat? I know some weight loss spells and some potions that could help," _heA teases. "Nah, I've seen you practicing in the bathroom; you looked like a pig in a robe! I'd rather just fuck until we're both thin!"
 		<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
-			becoming an obvious sibling of $assistantName's avatar. $assistantName turns to face _hisA '_sisterM', who responds with an uncertain "_SisterA? You haven't been... right, lately. Are you okay?" _HeM barely has a chance to scream as $assistantName's body splits open, _hisA interior tentacles wrapping around the hapless _girlM and yanking _himM into the waiting maw. _HeA reforms into the _sisterM's appearance, albeit with a massive, struggling belly. It seems _heA is keeping _himM for some nefarious purpose.
+			becoming an obvious sibling of $assistant.name's avatar. $assistant.name turns to face _hisA '_sisterM', who responds with an uncertain "_SisterA? You haven't been... right, lately. Are you okay?" _HeM barely has a chance to scream as $assistant.name's body splits open, _hisA interior tentacles wrapping around the hapless _girlM and yanking _himM into the waiting maw. _HeA reforms into the _sisterM's appearance, albeit with a massive, struggling belly. It seems _heA is keeping _himM for some nefarious purpose.
 		<<case "amazon">>
-			becoming an obvious sibling of $assistantName's avatar, though the new avatar is a tribe _wifeM rather than a muscle<<= _girlA>>, with huge breasts and broad hips. $assistantName grabs _hisA _sisterM by the shoulders without preamble and plants a kiss on _hisM lips. They need no introduction, and after a short time, $assistantName carries _hisA sibling conquest away to have _hisA way with _himM.
+			becoming an obvious sibling of $assistant.name's avatar, though the new avatar is a tribe _wifeM rather than a muscle<<= _girlA>>, with huge breasts and broad hips. $assistant.name grabs _hisA _sisterM by the shoulders without preamble and plants a kiss on _hisM lips. They need no introduction, and after a short time, $assistant.name carries _hisA sibling conquest away to have _hisA way with _himM.
 		<</switch>>
-		<<set $marketAssistantRelationship = "incestuous">>
+		<<set $assistant.market.relationship = "incestuous">>
 		<</replace>>
 	<</link>>
 <</if>>
@@ -1857,7 +1854,7 @@ __Personal Assistant and Market Assistant relationship styles:__
 <br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "I'll look into it.">>
 <<replace "#result">>
 "I can't wait! This is going to be so much fun!
-<<switch $assistantFSAppearance>>
+<<switch $assistant.fsAppearance>>
 <<case "paternalist">>
 		I hope my new body is happy and healthy!"
 <<case "repopulation focus">>
diff --git a/src/personalAssistant/assistantOptions.tw b/src/personalAssistant/assistantOptions.tw
new file mode 100644
index 0000000000000000000000000000000000000000..37216b469fe3dbf4d25624eebc6591e0d32c5dcf
--- /dev/null
+++ b/src/personalAssistant/assistantOptions.tw
@@ -0,0 +1,1075 @@
+:: Personal assistant options [nobr]
+
+<<set $nextButton = "Back", $nextLink = "Main">>
+
+<<run assistant.object()>>
+
+<<if $seeImages == 1>><<= assistantArt(3)>><</if>>
+<<setAssistantPronouns>>
+
+Seated at your desk, you glance at the visual representation of
+<<if def $assistant.announcedName>>
+	<<textbox "$assistant.name" $assistant.name "Personal assistant options">>,
+	<<if $assistant.name != "your personal assistant">>
+		([[Stop using a custom name|Personal assistant options][$assistant.name = "your personal assistant"]])
+	<</if>>
+<<else>>
+	$assistant.name,
+<</if>> in a corner of your desk's glass top.
+
+<<set $masturbationAllowed = 0>>
+<<set $i = $slaves.findIndex(function(s) { return s.rules.release.masturbation === 1; })>>
+<<if $i != -1>>
+	<<set $masturbationAllowed = 1>>
+<</if>>
+
+<<include "Personal Assistant Appearance">>
+
+<<if $assistant.power > 0>>
+	<br><br>
+	Though _heA remains short of a true AI, the arcology's upgraded computer core allows _himA to use brute force to simulate sentient behavior quite well. _HeA is not truly self aware, but _heA is able to predict what a sentient being with a certain character might say or do in common situations. The increased power has other applications; for example, it has improved the accuracy of your estimates of economic activity in the Free City.
+<<else>>
+	_HeA is well short of a true AI, but with extensive access to information on past human behavior and the processing power to query that information quickly, _heA can often seem self aware by modeling _himselfA after others' past behavior.
+<</if>>
+<br><br>
+
+<<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Assistant)>>
+
+<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'upgrades')" id="tab upgrades">Computer Core Upgrades</button>
+<<if def $assistant.options>>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'settings')" id="tab settings">Settings</button>
+	<<if $assistant.personality != 0>>
+		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'appearance')" id="tab appearance">Appearance</button>
+	<</if>>
+<</if>>
+
+<div id="upgrades" class="tabcontent">
+<div class="content">
+	<<if $assistant.power == 0>>
+		The first upgrade needed is a switch to a holographic memory core to store the immense quantity of data $assistant.name gathers.
+		//Will cost <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
+		[[Install holographic memory core|Personal assistant options][cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), "capEx"), $assistant.power += 1, $PC.skill.engineering += 1, $PC.skill.hacking += 1]]
+	<<elseif $assistant.power == 1>>
+		The next upgrade needed is a liquid nitrogen cooling system to allow for extensive overclocking.
+		//Will cost <<print cashFormat(Math.trunc(35000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>> and will allow you to upgrade the smart piercings in $arcologies[0].name//
+		[[Install upgraded cooling system|Personal assistant options][cashX(forceNeg(Math.trunc(35000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), "capEx"), $assistant.power += 1, $PC.skill.engineering += 1, $PC.skill.hacking += 1]]
+	<<elseif $assistant.power == 2>>
+		The final upgrade needed is a transition to optical RAM.
+		//Will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
+		[[Install optical RAM|Personal assistant options][cashX(forceNeg(Math.trunc(50000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), "capEx"), $assistant.power += 1, $PC.skill.engineering += 1, $PC.skill.hacking += 1]]
+	<<else>>
+		The arcology's computer core is fully upgraded.
+	<</if>>
+</div>
+</div>
+
+<div id="settings" class="tabcontent">
+<div class="content">
+	<h3>Behavior:</h3>
+	<<if $assistant.personality == 0>>
+		Your assistant is using _hisA default settings, and is not behaving as though _heA has a libido. [["Instruct " + _himA + " to simulate a sex drive"|Personal assistant options][$assistant.personality = 1]]
+	<<else>>
+		Your assistant is simulating preferences and a sex drive. [["Revert " + _himA + " to normal settings"|Personal assistant options][$assistant.personality = 0, $assistant.appearance = "normal"]]
+	<</if>>
+
+	<<if $assistant.market>>
+		<h3>Business Assistant:</h3>
+		The arcology's upgraded computers support advanced business analysis.
+		<<if $assistant.appearance != "normal">>
+			These capabilities are represented by an avatar styled after $assistant.name's, with which _heA simulates a ''$assistant.market.relationship'' relationship.
+			<br>
+			<<if $assistant.market.relationship != "cute">>
+				[[Cute|Personal assistant options][$assistant.market.relationship = "cute"]]
+				<br>
+			<</if>>
+			<<if $assistant.market.relationship != "romantic">>
+				[[Romantic|Personal assistant options][$assistant.market.relationship = "romantic"]]
+				<br>
+			<</if>>
+			<<if $assistant.market.relationship != "nonconsensual">>
+				[[Nonconsensual|Personal assistant options][$assistant.market.relationship = "nonconsensual"]]
+				<br>
+			<</if>>
+			<<if $assistant.market.relationship != "incestuous">>
+				[[Incestuous|Personal assistant options][$assistant.market.relationship = "incestuous"]]
+				<br>
+			<</if>>
+		<<else>>
+			Although technically an expanded subroutine within the same app, $assistant.name uses a distinct icon to identify these alerts and improve your workflow.
+			<br>
+		<</if>>
+		<br>_HeA is <<set $assistant.market.limit = Math.clamp($assistant.market.limit, 10000, 10000000)>>
+		<<if $assistant.market.limit>>
+			''allowed'' to use excess liquid assets over <<print cashFormat($assistant.market.limit)>> to play the menial slave market. [[Disallow|Personal assistant options][$assistant.market.limit = 0]]
+			<br>&nbsp;&nbsp;&nbsp;&nbsp;
+			//Define custom cash limit://<<textbox "$assistant.market.limit" $assistant.market.limit "Personal assistant options">>
+			<br>
+			_HeA will be
+			<<if $assistant.market.aggressiveness>>
+				''aggressive'' about buying and selling. [[Be conservative|Personal assistant options][$assistant.market.aggressiveness = 0]]
+			<<else>>
+				''conservative'' about buying and selling. [[Be aggressive|Personal assistant options][$assistant.market.aggressiveness = 100]]
+			<</if>>
+		<<else>>
+			''not allowed'' to use excess liquid assets to play the menial slave market. [[Allow|Personal assistant options][$assistant.market.limit = 10000]]
+		<</if>>
+ <</if>>
+</div>
+</div>
+
+<div id="appearance" class="tabcontent">
+<div class="content">
+	_HeA is currently using the ''$assistant.appearance'' avatar, which <<set _seed = []>>
+	<<if $PAPublic == 1>>
+		<<switch $assistant.appearance>>
+		<<case "businesswoman">>
+			<<if $arcologies[0].FSSubjugationist != "unset">> <<set _seed.push($arcologies[0].FSSubjugationistRace + " subjugation")>> <</if>>
+			<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
+			<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
+			<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
+			<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
+			<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
+			<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
+			<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
+			<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+		<<case "goddess">>
+			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+			<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+			<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
+			<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
+			<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
+			<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
+			<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
+			<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+			<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
+			<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
+			<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
+			<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+		<<case "amazon">>
+			<<if $arcologies[0].FSSupremacist != "unset">> <<set _seed.push($arcologies[0].FSSupremacistRace + " supremacy")>> <</if>>
+			<<if $arcologies[0].FSSubjugationist != "unset">> <<set _seed.push($arcologies[0].FSSubjugationistRace + " subjugation")>> <</if>>
+			<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+			<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
+			<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
+			<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
+			<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
+			<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
+		<<case "schoolgirl">>
+			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+			<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+			<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
+			<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
+			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+			<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
+			<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
+			<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+		<<case "monstergirl">>
+			<<if $arcologies[0].FSSupremacist != "unset">> <<set _seed.push($arcologies[0].FSSupremacistRace + " supremacy")>> <</if>>
+			<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
+			<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
+			<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+			<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
+			<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
+			<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
+		<<case "shemale">>
+			<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
+			<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
+			<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+			<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
+			<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
+			<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
+			<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
+			<<if $arcologies[0].FSIntellectualDependency != "unset">> <<set _seed.push("intellectual dependency")>> <</if>>
+		<<case "hypergoddess">>
+			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+			<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
+			<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
+			<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
+			<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
+		<<case "loli">>
+			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+			<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+			<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+			<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
+			<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
+			<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+		<<case "preggololi">>
+			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+			<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
+			<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+			<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
+			<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
+			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+		<<case "fairy">>
+			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+			<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+		<<case "pregnant fairy">>
+			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+			<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+			<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
+			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+		<<case "angel">>
+			<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+			<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+			<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+			<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
+			<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
+			<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+		<<case "cherub">>
+			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+			<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+			<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
+			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+			<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+		<<case "incubus">>
+			<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+			<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
+			<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
+			<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+			<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
+			<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
+			<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
+			<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
+			<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
+			<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
+			<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
+			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+			<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
+			<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+			<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
+			<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
+			<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
+			<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
+			<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
+			<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
+		<<case "succubus">>
+			<<if $arcologies[0].FSSupremacist != "unset">> <<set _seed.push($arcologies[0].FSSupremacistRace + " supremacy")>> <</if>>
+			<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
+			<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+			<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
+			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+			<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
+			<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+			<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
+			<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+			<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
+			<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
+			<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
+			<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
+			<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
+			<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
+			<<if $arcologies[0].FSIntellectualDependency != "unset">> <<set _seed.push("intellectual dependency")>> <</if>>
+			<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
+			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+			<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
+			<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+			<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
+			<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
+			<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
+			<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
+			<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
+			<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
+		<<case "imp">>
+			<<if $arcologies[0].FSSubjugationist != "unset">> <<set _seed.push($arcologies[0].FSSubjugationistRace + " subjugation")>> <</if>>
+			<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
+			<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+			<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
+			<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+			<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
+			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+		<<case "witch">>
+			<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
+			<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+			<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
+			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+			<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+			<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
+			<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+			<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
+			<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
+			<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
+			<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
+			<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
+			<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
+			<<if $arcologies[0].FSIntellectualDependency != "unset">> <<set _seed.push("intellectual dependency")>> <</if>>
+			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+			<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+		<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+			<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
+		<</switch>>
+		<<if _seed.length > 0>>
+			<<set _desc = "">>
+			<<for _i = 0; _i < _seed.length; _i++>>
+				<<set _desc = (_desc + _seed[_i])>>
+				<<if (_i < _seed.length-2)>>
+					<<set _desc = (_desc + ", ")>>
+				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>>
+					<<set _desc = (_desc + ", and ")>>
+				<<elseif (_seed.length == 2) && (_i == 0)>>
+					<<set _desc = (_desc + " and ")>>
+				<</if>>
+			<</for>>
+			 bolsters _desc.
+		<</if>>
+	<<elseif $PAPublic == 0 || _seed.length == 0>>
+		has no impact on public opinion.
+	<</if>>
+	<br>
+
+	<<if $assistant.appearance != "normal">> [[Normal|Personal assistant options][$assistant.appearance = "normal"]]
+		<br>
+	<</if>>
+	<<if $assistant.appearance != "businesswoman">> [[Businesswoman|Personal assistant options][$assistant.appearance = "businesswoman"]]
+		<<if $PAPublic == 1>>
+			<<set _seed = []>>
+			<<if $arcologies[0].FSSubjugationist != "unset">> <<set _seed.push($arcologies[0].FSSubjugationistRace + " subjugation")>> <</if>>
+			<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
+			<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
+			<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
+			<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
+			<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
+			<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
+			<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
+			<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+			<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
+			<<if _seed.length > 0>>
+				<<set _desc = "">>
+				<<for _i = 0; _i < _seed.length; _i++>>
+					<<set _desc = (_desc + _seed[_i])>>
+					<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+					<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+					<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+					<</if>>
+				<</for>>
+				A good emblem for _desc
+			<</if>>
+		<</if>>
+		<br>
+	<</if>>
+	<<if $seePreg != 0>>
+		<<if $assistant.appearance != "goddess">> [[Goddess|Personal assistant options][$assistant.appearance = "goddess"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+				<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+				<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+				<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
+				<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
+				<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+				<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
+				<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
+				<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+				<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
+				<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
+				<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+	<</if>>
+	<<if $assistant.appearance != "amazon">> [[Amazon|Personal assistant options][$assistant.appearance = "amazon"]]
+		<<if $PAPublic == 1>>
+			<<set _seed = []>>
+			<<if $arcologies[0].FSSupremacist != "unset">> <<set _seed.push($arcologies[0].FSSupremacistRace + " supremacy")>> <</if>>
+			<<if $arcologies[0].FSSubjugationist != "unset">> <<set _seed.push($arcologies[0].FSSubjugationistRace + " subjugation")>> <</if>>
+			<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+			<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
+			<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
+			<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
+			<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
+			<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
+			<<if _seed.length > 0>>
+				<<set _desc = "">>
+				<<for _i = 0; _i < _seed.length; _i++>>
+					<<set _desc = (_desc + _seed[_i])>>
+					<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+					<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+					<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+					<</if>>
+				<</for>>
+				A good emblem for _desc
+			<</if>>
+		<</if>>
+		<br>
+	<</if>>
+	<<if $assistant.appearance != "schoolgirl">> [[Schoolgirl|Personal assistant options][$assistant.appearance = "schoolgirl"]]
+		<<if $PAPublic == 1>>
+			<<set _seed = []>>
+			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+			<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+			<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
+			<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
+			<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
+			<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+			<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
+			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+			<<if _seed.length > 0>>
+				<<set _desc = "">>
+				<<for _i = 0; _i < _seed.length; _i++>>
+					<<set _desc = (_desc + _seed[_i])>>
+					<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+					<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+					<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+					<</if>>
+				<</for>>
+				A good emblem for _desc
+			<</if>>
+		<</if>>
+		<br>
+	<</if>>
+	<<if $seeDicks != 0>>
+		<<if $assistant.appearance != "monstergirl">> [[Monstergirl|Personal assistant options][$assistant.appearance = "monstergirl"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if $arcologies[0].FSSupremacist != "unset">> <<set _seed.push($arcologies[0].FSSupremacistRace + " supremacy")>> <</if>>
+				<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
+				<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
+				<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+				<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
+				<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
+				<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+		<<if $assistant.appearance != "shemale">> [[Shemale|Personal assistant options][$assistant.appearance = "shemale"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
+				<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
+				<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+				<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
+				<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
+				<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
+				<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
+				<<if $arcologies[0].FSIntellectualDependency != "unset">> <<set _seed.push("intellectual dependency")>> <</if>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+	<</if>>
+	<<if $seePreg != 0>>
+		<<if $assistant.appearance != "hypergoddess" && $seeHyperPreg == 1>> [[Hyper Goddess|Personal assistant options][$assistant.appearance = "hypergoddess"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+				<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+				<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
+				<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
+				<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
+				<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+	<</if>>
+	<<if $assistant.appearance != "loli" && $minimumSlaveAge < 13>> [[Loli|Personal assistant options][$assistant.appearance = "loli"]]
+		<<if $PAPublic == 1>>
+			<<set _seed = []>>
+			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+			<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+			<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+			<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
+			<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
+			<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+			<<if _seed.length > 0>>
+				<<set _desc = "">>
+				<<for _i = 0; _i < _seed.length; _i++>>
+					<<set _desc = (_desc + _seed[_i])>>
+					<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+					<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+					<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+					<</if>>
+				<</for>>
+				A good emblem for _desc
+			<</if>>
+		<</if>>
+		<br>
+	<</if>>
+	<<if $seePreg != 0>>
+		<<if $assistant.appearance != "preggololi" && $fertilityAge < 13 && $minimumSlaveAge < 13>> [[Preggololi|Personal assistant options][$assistant.appearance = "preggololi"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+				<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+				<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
+				<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+				<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
+				<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
+				<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+	<</if>>
+	<<if $assistant.appearance != "fairy">> [[Fairy|Personal assistant options][$assistant.appearance = "fairy"]]
+		<<if $PAPublic == 1>>
+			<<set _seed = []>>
+			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+			<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+			<<if _seed.length > 0>>
+				<<set _desc = "">>
+				<<for _i = 0; _i < _seed.length; _i++>>
+					<<set _desc = (_desc + _seed[_i])>>
+					<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+					<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+					<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+					<</if>>
+				<</for>>
+				A good emblem for _desc
+			<</if>>
+		<</if>>
+		<br>
+	<</if>>
+	<<if $seePreg != 0>>
+		<<if $assistant.appearance != "pregnant fairy">> [[Pregnant Fairy|Personal assistant options][$assistant.appearance = "pregnant fairy"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+				<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+				<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+				<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
+				<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+	<</if>>
+	<<if def $assistant.Extra1>>
+		<<if $assistant.appearance != "slimegirl">> [[Slime Girl|Personal assistant options][$assistant.appearance = "slimegirl"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+		<<if $assistant.appearance != "cowgirl">> [[Cow Girl|Personal assistant options][$assistant.appearance = "cowgirl"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+		<<if $assistant.appearance != "harpygirl">> [[Harpy Girl|Personal assistant options][$assistant.appearance = "harpygirl"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+		<<if $assistant.appearance != "kitsunegirl">> [[Kitsune|Personal assistant options][$assistant.appearance = "kitsunegirl"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+		<<if $assistant.appearance != "lamiagirl">> [[Lamia|Personal assistant options][$assistant.appearance = "lamiagirl"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+		<<if $assistant.appearance != "spidergirl">> [[Spider Girl|Personal assistant options][$assistant.appearance = "spidergirl"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+	<</if>>
+	<<if def $assistant.Extra2>>
+		<<if $assistant.appearance != "angel">> [[Angel|Personal assistant options][$assistant.appearance = "angel"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+				<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+				<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+				<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+				<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+				<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
+				<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+				<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+		<<if $assistant.appearance != "cherub">> [[Cherub|Personal assistant options][$assistant.appearance = "cherub"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+				<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
+				<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+				<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
+				<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+				<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+		<<if $seeDicks != 0>>
+			<<if $assistant.appearance != "incubus">> [[Incubus|Personal assistant options][$assistant.appearance = "incubus"]]
+				<<if $PAPublic == 1>>
+					<<set _seed = []>>
+					<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+					<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
+					<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
+					<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+					<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
+					<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
+					<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
+					<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
+					<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
+					<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
+					<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+					<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
+					<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
+					<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
+					<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
+					<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
+					<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
+					<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
+					<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+					<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
+					<<if _seed.length > 0>>
+						<<set _desc = "">>
+						<<for _i = 0; _i < _seed.length; _i++>>
+							<<set _desc = (_desc + _seed[_i])>>
+							<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+							<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+							<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+							<</if>>
+						<</for>>
+						A good emblem for _desc
+					<</if>>
+				<</if>>
+				<br>
+			<</if>>
+		<</if>>
+		<<if $assistant.appearance != "succubus">> [[Succubus|Personal assistant options][$assistant.appearance = "succubus"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if $arcologies[0].FSSupremacist != "unset">> <<set _seed.push($arcologies[0].FSSupremacistRace + " supremacy")>> <</if>>
+				<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
+				<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+				<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
+				<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+				<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
+				<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+				<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
+				<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+				<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
+				<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
+				<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
+				<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
+				<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
+				<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
+				<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+				<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
+				<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
+				<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
+				<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
+				<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
+				<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
+				<<if $arcologies[0].FSIntellectualDependency != "unset">> <<set _seed.push("intellectual dependency")>> <</if>>
+				<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
+				<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+				<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+		<<if $assistant.appearance != "imp">> [[Imp|Personal assistant options][$assistant.appearance = "imp"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if $arcologies[0].FSSubjugationist != "unset">> <<set _seed.push($arcologies[0].FSSubjugationistRace + " subjugation")>> <</if>>
+				<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
+				<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+				<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
+				<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
+				<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+				<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+		<<if $assistant.appearance != "witch">> [[Bonus: Witch|Personal assistant options][$assistant.appearance = "witch"]]
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
+				<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
+				<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
+				<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
+				<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
+				<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
+				<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
+				<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
+				<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
+				<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
+				<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
+				<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
+				<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
+				<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
+				<<if $arcologies[0].FSIntellectualDependency != "unset">> <<set _seed.push("intellectual dependency")>> <</if>>
+				<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+		<<if $assistant.appearance != "ERROR_1606_APPEARANCE_FILE_CORRUPT">> @@.link;WARNING! File c@@[[o|Personal assistant options][$assistant.appearance = "ERROR_1606_APPEARANCE_FILE_CORRUPT"]]@@.link;rrupt!@@
+			<<if $PAPublic == 1>>
+				<<set _seed = []>>
+				<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
+				<<if _seed.length > 0>>
+					<<set _desc = "">>
+					<<for _i = 0; _i < _seed.length; _i++>>
+						<<set _desc = (_desc + _seed[_i])>>
+						<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
+						<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
+						<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
+						<</if>>
+					<</for>>
+					A good emblem for _desc
+				<</if>>
+			<</if>>
+			<br>
+		<</if>>
+	<</if>>
+
+ <h3>Downloadable Content (DLC):</h3>
+	/*
+ <<if ndef $assistant.Extra1>>
+		[[Purchase a set of monstergirl appearances|Assistant Events][$event = "", cashX(forceNeg(Math.trunc(10000*$upgradeMultiplier)), "capEx"), $assistant.Extra1 = 1]]
+		//Costs <<print cashFormat(Math.trunc(6000*$upgradeMultiplier))>>//
+ <<else>>
+		You have downloaded a set of monstergirl appearances for your avatar.
+ <</if>>
+ */
+ <<if ndef $assistant.Extra2>>
+		<<set _text = $PC.skill.hacking < 75 ? "Purchase" : "Acquire">>
+		<<set _text += " a set of heaven and hell themed appearances">>
+		<<set _price = 10000 * $upgradeMultiplierArcology>>
+
+		<<link _text "Personal assistant options">>
+			<<set $assistant.Extra2 = 1>>
+			<<if $PC.skill.hacking < 75>>
+				<<run cashX(Math.trunc(-price), "capEx")>>
+			<</if>>
+			<<goto "Assistant Appearance Pack Two">>
+		<</link>> //<<if $PC.skill.hacking < 75>> Costs <<= num(_price)>> <<else>> Unencrypted files, ripe for the taking<</if>>//
+ <<else>>
+		You have downloaded a set of heavenly and hellish appearances for your avatar.
+ <</if>>
+
+ /* Choose _hisA FS appearance */
+ <<if def ($assistant.fsOptions) && $assistant.appearance != "normal">>
+		<h3>Society-specific setting:</h3>
+		_HeA can further refine _hisA avatar to match the arcology's social profile<<if $assistant.fsAppearance != "default">>; _hisA current variation shows ''$assistant.fsAppearance'' touches.<<else>>, though no details stand out right now.<</if>>
+		<br>
+		<<if $assistant.fsAppearance != "default">>
+			[[Default|Personal assistant options][$assistant.fsAppearance = "default"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "gender radicalist" && $arcologies[0].FSGenderRadicalistDecoration > 20>>
+			[[Gender Radicalist|Personal assistant options][$assistant.fsAppearance = "gender radicalist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "gender fundamentalist" && $arcologies[0].FSGenderFundamentalistDecoration > 20>>
+			[[Gender Fundamentalist|Personal assistant options][$assistant.fsAppearance = "gender fundamentalist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "paternalist" && $arcologies[0].FSPaternalistDecoration > 20>>
+			[[Paternalist|Personal assistant options][$assistant.fsAppearance = "paternalist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "degradationist" && $arcologies[0].FSDegradationistDecoration > 20>>
+			[[Degradationist|Personal assistant options][$assistant.fsAppearance = "degradationist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "repopulation focus" && $arcologies[0].FSRepopulationFocusDecoration > 20>>
+			[[Repopulation Focus|Personal assistant options][$assistant.fsAppearance = "repopulation focus"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "eugenics" && $arcologies[0].FSRestartDecoration > 20>>
+			[[Eugenics|Personal assistant options][$assistant.fsAppearance = "eugenics"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "intellectual dependency" && $arcologies[0].FSIntellectualDependencyDecoration > 20>>
+			[[Intellectual Dependency|Personal assistant options][$assistant.fsAppearance = "intellectual dependency"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "slave professionalism" && $arcologies[0].FSSlaveProfessionalismDecoration > 20>>
+			[[Slave Professionalism|Personal assistant options][$assistant.fsAppearance = "slave professionalism"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "body purist" && $arcologies[0].FSBodyPuristDecoration > 20>>
+			[[Body Purist|Personal assistant options][$assistant.fsAppearance = "body purist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "transformation fetishist" && $arcologies[0].FSTransformationFetishistDecoration > 20>>
+			[[Transformation Fetishist|Personal assistant options][$assistant.fsAppearance = "transformation fetishist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "youth preferentialist" && $arcologies[0].FSYouthPreferentialistDecoration > 20>>
+			[[Youth Preferentialist|Personal assistant options][$assistant.fsAppearance = "youth preferentialist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "maturity preferentialist" && $arcologies[0].FSMaturityPreferentialistDecoration > 20>>
+			[[Maturity Preferentialist|Personal assistant options][$assistant.fsAppearance = "maturity preferentialist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "slimness enthusiast" && $arcologies[0].FSSlimnessEnthusiastDecoration > 20>>
+			[[Slimness Enthusiast|Personal assistant options][$assistant.fsAppearance = "slimness enthusiast"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "petite admiration" && $arcologies[0].FSPetiteAdmirationDecoration > 20>>
+			[[Petite Admiration|Personal assistant options][$assistant.fsAppearance = "petite admiration"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "statuesque glorification" && $arcologies[0].FSStatuesqueGlorificationDecoration > 20>>
+			[[Statuesque Glorification|Personal assistant options][$assistant.fsAppearance = "statuesque glorification"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "asset expansionist" && $arcologies[0].FSAssetExpansionistDecoration > 20>>
+			[[Asset Expansionist|Personal assistant options][$assistant.fsAppearance = "asset expansionist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "pastoralist" && $arcologies[0].FSPastoralistDecoration > 20>>
+			[[Pastoralist|Personal assistant options][$assistant.fsAppearance = "pastoralist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "physical idealist" && $arcologies[0].FSPhysicalIdealistDecoration > 20>>
+			[[Physical Idealist|Personal assistant options][$assistant.fsAppearance = "physical idealist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "hedonistic decadence" && $arcologies[0].FSHedonisticDecadenceDecoration > 20>>
+			[[Hedonistic Decadence|Personal assistant options][$assistant.fsAppearance = "hedonistic decadence"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "supremacist" && $arcologies[0].FSSupremacistDecoration > 20>>
+			[[Supremacist|Personal assistant options][$assistant.fsAppearance = "supremacist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "subjugationist" && $arcologies[0].FSSubjugationistDecoration > 20>>
+			[[Subjugationist|Personal assistant options][$assistant.fsAppearance = "subjugationist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "chattel religionist" && $arcologies[0].FSChattelReligionistDecoration > 20>>
+			[[Chattel Religionist|Personal assistant options][$assistant.fsAppearance = "chattel religionist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "roman revivalist" && $arcologies[0].FSRomanRevivalistDecoration > 20>>
+			[[Roman Revivalist|Personal assistant options][$assistant.fsAppearance = "roman revivalist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "aztec revivalist" && $arcologies[0].FSAztecRevivalistDecoration > 20>>
+			[[Aztec Revivalist|Personal assistant options][$assistant.fsAppearance = "aztec revivalist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "egyptian revivalist" && $arcologies[0].FSEgyptianRevivalistDecoration > 20>>
+			[[Egyptian Revivalist|Personal assistant options][$assistant.fsAppearance = "egyptian revivalist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "edo revivalist" && $arcologies[0].FSEdoRevivalistDecoration > 20>>
+			[[Edo Revivalist|Personal assistant options][$assistant.fsAppearance = "edo revivalist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "arabian revivalist" && $arcologies[0].FSArabianRevivalistDecoration > 20>>
+			[[Arabian Revivalist|Personal assistant options][$assistant.fsAppearance = "arabian revivalist"]]
+			<br>
+		<</if>>
+		<<if $assistant.fsAppearance != "chinese revivalist" && $arcologies[0].FSChineseRevivalistDecoration > 20>>
+			[[Chinese Revivalist|Personal assistant options][$assistant.fsAppearance = "chinese revivalist"]]
+			<br>
+		<</if>>
+ <</if>>
+</div>
+</div>
\ No newline at end of file
diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
index 8c0304ba01c4fe3a061d8c6bfab961df7071ba85..011cd76151d78adeff3386db28c836587788c0e7 100644
--- a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
+++ b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterOrder.tw
@@ -4,7 +4,7 @@
 
 <<setAssistantPronouns>>
 
-<<if $JFCOrder == 0>>You work up a new slave order for posting where slave merchants can work to fulfill it.<</if>> <<if $JFCOrder == 1>>You review your posted slave order for a ''$Role''.<</if>> <<if $assistant == 1>>As you work, $assistantName makes lewd comments about what _heA looks forward to doing to this new slave.<</if>>
+<<if $JFCOrder == 0>>You work up a new slave order for posting where slave merchants can work to fulfill it.<</if>> <<if $JFCOrder == 1>>You review your posted slave order for a ''$Role''.<</if>> <<if $assistant.personality == 1>>As you work, $assistant.name makes lewd comments about what _heA looks forward to doing to this new slave.<</if>>
 
 <<if $JFCOrder == 0>>
 	<span id="JobType">
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index cfa40544c8af74a3ed23983cd0d0acce7df7e2df..0ea5767854e176bd1ab257d0ef26dd5979febca0 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -290,46 +290,46 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 	<<set _reactionType = 3>>
 <</if>>
 <br><br>
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> prompts you for wedding
-<<if $assistant == 0>>
+<<= capFirstChar($assistant.name)>> prompts you for wedding
+<<if $assistant.personality == 0>>
 	instructions.
 <<else>>
 	instructions, _hisA
-	<<if $assistantAppearance == "monstergirl">>
+	<<if $assistant.appearance == "monstergirl">>
 		monster<<= _girlA>> avatar appearing in a surprisingly conventional surplice that covers _himA up decently. All except for _hisA horns, which protrude from under the headpiece.
-	<<elseif $assistantAppearance == "shemale">>
+	<<elseif $assistant.appearance == "shemale">>
 		shemale avatar appears in a collar patterned to look like a minister's, and absolutely nothing else, stroking _himselfA with anticipation.
-	<<elseif $assistantAppearance == "amazon">>
+	<<elseif $assistant.appearance == "amazon">>
 		amazon avatar wearing a tribal shaman's cape and carrying a medicine stick adorned with all sorts of little charms and baubles.
-	<<elseif $assistantAppearance == "businesswoman">>
+	<<elseif $assistant.appearance == "businesswoman">>
 		business<<= _womanA>> avatar looking rather severe in a minister's collar.
-	<<elseif $assistantAppearance == "fairy">>
+	<<elseif $assistant.appearance == "fairy">>
 		fairy avatar looking incredibly silly, dressed in an oversized, disheveled priest's robes and looking rather smug about it.
-	<<elseif $assistantAppearance == "pregnant fairy">>
+	<<elseif $assistant.appearance == "pregnant fairy">>
 		fairy avatar looking incredibly silly, dressed in an oversized, disheveled priest's robes stretched tight by _hisA pregnant belly and looking rather smug about it.
-	<<elseif $assistantAppearance == "goddess">>
+	<<elseif $assistant.appearance == "goddess">>
 		goddess avatar completely unchanged, since _heA considers _hisA usual form perfectly appropriate for a marriage.
-	<<elseif $assistantAppearance == "hypergoddess">>
+	<<elseif $assistant.appearance == "hypergoddess">>
 		goddess avatar completely unchanged, since _heA considers _hisA usual form perfectly appropriate for a marriage.
-	<<elseif $assistantAppearance == "loli">>
+	<<elseif $assistant.appearance == "loli">>
 		_loliA avatar looking surprisingly mature in a minister's collar. Though, _heA would rather be the flower _girlA in this wedding.
-	<<elseif $assistantAppearance == "preggololi">>
+	<<elseif $assistant.appearance == "preggololi">>
 		_loliA avatar looking surprisingly mature in a minister's collar. Though, _heA would rather be the flower _girlA in this wedding.
-	<<elseif $assistantAppearance == "schoolgirl">>
+	<<elseif $assistant.appearance == "schoolgirl">>
 		school<<= _girlA>> avatar looking willfully absurd in a minister's collar and _hisA usual short plaid skirt.
-	<<elseif $assistantAppearance == "angel">>
+	<<elseif $assistant.appearance == "angel">>
 		angelic avatar looking, well, angelic in _hisA usual garb with an added minister's collar.
-	<<elseif $assistantAppearance == "cherub">>
+	<<elseif $assistant.appearance == "cherub">>
 		angelic avatar looking absurd in _hisA oversized robe, complete with wing-holes, and minister's collar.
-	<<elseif $assistantAppearance == "incubus">>
+	<<elseif $assistant.appearance == "incubus">>
 		demonic avatar completely unchanged, since _heA considers _hisA usual form perfectly appropriate for a marriage, though _heA has made sure to be fully erect for the wedding.
-	<<elseif $assistantAppearance == "succubus">>
+	<<elseif $assistant.appearance == "succubus">>
 		demonic avatar wearing nothing but a minister's collar. _HeA has brought several marital aids along with _himA to tease the bride and groom with.
-	<<elseif $assistantAppearance == "imp">>
+	<<elseif $assistant.appearance == "imp">>
 		demonic avatar looking absurd in _hisA oversized robe, complete with wing-holes, and minister's collar.
-	<<elseif $assistantAppearance == "witch">>
+	<<elseif $assistant.appearance == "witch">>
 		witchy avatar looking rather formal in a fine robe and minister's collar.
-	<<elseif $assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+	<<elseif $assistant.appearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
 		twitching avatar completely unchanged, sans a bulbous ring of flesh around _hisA neck that sort of resembles a minister's collar.
 	<<else>>
 		symbol appearing in white.
@@ -340,43 +340,39 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 <span id="result">
 <br><<link "Just redesignate $him as your slave $wife">>
 	<<replace "#result">>
-	You order $assistantName to simply redesignate $activeSlave.slaveName as your slave $wife.
-	<<if $assistant == 0>>
+	You order $assistant.name to simply redesignate $activeSlave.slaveName as your slave $wife.
+	<<if $assistant.personality == 0>>
 		"Slave redesignated," it responds immediately. The thing is done.
 	<<else>>
-		<<if $assistantAppearance == "monstergirl">>
+		<<if $assistant.appearance == "monstergirl">>
 			_HisA avatar snaps _hisA fingers and shrugs off _hisA surplice, revealing _hisA tentacle hair, pale skin, and cocks once more.
-		<<elseif $assistantAppearance == "shemale">>
+		<<elseif $assistant.appearance == "shemale">>
 			_HisA avatar snaps _hisA fingers and starts to masturbate more energetically.
-		<<elseif $assistantAppearance == "amazon">>
+		<<elseif $assistant.appearance == "amazon">>
 			_HisA avatar gives _hisA medicine stick a shake.
-		<<elseif $assistantAppearance == "businesswoman">>
+		<<elseif $assistant.appearance == "businesswoman">>
 			_HisA avatar snaps _hisA fingers.
-		<<elseif ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy")>>
+		<<elseif ($assistant.appearance.includes("fairy")>>
 			_HisA avatar claps _hisA hands twice, looking a bit disappointed at the lack of celebration.
-		<<elseif $assistantAppearance == "goddess">>
+		<<elseif $assistant.appearance.includes("goddess")>>
 			_HisA avatar makes a complex hand gesture, looking beatific.
-		<<elseif $assistantAppearance == "hypergoddess">>
-			_HisA avatar makes a complex hand gesture, looking beatific.
-		<<elseif $assistantAppearance == "loli">>
-			_HisA avatar claps _hisA hands together.
-		<<elseif $assistantAppearance == "preggololi">>
+		<<elseif $assistant.appearance.includes("loli")>>
 			_HisA avatar claps _hisA hands together.
-		<<elseif $assistantAppearance == "schoolgirl">>
+		<<elseif $assistant.appearance == "schoolgirl">>
 			_HisA avatar snaps _hisA fingers and gives a little twirl.
-		<<elseif $assistantAppearance == "angel">>
+		<<elseif $assistant.appearance == "angel">>
 			_HisA avatar spreads _hisA wings and arms and emits a flash of light.
-		<<elseif $assistantAppearance == "cherub">>
+		<<elseif $assistant.appearance == "cherub">>
 			_HisA avatar claps _hisA hands together, emitting a burst of light.
-		<<elseif $assistantAppearance == "incubus">>
+		<<elseif $assistant.appearance == "incubus">>
 			_HisA avatar flicks the tip of _hisA penis and blows _hisA load towards the both of you.
-		<<elseif $assistantAppearance == "succubus">>
+		<<elseif $assistant.appearance == "succubus">>
 			_HisA avatar starts to masturbate furiously and orgasms lewdly.
-		<<elseif $assistantAppearance == "imp">>
+		<<elseif $assistant.appearance == "imp">>
 			_HisA avatar claps _hisA hands together, emitting a burst of darkness.
-		<<elseif $assistantAppearance == "witch">>
+		<<elseif $assistant.appearance == "witch">>
 			_HisA avatar pulls out _hisA spell book and attempts a spell to bind you two; _heA manages to conjure a large ring around _himselfA, pinning _hisA arms to _hisA sides.
-		<<elseif $assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+		<<elseif $assistant.appearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
 			_HisA avatar splits open to reveal a number of tentacles and wraps them around each other.
 		<<else>>
 			_HisA symbol flashes.
@@ -439,7 +435,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 		<<link "Give $him your surname">>
 			<<replace "#surnaming">>
 				<<set $activeSlave.slaveSurname = $PC.slaveSurname>>
-				You also command $assistantName to rename your new slave $wife $activeSlave.slaveName $activeSlave.slaveSurname.
+				You also command $assistant.name to rename your new slave $wife $activeSlave.slaveName $activeSlave.slaveSurname.
 				<<if $activeSlave.fetish == "mindbroken">>
 					The new Mrs. $activeSlave.slaveSurname <<if canHear($activeSlave)>>hears<<else>>understands<</if>> this, of course, and shows no reaction. Like many things, names mean nothing to $him now.
 				<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
@@ -548,54 +544,54 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 			$His lacy g-string is starting to look a bit moist in front.
 		<</if>>
 	<</if>>
-	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> marries $him to you in a brief ceremony adapted for slaves and their owners. You place a
+	<<= capFirstChar($assistant.name)>> marries $him to you in a brief ceremony adapted for slaves and their owners. You place a
 	<<if hasAnyArms($activeSlave)>>
 		simple steel ring on $his finger;
 	<<else>>
 		chain with a simple steel ring around $his neck;
 	<</if>>
 	$he does not reciprocate, since this marriage does not bind you.
-	<<if $assistant == 0>>
-		"The marriage protocol now requires you to <<if $PC.dick != 0>>fellate<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>," $assistantName orders $him, and $he <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>.
+	<<if $assistant.personality == 0>>
+		"The marriage protocol now requires you to <<if $PC.dick != 0>>fellate<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>," $assistant.name orders $him, and $he <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>.
 	<<else>>
-		<<if $assistantAppearance == "monstergirl">>
-			"To consecrate the ceremony," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar begins to play with _hisA dicks.
-		<<elseif $assistantAppearance == "shemale">>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar starts to jill off.
-		<<elseif $assistantAppearance == "amazon">>
-			"To complete this ritual," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar starts to jill off.
-		<<elseif $assistantAppearance == "businesswoman">>
-			"To consecrate the marriage," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>fellate<<else>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar sneaks a hand down _hisA suit skirt, blushing furiously.
-		<<elseif $assistantAppearance == "fairy">>
-			"To seal the deal," $assistantName concludes, "$activeSlave.slaveName, you gotta drink the <<if $PC.title == 1>>groom's <<else>>bride's <</if>><<if $PC.dick != 0>>semen<<if $PC.vagina != -1>> and pussy juices<</if>><<else>>pussy juices<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar spreads _hisA legs while still hovering in the air and masturbates eagerly through _hisA half-worn robes.
-		<<elseif $assistantAppearance == "pregnant fairy">>
-			"To seal the deal," $assistantName concludes, "$activeSlave.slaveName, you gotta drink the <<if $PC.title == 1>>groom's <<else>>bride's <</if>><<if $PC.dick != 0>>semen<<if $PC.vagina != -1>> and pussy juices<</if>><<else>>pussy juices<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's pregnant avatar curls while still hovering in the air and masturbates eagerly around _hisA large belly.
-		<<elseif $assistantAppearance == "goddess">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you must now <<if $PC.dick != 0>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s seed<<else>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s female juices<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar looks on approvingly, cradling _hisA perpetual pregnancy.
-		<<elseif $assistantAppearance == "hypergoddess">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you must now <<if $PC.dick != 0>>drink the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s seed<<else>>drink the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s female juices<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar looks on approvingly, cradling _hisA massive perpetual pregnancy.
-		<<elseif $assistantAppearance == "loli">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina != -1>>and lick _hisP cunny.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunny<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar sneaks a hand down _hisA dress, blushing furiously.
-		<<elseif $assistantAppearance == "preggololi">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s lovely cock<<if $PC.vagina != -1>>and eat out _hisP cunt.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunt<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar attempts to sneak a hand down _hisA dress, but is thwarted by _hisA belly. _HeA instead openly rubs _hisA crotch through the front of _hisA dress, blushing furiously.
-		<<elseif $assistantAppearance == "schoolgirl">>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, the rules say you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar starts to jill off.
-		<<elseif $assistantAppearance == "angel">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you must now join <<= PlayerName()>> in their bedroom and consummate this marriage." The slave <<if _reactionType == 0>>stares blankly<<else>>looks confused<</if>>. "After the wedding ends, would be the time." $assistantName says, covering _hisA face in embarrassment at the thought.
-		<<elseif $assistantAppearance == "cherub">>
-			"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina != -1>>and lick _hisP pussy,<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s pussy<</if>>, in the privacy of <<= PlayerName()>>'s bedroom, of course." $assistantName hides _hisA face in _hisA hands at the thought.
-		<<elseif $assistantAppearance == "incubus">>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Enjoying the sight, $assistantName's avatar begins to furiously stroke its shaft.
-		<<elseif $assistantAppearance == "succubus">>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar pulls out a large dildo and begins ramming it into _hisA own pussy.
-		<<elseif $assistantAppearance == "imp">>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar hikes _hisA robe and vigorously rubs _hisA pussy.
-		<<elseif $assistantAppearance == "witch">>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar begins to fidget at the sight, having summoned a vibrator beforehand and accidentally linked it to your pleasure.
-		<<elseif $assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar begins to swell, drawing all its gained mass to its midsection. Its gravid middles splits vertically, allowing a new mass of flesh to fall to the floor, which quickly grows and reshapes itself into a spitting image of yourself. Meanwhile, the original twists into an image of $activeSlave.slaveName. $assistantName's two avatars begin copying you and $activeSlave.slaveName's actions perfectly.
+		<<if $assistant.appearance == "monstergirl">>
+			"To consecrate the ceremony," $assistant.name concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistant.name's avatar begins to play with _hisA dicks.
+		<<elseif $assistant.appearance == "shemale">>
+			"To get this marriage started," $assistant.name concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistant.name's avatar starts to jill off.
+		<<elseif $assistant.appearance == "amazon">>
+			"To complete this ritual," $assistant.name concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistant.name's avatar starts to jill off.
+		<<elseif $assistant.appearance == "businesswoman">>
+			"To consecrate the marriage," $assistant.name concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>fellate<<else>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistant.name's avatar sneaks a hand down _hisA suit skirt, blushing furiously.
+		<<elseif $assistant.appearance == "fairy">>
+			"To seal the deal," $assistant.name concludes, "$activeSlave.slaveName, you gotta drink the <<if $PC.title == 1>>groom's <<else>>bride's <</if>><<if $PC.dick != 0>>semen<<if $PC.vagina != -1>> and pussy juices<</if>><<else>>pussy juices<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistant.name's avatar spreads _hisA legs while still hovering in the air and masturbates eagerly through _hisA half-worn robes.
+		<<elseif $assistant.appearance == "pregnant fairy">>
+			"To seal the deal," $assistant.name concludes, "$activeSlave.slaveName, you gotta drink the <<if $PC.title == 1>>groom's <<else>>bride's <</if>><<if $PC.dick != 0>>semen<<if $PC.vagina != -1>> and pussy juices<</if>><<else>>pussy juices<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistant.name's pregnant avatar curls while still hovering in the air and masturbates eagerly around _hisA large belly.
+		<<elseif $assistant.appearance == "goddess">>
+			"To consummate the marriage," $assistant.name concludes, "$activeSlave.slaveName, you must now <<if $PC.dick != 0>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s seed<<else>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s female juices<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistant.name's avatar looks on approvingly, cradling _hisA perpetual pregnancy.
+		<<elseif $assistant.appearance == "hypergoddess">>
+			"To consummate the marriage," $assistant.name concludes, "$activeSlave.slaveName, you must now <<if $PC.dick != 0>>drink the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s seed<<else>>drink the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s female juices<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistant.name's avatar looks on approvingly, cradling _hisA massive perpetual pregnancy.
+		<<elseif $assistant.appearance == "loli">>
+			"To consummate the marriage," $assistant.name concludes, "$activeSlave.slaveName, you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina != -1>>and lick _hisP cunny.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunny<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistant.name's avatar sneaks a hand down _hisA dress, blushing furiously.
+		<<elseif $assistant.appearance == "preggololi">>
+			"To consummate the marriage," $assistant.name concludes, "$activeSlave.slaveName, you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s lovely cock<<if $PC.vagina != -1>>and eat out _hisP cunt.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunt<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistant.name's avatar attempts to sneak a hand down _hisA dress, but is thwarted by _hisA belly. _HeA instead openly rubs _hisA crotch through the front of _hisA dress, blushing furiously.
+		<<elseif $assistant.appearance == "schoolgirl">>
+			"To get this marriage started," $assistant.name concludes, "$activeSlave.slaveName, the rules say you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistant.name's avatar starts to jill off.
+		<<elseif $assistant.appearance == "angel">>
+			"To consummate the marriage," $assistant.name concludes, "$activeSlave.slaveName, you must now join <<= PlayerName()>> in their bedroom and consummate this marriage." The slave <<if _reactionType == 0>>stares blankly<<else>>looks confused<</if>>. "After the wedding ends, would be the time." $assistant.name says, covering _hisA face in embarrassment at the thought.
+		<<elseif $assistant.appearance == "cherub">>
+			"To consummate the marriage," $assistant.name concludes, "$activeSlave.slaveName, you should <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina != -1>>and lick _hisP pussy,<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s pussy<</if>>, in the privacy of <<= PlayerName()>>'s bedroom, of course." $assistant.name hides _hisA face in _hisA hands at the thought.
+		<<elseif $assistant.appearance == "incubus">>
+			"To get this marriage started," $assistant.name concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Enjoying the sight, $assistant.name's avatar begins to furiously stroke its shaft.
+		<<elseif $assistant.appearance == "succubus">>
+			"To get this marriage started," $assistant.name concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistant.name's avatar pulls out a large dildo and begins ramming it into _hisA own pussy.
+		<<elseif $assistant.appearance == "imp">>
+			"To get this marriage started," $assistant.name concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistant.name's avatar hikes _hisA robe and vigorously rubs _hisA pussy.
+		<<elseif $assistant.appearance == "witch">>
+			"To get this marriage started," $assistant.name concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistant.name's avatar begins to fidget at the sight, having summoned a vibrator beforehand and accidentally linked it to your pleasure.
+		<<elseif $assistant.appearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+			"To get this marriage started," $assistant.name concludes, "$activeSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistant.name's avatar begins to swell, drawing all its gained mass to its midsection. Its gravid middles splits vertically, allowing a new mass of flesh to fall to the floor, which quickly grows and reshapes itself into a spitting image of yourself. Meanwhile, the original twists into an image of $activeSlave.slaveName. $assistant.name's two avatars begin copying you and $activeSlave.slaveName's actions perfectly.
 		<<else>>
-			"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, the rules say you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. With only a symbol to express _hisA approval, $assistantName is forced to content _himselfA with spinning the symbol and making it glow in time with your new slave $wife's efforts.
+			"To get this marriage started," $assistant.name concludes, "$activeSlave.slaveName, the rules say you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. With only a symbol to express _hisA approval, $assistant.name is forced to content _himselfA with spinning the symbol and making it glow in time with your new slave $wife's efforts.
 		<</if>>
 		"Done," _heA says when you climax. "Enjoy your
 		<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
@@ -681,7 +677,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 		<<link "Give $him your surname">>
 			<<replace "#surnaming">>
 				<<set $activeSlave.slaveSurname = $PC.slaveSurname>>
-				You also command $assistantName to rename your new slave $wife $activeSlave.slaveName $activeSlave.slaveSurname.
+				You also command $assistant.name to rename your new slave $wife $activeSlave.slaveName $activeSlave.slaveSurname.
 				<<if $activeSlave.fetish == "mindbroken">>
 					Before you get too distracted, you tell your lovely new $wife that $he's now to be known as $activeSlave.slaveName $activeSlave.slaveSurname. You are uncertain if it sunk in or not.
 				<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
@@ -714,7 +710,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;
 			<<link "Straightforward ceremony">>
 				<<replace "#result">>
-				You order $assistantName to invite deserving citizens to a straightforward ceremony for a slave being married to a slaveowner, and to make the arrangement. The wedding will take place during the upcoming week.
+				You order $assistant.name to invite deserving citizens to a straightforward ceremony for a slave being married to a slaveowner, and to make the arrangement. The wedding will take place during the upcoming week.
 				<<set $weddingPlanned = 1>>
 				<<set $marrying.push($activeSlave.ID)>>
 				<<run cashX(-10000, "event", $activeSlave)>>
@@ -736,7 +732,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;
 				<<link "Orgiastic ceremony">>
 					<<replace "#result">>
-					You order $assistantName to invite deserving citizens to an orgiastic ceremony for a slave being married to a slaveowner, and to make the arrangements. The wedding orgy will take place during the upcoming week.
+					You order $assistant.name to invite deserving citizens to an orgiastic ceremony for a slave being married to a slaveowner, and to make the arrangements. The wedding orgy will take place during the upcoming week.
 					<<set $weddingPlanned = 2>>
 					<<set $marrying.push($activeSlave.ID)>>
 					<<run cashX(-10000, "event", $activeSlave)>>
@@ -759,7 +755,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;
 				<<link "Impregnation ceremony">>
 					<<replace "#result">>
-					You order $assistantName to invite deserving citizens to a ceremony for a fertile slave being married to a slaveowner, and to make the arrangements. The wedding will take place during the upcoming week.
+					You order $assistant.name to invite deserving citizens to a ceremony for a fertile slave being married to a slaveowner, and to make the arrangements. The wedding will take place during the upcoming week.
 					<<set $weddingPlanned = 3>>
 					<<set $marrying.push($activeSlave.ID)>>
 					<<run cashX(-10000, "event", $activeSlave)>>
@@ -783,7 +779,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;
 		<<link "Straightforward ceremony">>
 			<<replace "#result">>
-			You order $assistantName to invite deserving citizens to a straightforward ceremony for a slave being married to a slaveowner, and to make the arrangement. The wedding will take place during the upcoming week.
+			You order $assistant.name to invite deserving citizens to a straightforward ceremony for a slave being married to a slaveowner, and to make the arrangement. The wedding will take place during the upcoming week.
 			<<set $weddingPlanned = 1>>
 			<<set $marrying.push($activeSlave.ID)>>
 			<<run cashX(-10000, "event", $activeSlave)>>
@@ -793,7 +789,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;
 			<<link "Orgiastic ceremony">>
 				<<replace "#result">>
-				You order $assistantName to invite deserving citizens to an orgiastic ceremony for a slave being married to a slaveowner, and to make the arrangements. The wedding orgy will take place during the upcoming week.
+				You order $assistant.name to invite deserving citizens to an orgiastic ceremony for a slave being married to a slaveowner, and to make the arrangements. The wedding orgy will take place during the upcoming week.
 				<<set $weddingPlanned = 2>>
 				<<set $marrying.push($activeSlave.ID)>>
 				<<run cashX(-10000, "event", $activeSlave)>>
@@ -804,7 +800,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;
 			<<link "Impregnation ceremony">>
 				<<replace "#result">>
-				You order $assistantName to invite deserving citizens to a ceremony for a fertile slave being married to a slaveowner, and to make the arrangements. The wedding will take place during the upcoming week.
+				You order $assistant.name to invite deserving citizens to a ceremony for a fertile slave being married to a slaveowner, and to make the arrangements. The wedding will take place during the upcoming week.
 				<<set $weddingPlanned = 3>>
 				<<set $marrying.push($activeSlave.ID)>>
 				<<run cashX(-10000, "event", $activeSlave)>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index d9a4db1abe44b648c3a5f59886355695a5c05964..cfb1917caea79307c0a683789951c950c2c93689 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -27,13 +27,13 @@
 	<</if>>
 <</if>>
 
-You completed the legalities before heading to $incubatorName, knowing the tank will release $him on your approach, and instruct $assistantName to notify the new $girl's parents to meet you in your office. As the tank exhumes the disoriented $girl, you help $him to $his feet<<if $incubatorReproductionSetting > 1>>, making sure to feel-up $his overdeveloped body,<</if>> and walk $him to your penthouse. Though first you must decide upon a name for the new $girl; it won't take long to reach your office, so you have only @@.orange;one chance to name $him@@ before you arrive.
+You completed the legalities before heading to $incubatorName, knowing the tank will release $him on your approach, and instruct $assistant.name to notify the new $girl's parents to meet you in your office. As the tank exhumes the disoriented $girl, you help $him to $his feet<<if $incubatorReproductionSetting > 1>>, making sure to feel-up $his overdeveloped body,<</if>> and walk $him to your penthouse. Though first you must decide upon a name for the new $girl; it won't take long to reach your office, so you have only @@.orange;one chance to name $him@@ before you arrive.
 <span id="naming">
 <br>Choose a name for $him. <<textbox "$activeSlave.slaveName" $activeSlave.slaveName>>
 	<<link "Commit name.">>
 	<<set $activeSlave.birthName = $activeSlave.slaveName>>
 	<<replace "#naming">>
-	You instruct $assistantName to register the new $girl as "<<print $activeSlave.slaveName>>" in the slave registry.
+	You instruct $assistant.name to register the new $girl as "<<print $activeSlave.slaveName>>" in the slave registry.
 	<</replace>>
 	<<replace "#newName">>
 		<span class='slave-name'>$activeSlave.slaveName</span>
@@ -42,7 +42,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 <br><<link "Have your PA assign $him a random name">>
 	<<replace "#naming">>
 		<<NewChildName $activeSlave>>
-		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
+		$assistant.name registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 	<</replace>>
 	<<replace "#newName">>
 		<span class='slave-name'>$activeSlave.slaveName</span>
@@ -53,7 +53,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		<<replace "#naming">>
 		<<set $activeSlave.slaveName = setup.cowSlaveNames.random()>>
 		<<set $activeSlave.birthName = $activeSlave.slaveName>>
-		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
+		$assistant.name registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
 			<span class='slave-name'>$activeSlave.slaveName</span>
@@ -65,7 +65,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		<<replace "#naming">>
 		<<set $activeSlave.slaveName = setup.bimboSlaveNames.random()>>
 		<<set $activeSlave.birthName = $activeSlave.slaveName>>
-		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
+		$assistant.name registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
 			<span class='slave-name'>$activeSlave.slaveName</span>
@@ -77,7 +77,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		<<replace "#naming">>
 		<<set $activeSlave.slaveName = setup.chattelReligionistSlaveNames.random()>>
 		<<set $activeSlave.birthName = $activeSlave.slaveName>>
-		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
+		$assistant.name registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
 			<span class='slave-name'>$activeSlave.slaveName</span>
@@ -89,7 +89,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		<<replace "#naming">>
 		<<set $activeSlave.slaveName = setup.romanSlaveNames.random()>>
 		<<set $activeSlave.birthName = $activeSlave.slaveName>>
-		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
+		$assistant.name registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
 			<span class='slave-name'>$activeSlave.slaveName</span>
@@ -100,7 +100,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		<<replace "#naming">>
 		<<set $activeSlave.slaveName = setup.aztecSlaveNames.random()>>
 		<<set $activeSlave.birthName = $activeSlave.slaveName>>
-		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
+		$assistant.name registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
 			<span class='slave-name'>$activeSlave.slaveName</span>
@@ -111,7 +111,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		<<replace "#naming">>
 		<<set $activeSlave.slaveName = setup.ancientEgyptianSlaveNames.random()>>
 		<<set $activeSlave.birthName = $activeSlave.slaveName>>
-		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
+		$assistant.name registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
 			<span class='slave-name'>$activeSlave.slaveName</span>
@@ -122,7 +122,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		<<replace "#naming">>
 		<<set $activeSlave.slaveName = setup.edoSlaveNames.random()>>
 		<<set $activeSlave.birthName = $activeSlave.slaveName>>
-		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
+		$assistant.name registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
 			<span class='slave-name'>$activeSlave.slaveName</span>
@@ -134,7 +134,7 @@ You completed the legalities before heading to $incubatorName, knowing the tank
 		<<replace "#naming">>
 		<<run DegradingName($activeSlave)>>
 		<<set $activeSlave.birthName = $activeSlave.slaveName>>
-		$assistantName registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
+		$assistant.name registers the new $girl as "<<print $activeSlave.slaveName>>" in your registry.
 		<</replace>>
 		<<replace "#newName">>
 			<span class='slave-name'>$activeSlave.slaveName</span>
diff --git a/src/pregmod/reMaleArcologyOwner.tw b/src/pregmod/reMaleArcologyOwner.tw
index 03c05e9e24727b02b396f66c594803279e1f5333..dfbfd8ba6036b04a13a557a2f7a0654308ce8292 100644
--- a/src/pregmod/reMaleArcologyOwner.tw
+++ b/src/pregmod/reMaleArcologyOwner.tw
@@ -17,7 +17,7 @@ He strikes a fine balance in conversation with you, firm enough to not overpower
 <</link>>
 <br><<link "Walk past him and out onto an unoccupied balcony">>
 	<<replace "#result">>
-		You walk past him and out onto a balcony. He politely disengages himself and follows, meeting your gaze with a twinkle in his eye. You start talking of nothing of real consequence, but you find that you do have a fair amount to discuss and joke about, since there are oddities to your life that only another slaveowning arcology owner can really understand. You discover that he is very willing to share $PC.refreshment, and you break out some of your best. The party takes notice of your tête-à-tête, but his judgment was obviously correct. Rather than looking down on you, the other prominent guests seem respectfully envious of his access to you. This is still the case even when he starts to get flirty, leaning into you, brushing against you, and more. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> cleared your suite long ago, so when he finally nudges his hip against yours and does not take it away, you take him by the hand and lead him there. He stops you with a hand at the door to the suite and unbuttons his shirt, revealing a triathlete's tanned and sculpted body. As you begin to strip, he embraces you, whispering, "You have no idea how nice this is." It's clear it's been a long time since you've let someone else take the lead, and he sometimes has to snap wrestle you for dominance. He leaves a few hours later with a satisfied expression, giving you a deep kiss on his way out in full public view. @@.green;Your reputation has greatly improved.@@
+		You walk past him and out onto a balcony. He politely disengages himself and follows, meeting your gaze with a twinkle in his eye. You start talking of nothing of real consequence, but you find that you do have a fair amount to discuss and joke about, since there are oddities to your life that only another slaveowning arcology owner can really understand. You discover that he is very willing to share $PC.refreshment, and you break out some of your best. The party takes notice of your tête-à-tête, but his judgment was obviously correct. Rather than looking down on you, the other prominent guests seem respectfully envious of his access to you. This is still the case even when he starts to get flirty, leaning into you, brushing against you, and more. <<= capFirstChar($assistant.name)>> cleared your suite long ago, so when he finally nudges his hip against yours and does not take it away, you take him by the hand and lead him there. He stops you with a hand at the door to the suite and unbuttons his shirt, revealing a triathlete's tanned and sculpted body. As you begin to strip, he embraces you, whispering, "You have no idea how nice this is." It's clear it's been a long time since you've let someone else take the lead, and he sometimes has to snap wrestle you for dominance. He leaves a few hours later with a satisfied expression, giving you a deep kiss on his way out in full public view. @@.green;Your reputation has greatly improved.@@
 		<<if canGetPregnant($PC)>>
 			<<= knockMeUp($PC, 60, 0, -4)>>
 		<</if>>
@@ -31,7 +31,7 @@ He strikes a fine balance in conversation with you, firm enough to not overpower
 		<<replace "#result">>
 		<<set _randomForeignFS = random(1,100)>>
 		<<if $PC.preg >= 28 && $PC.pregMood == 2>>
-			You move to waddle past him and purposefully stumble, prompting him to catch you. Feigning fatigue, you politely ask if he'd help you out. You aren't exactly subtle as he walks you back to your room, dropping hints at how difficult your pregnancy has been and just how good it feels to be with a man. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> cleared your suite long ago, so when you enter, disrobe and splay yourself across the bed, it's just you and him.
+			You move to waddle past him and purposefully stumble, prompting him to catch you. Feigning fatigue, you politely ask if he'd help you out. You aren't exactly subtle as he walks you back to your room, dropping hints at how difficult your pregnancy has been and just how good it feels to be with a man. <<= capFirstChar($assistant.name)>> cleared your suite long ago, so when you enter, disrobe and splay yourself across the bed, it's just you and him.
 			<<if _randomForeignFS > 90>>
 				It's immediately clear by the look on his face that you made a mistake. The man clearly comes from a society that dislikes pregnant woman leading and your attempt to manipulate him into being your lover has pushed him past his level of tolerance. He storms out in anger and, upon returning to the party, makes your underhanded efforts known. @@.red;Your reputation has taken a major hit.@@
 				<<run repX(-1000, "event")>>
@@ -98,7 +98,7 @@ He strikes a fine balance in conversation with you, firm enough to not overpower
 	<<if $PC.belly < 5000 && $PC.boobs < 1200 && $PC.butt < 4>>
 		<br><<link "Quickly arrange an anonymous night out for him">>
 			<<replace "#result">>
-				You immediately enlist $assistantName to help you make some hasty preparations, and then send him a message asking him if he'd like to spend a night out with you, as a couple of unremarkable citizens. He glances at you with a curious expression, and you direct him to a side room. He finds you there, changing into the heavy, anonymizing armor of one of your mercenaries; you have a male suit for him, too. Once you're both suited up, you move to show him how to activate the face-obscuring helmet, but you find that he's already got it on and active. "This," he says, "is either the best or the stupidest date idea I have ever heard. Let's fucking do this." You pass a mercenary on your way out onto the club, and he cannot resist giving you a thumbs up, which your fellow arcology owner fortunately fails to notice. You patrol for a while, using internal comms to joke about life as an arcology owner, something he clearly gets to do too infrequently. You don't mind the chance, either. Your mercenaries frequently spend time together off duty, so nobody sees anything unusual about a male and female in mercenary armor sharing a milkshake at a dairy bar, even when they start to engage in increasingly rough public flirting, armor and all. Later, your slaves are obliged to pick up and sort a trail of discarded armor pieces leading from the entry to your penthouse all the way to your suite, which is now emitting the indistinct sounds of very energetic sex. A few hours later, when you're showering up together so he can head back to his domain, he looks at you and says seriously, "That was pretty fun. If things ever go to shit, I wouldn't mind wearing that armor for real." Your mercenaries cannot keep their mouths shut, for once, and the almost unbelievably juicy story of the arcology owners wearing borrowed armor to go on an anonymous date spreads like wildfire. @@.green;Your reputation has greatly improved.@@
+				You immediately enlist $assistant.name to help you make some hasty preparations, and then send him a message asking him if he'd like to spend a night out with you, as a couple of unremarkable citizens. He glances at you with a curious expression, and you direct him to a side room. He finds you there, changing into the heavy, anonymizing armor of one of your mercenaries; you have a male suit for him, too. Once you're both suited up, you move to show him how to activate the face-obscuring helmet, but you find that he's already got it on and active. "This," he says, "is either the best or the stupidest date idea I have ever heard. Let's fucking do this." You pass a mercenary on your way out onto the club, and he cannot resist giving you a thumbs up, which your fellow arcology owner fortunately fails to notice. You patrol for a while, using internal comms to joke about life as an arcology owner, something he clearly gets to do too infrequently. You don't mind the chance, either. Your mercenaries frequently spend time together off duty, so nobody sees anything unusual about a male and female in mercenary armor sharing a milkshake at a dairy bar, even when they start to engage in increasingly rough public flirting, armor and all. Later, your slaves are obliged to pick up and sort a trail of discarded armor pieces leading from the entry to your penthouse all the way to your suite, which is now emitting the indistinct sounds of very energetic sex. A few hours later, when you're showering up together so he can head back to his domain, he looks at you and says seriously, "That was pretty fun. If things ever go to shit, I wouldn't mind wearing that armor for real." Your mercenaries cannot keep their mouths shut, for once, and the almost unbelievably juicy story of the arcology owners wearing borrowed armor to go on an anonymous date spreads like wildfire. @@.green;Your reputation has greatly improved.@@
 				<<set $desc = "a flirtatious thank-you note from a male arcology owner of your acquaintance">>
 				<<set $trinkets.push($desc)>>
 				<<if canGetPregnant($PC)>>
diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw
index fece21d09c58d6f69276b5e41e580cf29222aa25..e1b36899be8d5896db1c6a4367b5ee96d0d7ba02 100644
--- a/src/pregmod/reMaleCitizenHookup.tw
+++ b/src/pregmod/reMaleCitizenHookup.tw
@@ -79,7 +79,7 @@
 	<<set _FS = "none">>
 <</if>>
 
-At night, the best living areas in the arcology offer a constant mélange of selective entertainments. There's a perpetual social scrum of who is to be invited to what going on, and you occupy a preeminent place atop it, mostly aloof from the struggles of your citizens for recognition and influence. You're invited to almost everything, since everyone who lives here knows the value of being in favor with the owner of the arcology. Invitations to your parties, of course, are some of the most valuable social currency in the arcology and one of $assistantName's most important duties is to help you manage them without wasting your valuable time. It's not actually necessary for you to attend your own parties, since almost everyone will be glad to be seen in the entertainment area of the penthouse whether or not the propriet<<if $PC.title == 1>>or<<else>>ress<</if>> is actually present.
+At night, the best living areas in the arcology offer a constant mélange of selective entertainments. There's a perpetual social scrum of who is to be invited to what going on, and you occupy a preeminent place atop it, mostly aloof from the struggles of your citizens for recognition and influence. You're invited to almost everything, since everyone who lives here knows the value of being in favor with the owner of the arcology. Invitations to your parties, of course, are some of the most valuable social currency in the arcology and one of $assistant.name's most important duties is to help you manage them without wasting your valuable time. It's not actually necessary for you to attend your own parties, since almost everyone will be glad to be seen in the entertainment area of the penthouse whether or not the propriet<<if $PC.title == 1>>or<<else>>ress<</if>> is actually present.
 <br><br>
 But tonight, you've put in an appearance. Your citizens are drinking your <<if $arcologies[0].FSPastoralist != "unset">>milk<<elseif $arcologies[0].FSRestart != "unset">>finest alcohol<<else>>alcohol<</if>> and eating your food, though of course they helped pay for it through their rent. They're performing a complex dance of social dominance, and it all radiates around you, with complex unspoken rules of collective approval governing which citizens cycle past you for a word, and for how long. During a low point in the ebb and flow,
 <<switch _FS>>
diff --git a/src/pregmod/reTheSirenStrikesBack.tw b/src/pregmod/reTheSirenStrikesBack.tw
index 08cf5ac89d032969145513d48297dbba805d7e77..6a0c0c32216c6e4165c234f21d752b26f9e6cc41 100644
--- a/src/pregmod/reTheSirenStrikesBack.tw
+++ b/src/pregmod/reTheSirenStrikesBack.tw
@@ -54,7 +54,7 @@
 	/* 000-250-006 */
 </span>
 
-Several weeks have passed since you gained the musical prodigy and you couldn't help but notice $his constant scowl and muttering about "getting revenge one day" or "wishing $his producer would pay for what happened" whenever $he was not working. You decide to look into the incident and direct $assistantName to look into the financial situation of $his record label. It turns out that not only should this slave not be eligible for enslavement due to $his performance profits, but a certain someone has been taking that money for themselves. You issue a bounty for $his producer and await a response. With surprising speed, an answer comes from a bounty hunter. The underhanded producer never left the arcology, instead opting to make use of the guest living arrangements you had set up for the concert. Only when an announcement of the bounty went out did _he2 realize _his2 peril and attempt to flee. The bounty hunter literally drags the escapee by the collar into your penthouse and throws _him2 at your feet. The coward shivers as your eyes meet _hers2.
+Several weeks have passed since you gained the musical prodigy and you couldn't help but notice $his constant scowl and muttering about "getting revenge one day" or "wishing $his producer would pay for what happened" whenever $he was not working. You decide to look into the incident and direct $assistant.name to look into the financial situation of $his record label. It turns out that not only should this slave not be eligible for enslavement due to $his performance profits, but a certain someone has been taking that money for themselves. You issue a bounty for $his producer and await a response. With surprising speed, an answer comes from a bounty hunter. The underhanded producer never left the arcology, instead opting to make use of the guest living arrangements you had set up for the concert. Only when an announcement of the bounty went out did _he2 realize _his2 peril and attempt to flee. The bounty hunter literally drags the escapee by the collar into your penthouse and throws _him2 at your feet. The coward shivers as your eyes meet _hers2.
 <br><br>
 "Plea<<s>>e, don't hurt me! I'll pay for that <<s>>lave I <<s>>ent you to be relea<<s>>ed, even <<s>>et $him up with the life <<he 2>> would have had if I hadn't embe<<zz>>led the profit<<s>>!"
 <br><br>
diff --git a/src/pregmod/seFCTVinstall.tw b/src/pregmod/seFCTVinstall.tw
index af66678335b6dfda675166c4788a4de0e44e1eb4..ee92f954f3dd6ba04ddbf0b0688785bf17d0f662 100644
--- a/src/pregmod/seFCTVinstall.tw
+++ b/src/pregmod/seFCTVinstall.tw
@@ -3,7 +3,7 @@
 <<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "FCTV", $receiverAvailable = 1>>
 <<set $showOne = 0, $showTwo = 0, $showThree = 0, $showFour = 0, $showFive = 0, $showSix = 0, $showSeven = 0, $showEight = 0, $showNine = 0, $showTen = 0, $showEleven = 0, $showTwelve = 0, $showThirteen = 0, $showFourteen = 0, $randShow = 0, $lastShow = -1>>
 
-You've been sitting in your office into the early afternoon going over bothersome lease documents that need your approval. When you take a break to look out the window, $assistantName speaks up. "<<= properTitle()>>, you have received an approval welcome packet from 8HGG Inc. in regards to Free Cities TV. It seems that they've determined that $arcologies[0].name is now sufficiently developed enough to warrant a FCTV-Citizen connection. All the details and contracts necessary are included in the packet. From there, a receiver will need to be built onto $arcologies[0].name in order to access FCTV."
+You've been sitting in your office into the early afternoon going over bothersome lease documents that need your approval. When you take a break to look out the window, $assistant.name speaks up. "<<= properTitle()>>, you have received an approval welcome packet from 8HGG Inc. in regards to Free Cities TV. It seems that they've determined that $arcologies[0].name is now sufficiently developed enough to warrant a FCTV-Citizen connection. All the details and contracts necessary are included in the packet. From there, a receiver will need to be built onto $arcologies[0].name in order to access FCTV."
 <br><br>
 
 You browse the guide: home shopping networks, random dramas, how-to shows and a myriad of other things. Of more interest are some of the programs showing glimpses into foreign arcologies and how they are using the service to help mold society.
diff --git a/src/pregmod/seFCTVremote.tw b/src/pregmod/seFCTVremote.tw
index 876d789e27162253405a5e13b6fa2cd769faaa32..b6dedfa109b110d40d31485dfec4b779c4e30b42 100644
--- a/src/pregmod/seFCTVremote.tw
+++ b/src/pregmod/seFCTVremote.tw
@@ -60,14 +60,14 @@
 <p>
 	You have a gap in your schedule in the morning, and decide to watch some FCTV
 	<<if $Concubine != 0>>
-		FCTV with your concubine, 
+		FCTV with your concubine,
 		<span class="slave name simple">
 			$Concubine.slaveName.
 		</span>
 	<<else>>
 	FCTV.
 	<</if>>
-	No sooner do you begin to watch a random show, than you have a notification that someone is here to see you. It seems to be a tech of some sort, complete with a small utility drone. A camera reveals the back of $his shirt, on which is written in block letters "FCTV SERVICE." Incredible. How do these people always find the worst time to stop in? <<if $assistant > 0>>Your assistant shrugs. At a gesture from you, _heA lets $him in.<<else>>You push a button to allow $him to come in.<</if>> This had better be good.
+	No sooner do you begin to watch a random show, than you have a notification that someone is here to see you. It seems to be a tech of some sort, complete with a small utility drone. A camera reveals the back of $his shirt, on which is written in block letters "FCTV SERVICE." Incredible. How do these people always find the worst time to stop in? <<if assistant.personality > 0>>Your assistant shrugs. At a gesture from you, _heA lets $him in.<<else>>You push a button to allow $him to come in.<</if>> This had better be good.
 </p>
 
 <p>
@@ -77,7 +77,7 @@
 	<<else>>
 		although you find the random nature of the shows a little annoying,
 	<</if>>
-	then ask the tech to cut to the point. $He shifts from one foot to the other, and then sheepishly admits that the service comes with a free remote that allows you to change the channels. Incredible! Why didn't you receive one? "It'<<s>>, uh, 8HGG Inc. poli<<c>>y to di<<s>>tribute remote<<s>> only after a trial period." <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> quietly notifies you that "$He's lying. We've had no notification from 8HGG Inc. of a visit. It's definitely the same tech as last time; $he's trying to cover up $his mistake on a big contract. <i>They don't know $he's here.</i>"
+	then ask the tech to cut to the point. $He shifts from one foot to the other, and then sheepishly admits that the service comes with a free remote that allows you to change the channels. Incredible! Why didn't you receive one? "It'<<s>>, uh, 8HGG Inc. poli<<c>>y to di<<s>>tribute remote<<s>> only after a trial period." <<= capFirstChar($assistant.name)>> quietly notifies you that "$He's lying. We've had no notification from 8HGG Inc. of a visit. It's definitely the same tech as last time; $he's trying to cover up $his mistake on a big contract. <i>They don't know $he's here.</i>"
 </p>
 
 <p>
@@ -145,7 +145,7 @@
 			<<run cashX(forceNeg(($modCost*2) + $SPcost), "slaveMod", $activeSlave)>> /* two tats and a smart piercing */
 
 			<p>
-				With a barely perceptible signal to $assistantName, $his drone whirs to a stop and begins to fall to the floor. Before it lands, a dart hits $him in the neck. $He collapses into darkness.
+				With a barely perceptible signal to $assistant.name, $his drone whirs to a stop and begins to fall to the floor. Before it lands, a dart hits $him in the neck. $He collapses into darkness.
 			</p>
 
 			<p>
@@ -155,7 +155,7 @@
 				<<else>>
 					at $him
 				<</if>>
-				with concern. $He winces in pain and asks what happened. You gravely inform $him that $he must been working very hard and may have been dehydrated: $he passed out. $His back was quite bruised but other than some nausea, your systems report $he should be fine. You encourage $him to keep up $his fluids, then hand $him back $his communicator and mention it looks like $he is going to be late for $his other appointment. With a panicked look on $his face the tech thanks you, seizes $his device and heads out the door followed by $his drone. "I haven't seen that much debt outside of a slave in quite some time," $assistantName remarks. "$He's fortunate to have that job."
+				with concern. $He winces in pain and asks what happened. You gravely inform $him that $he must been working very hard and may have been dehydrated: $he passed out. $His back was quite bruised but other than some nausea, your systems report $he should be fine. You encourage $him to keep up $his fluids, then hand $him back $his communicator and mention it looks like $he is going to be late for $his other appointment. With a panicked look on $his face the tech thanks you, seizes $his device and heads out the door followed by $his drone. "I haven't seen that much debt outside of a slave in quite some time," $assistant.name remarks. "$He's fortunate to have that job."
 			</p>
 
 			<p>
@@ -278,11 +278,11 @@
 							<<replace "#result">>
 								You can't possibly be the only one annoyed at FCTV customer service. You soon have $him bent over with $his upper half encased in a wall, and $his lower half along with $his tramp stamp "$activeSlave.stampTat" exposed to the entire arcology. A large monitor above $his ass ensures every detail of $his expressions are available, and aphrodisiacs ensure they are interesting. Long waits for tech support are common in this broken world, but even so, the queue that forms as the word gets out is quite impressive. $He spends a torturous day in the wall before being hauled in for enslavement, somewhat
 								<span class="health dec">the worse for wear</span>
-								and 
+								and
 								<span class="flaw gain">
 									acting oddly
 								</span>
-								due to $his ordeal, bruises all over $his body, cum leaking from $his 
+								due to $his ordeal, bruises all over $his body, cum leaking from $his
 								<span class="virginity loss">
 									loosened
 								</span>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 838ad671a75c87a0152814179316444a80c73b99..550b032adcd6bb3f3aab2c1927a1f791957eb8bd 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -992,7 +992,7 @@
 			</div>
 		<</if>>
 		a documentary on the rise of the Transformation Fetish titled: "The Mass Insanity of Adding Mass". The opening credits are styled to look like a psychological case study from a mental institution. When the credits finish, the video cuts to a scene of a man sitting behind a desk, the whole shot is high contrast due to the harsh lighting from a lone desk lamp. The middle-aged man screams 'hard-boiled' and looks like he walked straight out of a noir film to host this documentary. His opening monologue makes it pretty clear that this documentary has a lot of parallels with a crime documentary. Worse, is that the evidence and expert witnesses available to the producers were apparently overwhelming, because the program seems rushed trying to fit as much as it can into a narrow time slot.
-		<br><br>Evidence and whatever else be damned, this isn't the kind of documentary that should be on the FCTV stream in your arcology. You tell $assistantName to remind you to send a complaint in the morning.
+		<br><br>Evidence and whatever else be damned, this isn't the kind of documentary that should be on the FCTV stream in your arcology. You tell $assistant.name to remind you to send a complaint in the morning.
 
 	<<else>>
 		<<if $seeImages == 1>>
@@ -1941,7 +1941,7 @@
 
 
 <<default>>
-	It seems there's a technical error preventing you from streaming; you tell $assistantName to look into it.
+	It seems there's a technical error preventing you from streaming; you tell $assistant.name to look into it.
 <</switch>>
 
 <<set $randShow = "">>
\ No newline at end of file
diff --git a/src/pregmod/seFCTVwatch.tw b/src/pregmod/seFCTVwatch.tw
index e45c6baa410d3211b9af86126063e4740995faf5..b694d865c09aa4d42ed54323598304bd7cccd357 100644
--- a/src/pregmod/seFCTVwatch.tw
+++ b/src/pregmod/seFCTVwatch.tw
@@ -20,7 +20,7 @@
 	<<set $showSixteen = 0>>
 <</if>>
 
-Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveName@@<<else>>$assistantName<</if>> to turn on the TV and
+Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveName@@<<else>>$assistant.name<</if>> to turn on the TV and
 <<if $cheatMode == 1 || $debugMode == 1 || $FCTVremote > 0>>
 	bring you the remote so you can choose whatever show you find interesting.
 	<br>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 841dd124cfadd590a41ca6b8cd530a462edaf32e..08ae7a3aac954587a7e4045b30fa3420a94abbdb 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -94,7 +94,7 @@ PC.pregSource documentation
 		<<set $PC.preg = -2>>
 	<</if>>
 <<else>>
-While sitting at your desk planning your day, @@.lime;your water breaks,@@ thoroughly soaking your crotch and the slave servicing it. You <<if $PC.belly >= 60000>>struggle to<</if>> pull your laboring body to its feet, notify $assistantName that it's time, and begin heading towards
+While sitting at your desk planning your day, @@.lime;your water breaks,@@ thoroughly soaking your crotch and the slave servicing it. You <<if $PC.belly >= 60000>>struggle to<</if>> pull your laboring body to its feet, notify $assistant.name that it's time, and begin heading towards
 <<if $masterSuite != 0 && $masterSuiteUpgradePregnancy == 1>>
 	$masterSuiteName, since you had it redesigned to accommodate pregnant slaves. You should be able to give birth in both luxury and privacy there.
 <<elseif $clinic != 0>>
@@ -120,11 +120,11 @@ While sitting at your desk planning your day, @@.lime;your water breaks,@@ thoro
 	<<elseif _concubinePresent == 1>>
 		@@.pink;$Concubine.slaveName@@ is waiting for you. _He2 believes, if anything, that _he2 could at least comfort you while you give birth.
 	<<else>>
-		it quite empty. At least $assistantName knows where you are should anything go wrong.
+		it quite empty. At least $assistant.name knows where you are should anything go wrong.
 	<</if>>
 <<else>>
 	<<if $Concubine != 0>><<setLocalPronouns $Concubine 2>><<if !canWalk($Concubine)>><<set _concubinePresent = 2>><<else>><<set _concubinePresent = 1>><</if>><</if>>
-	You barely make it half-way down the hall before you feel the first of your many children drop into position at the entrance to your birth canal. You try to keep going, but as it forces its way through your pelvis, spreading it wider, you're forced to the ground. Fortunately the penthouse is littered with supply rooms and closets, so you drag your laboring body into the nearest one instead. Fortunately, $assistantName discretely directs
+	You barely make it half-way down the hall before you feel the first of your many children drop into position at the entrance to your birth canal. You try to keep going, but as it forces its way through your pelvis, spreading it wider, you're forced to the ground. Fortunately the penthouse is littered with supply rooms and closets, so you drag your laboring body into the nearest one instead. Fortunately, $assistant.name discretely directs
 	<<if $Nurse != 0>>
 		<<setLocalPronouns $Nurse>>
 		@@.pink;$Nurse.slaveName@@ to you with everything $he'll need to deliver your child<<if $PC.pregType > 1>>ren<</if>>.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ bursts in after $him and circles around behind you before <<if hasAnyArms($Concubine)>>wrapping _his2 arm<<if hasBothArms($Concubine)>>s<</if>> around<<else>>nuzzling against<</if>> your contraction wracked middle. _He2'll be here to comfort you while you labor.<</if>>
@@ -137,7 +137,7 @@ While sitting at your desk planning your day, @@.lime;your water breaks,@@ thoro
 	<<elseif _concubinePresent == 1>>
 		@@.pink;$Concubine.slaveName@@ to your location. _He2 believes, if anything, that _he2 could at least comfort you while you give birth.
 	<<else>>
-		a camera on the room you crawled into. At least $assistantName knows where you are should anything go wrong.
+		a camera on the room you crawled into. At least $assistant.name knows where you are should anything go wrong.
 	<</if>>
 <</if>>
 <br><br>
@@ -339,7 +339,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
 			<<else>>
 				barely able to
 			<</if>>
-			gather them to your chest. Fortunately, $assistantName calls several devoted slaves to your aid; you're helped to your bed and left to connect with your children.
+			gather them to your chest. Fortunately, $assistant.name calls several devoted slaves to your aid; you're helped to your bed and left to connect with your children.
 		<</if>>
 	<</if>>
 <</if>>
diff --git a/src/pregmod/widgets/pregmodBirthWidgets.tw b/src/pregmod/widgets/pregmodBirthWidgets.tw
index 5c4efc6043786f1179da6aac9d3a0751f3afe8c6..97af83b22a264dba2ec1e63ceee1d7e88eb40830 100644
--- a/src/pregmod/widgets/pregmodBirthWidgets.tw
+++ b/src/pregmod/widgets/pregmodBirthWidgets.tw
@@ -381,11 +381,11 @@
 			<<if _birthScene > 50>>
 				While giving a slave oral service, $slaves[$i].slaveName's water breaks. $He disregards this development and continues working.
 				<<ClothingBirth>>
-				The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. Instead, $he draws <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child to $his breast until <<if $Stewardess != 0>>$Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<elseif $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>> shouts at $him to move $his useless pregnant ass.
+				The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. Instead, $he draws <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child to $his breast until <<if $Stewardess != 0>>$Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<else>>$assistant.name<</if>> shouts at $him to move $his useless pregnant ass.
 			<<else>>
 				While scrubbing the penthouse floor, $slaves[$i].slaveName's water breaks. $He turns to clean this new spill, disregarding what it means.
 				<<ClothingBirth>>
-				Instead of cleaning the fresh mess $he made, $he draws <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child to $his breast until <<if $Stewardess != 0>>$Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<elseif $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>> shouts at $him to move $his useless pregnant ass.
+				Instead of cleaning the fresh mess $he made, $he draws <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child to $his breast until <<if $Stewardess != 0>>$Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<else>>$assistant.name<</if>> shouts at $him to move $his useless pregnant ass.
 			<</if>>
 		<</if>>
 	<<else>>
@@ -396,11 +396,11 @@
 				While giving a slave oral service, $slaves[$i].slaveName's water breaks. $He desperately tries to pull away but they grab $his head and force $him back to their crotch.
 				<<set $humiliation = 1>>
 				<<ClothingBirth>>
-				The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. $He hurriedly tries to mop up the mess and collect <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child before <<if $Stewardess != 0>>$Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<else>><<if $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>><</if>> shouts at $him for dragging $his pregnant ass.
+				The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. $He hurriedly tries to mop up the mess and collect <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child before <<if $Stewardess != 0>>$Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<else>><</if>> shouts at $him for dragging $his pregnant ass.
 			<<else>>
 				While scrubbing the penthouse floor, $slaves[$i].slaveName's water breaks. $He panics at the thought of not cleaning up $his spill but $his worsening contractions force $him to find a secluded place to give birth.
 				<<ClothingBirth>>
-				Collecting <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child, $he carefully exits $his hiding place before coming under the eye of <<if $Stewardess != 0>>the glaring $Stewardess.slaveName. $His child is promptly taken<<elseif $HeadGirl != 0>>the glaring $HeadGirl.slaveName. $His child is promptly taken <<else>><<if $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>>. $His child is promptly taken by other servants<</if>> following a lecture about priorities and time management given $his constant pregnancy and predictable birth cycle.
+				Collecting <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child, $he carefully exits $his hiding place before coming under the eye of <<if $Stewardess != 0>>the glaring $Stewardess.slaveName. $His child is promptly taken<<elseif $HeadGirl != 0>>the glaring $HeadGirl.slaveName. $His child is promptly taken <<else>>. $His child is promptly taken by other servants<</if>> following a lecture about priorities and time management given $his constant pregnancy and predictable birth cycle.
 			<</if>>
 		<</if>>
 	<</if>>
@@ -673,10 +673,10 @@
 
 <<case "take classes">>
 	<<if (random(1,20) > $suddenBirth)>>
-		Or $he would have, had <<if $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>> allowed it. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth, not without your assistant noticing. As punishment for poor planning, especially since this will be a weekly occurrence in $his life, $his birth will be turned into a live broadcast. Blushing strongly, $he begins working on birthing <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, trying $his best to hide $his shame. Exhausted from the birth, $he is permitted a short break as $his child is collected to clean $himself up before the lesson is continued.
+		Or $he would have, had  allowed it. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth, not without your assistant noticing. As punishment for poor planning, especially since this will be a weekly occurrence in $his life, $his birth will be turned into a live broadcast. Blushing strongly, $he begins working on birthing <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, trying $his best to hide $his shame. Exhausted from the birth, $he is permitted a short break as $his child is collected to clean $himself up before the lesson is continued.
 		<<set $humiliation = 1>>
 	<<else>>
-		During a lesson under <<if $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>>, $slaves[$i].slaveName's water breaks. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth, not without your assistant noticing. As punishment for poor planning, especially since this will be a weekly occurrence in $his life, $he is forbidden from leaving. Additionally, $his birth will be turned into a live broadcast.
+		During a lesson under , $slaves[$i].slaveName's water breaks. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth, not without your assistant noticing. As punishment for poor planning, especially since this will be a weekly occurrence in $his life, $he is forbidden from leaving. Additionally, $his birth will be turned into a live broadcast.
 		<<set $humiliation = 1>>
 		<<ClothingBirth>>
 		Exhausted from the birth, $he is permitted a short break as <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child is gathered to <<if !canWalk($slaves[$i])>>be cleaned<<else>>clean $himself<</if>> up before the lesson is continued.
@@ -1490,18 +1490,18 @@
 		<<if random(0,1) == 1>>
 			While giving a slave oral service, $slaves[$i].slaveName's body begins to birth another of $his brood. $He disregards this development and continues working.
 			<<ClothingBirth>>
-			The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. Instead, $he struggles to bring $his child to $his breast until <<if $Stewardess != 0>>$Stewardess.slaveName shouts at $him to move $his useless ass<<elseif $HeadGirl != 0>>$HeadGirl.slaveName shouts at $him to move $his useless ass<<else>><<if $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>>shouts at $him to move $his useless ass<</if>>.
+			The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. Instead, $he struggles to bring $his child to $his breast until <<if $Stewardess != 0>>$Stewardess.slaveName shouts at $him to move $his useless ass<<elseif $HeadGirl != 0>>$HeadGirl.slaveName shouts at $him to move $his useless ass<<else>>shouts at $him to move $his useless ass<</if>>.
 		<<else>>
 			While struggling to scrub the penthouse floor, $slaves[$i].slaveName's body begins to birth another of $his brood. $He carries on trying to clean as $he drags $his belly along the floor.
 			<<ClothingBirth>>
-			Instead of carrying on $his task, $he draws $his child to $his breast until <<if $Stewardess != 0>>$Stewardess.slaveName shouts at $him to move $his useless ass<<elseif $HeadGirl != 0>>$HeadGirl.slaveName shouts at $him to move $his useless ass<<else>><<if $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>>shouts at $him to move $his useless ass<</if>>.
+			Instead of carrying on $his task, $he draws $his child to $his breast until <<if $Stewardess != 0>>$Stewardess.slaveName shouts at $him to move $his useless ass<<elseif $HeadGirl != 0>>$HeadGirl.slaveName shouts at $him to move $his useless ass<<else>>shouts at $him to move $his useless ass<</if>>.
 		<</if>>
 	<<else>>
 		<<if random(0,1) == 1>>
 			While giving a slave oral service, $slaves[$i].slaveName's body begins to birth another of $his brood. $He desperately tries to pull away but they grab $his head and force $him back to their crotch.
 			<<set $humiliation = 1>>
 			<<ClothingBirth>>
-			The slave gets off quite strongly to the show and shoves $him to the ground, leaving $him struggling to get up before <<if $Stewardess != 0>>$Stewardess.slaveName shouts at $him<<elseif $HeadGirl != 0>>$HeadGirl.slaveName shouts at $him <<else>><<if $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>>shouts at $him<</if>>.
+			The slave gets off quite strongly to the show and shoves $him to the ground, leaving $him struggling to get up before <<if $Stewardess != 0>>$Stewardess.slaveName shouts at $him<<elseif $HeadGirl != 0>>$HeadGirl.slaveName shouts at $him <<else>>shouts at $him<</if>>.
 		<<else>>
 			While using $his bloated belly to scrub the penthouse floor, $slaves[$i].slaveName's body begins to birth another of $his brood. Since this isn't the first time this week this happened, $he readies $himself for the coming birth.
 			<<ClothingBirth>>
@@ -1662,11 +1662,11 @@
 
 <<case "take classes">>
 	<<if !canWalk($slaves[$i])>>
-		During a lesson under <<if $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>>, $slaves[$i].slaveName's body begins to birth another of $his brood. Your assistant pauses and waits for $him to finish, having given up after the last several times
+		During a lesson under , $slaves[$i].slaveName's body begins to birth another of $his brood. Your assistant pauses and waits for $him to finish, having given up after the last several times
 		<<ClothingBirth>>
 		Exhausted from the birth, $he is permitted a short break as $his child is collected to be cleaned up before the lesson is continued.
 	<<else>>
-		During a lesson under <<if $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>>, $slaves[$i].slaveName's body begins to birth another of $his brood. Your assistant pauses and waits for $him to finish, having given up after the last several times
+		During a lesson under , $slaves[$i].slaveName's body begins to birth another of $his brood. Your assistant pauses and waits for $him to finish, having given up after the last several times
 		<<ClothingBirth>>
 		Exhausted from the birth, $he is permitted a short break as $his child is collected to clean $himself up before the lesson is continued.
 	<</if>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 89bf73f4cd289dad0c2bf6573e0c17ac98387b71..9a4e7f1d940c03719df48a55f1e112b867601ac9 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -39,8 +39,10 @@
 	<<set _apl = ["he", "his", "hers", "him", "himself", "woman", "women", "loli", "girl", "daughter", "sister", "wife", "wives",
 		"He", "His", "Hers", "Him", "Himself", "Woman", "Women", "Loli", "Girl", "Daughter", "Sister", "Wife", "Wives"]>>
 
-	<<run App.Utils.setLocalPronouns($assistantPronouns, 'A', _apl)>>
-	<<run App.Utils.setLocalPronouns($marketAssistantPronouns, 'M', _apl)>>
+	<<run App.Utils.setLocalPronouns(assistant.pronouns().main, 'A', _apl)>>
+	<<if $assistant.market>>
+		<<run App.Utils.setLocalPronouns(assistant.pronouns().market, 'M', _apl)>>
+	<</if>>
 	<<unset _apl>>
 <</widget>>
 
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 70b0f6adc7f281133f9bd8a2411f9428991749f0..bdba6c1faae04b2c5bf0af8fee704189cc760946 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1329,15 +1329,6 @@
 	<</if>>
 	<<unset $trainingRegimen, $personalAttentionChanged>>
 <</if>>
-<<if ndef $assistantExtra1>>
-	<<set $assistantExtra1 = 0>>
-<</if>>
-<<if ndef $assistantExtra2>>
-	<<set $assistantExtra2 = 0>>
-<</if>>
-<<if ndef $assistantBodyDesire>>
-	<<set $assistantBodyDesire = 0>>
-<</if>>
 
 <<if ndef $huskSlaveOrdered>>
 	<<set $huskSlaveOrdered = 0>>
@@ -2063,8 +2054,11 @@
 <</silently>>
 
 Setting missing global variables:
-<<if ndef $assistantPower>>
-	<<set $assistantPower = 0>>
+
+<<if typeof $assistant == "number">>
+	<<run assistant.BC()>>
+<<else>>
+	<<run assistant.object()>>
 <</if>>
 
 <<if ndef $CulturalOpenness>>
@@ -2275,9 +2269,6 @@ Setting missing global variables:
 	<<set $buckets = 0>>
 <</if>>
 
-<<if ndef $assistantFSAppearance>>
-	<<set $assistantFSAppearance = "default">>
-<</if>>
 <<if ndef $universalRulesRest>>
 	<<set $universalRulesRest = 0>>
 <</if>>
@@ -2499,18 +2490,10 @@ Setting missing global variables:
 	<<set $NUL = {schoolUpgrade: 0, schoolPresent: 0, schoolProsperity: 0, subsidize: 0, schoolAnnexed: 0, studentsBought: 0, schoolSale: 0}>>
 <</if>>
 
-<<if ndef $assistantName>>
-	<<set $assistantName = "your personal assistant">>
-<</if>>
-
 <<if ndef $birthee>>
 	<<set $birthee = 0>>
 <</if>>
 
-<<if ndef $assistantNameAnnounced>>
-	<<set $assistantNameAnnounced = 0>>
-<</if>>
-
 <<if ndef $alwaysSubsidizeRep>>
 	<<set $alwaysSubsidizeRep = 0>>
 <</if>>
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 69b1bcaf75cfcefe4ba9c55b724182553f41a748..24416a03deb409611120ce5d401455022f58635d 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -108,7 +108,7 @@
 
 <<case "madam strategy">>
 
-Your madam <<EventNameLink>> is a perceptive whore mistress. You are a clever and well-informed manager, of course, and $assistantName is as well-informed as it is physically possible to be about anything that happens within $his sensor net, but the madam has special insight. $He sees more sex in person than anyone in the arcology, not excepting you, and may even know some of your brothel slaves better than you do. This certainly extends to their sexualities and skills; if $he ever has any doubts about any of them, $he usually fucks them $himself to get at the truth.
+Your madam <<EventNameLink>> is a perceptive whore mistress. You are a clever and well-informed manager, of course, and $assistant.name is as well-informed as it is physically possible to be about anything that happens within $his sensor net, but the madam has special insight. $He sees more sex in person than anyone in the arcology, not excepting you, and may even know some of your brothel slaves better than you do. This certainly extends to their sexualities and skills; if $he ever has any doubts about any of them, $he usually fucks them $himself to get at the truth.
 
 <<case "DJ publicity">>
 
@@ -246,7 +246,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <<link "Review $his charges' skills with $him">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You call $activeSlave.slaveName up to your office; $he enters with the clear anticipation of being thrown over your desk, but instead finds $himself sitting across it from you, taking part in a three-way strategy session between you and $assistantName. The three of you carefully review the sexual advantages and disadvantages of each of $his whores. $He is @@.hotpink;properly deferential,@@ but definitely has insight to offer about how many of them satisfy customers. With $his input, you put together a plan to @@.green;address@@ their deficiencies with instruction and hands-on correction.
+	You call $activeSlave.slaveName up to your office; $he enters with the clear anticipation of being thrown over your desk, but instead finds $himself sitting across it from you, taking part in a three-way strategy session between you and $assistant.name. The three of you carefully review the sexual advantages and disadvantages of each of $his whores. $He is @@.hotpink;properly deferential,@@ but definitely has insight to offer about how many of them satisfy customers. With $his input, you put together a plan to @@.green;address@@ their deficiencies with instruction and hands-on correction.
 	<<set $activeSlave.devotion += 4>>
 	<<for $i = 0; $i < _SL; $i++>>
 		<<if $slaves[$i].assignment == "work in the brothel">>
@@ -264,7 +264,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
 <br><<link "Talk over the whores' appearance and correct any deficiencies">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You call $activeSlave.slaveName up to your office; $he enters with the clear anticipation of being thrown over your desk, but instead finds $himself sitting across it from you, taking part in a three-way inventory review with you and $assistantName. The three of you carefully review the appearance of each of $his whores. $He is @@.hotpink;properly deferential,@@ but definitely has insight to offer about how many of them appeal to customers. With $his input, you put together a plan to @@.limegreen;correct@@ their deficiencies when they can be pulled out of a shift for a quick surgical improvement.
+	You call $activeSlave.slaveName up to your office; $he enters with the clear anticipation of being thrown over your desk, but instead finds $himself sitting across it from you, taking part in a three-way inventory review with you and $assistant.name. The three of you carefully review the appearance of each of $his whores. $He is @@.hotpink;properly deferential,@@ but definitely has insight to offer about how many of them appeal to customers. With $his input, you put together a plan to @@.limegreen;correct@@ their deficiencies when they can be pulled out of a shift for a quick surgical improvement.
 	<<set $activeSlave.devotion += 4>>
 	<<for $i = 0; $i < _SL; $i++>>
 		<<if $slaves[$i].assignment == "work in the brothel">>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index b77c11c1e471c372f8b901a9d66c393cc35d2e29..4be22e1e7f749bb80a7865c7c7fccc676df63b25 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -330,7 +330,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 				<<else>>
 					ready and willing,
 				<</if>>
-				and angles $himself just right, but you administer a light slap to $his $activeSlave.skin ass and continue, telling $him that it's so nice you feel like sharing it. $He's 
+				and angles $himself just right, but you administer a light slap to $his $activeSlave.skin ass and continue, telling $him that it's so nice you feel like sharing it. $He's
 				<<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>
 					so ready to fuck $he can't quite think of what to say,
 				<<else>>
@@ -401,7 +401,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 				<<else>>
 					pussy pressed against
 				<</if>>
-				$HeadGirl.slaveName. 
+				$HeadGirl.slaveName.
 				<<run seX($activeSlave, "anal", $HeadGirl, "penetrative")>>
 
 				$HeadGirl.slaveName smacks the humping
@@ -556,11 +556,11 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 				<</if>>
 				$Concubine.slaveName.
 				<<run seX($activeSlave, "anal", $Concubine, "penetrative")>>
-				$Concubine.slaveName smacks the humping 
+				$Concubine.slaveName smacks the humping
 				<<if $activeSlave.physicalAge > 30>>
-					$woman's 
+					$woman's
 				<<else>>
-					$girl's 
+					$girl's
 				<</if>>
 				butt to get $him to stop, and slides an index finger up $his ass alongside the
 				<<if !canPenetrate($Concubine)>>
@@ -612,7 +612,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 <br><<link "Change it some more">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You tell $him that since $he appreciates how $his ass has changed, $he won't be surprised if you treat it like the fuckhole it is. Something in your tone makes $him cautious, but $he's a good $girl and says "Ye<<s>>, <<Master>>," automatically. You pass $assistantName wardrobe orders for the poor <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>>, and instructions to have $him report to your office once $he's dressed. A few minutes later, $activeSlave.slaveName walks up to your desk, stark naked except for a buttplug that comfortably fills $his rectum and a sturdy leather collar attached to a leash. You snap your fingers, pointing at the ground, and $he scrambles <<if hasAllLimbs($activeSlave)>>to $his hands and knees<<else>>downwards<</if>> and removes $his plug. After $he's taken a harsh buttfuck, you <<if $PC.dick != 0>>push the plug back in without letting any of your cum escape<<else>>plug $him up again<</if>> and attach the leash to your belt. You ignore your anal toy completely, letting $him kneel next to you as you work — $he doesn't seem to want to sit, for some reason. For the rest of the day, $his anus takes the full force of your libido. You fuck nothing else, confining your efforts to $his backdoor, keeping $him plugged when you aren't penetrating $him. When you're bored, you hand $him a dildo and tell $him to take care of it $himself.
+	You tell $him that since $he appreciates how $his ass has changed, $he won't be surprised if you treat it like the fuckhole it is. Something in your tone makes $him cautious, but $he's a good $girl and says "Ye<<s>>, <<Master>>," automatically. You pass $assistant.name wardrobe orders for the poor <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>>, and instructions to have $him report to your office once $he's dressed. A few minutes later, $activeSlave.slaveName walks up to your desk, stark naked except for a buttplug that comfortably fills $his rectum and a sturdy leather collar attached to a leash. You snap your fingers, pointing at the ground, and $he scrambles <<if hasAllLimbs($activeSlave)>>to $his hands and knees<<else>>downwards<</if>> and removes $his plug. After $he's taken a harsh buttfuck, you <<if $PC.dick != 0>>push the plug back in without letting any of your cum escape<<else>>plug $him up again<</if>> and attach the leash to your belt. You ignore your anal toy completely, letting $him kneel next to you as you work — $he doesn't seem to want to sit, for some reason. For the rest of the day, $his anus takes the full force of your libido. You fuck nothing else, confining your efforts to $his backdoor, keeping $him plugged when you aren't penetrating $him. When you're bored, you hand $him a dildo and tell $him to take care of it $himself.
 	<br><br>
 	$He's quite exhausted by the end of the day, walking dumbly along behind you, leashed to your belt and wondering tiredly when $his next reaming is coming. $He doesn't notice that you're bringing $him back to stand in front of the mirror until $he's there. You push $his compliant body into an approximation of $his position from the morning and tell $him to remove $his plug and look at $his asshole. "Ye<<s>> <<Master>>," $he <<says>>, and obeys.<<if $PC.dick != 0>> This releases quite a rush of ejaculate.<</if>> $His anus is @@.lime;very loose,@@ a lewd, gaping fuckhole hungry for toys, fingers, and dick. You tell $him that, and ask whether $he agrees. @@.hotpink;"Ye<<s>> <<Master>>," $he <<say>>s.@@
 	<<set $activeSlave.devotion += 4>>
@@ -796,7 +796,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 
 	<<replace "#result">>
 	<p>
-		You tell $him to head down to the wardrobe and put on the outfit that'll be laid out for $him there. $He obeys promptly, but does not return for some time, having gotten instructions from $assistantName along the way to put extra effort into $his grooming. When $he finally returns, the effect is striking.
+		You tell $him to head down to the wardrobe and put on the outfit that'll be laid out for $him there. $He obeys promptly, but does not return for some time, having gotten instructions from $assistant.name along the way to put extra effort into $his grooming. When $he finally returns, the effect is striking.
 		<<if $activeSlave.face > 10>>
 			$He's a gorgeous $girl with or without makeup, dressed up or naked, but $he's especially luscious tonight.
 		<<else>>
@@ -813,7 +813,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 <br><<link "Show $him off online">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You tell $him that $he's become a very pretty sex slave, and to prove it, you set up a live feed for $him that's available for free in the old world. The Free Cities produce an utter torrent of hardcore video, so much that there's never any profit to be made off it anymore, but viewers begin to join the channel anyway and by the end of the week $he has thousands of eyes watching $him as $he <<if $activeSlave.assignment == "whore">>sells $his body<<else>>has sex with random citizens<</if>> in the hallways of $arcologies[0].name. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> keeps $him constantly informed of how many people are watching $him get fucked, how many of them are likely masturbating to $his body, and how many inquiries about $him $assistantName is culling out of your inbox. $He slowly gets used to $his starring role in an impromptu free hardcore stream, but never quite stops stealing wondering glances at the nearest camera, as though $he cannot believe that so many people would sexualize $him. This lends $him a naughtiness that cannot be faked, garnering $him @@.green;much attention@@ by the end of the week.
+	You tell $him that $he's become a very pretty sex slave, and to prove it, you set up a live feed for $him that's available for free in the old world. The Free Cities produce an utter torrent of hardcore video, so much that there's never any profit to be made off it anymore, but viewers begin to join the channel anyway and by the end of the week $he has thousands of eyes watching $him as $he <<if $activeSlave.assignment == "whore">>sells $his body<<else>>has sex with random citizens<</if>> in the hallways of $arcologies[0].name. <<= capFirstChar($assistant.name)>> keeps $him constantly informed of how many people are watching $him get fucked, how many of them are likely masturbating to $his body, and how many inquiries about $him $assistant.name is culling out of your inbox. $He slowly gets used to $his starring role in an impromptu free hardcore stream, but never quite stops stealing wondering glances at the nearest camera, as though $he cannot believe that so many people would sexualize $him. This lends $him a naughtiness that cannot be faked, garnering $him @@.green;much attention@@ by the end of the week.
 	<<if ($activeSlave.fetish == "humiliation") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
 		Of course, since $he's a humiliation fetishist, this experience is like sexual candy for $him. $He @@.hotpink;can't get enough.@@
 		<<set $activeSlave.devotion += 4>>
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index 806bc5f646fde91ebc00edd8aa9eec997985aea2..6687a1f8c66e25e4f941338213580e08579b8f20 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -293,7 +293,7 @@
 	<span id="result">
 		<<link "Alert your drones and keep walking">>
 			<<replace "#result">>
-				You inform $assistantName that you have a slave beater in need of detainment by your security drones, then continue on your way confident in your knowledge that the citizen will soon be in custody.
+				You inform $assistant.name that you have a slave beater in need of detainment by your security drones, then continue on your way confident in your knowledge that the citizen will soon be in custody.
 			<</replace>>
 		<</link>>
 		<<if $cash >= 2000>>
@@ -330,7 +330,7 @@
 	<span id="result">
 		<<link "Alert your drones and keep walking">>
 			<<replace "#result">>
-				You inform $assistantName that you have a slave lover in need of harassment by your security drones, then continue on your way. You did not instruct your drones to attack the obscene pair, as the scrutiny and public shame of a drone escort around the arcology are a more fitting punishment for a citizen and will perhaps encourage him to think twice before treating his slave as an equal.
+				You inform $assistant.name that you have a slave lover in need of harassment by your security drones, then continue on your way. You did not instruct your drones to attack the obscene pair, as the scrutiny and public shame of a drone escort around the arcology are a more fitting punishment for a citizen and will perhaps encourage him to think twice before treating his slave as an equal.
 			<</replace>>
 		<</link>>
 		<<if $cash >= 2000>>
@@ -435,7 +435,7 @@
 		<</if>>
 		<br><<link "Offer to enhance $him in your remote surgery in exchange for a fuck">>
 			<<replace "#result">>
-				You make your presence known to citizen, and once the usual shock and disbelief have worn off the citizen rapidly agrees to your proposal. $He follows you back to the penthouse where you inform $assistantName that the citizen is to be given the works in the remote surgery. As the citizen passes through the doors to the surgery, $he turns and blows you a kiss of gratitude.
+				You make your presence known to citizen, and once the usual shock and disbelief have worn off the citizen rapidly agrees to your proposal. $He follows you back to the penthouse where you inform $assistant.name that the citizen is to be given the works in the remote surgery. As the citizen passes through the doors to the surgery, $he turns and blows you a kiss of gratitude.
 				<br><br>
 				When the citizen is later delivered to your private suite to uphold $his end of the bargain, $he does so as the veritable image of a perfect bimbo slut. In $his rush to come thank you for transforming $him from $his plain and plebian appearance $he has evidently neglected to clothe $himself, so you can admire $his new firm tits, plump ass and bee-stung lips from the moment $he enters the room. Despite being fresh from surgery, $he's an exquisite fuck and an enthusiastic partner — citizens like $him often are, given that penetration from a slave would be a social suicide.
 				<<if $cash >= 10000>>
@@ -443,7 +443,7 @@
 					<span id="result2">
 						<<link "Enslave $him afterwards">>
 							<<replace "#result2">>
-								As your new playmate lies slumbering in bed, you consult with $assistantName as to the cost of the surgery conducted today. With some creative accounting, you settle the citizen's other outstanding debts and then arrange for $him to be charged a sum in excess of $his financial means for the surgery conducted on $him today. Of course, that was not what you agreed, but it was $his mistake for undergoing an expensive procedure without a formal contract. When $he awakens, though $he will retain $his new bimbo body, $he will be just another slave in your penthouse.
+								As your new playmate lies slumbering in bed, you consult with $assistant.name as to the cost of the surgery conducted today. With some creative accounting, you settle the citizen's other outstanding debts and then arrange for $him to be charged a sum in excess of $his financial means for the surgery conducted on $him today. Of course, that was not what you agreed, but it was $his mistake for undergoing an expensive procedure without a formal contract. When $he awakens, though $he will retain $his new bimbo body, $he will be just another slave in your penthouse.
 								<<run newSlave($activeSlave)>> /* skip New Slave Intro */
 								<<run cashX(-10000, "event", $activeSlave)>>
 							<</replace>>
@@ -503,7 +503,7 @@
 		<</if>>
 		<br><<link "Manipulate $him into having sex with you">>
 			<<replace "#result">>
-				It only takes a moment for $assistantName to uncover the father's financial records and the copious debt therein, and only another moment for you to browbeat the terrified father into allowing his $daughter to sleep with you under threat of purchasing all their debt and summarily enslaving $him.
+				It only takes a moment for $assistant.name to uncover the father's financial records and the copious debt therein, and only another moment for you to browbeat the terrified father into allowing his $daughter to sleep with you under threat of purchasing all their debt and summarily enslaving $him.
 				<br><br>
 				Once you both retire to your private suite, you peel the $girl's clothes off as easily as one might shed a gift of its wrapping. In the nude $his body is tastefully youthful, with narrow hips, firm breasts, and a delicate blush across $his shamefaced, rosy cheeks. Despite the circumstances of your sexual conquest of $him, $he seems to enjoy the fuck well enough by the sounds of $his frenzied moans — citizens like $him often do since sexual submission to a slave would be a crippling scandal to a prominent citizen, let alone one of $his diminished social stature.
 				<<if $cash >= 10000>>
@@ -555,7 +555,7 @@
 		<</if>>
 		<br><<link "Manipulate $him into having sex with you">>
 			<<replace "#result">>
-				It only takes a moment for $assistantName to uncover the citizen's financial records and the copious debt therein, and only another moment for you to browbeat the terrified older women into sleeping with you under threat of purchasing all $his debt and summarily enslaving $him. $His sons, frightened into obedience by the possibility of losing their dear mother, take their cue to make themselves scarce during the encounter.
+				It only takes a moment for $assistant.name to uncover the citizen's financial records and the copious debt therein, and only another moment for you to browbeat the terrified older women into sleeping with you under threat of purchasing all $his debt and summarily enslaving $him. $His sons, frightened into obedience by the possibility of losing their dear mother, take their cue to make themselves scarce during the encounter.
 				<br><br>
 				Once you both retire to your private suite, you peel the mature citizen's clothes off as easily as one might shed a gift of its wrapping. In the nude $his body is tastefully plush, with wide hips, firm motherly breasts, and a delicate blush across $his shamefaced, plump cheeks. Despite the circumstances of your sexual conquest of $him, $he seems to enjoy the fuck well enough by the sounds of $his frenzied moans — citizens like $him often do since sexual submission to a slave would be a crippling scandal to a prominent citizen, let alone one of $his diminished social stature.
 				<<if $cash >= 10000>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 569c865fac5d210490a745e118ca182269c85c09..2a4b71963d2ee7fee66e07e50b403651ce8d1ea1 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -408,11 +408,11 @@ With $his back arched and $his thighs together $his <<if $activeSlave.butt > 5>>
 
 <<case "bed snuggle">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> wakes you in the morning,
-<<if $assistant == 0>>
+<<= capFirstChar($assistant.name)>> wakes you in the morning,
+<<if $assistant.personality == 0>>
 	_hisA voice
 <<else>>
-	<<switch $assistantAppearance>>
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		_hisA monster<<= _girlA>> avatar's sultry voice
 	<<case "shemale">>
@@ -447,7 +447,7 @@ With $his back arched and $his thighs together $his <<if $activeSlave.butt > 5>>
 <</if>>
 gently calling your name. As you regain consciousness, you become aware of a weight on your chest<<if $PC.boobs >= 1400>> other than your heavy tits<</if>>. <<EventNameLink>> has snuggled up against you in $his sleep. $He's nude, and so are you; everyone sleeps naked in your penthouse. The sheet is down at your hips, leaving your upper bodies bare. <<if !hasAnyArms($activeSlave)>>$He's wormed $his <<if isAmputee($activeSlave)>>limbless<<else>>armless<</if>> torso under your arm,<<else>>$He has one arm across your <<if $PC.boobs >= 300>>chest, just below your breasts,<<elseif $PC.title == 1>>manly chest<<else>>flat chest,<</if>><</if>> and is using your shoulder as a pillow. You can feel $his warm breath across <<if $PC.boobs >= 300 || $PC.title == 0>>your nipple on that side, and it hardens slowly under your gaze<<else>>your well-developed pectorals<</if>>. $His <<if $activeSlave.boobs > 4000>>incredible tits are resting to either side of your ribcage, with one of them a heavy mass on your chest and the other trapped under $his<<elseif $activeSlave.boobs > 1200>>big boobs form a warm, soft mass between you<<else>>soft chest rests warmly against your ribcage<</if>><<if $activeSlave.belly >= 10000>>, beneath them, $his _belly <<if $activeSlave.bellyPreg >= 8000>>pregnant <</if>>belly rests <<if $PC.belly >= 1500>>against your own baby bump<<else>>upon your flat stomach<</if>><</if>>, and farther down, there's another source of warmth where $he's <<if !hasAnyLegs($activeSlave)>>got $his legless pelvis resting against your hip<<else>>straddling your thigh<</if>>.
 <br><br>
-"<<= properTitle()>>," $assistantName calls again, "you <<if $assistant == 0>>set a wake up for this time<<else>>asked me to wake you at this time<</if>>. You have a business meeting that starts shortly." You begin to slide out from under $activeSlave.slaveName, but the
+"<<= properTitle()>>," $assistant.name calls again, "you <<if $assistant.personality == 0>>set a wake up for this time<<else>>asked me to wake you at this time<</if>>. You have a business meeting that starts shortly." You begin to slide out from under $activeSlave.slaveName, but the
 <<if $activeSlave.physicalAge > 30>>
 	$woman
 <<elseif $activeSlave.physicalAge > 18>>
@@ -629,7 +629,7 @@ $He stands up straight, but this brings $his <<if canSee($activeSlave)>><<= App.
 
 <<case "devoted exhibition">>
 
-You make a habit of circulating through the arcology's public spaces when you can, to maintain your reputation for hands-on control and to keep a personal eye on the atmosphere. Citizens high and low avail themselves of the opportunity to greet you, introduce themselves, or bring small matters to your attention. Today, one of your prominent citizens brought up an unusually important subject, so you performed a walk and talk with him, ending out on a balcony. He goes away satisfied, but you spent longer than you intended away from the penthouse. As such, you missed the start of <<EventNameLink>>'s weekly inspection. $He finds you out on the balcony, directed to you by $assistantName,
+You make a habit of circulating through the arcology's public spaces when you can, to maintain your reputation for hands-on control and to keep a personal eye on the atmosphere. Citizens high and low avail themselves of the opportunity to greet you, introduce themselves, or bring small matters to your attention. Today, one of your prominent citizens brought up an unusually important subject, so you performed a walk and talk with him, ending out on a balcony. He goes away satisfied, but you spent longer than you intended away from the penthouse. As such, you missed the start of <<EventNameLink>>'s weekly inspection. $He finds you out on the balcony, directed to you by $assistant.name,
 <<if ($activeSlave.weight > 160)>>
 	breathing hard from the effort of hauling $his fat ass
 <<elseif ($activeSlave.belly >= 100000)>>
@@ -731,7 +731,7 @@ from your view. The wait gives license to $his fears. $His<<if ($activeSlave.lip
 
 <<case "cooler lockin">>
 
-You're circulating in $clubName, looking over your holdings but mostly just letting yourself be seen, when your personal assistant quietly alerts you. <<if $assistant == 0>>"<<= properTitle()>>,"<<else>>"Baby,"<</if>> _heA says, "<<EventNameLink>> can't get out of the refrigerator." <<if $assistant == 0>>The personal assistant explains the absurd statement: "$He's been assigned to get some items out of the walk-in refrigerator. $He accidentally let the door shut behind $him, didn't notice, took too long in there, and is now too chilled to figure out the emergency release. I can unlock it remotely, or you can let $him out yourself."<<else>>Chuckling, your personal assistant explains the absurd statement: "The silly $girl's been assigned to get some things out of the walk-in refrigerator. $He accidentally let the door shut behind $him, didn't notice, took too long in there, and is now too chilled to figure out the emergency release. I can unlock it remotely, or you can head over and have some fun with $him."<</if>>
+You're circulating in $clubName, looking over your holdings but mostly just letting yourself be seen, when your personal assistant quietly alerts you. <<if $assistant.personality == 0>>"<<= properTitle()>>,"<<else>>"Baby,"<</if>> _heA says, "<<EventNameLink>> can't get out of the refrigerator." <<if $assistant.personality == 0>>The personal assistant explains the absurd statement: "$He's been assigned to get some items out of the walk-in refrigerator. $He accidentally let the door shut behind $him, didn't notice, took too long in there, and is now too chilled to figure out the emergency release. I can unlock it remotely, or you can let $him out yourself."<<else>>Chuckling, your personal assistant explains the absurd statement: "The silly $girl's been assigned to get some things out of the walk-in refrigerator. $He accidentally let the door shut behind $him, didn't notice, took too long in there, and is now too chilled to figure out the emergency release. I can unlock it remotely, or you can head over and have some fun with $him."<</if>>
 <br><br>
 The walk-in cooling unit is designed for the refrigeration of food for you and guests only, since the slaves drink a nutritive fluid that doesn't require it. Only servants ever have any reason to be in there, but $he was indeed instructed to fetch out some beverages necessary for an entertainment you have planned. It's cool in there, but not freezing, so $he's in no immediate danger.
 
@@ -780,7 +780,7 @@ You shake your head no, for the moment, and just enjoy the view. After a few min
 
 <<case "nympho with assistant">>
 
-You pass one of the penthouse's several supply closets by chance, and are surprised to hear $assistantName's voice inside. Oddly, there seems to be more than one of _himA. You open the door on a whim, to find that almost every one of the dildo machines in the closet is currently fucking <<EventNameLink>>,
+You pass one of the penthouse's several supply closets by chance, and are surprised to hear $assistant.name's voice inside. Oddly, there seems to be more than one of _himA. You open the door on a whim, to find that almost every one of the dildo machines in the closet is currently fucking <<EventNameLink>>,
 <<if $activeSlave.belly >= 500000>>
 	atop $his <<if $activeSlave.bellyPreg >= 5000>>excited and wriggling mass of children<<else>>over-inflated sphere of a stomach<</if>>
 <<else>>
@@ -788,7 +788,7 @@ You pass one of the penthouse's several supply closets by chance, and are surpri
 <</if>>
 in the middle of the room with the machines all around $him. $He has <<if canDoVaginal($activeSlave)>><<if $activeSlave.vagina > 2>>two large dildos working $his gaping cunt, <<elseif $activeSlave.vagina > 1>>a large dildo working $his cunt, <<elseif $activeSlave.vagina > 0>>a dildo working $his tight pussy, <</if>><</if>><<if canDoAnal($activeSlave)>><<if $activeSlave.anus > 2>>two large dildos fucking $his enormous butthole, <<elseif $activeSlave.anus > 1>>a large dildo fucking $his butthole, <<elseif $activeSlave.anus > 0>>a dildo fucking $his tight butt, <</if>><</if>><<if $activeSlave.boobs > 1200>>has lubricated $his cavernous cleavage to titfuck another, <<elseif $activeSlave.boobs > 400>>has lubricated $his cleavage to titfuck another, <</if>><<if $activeSlave.nipples == "fuckable">>has a pair pistoning in and out of $his nipples, <</if>><<if hasAnyArms($activeSlave)>>is performing <<if !hasBothArms($activeSlave)>>a frantic handjob<<else>>two handjobs at once, to either side<</if>>, <</if>><<if $activeSlave.belly >= 5000>>has lubricated the sides of $his _belly <<if $activeSlave.bellyPreg >= 3000>> pregnancy<</if>>, along with $his inner thighs, to create a sort of belly job, <</if>><<if $activeSlave.skill.oral >= 60>>and is making use of $his outstanding oral skills to suck off two more.<<elseif $activeSlave.skill.oral > 30>>and is taking a throatfuck from one more.<<else>>and is giving the final one a blowjob.<</if>> When $he <<if canSee($activeSlave)>>sees that you've entered — which takes a while, since $he's distracted<<elseif canHear($activeSlave)>>hears that you've entered — which takes a while, given the amount of noise<<else>>realizes that you've entered — which takes a while, considering $his state<</if>> — $he tries to smile<<if hasAnyArms($activeSlave)>> and wave<</if>>.
 <br><br>
-The source of the many-voiced personal assistant becomes clear: probably on the incorrigible $activeSlave.slaveName's request, your sultry personal assistant is voicing each and every one of the machines. When the nymphomaniac masturbator tries to smile <<if hasAnyArms($activeSlave)>> and wave<</if>>, there's an absolute chorus of "Back to work, slut", "Smile less, suck more", "Take it, bitch", et cetera. Yet another instance of $assistantName chuckles in your ear. "Care to join in, <<= properTitle()>>? I'm sure we can find room somewhere."
+The source of the many-voiced personal assistant becomes clear: probably on the incorrigible $activeSlave.slaveName's request, your sultry personal assistant is voicing each and every one of the machines. When the nymphomaniac masturbator tries to smile <<if hasAnyArms($activeSlave)>> and wave<</if>>, there's an absolute chorus of "Back to work, slut", "Smile less, suck more", "Take it, bitch", et cetera. Yet another instance of $assistant.name chuckles in your ear. "Care to join in, <<= properTitle()>>? I'm sure we can find room somewhere."
 
 <<case "sore ass">>
 
@@ -803,7 +803,7 @@ One night, you see <<EventNameLink>> <<if (!hasAnyLegs($activeSlave))>>scooting
 
 <<case "shift doorframe">>
 
-Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. <<if $Concubine != 0>>Your concubine, $Concubine.slaveName<<elseif $HeadGirl != 0>>Your Head Girl, $HeadGirl.slaveName<<elseif $assistantName == "your personal assistant">>Your personal assistant<<else>>Your personal assistant, <<= capFirstChar($assistantName)>> <</if>>manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<EventNameLink>> has just come on shift.
+Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. <<if $Concubine != 0>>Your concubine, $Concubine.slaveName<<elseif $HeadGirl != 0>>Your Head Girl, $HeadGirl.slaveName<<elseif $assistant.name == "your personal assistant">>Your personal assistant<<else>>Your personal assistant, <<= capFirstChar($assistant.name)>> <</if>>manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<EventNameLink>> has just come on shift.
 <br><br>
 You're at your desk as $he arrives; $his predecessor passes $him on the way out. $activeSlave.slaveName pauses for a moment in the doorway, and then decides to give you a show. $He spreads $his legs until $his
 <<if $activeSlave.shoes == "heels">>
@@ -973,7 +973,7 @@ $He pulls the buttock closest to you aside, giving you a clear view of $his
 
 <<case "resistant shower">>
 
-Though $assistantName constantly monitors all your slaves, you keep an eye on the video feeds yourself. There's nothing like the personal, human touch. You notice one night that <<EventNameLink>> is crouched in the bottom of the shower. Sensing something amiss, you discreetly investigate, and find that $he's crying quietly under the warm water.
+Though $assistant.name constantly monitors all your slaves, you keep an eye on the video feeds yourself. There's nothing like the personal, human touch. You notice one night that <<EventNameLink>> is crouched in the bottom of the shower. Sensing something amiss, you discreetly investigate, and find that $he's crying quietly under the warm water.
 
 <<case "resistant gelding">>
 
@@ -985,7 +985,7 @@ You have a lot of work to do with <<EventNameLink>>. $He compounds the usual reb
 
 <<case "escapee">>
 
-An escape attempt occurs and is stopped almost before you are informed of it. <<EventNameLink>> made a rash attempt to leave the penthouse, but $assistantName monitors everyone constantly and was able to enclose $him before $he got very far. <<if $assistant == 0>>It reports impersonally that the would-be escapee is locked in the entryway awaiting your judgment.<<else>>$He reports suggestively that the would-be escapee is locked in the entryway awaiting your pleasure.<</if>>
+An escape attempt occurs and is stopped almost before you are informed of it. <<EventNameLink>> made a rash attempt to leave the penthouse, but $assistant.name monitors everyone constantly and was able to enclose $him before $he got very far. <<if $assistant.personality == 0>>It reports impersonally that the would-be escapee is locked in the entryway awaiting your judgment.<<else>>$He reports suggestively that the would-be escapee is locked in the entryway awaiting your pleasure.<</if>>
 <br><br>
 <<if $arcologyUpgrade.drones == 1>>Your advanced security systems are able to stop $him promptly, and there is no indication to the public that any escape attempt was made.<<else>>Your basic security systems are only able to stop $him by briefly locking down your penthouse, exciting @@.red;some adverse public comment.@@<<run repX(forceNeg(100), "event", $activeSlave)>><</if>>
 <<if $activeSlave.indentureRestrictions > 0>>
@@ -1316,7 +1316,7 @@ naked ass catching your eye as $he goes.
 
 <<case "shift masturbation">>
 
-Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. <<if $Concubine != 0>>Your concubine, $Concubine.slaveName<<elseif $HeadGirl != 0>>Your Head Girl, $HeadGirl.slaveName<<elseif $assistantName == "your personal assistant">>Your personal assistant<<else>>Your personal assistant, <<= capFirstChar($assistantName)>> <</if>>manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<EventNameLink>> has just come on shift.
+Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. <<if $Concubine != 0>>Your concubine, $Concubine.slaveName<<elseif $HeadGirl != 0>>Your Head Girl, $HeadGirl.slaveName<<elseif $assistant.name == "your personal assistant">>Your personal assistant<<else>>Your personal assistant, <<= capFirstChar($assistant.name)>> <</if>>manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<EventNameLink>> has just come on shift.
 <br><br>
 And has $he ever come on shift. $He enters your office at something not far removed from a run, displaying evident signs of sexual excitation, a blush visible on $his $activeSlave.skin cheeks. Between $his job, the mild drugs in $his food, and $his life, $he's beside $himself with need. $He realizes you're working and tries to compose $himself, but gives up after a short struggle and flings $himself down on the couch. $He scoots down so $his <<if $activeSlave.butt > 5>>enormous<<elseif $activeSlave.butt > 2>>healthy<<else>>trim<</if>> butt is hanging off the edge of the cushion, and spreads $his legs up and back<<if $activeSlave.belly >= 5000>> to either side of $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly<</if>> as wide as they'll go<<if ($activeSlave.boobs > 1000)>>, hurriedly shoving $his tits out of the way<</if>>. $He uses both hands to frantically
 <<if ($activeSlave.dick > 0) && !canAchieveErection($activeSlave)>>
@@ -1348,7 +1348,7 @@ but after a moment $he clearly decides this isn't enough stimulation. $He <<if $
 
 <<case "shift sleep">>
 
-Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. <<if $Concubine != 0>>Your concubine, $Concubine.slaveName<<elseif $HeadGirl != 0>>Your Head Girl, $HeadGirl.slaveName<<elseif $assistantName == "your personal assistant">>Your personal assistant<<else>>Your personal assistant, <<= capFirstChar($assistantName)>> <</if>>manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<EventNameLink>> has just come on shift.
+Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. <<if $Concubine != 0>>Your concubine, $Concubine.slaveName<<elseif $HeadGirl != 0>>Your Head Girl, $HeadGirl.slaveName<<elseif $assistant.name == "your personal assistant">>Your personal assistant<<else>>Your personal assistant, <<= capFirstChar($assistant.name)>> <</if>>manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<EventNameLink>> has just come on shift.
 <br><br>
 Though it's late, $he's surprised to find the lights in the master suite off. You had an unusually trying day, so you've retired for the night; you're on the point of sleep when $he comes in<<if $Concubine != 0>>, $Concubine.slaveName nestled under your arm<</if>>. After a moment's hesitation, $activeSlave.slaveName strips quietly and
 <<if $activeSlave.belly >= 100000>>
@@ -1415,7 +1415,7 @@ The showers your slaves use are well vented and transparent walled so that you c
 
 <<case "obedient idiot">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> breaks in on your work at your desk. <<if $assistant == 0>>"<<= properTitle()>>,"<<else>>"Sweetheart,"<</if>> $he says, "<<EventNameLink>> is having trouble figuring out the meal dispenser again." <<if $assistant == 0>>The report is deadpan, but $he brings up a visual feed.<<else>>$He brings up a visual feed. "Poor baby!" $he exclaims.<</if>>
+<<= capFirstChar($assistant.name)>> breaks in on your work at your desk. <<if $assistant.personality == 0>>"<<= properTitle()>>,"<<else>>"Sweetheart,"<</if>> $he says, "<<EventNameLink>> is having trouble figuring out the meal dispenser again." <<if $assistant.personality == 0>>The report is deadpan, but $he brings up a visual feed.<<else>>$He brings up a visual feed. "Poor baby!" $he exclaims.<</if>>
 <br><br>
 Slaves are supposed to place a cup under a spigot, which detects the cup's presence and dispenses the appropriate nutrition for the $girl. Unfortunately this concept seems a little tough for $activeSlave.slaveName. With no one around to ask for help, $he has resorted to trying to suck food out of the spigot with $his mouth. With no cup to be detected, $he's not getting very far, and is getting bitterly frustrated.
 
@@ -2548,7 +2548,7 @@ A perfectly devoted slave might display $himself, and a rebellious one might try
 
 <<case "diet">>
 
-<<EventNameLink>> is on a diet, and $he needs it. That doesn't make it any easier for $him. Your slaves are not permitted time to waste over meals. They enter the simple kitchen, drink their allotted portion of slave food out of a cup, and get on with their duties.<<if $activeSlave.preg > $activeSlave.pregData.normalBirth/1.33>> Despite eating for <<if $activeSlave.pregType <= 1>>two<<elseif $activeSlave.pregType >= 10>>far too many<<else>><<= num($activeSlave.pregType + 1)>><</if>>, $his diet is still in full effect.<</if>> <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> catches $activeSlave.slaveName, whose cup is always filled less than halfway, skulking around in the hope that one of the others will take $his eyes off $his cup, or even leave leftovers.
+<<EventNameLink>> is on a diet, and $he needs it. That doesn't make it any easier for $him. Your slaves are not permitted time to waste over meals. They enter the simple kitchen, drink their allotted portion of slave food out of a cup, and get on with their duties.<<if $activeSlave.preg > $activeSlave.pregData.normalBirth/1.33>> Despite eating for <<if $activeSlave.pregType <= 1>>two<<elseif $activeSlave.pregType >= 10>>far too many<<else>><<= num($activeSlave.pregType + 1)>><</if>>, $his diet is still in full effect.<</if>> <<= capFirstChar($assistant.name)>> catches $activeSlave.slaveName, whose cup is always filled less than halfway, skulking around in the hope that one of the others will take $his eyes off $his cup, or even leave leftovers.
 
 <<case "huge naturals">>
 
@@ -2589,7 +2589,7 @@ Through the glass walls of your office, you see <<EventNameLink>> fucking anothe
 <<case "PA servant">>
 
 As you begin your day one morning, you hear the quiet
-<<switch $assistantAppearance>>
+<<switch $assistant.appearance>>
 <<case "monstergirl">>
 	but unmistakably sensual voice of your monster<<= _girlA>>
 <<case "shemale">>
@@ -2623,8 +2623,8 @@ As you begin your day one morning, you hear the quiet
 <<case "schoolgirl">>
 	but unmistakably suggestive voice of your school<<= _girlA>>
 <</switch>>
-personal assistant coming from your office. Looking in, you are treated to the sight of <<EventNameLink>>'s <<if $activeSlave.butt > 8>>ridiculous bottom jiggling<<elseif $activeSlave.butt > 4>>big behind bouncing<<else>>cute rear<</if>><<if $activeSlave.belly >= 5000>>, and the _ belly rounded belly hanging between $his legs,<</if>> as $he reaches out over the glass top of your desk with a soft, dust-free cloth and a bottle of screen cleaner. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> is displaying _hisA avatar right under where the slave is cleaning the glass screen, and _heA's displaying it nude. _HeA's positioned _himselfA so that the poor slave appears to be wiping
-<<switch $assistantAppearance>>
+personal assistant coming from your office. Looking in, you are treated to the sight of <<EventNameLink>>'s <<if $activeSlave.butt > 8>>ridiculous bottom jiggling<<elseif $activeSlave.butt > 4>>big behind bouncing<<else>>cute rear<</if>><<if $activeSlave.belly >= 5000>>, and the _ belly rounded belly hanging between $his legs,<</if>> as $he reaches out over the glass top of your desk with a soft, dust-free cloth and a bottle of screen cleaner. <<= capFirstChar($assistant.name)>> is displaying _hisA avatar right under where the slave is cleaning the glass screen, and _heA's displaying it nude. _HeA's positioned _himselfA so that the poor slave appears to be wiping
+<<switch $assistant.appearance>>
 <<case "monstergirl">>
 	_hisA hair-tentacles
 <<case "shemale">>
@@ -2662,7 +2662,7 @@ personal assistant coming from your office. Looking in, you are treated to the s
 <<case "schoolgirl">>
 	_hisA perky tits
 <</switch>>
-down with screen cleaner, and is talking dirty to the furiously blushing servant. "Ohh, that feels good," _heA moans. "Rub me right there, you $desc slut! I love it!" The poor slave is doing $his best to hurry, embarrassed and unsure of how to react to $assistantName's behavior.
+down with screen cleaner, and is talking dirty to the furiously blushing servant. "Ohh, that feels good," _heA moans. "Rub me right there, you $desc slut! I love it!" The poor slave is doing $his best to hurry, embarrassed and unsure of how to react to $assistant.name's behavior.
 
 <<case "like me">>
 
@@ -2693,9 +2693,9 @@ You decide to stop by to see $his method at work. By the time you arrive, $he's
 
 <<case "forbidden masturbation">>
 
-<<if $assistant > 0>>
-	There is an alert from $assistantName, in _hisA deliciously feminine voice: "$activeSlave.slaveName is masturbating, <<= properMaster()>>. Ooh, $he's breaking the rules, <<= properMaster()>>!" _HisA avatar
-	<<switch $assistantAppearance>>
+<<if assistant.personality > 0>>
+	There is an alert from $assistant.name, in _hisA deliciously feminine voice: "$activeSlave.slaveName is masturbating, <<= properMaster()>>. Ooh, $he's breaking the rules, <<= properMaster()>>!" _HisA avatar
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		strokes _hisA dicks suggestively.
 	<<case "shemale">>
@@ -2732,7 +2732,7 @@ You decide to stop by to see $his method at work. By the time you arrive, $he's
 		spins accusingly.
 	<</switch>>
 <<else>>
-	There is a gentle alert from $assistantName: "$activeSlave.slaveName is masturbating in violation of the rules, <<= properMaster()>>."
+	There is a gentle alert from $assistant.name: "$activeSlave.slaveName is masturbating in violation of the rules, <<= properMaster()>>."
 <</if>>
 A video feed appears.
 <<if ($activeSlave.chastityVagina)>>
@@ -2828,72 +2828,72 @@ running $his tongue over $his<<if $activeSlave.lips > 40>> whorish<<elseif $acti
 
 Partway through <<EventNameLink>>'s weekly inspection, you have to leave for a moment to deal with a minor matter. Inspecting such a devoted slave is a pleasure, but you tear yourself away. Such sacrifices must be made.
 <br><br>
-When you return, the comfortably nude $desc is flirting shamelessly with $assistantName. Your personal assistant's $assistantAppearance avatar is glowing brightly on the desktop, and $he and $activeSlave.slaveName are trading increasingly exaggerated compliments.
-<<switch $assistantAppearance>>
+When you return, the comfortably nude $desc is flirting shamelessly with $assistant.name. Your personal assistant's $assistant.appearance avatar is glowing brightly on the desktop, and $he and $activeSlave.slaveName are trading increasingly exaggerated compliments.
+<<switch $assistant.appearance>>
 <<case "monstergirl">>
 	"I love your hair," the slave <<say>>s. "Have you done anything to it lately?"
 	<br><br>
-	$assistantName smiles dangerously, _hisA tentacle hair flaring out, its suckers starting to pulsate. "Don't you mean, 'have I done anyone with it lately?' I'd love to do you," _heA purrs.
+	$assistant.name smiles dangerously, _hisA tentacle hair flaring out, its suckers starting to pulsate. "Don't you mean, 'have I done anyone with it lately?' I'd love to do you," _heA purrs.
 <<case "shemale">>
 	"I love your cock," the slave <<if SlaveStatsChecker.checkForLisp($activeSlave)>>lisps wistfully<<else>>sighs wistfully<</if>>. <<if canAchieveErection($activeSlave)>>"I'd love to be that big."<<else>>"I can't look away."<</if>>
 	<br><br>
-	Complimented, $assistantName looks pleased. "Yeah, it's pretty great," _heA giggles.
+	Complimented, $assistant.name looks pleased. "Yeah, it's pretty great," _heA giggles.
 <<case "amazon">>
 	"You're <<s>>o big and <<s>>trong," the slave <<say>>s. "You look like you could give a great hug."
 	<br><br>
-	$assistantName blushes. "Um, well," _heA says, _hisA muscular avatar kicking its heels. "I can't. But I'd like to give you one!"
+	$assistant.name blushes. "Um, well," _heA says, _hisA muscular avatar kicking its heels. "I can't. But I'd like to give you one!"
 <<case "businesswoman">>
 	"You're <<s>>o confident and <<s>>e<<x>>y," the slave <<say>>s. "I love doing what you <<s>>ay."
 	<br><br>
-	$assistantName favors $him with an aristocratic look. "Well, you are a good slave," _heA says measuringly. "So I suppose I love telling you what to do." _HeA uncrosses and recrosses _hisA legs.
+	$assistant.name favors $him with an aristocratic look. "Well, you are a good slave," _heA says measuringly. "So I suppose I love telling you what to do." _HeA uncrosses and recrosses _hisA legs.
 <<case "fairy">>
 	"You're <<s>>o tiny and adorable," the slave <<say>>s. "You're a load of fun to be with."
 	<br><br>
-	$assistantName giggles and holds _hisA hands up to _hisA face. "Aw shucks, you're just saying that," _heA says shyly. "You're quite the cutie yourself!" _HeA flits to and fro.
+	$assistant.name giggles and holds _hisA hands up to _hisA face. "Aw shucks, you're just saying that," _heA says shyly. "You're quite the cutie yourself!" _HeA flits to and fro.
 <<case "pregnant fairy">>
 	"You're <<s>>o tiny and adorable," the slave <<say>>s. "You're a load of fun to be with."
 	<br><br>
-	$assistantName giggles and holds _hisA hands up to _hisA face. "Aw shucks, you're just saying that," _heA says shyly. "You're quite the cutie yourself!" _HeA moves one hand down to caress _hisA belly.
+	$assistant.name giggles and holds _hisA hands up to _hisA face. "Aw shucks, you're just saying that," _heA says shyly. "You're quite the cutie yourself!" _HeA moves one hand down to caress _hisA belly.
 <<case "cherub" "schoolgirl">>
 	"You're <<s>>o cute," the slave <<say>>s. "It make<<s>> thing<<s>> fun."
 	<br><br>
-	$assistantName looks touched. "Aw," _heA coos, "I love you too!"
+	$assistant.name looks touched. "Aw," _heA coos, "I love you too!"
 <<case "goddess" "hypergoddess">>
 	"I love the way you glow," the slave <<say>>s. "It'<<s>> really comforting."
 	<br><br>
-	$assistantName beams maternally. "That's wonderful," _heA says resonantly. "I want the best for you."
+	$assistant.name beams maternally. "That's wonderful," _heA says resonantly. "I want the best for you."
 <<case "loli">>
 	"You're <<s>>o cute," the slave <<say>>s. "It'<<s>> really calming."
 	<br><br>
-	$assistantName beams cutely. _HeA giggles quietly. "I'll be cuter just for you."
+	$assistant.name beams cutely. _HeA giggles quietly. "I'll be cuter just for you."
 <<case "preggololi">>
 	"You're <<s>>o cute," the slave <<say>>s. "It'<<s>> really calming."
 	<br><br>
-	$assistantName beams proudly. _HeA giggles loudly and pats _hisA belly. "I'll be cuter just for you."
+	$assistant.name beams proudly. _HeA giggles loudly and pats _hisA belly. "I'll be cuter just for you."
 <<case "angel">>
 	"I love your wing<<s>>," the slave <<say>>s. "They are <<s>>o maje<<s>>tic."
 	<br><br>
-	$assistantName smiles happily. "If it keeps you out of trouble."
+	$assistant.name smiles happily. "If it keeps you out of trouble."
 <<case "incubus">>
 	"You're <<s>>o <<s>>e<<x>>y," the slave <<say>>s. "I can't help be feel <<s>>o hot around you."
 	<br><br>
-	$assistantName beams proudly. "What kind of sex demon would I be if I couldn't turn you on?"
+	$assistant.name beams proudly. "What kind of sex demon would I be if I couldn't turn you on?"
 <<case "succubus">>
 	"You're <<s>>o <<s>>e<<x>>y," the slave <<say>>s. "I can't help be feel <<s>>o hot around you."
 	<br><br>
-	$assistantName beams proudly. "What kind of sex demoness would I be if I couldn't turn you on?"
+	$assistant.name beams proudly. "What kind of sex demoness would I be if I couldn't turn you on?"
 <<case "imp">>
 	"You're <<s>>o cute," the slave <<say>>s. "It make<<s>> you fun."
 	<br><br>
-	$assistantName cackles. "Won't spare you the whip and hot wax just for compliments!"
+	$assistant.name cackles. "Won't spare you the whip and hot wax just for compliments!"
 <<case "witch">>
 	"You're <<s>>o, uh, determined," the slave <<say>>s. "It make<<s>> you fun."
 	<br><br>
-	$assistantName giggles. "I'll just have to play with you more often then."
+	$assistant.name giggles. "I'll just have to play with you more often then."
 <<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
 	"You're <<s>>o intere<<s>>ting," the slave <<say>>s. "You alway<<s>> have <<s>>omething new to <<sh>>ow off."
 	<br><br>
-	$assistantName laughs. "I'll always find a way into your pants, so why bother trying to say no?"
+	$assistant.name laughs. "I'll always find a way into your pants, so why bother trying to say no?"
 <</switch>>
 
 <<case "dick wringing">>
@@ -2943,7 +2943,7 @@ Heading back towards your office after seeing to a minor matter, you encounter <
 
 <<case "refreshment delivery">>
 
-When it's time for refreshments, $assistantName directs the closest unoccupied slave to bring them in. This has the added advantage of bringing an enjoyably unpredictable variety of slaves under your eyes. This time, <<EventNameLink>> comes through the door of your office, carrying
+When it's time for refreshments, $assistant.name directs the closest unoccupied slave to bring them in. This has the added advantage of bringing an enjoyably unpredictable variety of slaves under your eyes. This time, <<EventNameLink>> comes through the door of your office, carrying
 <<if $PC.refreshmentType == 0>>
 	a selection of $PC.refreshment brands and the necessary implements
 <<elseif $PC.refreshmentType == 1>>
@@ -3162,7 +3162,7 @@ Still dreaming, $he clasps $his arm<<if hasBothArms($activeSlave)>>s<</if>> prot
 
 <<case "cockfeeder resistance">>
 
-As you're starting your day, $assistantName pauses _hisA review of business matters to report that <<EventNameLink>> is not accepting $his breakfast from the phallic feeders in the kitchen. With nothing else urgent, you head down to address the situation. $activeSlave.slaveName is in the proper position for feeding, on <<if hasBothLegs($activeSlave)>>$his knees<<else>>the ground<</if>> in front of a feeding fuckmachine. $He isn't sucking it off for $his breakfast, however. $He doesn't seem to be fully awake, and is <<if canSee($activeSlave)>>regarding<<else>>touching<</if>> the big dildo that $he's supposed to suck off for food with vague distaste. $His $activeSlave.faceShape face is scrunched into a look of tired disgust.
+As you're starting your day, $assistant.name pauses _hisA review of business matters to report that <<EventNameLink>> is not accepting $his breakfast from the phallic feeders in the kitchen. With nothing else urgent, you head down to address the situation. $activeSlave.slaveName is in the proper position for feeding, on <<if hasBothLegs($activeSlave)>>$his knees<<else>>the ground<</if>> in front of a feeding fuckmachine. $He isn't sucking it off for $his breakfast, however. $He doesn't seem to be fully awake, and is <<if canSee($activeSlave)>>regarding<<else>>touching<</if>> the big dildo that $he's supposed to suck off for food with vague distaste. $His $activeSlave.faceShape face is scrunched into a look of tired disgust.
 
 <br><br>
 
@@ -3175,7 +3175,7 @@ $He turns to you as you enter, and <<if canSee($activeSlave)>>seeing<<else>>real
 
 <<case "suppository resistance">>
 
-As you're starting your day, $assistantName pauses _hisA review of business matters to report that <<EventNameLink>> is not accepting $his breakfast from the phallic feeders in the kitchen. With nothing else urgent, you head down to address the situation. $activeSlave.slaveName is standing in front of the place where $he's supposed to take $his drugs. It's a little pad on the ground on which $he's supposed to kneel, with a fuckmachine positioned to penetrate $his anus once $he does so. $He's not completely awake yet, and is just standing there, <<if canSee($activeSlave)>>viewing<<else>>feeling<</if>> the setup with a vague look of distaste. $He's facing it, and has $his <<if $activeSlave.butt > 6>>massive behind<<elseif $activeSlave.butt > 3>>beautiful bottom<<else>>cute butt<</if>> pointed very much away from the machine that's supposed to be fucking it.
+As you're starting your day, $assistant.name pauses _hisA review of business matters to report that <<EventNameLink>> is not accepting $his breakfast from the phallic feeders in the kitchen. With nothing else urgent, you head down to address the situation. $activeSlave.slaveName is standing in front of the place where $he's supposed to take $his drugs. It's a little pad on the ground on which $he's supposed to kneel, with a fuckmachine positioned to penetrate $his anus once $he does so. $He's not completely awake yet, and is just standing there, <<if canSee($activeSlave)>>viewing<<else>>feeling<</if>> the setup with a vague look of distaste. $He's facing it, and has $his <<if $activeSlave.butt > 6>>massive behind<<elseif $activeSlave.butt > 3>>beautiful bottom<<else>>cute butt<</if>> pointed very much away from the machine that's supposed to be fucking it.
 
 <br><br>
 
@@ -3291,9 +3291,9 @@ in time with $his humming, $he runs $his hand<<if hasBothArms($activeSlave)>>s<<
 
 First thing in the morning,
 <<if $activeSlave.ID == $Bodyguard.ID>>
-	before you've even gotten out of bed, you hear <<EventNameLink>>'s voice coming up from where $he sleeps, on $his own bedroll in your suite. There's a distinctly plaintive note in $his voice, and as soon as you sit up and look in $his direction, it's obvious why. $He sleeps out of $his P-Limbs, since it's good to rest the anchor points implanted into $his torso. They're held in actuators over $his bedroll, which can swing down and attach them to $him the instant $he's awake. Except today, they're staying obstinately up near the ceiling. <<if $assistant != 0>>$assistantName tells you _heA's<<else>>Your personal assistant informs you _heA's<</if>> troubleshooting the problem, but in the meantime, poor
+	before you've even gotten out of bed, you hear <<EventNameLink>>'s voice coming up from where $he sleeps, on $his own bedroll in your suite. There's a distinctly plaintive note in $his voice, and as soon as you sit up and look in $his direction, it's obvious why. $He sleeps out of $his P-Limbs, since it's good to rest the anchor points implanted into $his torso. They're held in actuators over $his bedroll, which can swing down and attach them to $him the instant $he's awake. Except today, they're staying obstinately up near the ceiling. <<if $assistant.personality != 0>>$assistant.name tells you _heA's<<else>>Your personal assistant informs you _heA's<</if>> troubleshooting the problem, but in the meantime, poor
 <<else>>
-	$assistantName informs you that there's a minor problem with <<EventNameLink>>, and asks whether you'd like it to be handled without you. $He sleeps out of $his P-Limbs, since it's good to rest the anchor points implanted into $his torso. When $he wakes up, $he usually asks whichever slave is nearest to attach $his dominant arm, at which point $he can do the rest $himself. Due to an unexpected change in the slaves' schedules, though, $he's all alone today. Poor
+	$assistant.name informs you that there's a minor problem with <<EventNameLink>>, and asks whether you'd like it to be handled without you. $He sleeps out of $his P-Limbs, since it's good to rest the anchor points implanted into $his torso. When $he wakes up, $he usually asks whichever slave is nearest to attach $his dominant arm, at which point $he can do the rest $himself. Due to an unexpected change in the slaves' schedules, though, $he's all alone today. Poor
 <</if>>
 $activeSlave.slaveName is left as a helpless,
 <<if $activeSlave.bellyImplant >= 100000>>
@@ -3326,9 +3326,9 @@ $He doesn't phrase it quite like that, of course.
 <<setLocalPronouns _newSlaves[0] 2>>
 <<setLocalPronouns _newSlaves[1] 3>>
 
-One evening, $assistantName breaks in on your
-<<if $assistant > 0>>
-	work, _hisA $assistantAppearance avatar looking uncharacteristically somber. "<<= properMaster()>>," _heA says, "a group of tourists are giving <<EventNameLink>> a bad time." Before you can ask why the security drones haven't addressed the situation, _heA continues, "They're not abusing $him physically or anything. But, look." _HeA
+One evening, $assistant.name breaks in on your
+<<if assistant.personality > 0>>
+	work, _hisA $assistant.appearance avatar looking uncharacteristically somber. "<<= properMaster()>>," _heA says, "a group of tourists are giving <<EventNameLink>> a bad time." Before you can ask why the security drones haven't addressed the situation, _heA continues, "They're not abusing $him physically or anything. But, look." _HeA
 <<else>>
 	work, announcing that a group of visitors to the arcology are being verbally abusive to <<EventNameLink>>. Before you can ask why _heA's bothering you with this, _heA continues, "An enslavement opportunity may exist," and
 <</if>>
@@ -3514,7 +3514,7 @@ against the edge of the counter as $he leans forward a little to <<if $activeSla
 
 <<case "retching cum feeding">>
 
-You are inspecting the slave feeding area early in the week, watching your slaves as they come and go to get their required nourishment for the morning. You see <<EventNameLink>><<if $cockFeeder == 1>> as $he kneels in front of the feeder phallus with a look of disgust on $his face <<else>> as $he <<if canSee($activeSlave)>>stares into $his cup of nutritional fluid with a look of disgust on $his face<<else>>grimaces at $his cup of nutritional fluid<</if>>.<</if>> You quickly check your records and $assistantName confirms that $activeSlave.slaveName is required to ingest<<if $activeSlave.dietCum == 2>> an extreme diet based almost entirely on human ejaculate.<<else>> a large amount of human ejaculate as part of $his diet.<</if>>
+You are inspecting the slave feeding area early in the week, watching your slaves as they come and go to get their required nourishment for the morning. You see <<EventNameLink>><<if $cockFeeder == 1>> as $he kneels in front of the feeder phallus with a look of disgust on $his face <<else>> as $he <<if canSee($activeSlave)>>stares into $his cup of nutritional fluid with a look of disgust on $his face<<else>>grimaces at $his cup of nutritional fluid<</if>>.<</if>> You quickly check your records and $assistant.name confirms that $activeSlave.slaveName is required to ingest<<if $activeSlave.dietCum == 2>> an extreme diet based almost entirely on human ejaculate.<<else>> a large amount of human ejaculate as part of $his diet.<</if>>
 <br><br>
 As you watch $activeSlave.slaveName unpleasantly retch as $he<<if $cockFeeder == 1>> stimulates the feeder phallus with $his mouth<<else>> tentatively drinks from $his cup<</if>> and chokes $his food down, knowing that if $he doesn't eat it willingly, $he will be forced to, you can almost see $his <<if $activeSlave.intelligence+$activeSlave.intelligenceImplant > 15>> intelligent mind <<else>> stupid mind<</if>> working through the reality of what $his life has become. $He is now a receptacle for <<if $activeSlave.dietCum == 2>> concentrated <</if>>human ejaculate, and for no other reason than the perverse amusement of $his owner. Almost as soon as $he swallows $his food, $he whimpers, burps, and then <<if $activeSlave.belly >= 10000>>hastily waddles<<else>>quickly runs<</if>> to a nearby bathroom to vomit it back up. This is a common reaction for unbroken slaves on cum diets,<<if $activeSlave.weight > 0>> and can also be an effective, if unhealthy, way of forcing them to lose weight.<<else>> but it can also prevent slaves that are already too thin from gaining weight.<</if>>
 
@@ -3631,7 +3631,7 @@ $He knows that that's not allowed, and keeps $his hands where they are, though i
 
 <<case "moist pussy">>
 
-Just as you're about to give <<EventNameLink>> $his weekly inspection, a minor business matter comes up and diverts your attention. So, for about ten minutes, $he has nothing at all to do other than <<if canWalk($activeSlave)>>stand<<elseif hasAnyLegs($activeSlave)>>kneel<<else>>sit<</if>> in front of your desk in your office, <<if canSee($activeSlave)>>watching<<elseif canHear($activeSlave)>>listening to<<else>>feeling the subtle vibrations from<</if>> you,<<if $assistant > 0>> $assistantName's avatar,<</if>> the other slaves who come and go, and the general lewdness of the arcology, much of which is <<if canSee($activeSlave)>>visible<<elseif canHear($activeSlave)>>audible<<else>>apparent<</if>> from right here.
+Just as you're about to give <<EventNameLink>> $his weekly inspection, a minor business matter comes up and diverts your attention. So, for about ten minutes, $he has nothing at all to do other than <<if canWalk($activeSlave)>>stand<<elseif hasAnyLegs($activeSlave)>>kneel<<else>>sit<</if>> in front of your desk in your office, <<if canSee($activeSlave)>>watching<<elseif canHear($activeSlave)>>listening to<<else>>feeling the subtle vibrations from<</if>> you,<<if assistant.personality > 0>> $assistant.name's avatar,<</if>> the other slaves who come and go, and the general lewdness of the arcology, much of which is <<if canSee($activeSlave)>>visible<<elseif canHear($activeSlave)>>audible<<else>>apparent<</if>> from right here.
 <<if ($activeSlave.attrXY > 50) && ($PC.boobs < 300)>>
 	$He finds your strong body attractive, and $his gaze rests most frequently <<if canSee($activeSlave)>>on<<else>>towards<</if>> you.
 <<elseif ($activeSlave.attrXX > 50) && ($PC.boobs >= 650)>>
@@ -4096,9 +4096,9 @@ As another long week draws to a close, <<EventNameLink>> happens to walk past yo
 
 <<case "nice guys">>
 
-One afternoon, $assistantName informs you $he that $he has a non-urgent matter that you might be interested in overseeing personally.
-<<if $assistant > 0>>
-	_HisA $assistantAppearance avatar looks unusually curious. "<<= properTitle()>>," _heA says, "a group of tourists have just entered the arcology. They seem strangely enthralled by <<EventNameLink>>." Before you can ask why _heA deemed this important enough news to draw your attention to, _heA continues, "They're not using $him or anything. Just look." _HeA
+One afternoon, $assistant.name informs you $he that $he has a non-urgent matter that you might be interested in overseeing personally.
+<<if assistant.personality > 0>>
+	_HisA $assistant.appearance avatar looks unusually curious. "<<= properTitle()>>," _heA says, "a group of tourists have just entered the arcology. They seem strangely enthralled by <<EventNameLink>>." Before you can ask why _heA deemed this important enough news to draw your attention to, _heA continues, "They're not using $him or anything. Just look." _HeA
 <<else>>
 	It announces that a group of tourists have just entered the arcology, and seem unusually enthralled by <<EventNameLink>>. Before you can ask why _heA's bothering you with this, _heA continues, "A business opportunity may exist," and
 <</if>>
@@ -4235,9 +4235,9 @@ says a third, obviously smitten. "I'd give anything to have a night with $him."
 
 <<case "lazy evening">>
 
-Although your life as an arcology owner comes with many associated privileges, extended idleness to bask in your luxury is not often among them. Thankfully, $assistantName knows better than to let you run yourself ragged from the weight of your assorted responsibilities and often allots time in the evenings of your active schedule to simply relax.
+Although your life as an arcology owner comes with many associated privileges, extended idleness to bask in your luxury is not often among them. Thankfully, $assistant.name knows better than to let you run yourself ragged from the weight of your assorted responsibilities and often allots time in the evenings of your active schedule to simply relax.
 <br><br>
-Of course, no self respecting arcology owner could be expected to enjoy a lazy night of idle relaxation on their own. As you resolve the last of your most pressing responsibilities for the evening, $assistantName directs one of your attentive slaves to gently guide you away from the unending burdens of running your arcology. Leaning against the doorway and wearing a facsimile of what an old world $woman might wear on a casual night in, <<EventNameLink>>
+Of course, no self respecting arcology owner could be expected to enjoy a lazy night of idle relaxation on their own. As you resolve the last of your most pressing responsibilities for the evening, $assistant.name directs one of your attentive slaves to gently guide you away from the unending burdens of running your arcology. Leaning against the doorway and wearing a facsimile of what an old world $woman might wear on a casual night in, <<EventNameLink>>
 <<if !canTalk($activeSlave)>>
 	asks with a gesture that carries just the right mixture of submission and exaggerated casualness if you'd like to 'hang out.'
 <<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>
@@ -4332,7 +4332,7 @@ $He does $his very best to get through the inspection without disgrace, hugging
 
 <<case "objectifying visit">>
 
-At appropriate intervals during the day $assistantName directs an unoccupied slave to visit your office to ensure all your needs are currently being met. With such a vague task set before them, the slaves who enter your domain in such a way often find themselves used in a multitude of refreshingly novel ways. At this particular moment, <<EventNameLink>> comes through the door of your office and obediently
+At appropriate intervals during the day $assistant.name directs an unoccupied slave to visit your office to ensure all your needs are currently being met. With such a vague task set before them, the slaves who enter your domain in such a way often find themselves used in a multitude of refreshingly novel ways. At this particular moment, <<EventNameLink>> comes through the door of your office and obediently
 <<if $activeSlave.belly >= 300000>>
 	settles $himself
 <<else>>
@@ -4618,7 +4618,7 @@ $He cranes $his neck, glancing over $his shoulder to give you a pleading look.
 
 <<case "devoted fearful slave">>
 
-You are working late tonight, poring over some particularly troublesome business documents — though, thankfully, the end appears to be in sight. The sun has all but completely slipped below the horizon, drowning your office in moody twilight. Seeing that you are finally approaching the end of a long day, $assistantName takes the liberty of having a
+You are working late tonight, poring over some particularly troublesome business documents — though, thankfully, the end appears to be in sight. The sun has all but completely slipped below the horizon, drowning your office in moody twilight. Seeing that you are finally approaching the end of a long day, $assistant.name takes the liberty of having a
 <<if $PC.refreshmentType == 0>>
 	$PC.refreshment
 <<elseif $PC.refreshmentType == 1>>
@@ -6107,7 +6107,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<elseif _meetingBonus < 1000>>
 			<<set _meetingBonus = 1000>>
 		<</if>>
-		You tell $assistantName to inform your business contacts that you'll be attending the meeting by telepresence. A camera mounted above you focuses tightly on your face, making it look like you're relaxing, but concealing the fact that you have a naked
+		You tell $assistant.name to inform your business contacts that you'll be attending the meeting by telepresence. A camera mounted above you focuses tightly on your face, making it look like you're relaxing, but concealing the fact that you have a naked
 		<<if $activeSlave.physicalAge > 30>>
 			$woman
 		<<elseif $activeSlave.physicalAge > 18>>
@@ -6127,7 +6127,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <br><<link "Go back to sleep">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		You tell $assistantName to cancel the appointment, plant a kiss atop your bedmate's sleeping head, and go back to sleep yourself, with the peerless comfort of a warm, naked
+		You tell $assistant.name to cancel the appointment, plant a kiss atop your bedmate's sleeping head, and go back to sleep yourself, with the peerless comfort of a warm, naked
 		<<if $activeSlave.physicalAge > 30>>
 			$woman
 		<<elseif $activeSlave.physicalAge > 18>>
@@ -6137,7 +6137,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<else>>
 			kid
 		<</if>>
-		cuddled up beside you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> lowers the temperature in the room and directs another slave to quietly put a couple of warm blankets over you and $activeSlave.slaveName. When you finally wake, several hours later, the effect is magical. You're ensconced in a little island of warmth and comfort, a tiny universe of relaxation populated only by yourself and your slave. $He woke before you did, but remained still to avoid disturbing you. <<if canSee($activeSlave)>>From the lazy, contented look in $his <<= App.Desc.eyesColor($activeSlave)>> as $he meets your waking gaze, $he did not mind waiting. @@.hotpink;$He was already looking at your face when you opened your eyes.@@<<else>>From the serene expression on $his face as $he meets your waking gaze, $he did not mind waiting. @@.hotpink;$He was already looking at your face, lost in the soothing sounds of your breathing, when you opened your eyes.@@<</if>>
+		cuddled up beside you. <<= capFirstChar($assistant.name)>> lowers the temperature in the room and directs another slave to quietly put a couple of warm blankets over you and $activeSlave.slaveName. When you finally wake, several hours later, the effect is magical. You're ensconced in a little island of warmth and comfort, a tiny universe of relaxation populated only by yourself and your slave. $He woke before you did, but remained still to avoid disturbing you. <<if canSee($activeSlave)>>From the lazy, contented look in $his <<= App.Desc.eyesColor($activeSlave)>> as $he meets your waking gaze, $he did not mind waiting. @@.hotpink;$He was already looking at your face when you opened your eyes.@@<<else>>From the serene expression on $his face as $he meets your waking gaze, $he did not mind waiting. @@.hotpink;$He was already looking at your face, lost in the soothing sounds of your breathing, when you opened your eyes.@@<</if>>
 		<br><br>
 		Since you're awake, $he rolls onto $his face and then further, to place $his back and <<if $activeSlave.butt > 5>>massive ass<<elseif $activeSlave.butt > 2>>healthy rear<<else>>butt<</if>> against you, making sure to drag $his $activeSlave.nipples nipples against you the whole way. You accept the invitation and spoon $him, <<if $activeSlave.height >= 185>>your bodies lining up well, since $he's as tall as you are<<elseif $activeSlave.height >= 160>>$his body fitting neatly within the embrace of your larger frame<<else>>$his small body fitting entirely within your embrace<</if>>. $His <<if $activeSlave.muscles > 30>>muscles<<else>>softness<</if>> and warmth awaken your desire, and $he feels <<if $PC.dick != 0>>your stiffening cock beginning to press against <<if !hasBothLegs($activeSlave)>>$his perineum. $He shifts to slide $himself along its shaft<<if $PC.vagina != -1>> and down to where your pussy begins<</if>><<else>>the place between $his thighs. $He shifts to let your dick slide between them, and reaches down to massage its head<</if>><<else>>heat building against $his butt. <<if !hasAnyArms($activeSlave)>>$He does $his best to grind against you, since $he can't caress you without hands<<else>>$He snakes a hand behind $himself to caress your womanhood, and begins to gently <<if hasBothArms($activeSlave)>>masturbate with the other<<else>>grind against you<</if>><</if>><</if>>.
 		<<if $PC.dick != 0>>
@@ -6195,7 +6195,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <br><<link "Spend the day in bed">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		What's the point of becoming a wealthy tycoon in an anarcho-libertarian paradise if you have to obey the rules all the time? You tell $assistantName to cancel the appointment. Then, you wake your bedmate, and <<if $PC.dick != 0>>get a blowjob<<if $PC.vagina != -1>> and some attention for your pussy<</if>><<else>>have $him eat you out<</if>> under the sheet while you enjoy the lurid sunrise through the glass wall of your bedroom. When the sun is up and you've <<if $PC.dick != 0>>shot your load down $his throat<<else>>climaxed twice<</if>>, you pull the bemused $girl up alongside you again, bring the sheets up over you both, switch on a wallscreen, and ask $him if there's anything $he'd like to <<if canSee($activeSlave)>>watch<<elseif canHear($activeSlave)>>listen to<<else>>put on<</if>>. $He smiles incredulously, but after you encourage $him $he @@.mediumaquamarine;finds $his confidence@@ and admits that there's a Free Cities serial drama about slave life that $he enjoys. You put it on and watch three episodes with $him. It's terribly insipid, but there's a lot of explicit sex to liven things up, and all the actresses are nice enough to look at. $activeSlave.slaveName cuddles comfortably with you the entire time, <<if canSee($activeSlave)>>watching raptly<<elseif canHear($activeSlave)>>listening intently<<else>>staying as silent as possible<</if>> and doing $his best to explain the wretchedly trite plot you've missed.
+		What's the point of becoming a wealthy tycoon in an anarcho-libertarian paradise if you have to obey the rules all the time? You tell $assistant.name to cancel the appointment. Then, you wake your bedmate, and <<if $PC.dick != 0>>get a blowjob<<if $PC.vagina != -1>> and some attention for your pussy<</if>><<else>>have $him eat you out<</if>> under the sheet while you enjoy the lurid sunrise through the glass wall of your bedroom. When the sun is up and you've <<if $PC.dick != 0>>shot your load down $his throat<<else>>climaxed twice<</if>>, you pull the bemused $girl up alongside you again, bring the sheets up over you both, switch on a wallscreen, and ask $him if there's anything $he'd like to <<if canSee($activeSlave)>>watch<<elseif canHear($activeSlave)>>listen to<<else>>put on<</if>>. $He smiles incredulously, but after you encourage $him $he @@.mediumaquamarine;finds $his confidence@@ and admits that there's a Free Cities serial drama about slave life that $he enjoys. You put it on and watch three episodes with $him. It's terribly insipid, but there's a lot of explicit sex to liven things up, and all the actresses are nice enough to look at. $activeSlave.slaveName cuddles comfortably with you the entire time, <<if canSee($activeSlave)>>watching raptly<<elseif canHear($activeSlave)>>listening intently<<else>>staying as silent as possible<</if>> and doing $his best to explain the wretchedly trite plot you've missed.
 		<<run seX($activeSlave, "oral", $PC, "penetrative")>>
 		You have a meal delivered,
 		<<if $activeSlave.vagina > 0 && canDoVaginal($activeSlave)>>
@@ -6261,7 +6261,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				asshole<<if $PC.dick != 0>>,<<else>>.<</if>>
 				<<run seX($activeSlave, "penetrative", $PC, "anal")>>
 			<</if>>
-			<<if $PC.dick != 0>>shuddering with delight at the warmth tickling your prostate.<</if>>			
+			<<if $PC.dick != 0>>shuddering with delight at the warmth tickling your prostate.<</if>>
 			<<if canImpreg($PC, $activeSlave)>>
 				<<= knockMeUp($PC, 20, 0, $activeSlave.ID)>>
 			<</if>>
@@ -6301,7 +6301,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <br><<link "Bring your good slaves out for a day at the beach">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		You direct $assistantName to bring your slaves who deserve it out for a day at the beach. There might be little sand out on the balcony, but there's plenty of warm sun. And beaches are overrated these days anyway, with the ocean becoming so unpredictable. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> advises them to get naked, and bring towels and sun lotion appropriate for their individual skin types, so they know they're going to get some sunshine, but they're surprised when they get outside. They're obviously expecting an orgy of some kind, but all they see is you and $activeSlave.slaveName luxuriating on the decking. As they arrive, they take the cue and line up with you one by one. After a long sunbathing session, you send a couple of them inside to bring out cool drinks, a beach ball, and other essentials. The hornier slaves are doubtful for a while, but eventually they all relax and @@.mediumaquamarine;gain confidence@@ from the simple, nonsexual pleasure of a little time in the sun.
+		You direct $assistant.name to bring your slaves who deserve it out for a day at the beach. There might be little sand out on the balcony, but there's plenty of warm sun. And beaches are overrated these days anyway, with the ocean becoming so unpredictable. <<= capFirstChar($assistant.name)>> advises them to get naked, and bring towels and sun lotion appropriate for their individual skin types, so they know they're going to get some sunshine, but they're surprised when they get outside. They're obviously expecting an orgy of some kind, but all they see is you and $activeSlave.slaveName luxuriating on the decking. As they arrive, they take the cue and line up with you one by one. After a long sunbathing session, you send a couple of them inside to bring out cool drinks, a beach ball, and other essentials. The hornier slaves are doubtful for a while, but eventually they all relax and @@.mediumaquamarine;gain confidence@@ from the simple, nonsexual pleasure of a little time in the sun.
 		<<if ($activeSlave.ID != $HeadGirl.ID) && ($HeadGirl != 0)>>
 			<<setLocalPronouns $HeadGirl 2>>
 			Your Head Girl $HeadGirl.slaveName quietly compliments the idea, and asks you how it came to you. You let _him2 know it was $activeSlave.slaveName's idea,
@@ -6867,22 +6867,22 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 
 <<case "cooler lockin">>
 
-<<link "Just direct $assistantName to let $him out">>
+<<link "Just direct $assistant.name to let $him out">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> unlatches the cooler door remotely, and admonishes $activeSlave.slaveName. The chilled slave scampers out of the cold air, rubbing $his<<if $activeSlave.bellyPreg >= 1500>> _belly pregnant belly's<</if>> $activeSlave.skin skin to get some warmth back into it. $He's too cold to do much more than nod dumbly at $assistantName's review of how to operate the release, but $he's much more careful the next time $he's sent in there.
+		<<= capFirstChar($assistant.name)>> unlatches the cooler door remotely, and admonishes $activeSlave.slaveName. The chilled slave scampers out of the cold air, rubbing $his<<if $activeSlave.bellyPreg >= 1500>> _belly pregnant belly's<</if>> $activeSlave.skin skin to get some warmth back into it. $He's too cold to do much more than nod dumbly at $assistant.name's review of how to operate the release, but $he's much more careful the next time $he's sent in there.
 	<</replace>>
 <</link>>
 <br><<link "Let $him out yourself">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		You're not close to the penthouse kitchen area, so it takes you some time to make your way there. By the time you get there, the poor $girl is pounding weakly against the refrigerator door to try to get someone's attention. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> was right, $he must be too cold to think straight; if $he weren't $he might <<if canSee($activeSlave)>>notice the<<else>>have thought to feel around for the<</if>> prominent release button right next to where $he's striking the door. $His desperate $activeSlave.skin face is visible in the window. You hit the exterior release and the door swings open quickly, dumping $him into your arms. Despite not being devoted to you, $he clings to you like a long lost love, $his <<if ($activeSlave.height >= 185)>>big cold<<elseif ($activeSlave.height >= 160)>>cold<<else>>cold little<</if>> <<if $activeSlave.belly >= 1500>>_belly <<if $activeSlave.bellyPreg >= 1500>>pregnant <</if>><</if>>body shaking convulsively. $He tries to burrow even <<if ($PC.boobs >= 650)>>deeper between your breasts<<else>>closer to you<</if>>, soaking up your warmth.
+		You're not close to the penthouse kitchen area, so it takes you some time to make your way there. By the time you get there, the poor $girl is pounding weakly against the refrigerator door to try to get someone's attention. <<= capFirstChar($assistant.name)>> was right, $he must be too cold to think straight; if $he weren't $he might <<if canSee($activeSlave)>>notice the<<else>>have thought to feel around for the<</if>> prominent release button right next to where $he's striking the door. $His desperate $activeSlave.skin face is visible in the window. You hit the exterior release and the door swings open quickly, dumping $him into your arms. Despite not being devoted to you, $he clings to you like a long lost love, $his <<if ($activeSlave.height >= 185)>>big cold<<elseif ($activeSlave.height >= 160)>>cold<<else>>cold little<</if>> <<if $activeSlave.belly >= 1500>>_belly <<if $activeSlave.bellyPreg >= 1500>>pregnant <</if>><</if>>body shaking convulsively. $He tries to burrow even <<if ($PC.boobs >= 650)>>deeper between your breasts<<else>>closer to you<</if>>, soaking up your warmth.
 		<<if !canTalk($activeSlave)>>
 			$He gestures $his thanks shakily.
 		<<else>>
 			"T-t-thank y-you, <<Master>>. I d-don't know what would have hap-p-pened if you hadn't come by," $he <<say>>s, teeth chattering.
 		<</if>>
-		$He clearly has no idea whatsoever that $assistantName could have let $him out at any time. You rub your hands up and down $his
+		$He clearly has no idea whatsoever that $assistant.name could have let $him out at any time. You rub your hands up and down $his
 		<<if $activeSlave.weight > 160>>
 			rippling
 		<<elseif $activeSlave.weight > 95>>
@@ -7075,7 +7075,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <<link "No, spectate and relax with $him afterward">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		You leave for a moment, but return quickly with a chair and a refreshing beverage so you can sit and enjoy the spectacle. It's hard to tell, but you're reasonably sure $activeSlave.slaveName is flattered by your interest. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> does not let $him go for a long time, however, and when $he finally retracts all the phalli, $activeSlave.slaveName collapses weakly to the sweat-stained floor.
+		You leave for a moment, but return quickly with a chair and a refreshing beverage so you can sit and enjoy the spectacle. It's hard to tell, but you're reasonably sure $activeSlave.slaveName is flattered by your interest. <<= capFirstChar($assistant.name)>> does not let $him go for a long time, however, and when $he finally retracts all the phalli, $activeSlave.slaveName collapses weakly to the sweat-stained floor.
 		<<if $activeSlave.belly >= 300000>>
 			You try to gather the limp nympho in your arms, but $his _belly is far too heavy to carry, so you settle for assisting $him to your private bath, which is all ready and filled with steaming water. $activeSlave.slaveName groans with pleasure as you help $him into the water and slip in beside $him.
 		<<else>>
@@ -7088,7 +7088,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <br><<link "Tour $his holes">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		The polite thing to do would be to instruct $assistantName to retract a dildo before replacing it with <<if $PC.dick == 0>>a strap-on<<else>>your dick<</if>>. You are not, however, feeling particularly polite. $activeSlave.slaveName writhes in anguish when $he feels an additional phallus forcing its way past $his lips. $He tries to relax but loses control and spasms; the throat fucking continues unmercifully and in short order $he is gagging desperately. Each of $his holes receives the same treatment in turn; all $he manages to do in response is writhe here and there, and squeal incoherently whenever $his mouth isn't totally full. $He has become @@.hotpink;more submissive to you.@@
+		The polite thing to do would be to instruct $assistant.name to retract a dildo before replacing it with <<if $PC.dick == 0>>a strap-on<<else>>your dick<</if>>. You are not, however, feeling particularly polite. $activeSlave.slaveName writhes in anguish when $he feels an additional phallus forcing its way past $his lips. $He tries to relax but loses control and spasms; the throat fucking continues unmercifully and in short order $he is gagging desperately. Each of $his holes receives the same treatment in turn; all $he manages to do in response is writhe here and there, and squeal incoherently whenever $his mouth isn't totally full. $He has become @@.hotpink;more submissive to you.@@
 		<<= VCheck.Both()>>
 		<<set $activeSlave.devotion += 4>>
 		<<if $activeSlave.vagina == 1 && canDoVaginal($activeSlave)>>
@@ -7119,7 +7119,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<br><<link "Replace the machines with cockmilkees from the Dairy">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
-			Some minutes later $activeSlave.slaveName feels one of the dildos retract and wriggles in protest. $He's not long disappointed, though, as $he immediately feels it replaced by a turgid dick. You and $assistantName stage-manage, and it isn't easy. Getting all the cocks into $him requires some creative choreography; quite apart from the limits of even $his well-used holes, it's hard just figuring out where everyone ought to stand. The cockmilked slaves are used to coming fast, and they do here, too, so there's also the necessity of switching them out periodically. Eventually you tire of the amusement and direct the Dairy bitches to clean up, which is no mean job, since $activeSlave.slaveName is by now lying in a pool of sweat and cum. But mostly cum. Despite the mess, everyone @@.hotpink;enjoys@@ themselves immensely.
+			Some minutes later $activeSlave.slaveName feels one of the dildos retract and wriggles in protest. $He's not long disappointed, though, as $he immediately feels it replaced by a turgid dick. You and $assistant.name stage-manage, and it isn't easy. Getting all the cocks into $him requires some creative choreography; quite apart from the limits of even $his well-used holes, it's hard just figuring out where everyone ought to stand. The cockmilked slaves are used to coming fast, and they do here, too, so there's also the necessity of switching them out periodically. Eventually you tire of the amusement and direct the Dairy bitches to clean up, which is no mean job, since $activeSlave.slaveName is by now lying in a pool of sweat and cum. But mostly cum. Despite the mess, everyone @@.hotpink;enjoys@@ themselves immensely.
 			<<if $activeSlave.vagina == 0 && canDoVaginal($activeSlave)>>
 				$He certainly @@.lime;isn't a virgin any more.@@
 				<<set $activeSlave.vagina += 1>>
@@ -8615,9 +8615,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 		There's no reason for $him to do that in a quiet corner. You interrupt $him and bring $him into your office, setting $him up on a machine so $he can have that dildo rammed up $his ass for as long as $he likes. Your office is filled with the rhythmic sounds of a sloppy anus being pounded for a good long while.
-		<<if $assistant > 0>>
+		<<if assistant.personality > 0>>
 			The
-			<<switch $assistantAppearance>>
+			<<switch $assistant.appearance>>
 			<<case "monstergirl">>
 				monstrous voice of your assistant's avatar can also be heard, encouraging $activeSlave.slaveName to "take my cocks, slave."
 			<<case "shemale">>
@@ -9608,7 +9608,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <<link "Give $him something more appropriate to suck on">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>>, as usual, has to give the stupid slut considerable coaching to get $him to your office without getting lost. This is a near-miraculous imbecility, as the penthouse is expressly designed to make it nearly impossible to get anywhere from anywhere else without passing by the office door. $He understands orders to <<if $PC.dick == 0>>perform cunnilingus<<else>>suck a dick<</if>>, though, and gets down to it eagerly enough. When $he finishes the job, <<if $PC.dick == 0>>wipes $his mouth<<else>>$he busily swallows every drop of your ejaculate<</if>> and then looks up at you doubtfully.
+		<<= capFirstChar($assistant.name)>>, as usual, has to give the stupid slut considerable coaching to get $him to your office without getting lost. This is a near-miraculous imbecility, as the penthouse is expressly designed to make it nearly impossible to get anywhere from anywhere else without passing by the office door. $He understands orders to <<if $PC.dick == 0>>perform cunnilingus<<else>>suck a dick<</if>>, though, and gets down to it eagerly enough. When $he finishes the job, <<if $PC.dick == 0>>wipes $his mouth<<else>>$he busily swallows every drop of your ejaculate<</if>> and then looks up at you doubtfully.
 		<<if !canTalk($activeSlave)>>
 			$He slowly spells out a question with $his hand<<if hasBothArms($activeSlave)>>s<</if>>, asking if $he's a good slave.
 		<<else>>
@@ -10288,7 +10288,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <br><<link "Geld $him gradually">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		You shove $his unresisting<<if $activeSlave.belly >= 5000>> <<if $activeSlave.bellyPreg >= 3000>>gravid<<else>>swollen<</if>><</if>> body over the couch and seize $his ballsack. When $he feels your tight grip $he spasms and tries to pull away reflexively, but goes limp when $he feels the agony of a warning squeeze. You fasten a tight rubber ring around the base of $his sack, leaving $him writhing on the couch in considerable discomfort. You add leather mittens to $his hands to stop $him from removing the rubber, and then observe that this is a method used to geld livestock. $His tearful begging goes on until you tire of it and put $him out. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> tracks $his agonized, weeping progress around the arcology for the many hours it takes the lack of blood flow to necessitate a trip to the remote surgery. When that time comes, you make $him beg you to remove $his balls for an hour straight before you do — and $he's so desperate for relief from the pain that $he does it. The experience has left $him @@.red;slightly injured,@@ @@.orange;gelded,@@ @@.red;thoroughly traumatized,@@ and @@.gold;willing to do anything@@ to avoid any more pain.
+		You shove $his unresisting<<if $activeSlave.belly >= 5000>> <<if $activeSlave.bellyPreg >= 3000>>gravid<<else>>swollen<</if>><</if>> body over the couch and seize $his ballsack. When $he feels your tight grip $he spasms and tries to pull away reflexively, but goes limp when $he feels the agony of a warning squeeze. You fasten a tight rubber ring around the base of $his sack, leaving $him writhing on the couch in considerable discomfort. You add leather mittens to $his hands to stop $him from removing the rubber, and then observe that this is a method used to geld livestock. $His tearful begging goes on until you tire of it and put $him out. <<= capFirstChar($assistant.name)>> tracks $his agonized, weeping progress around the arcology for the many hours it takes the lack of blood flow to necessitate a trip to the remote surgery. When that time comes, you make $him beg you to remove $his balls for an hour straight before you do — and $he's so desperate for relief from the pain that $he does it. The experience has left $him @@.red;slightly injured,@@ @@.orange;gelded,@@ @@.red;thoroughly traumatized,@@ and @@.gold;willing to do anything@@ to avoid any more pain.
 		<<set $activeSlave.behavioralFlaw = "odd", $activeSlave.trust -= 20, $activeSlave.balls = 0, $activeSlave.scrotum = 0>>
 		<<run surgeryDamage($activeSlave, 10)>>
 	<</replace>>
@@ -10722,10 +10722,10 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		"I've noti<<c>>ed a couple of the <<s>>lave<<s>> working better together re<<c>>ently, <<s>>o I'm making <<s>>ome minor adju<<s>>tment<<s>> to give them more <<sh>>ift<<s>> together."
 		<br><br>
 		You're sure $he'll do $his best, and you tell $him so. $He thanks you again, and you both go back to your work. Though your Head Girl continues manipulating $his tablet diligently, $he can't seem to stop $himself from @@.hotpink;stealing the occasional glance at you.@@ $His <<= App.Desc.eyesColor($activeSlave)>>, dark in the dimness of the office, seem to have an unaccountable sheen.
-		<<if $assistant != 0>>
+		<<if $assistant.personality != 0>>
 		<<setSpokenAssistantPronouns $activeSlave>>
-		<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>>'s $assistantAppearance avatar appears on your desktop, glowing brightly, and ruins the moment. "$activeSlave.slaveName loooves $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Maaaster<<else>>Miiistress<</if>>," _heA taunts,
-		<<switch $assistantAppearance>>
+		<<= capFirstChar($assistant.name)>>'s $assistant.appearance avatar appears on your desktop, glowing brightly, and ruins the moment. "$activeSlave.slaveName loooves $his <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Maaaster<<else>>Miiistress<</if>>," _heA taunts,
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			_hisA hair forming a heart shape.
 		<<case "shemale">>
@@ -10763,7 +10763,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<</switch>>
 		<br><br>
 		Your Head Girl turns a darker shade of red. "Oh, <<sh>>ut up, you little
-		<<switch $assistantAppearance>>
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			mon<<s>>ter,"
 		<<case "shemale">>
@@ -12307,7 +12307,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<EventNameDelink $activeSlave>>
 			<<replace "#result">>
 				<<setNonlocalPronouns $seeDicks>>
-				You make a ceremony of querying $assistantName, aloud for everyone to hear, into $activeSlave.slaveName's sexual history. $He soon realizes <<if canHear($activeSlave)>>this is a sort of recitation of $his service<<else>>what $assistantName is detailing<</if>> for the benefit of the other slaves, and $he stands a little straighter. $His <<if canSee($activeSlave)>><<= App.Desc.eyesColor($activeSlave)>> glitter<<else>>face beams<</if>> with @@.mediumaquamarine;pride@@ as $assistantName finishes, "...and $his anus has been penetrated $activeSlave.counter.anal times." You announce that $activeSlave.counter.anal isn't nearly enough, detail a slave to fetch you a comfortable chair, seat yourself, and draw the compliant $activeSlave.slaveName's head down towards your <<if $PC.dick == 0>>pussy<<else>>cock<</if>>. $He gets eagerly to work, surrounded by a circle of slaves staring at the show. You select a favored _girlU and tell _himU to get to work driving that anal count up. $activeSlave.slaveName keeps <<if $PC.dick == 0>>eating you out<<else>>sucking your dick<</if>> as the chosen _girlU pulls $activeSlave.slaveName's hips up a little and
+				You make a ceremony of querying $assistant.name, aloud for everyone to hear, into $activeSlave.slaveName's sexual history. $He soon realizes <<if canHear($activeSlave)>>this is a sort of recitation of $his service<<else>>what $assistant.name is detailing<</if>> for the benefit of the other slaves, and $he stands a little straighter. $His <<if canSee($activeSlave)>><<= App.Desc.eyesColor($activeSlave)>> glitter<<else>>face beams<</if>> with @@.mediumaquamarine;pride@@ as $assistant.name finishes, "...and $his anus has been penetrated $activeSlave.counter.anal times." You announce that $activeSlave.counter.anal isn't nearly enough, detail a slave to fetch you a comfortable chair, seat yourself, and draw the compliant $activeSlave.slaveName's head down towards your <<if $PC.dick == 0>>pussy<<else>>cock<</if>>. $He gets eagerly to work, surrounded by a circle of slaves staring at the show. You select a favored _girlU and tell _himU to get to work driving that anal count up. $activeSlave.slaveName keeps <<if $PC.dick == 0>>eating you out<<else>>sucking your dick<</if>> as the chosen _girlU pulls $activeSlave.slaveName's hips up a little and
 				<<if $activeSlave.butt > 18>>
 					struggles into $his immense butt.
 				<<elseif $activeSlave.butt > 10>>
@@ -12706,7 +12706,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<if $HeadGirl != 0>>
 			<<setLocalPronouns $HeadGirl 2>>
 		<</if>>
-		You thank $him kindly, tell $him to put $his offering on your desk, and go back to your work. $He flees, and once $he's gone, you <<if $HeadGirl != 0>>have $assistantName pass a note to your Head Girl instructing _him2<<else>>instruct $assistantName<</if>> to tighten up your slaves' schedules, since you feel that they have too much time on their hands. Then you direct another slave to return the napkin to its proper place. Your slaves find their spare moments occupied by household minutiae during the coming week, @@.yellowgreen;saving you some money@@ on penthouse and slave upkeep.
+		You thank $him kindly, tell $him to put $his offering on your desk, and go back to your work. $He flees, and once $he's gone, you <<if $HeadGirl != 0>>have $assistant.name pass a note to your Head Girl instructing _him2<<else>>instruct $assistant.name<</if>> to tighten up your slaves' schedules, since you feel that they have too much time on their hands. Then you direct another slave to return the napkin to its proper place. Your slaves find their spare moments occupied by household minutiae during the coming week, @@.yellowgreen;saving you some money@@ on penthouse and slave upkeep.
 		<<run cashX(2000, "event", $activeSlave)>>
 	<</replace>>
 <</link>>
@@ -14629,7 +14629,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 		You enter, eliciting an embarrassed
-		"Um, hi <<Master>>" from $activeSlave.slaveName and a cheery wave from $assistantName. At this stage of your morning ablutions, you're conveniently naked, so you
+		"Um, hi <<Master>>" from $activeSlave.slaveName and a cheery wave from $assistant.name. At this stage of your morning ablutions, you're conveniently naked, so you
 		<<if $PC.belly >= 5000>>
 			heft yourself
 		<<elseif $PC.belly >= 1500>>
@@ -14643,8 +14643,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<else>>
 			hot cunt, and the obedient slave <<if $activeSlave.belly >= 5000>>hefts $himself<<else>>clambers<</if>> up to eat you out. You surprise $him by taking your time, drawing out the oral session with the ulterior motive of getting as much saliva and pussyjuice onto the glass as possible.
 		<</if>>
-		<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> shifts _hisA avatar so that this lands all over _hisA
-		<<switch $assistantAppearance>>
+		<<= capFirstChar($assistant.name)>> shifts _hisA avatar so that this lands all over _hisA
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			cocks.
 		<<case "shemale">>
@@ -14689,7 +14689,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<else>>
 				$his tight little pussy completely vulnerable.
 			<</if>>
-			As <<if $PC.dick != 0>><<if $PC.vagina != -1>>use manual stimulation of your pussy to get your dick<<else>>stroke yourself<</if>> rapidly back to full mast<<else>>don a strap-on<</if>>, $assistantName opines helpfully, "Hey $activeSlave.slaveName! You're about to get fucked!" The slave reacts by obediently reaching back to spread $his buttocks and relaxing, but $assistantName ruins $his attempt at graceful submission." <<if $PC.title == 1>>Siiir,<<else>>Ma'aaam,<</if>> $he's bluuuushing," $he says tauntingly, and the slave stiffens with renewed embarrassment, not to mention stimulation, as you penetrate $him.
+			As <<if $PC.dick != 0>><<if $PC.vagina != -1>>use manual stimulation of your pussy to get your dick<<else>>stroke yourself<</if>> rapidly back to full mast<<else>>don a strap-on<</if>>, $assistant.name opines helpfully, "Hey $activeSlave.slaveName! You're about to get fucked!" The slave reacts by obediently reaching back to spread $his buttocks and relaxing, but $assistant.name ruins $his attempt at graceful submission." <<if $PC.title == 1>>Siiir,<<else>>Ma'aaam,<</if>> $he's bluuuushing," $he says tauntingly, and the slave stiffens with renewed embarrassment, not to mention stimulation, as you penetrate $him.
 			<<= VCheck.Vaginal()>>
 		<<else>>
 			<<if $activeSlave.anus > 2>>
@@ -14699,10 +14699,10 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<else>>
 				$his tight little rosebud completely vulnerable.
 			<</if>>
-			As <<if $PC.dick != 0>><<if $PC.vagina != -1>>use manual stimulation of your pussy to get your dick<<else>>stroke yourself<</if>> rapidly back to full mast<<else>>don a strap-on<</if>>, $assistantName opines helpfully, "Hey $activeSlave.slaveName! You're about to get buttfucked!" The slave reacts by obediently reaching back to spread $his buttocks, and relaxes $his anus, but $assistantName ruins $his attempt at graceful anal submission." <<if $PC.title == 1>>Siiir,<<else>>Ma'aaam,<</if>> $he's bluuuushing," $he says tauntingly, and the slave stiffens with renewed embarrassment, not to mention discomfort, as you penetrate $him.
+			As <<if $PC.dick != 0>><<if $PC.vagina != -1>>use manual stimulation of your pussy to get your dick<<else>>stroke yourself<</if>> rapidly back to full mast<<else>>don a strap-on<</if>>, $assistant.name opines helpfully, "Hey $activeSlave.slaveName! You're about to get buttfucked!" The slave reacts by obediently reaching back to spread $his buttocks, and relaxes $his anus, but $assistant.name ruins $his attempt at graceful anal submission." <<if $PC.title == 1>>Siiir,<<else>>Ma'aaam,<</if>> $he's bluuuushing," $he says tauntingly, and the slave stiffens with renewed embarrassment, not to mention discomfort, as you penetrate $him.
 			<<= VCheck.Anal()>>
 		<</if>>
-		$He keeps licking away, cleaning up the mess you made as $assistantName does everything $he can to make it seem like the slave is pleasuring $him. Partway through, $assistantName sticks out a hand for a high-five from you, producing a gurgle of indignation @@.mediumaquamarine;or perhaps even laughter@@ as $his owner and $his owner's personal assistant program high-five over $his back.
+		$He keeps licking away, cleaning up the mess you made as $assistant.name does everything $he can to make it seem like the slave is pleasuring $him. Partway through, $assistant.name sticks out a hand for a high-five from you, producing a gurgle of indignation @@.mediumaquamarine;or perhaps even laughter@@ as $his owner and $his owner's personal assistant program high-five over $his back.
 		<<set $activeSlave.trust += 4>>
 		<<run seX($activeSlave, "oral", $PC, "penetrative")>>
 	<</replace>>
@@ -14712,8 +14712,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
 			You enter, eliciting an embarrassed
-			"Um, hi <<Master>>" from $activeSlave.slaveName, and ask $assistantName if $he'd like to DP the slave with you.
-			<<switch $assistantAppearance>>
+			"Um, hi <<Master>>" from $activeSlave.slaveName, and ask $assistant.name if $he'd like to DP the slave with you.
+			<<switch $assistant.appearance>>
 			<<case "monstergirl">>
 				"Oh yes," _heA purrs threateningly over the slave's moan of apprehension, and _hisA avatar begins to stroke _hisA dicks meaningfully.
 			<<case "shemale" "incubus">>
@@ -14738,7 +14738,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 				"Fuck yeah!" _heA cheers over the slave's moan of apprehension, and _hisA avatar quickly dons a big strap-on.
 			<</switch>>
 			You indicate a fuckmachine in the corner of the room, and the slave obediently hurries over to it. It's vertical, and $he hops up on it, positioning $his anus over its
-			<<switch $assistantAppearance>>
+			<<switch $assistant.appearance>>
 			<<case "monstergirl">>
 				pair of dildos. They insert themselves
 			<<case "shemale" "incubus">>
@@ -14776,13 +14776,13 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<if canDoVaginal($activeSlave)>>
 				$He gasps as $he feels <<if $PC.dick != 0>>your hot dickhead<<else>>the slick head of your strap-on<</if>> part $his pussylips, no doubt feeling full already.
 				<<= VCheck.Vaginal(3)>>
-				When you're all the way in, the <<if $assistantAppearance == "monstergirl">>dildos in $his butt begin<<else>>dildo in $his butt begins<</if>> to fuck $him, harder and harder, as $assistantName moans happily. The all-encompassing feeling of fullness as $his cunt and ass are fucked to the very limit of their capacities
+				When you're all the way in, the <<if $assistant.appearance == "monstergirl">>dildos in $his butt begin<<else>>dildo in $his butt begins<</if>> to fuck $him, harder and harder, as $assistant.name moans happily. The all-encompassing feeling of fullness as $his cunt and ass are fucked to the very limit of their capacities
 			<<else>>
 				$He gasps as $he feels you push a finger up $his already-full butt and pull $his sphincter a bit wider. You withdraw it and replace it with <<if $PC.dick != 0>>your turgid cock<<else>>your strap-on<</if>>; the slave writhes involuntarily, $his body trying to refuse the invasion of yet another phallus.
 				<<= VCheck.Anal(3)>>
-				When you're all the way in, the <<if $assistantAppearance == "monstergirl">>dildos alongside your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> in $his butt begin<<else>>dildo alongside your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> in $his butt begins<</if>> to fuck $him, harder and harder, as $assistantName moans happily. The all-encompassing feeling of fullness as $his ass is fucked to the very limit of its capacity
+				When you're all the way in, the <<if $assistant.appearance == "monstergirl">>dildos alongside your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> in $his butt begin<<else>>dildo alongside your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> in $his butt begins<</if>> to fuck $him, harder and harder, as $assistant.name moans happily. The all-encompassing feeling of fullness as $his ass is fucked to the very limit of its capacity
 			<</if>>
-			quickly drives all feminine grace, presence of mind, or really, @@.hotpink;conscious thought out of the poor slave.@@ After begging for mercy for a short while, $he lapses into animal groans, drooling and leaking tears out the corner of $his eyes as you and $assistantName fuck $him into insensibility. When you climax, $assistantName ejaculates, filling the slave's anus with warm fluid.
+			quickly drives all feminine grace, presence of mind, or really, @@.hotpink;conscious thought out of the poor slave.@@ After begging for mercy for a short while, $he lapses into animal groans, drooling and leaking tears out the corner of $his eyes as you and $assistant.name fuck $him into insensibility. When you climax, $assistant.name ejaculates, filling the slave's anus with warm fluid.
 			<br><br>
 			By this point $he's so helpless that you
 			<<if $activeSlave.belly >= 300000 || $activeSlave.weight > 190>>
@@ -14790,8 +14790,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<<else>>
 				gently lift
 			<</if>>
-			$him off the fuckmachine and carry $him to the shower. You set $him down there, and $assistantName activates the water, using the powerful jets in pulses to massage life back into your exhausted fuckpuppet. $His avatar appears on a screen behind the shower, creating an optical illusion that makes it look like $he's petting the slave in time with the water. $He reassures to the slave as $he does:
-			<<switch $assistantAppearance>>
+			$him off the fuckmachine and carry $him to the shower. You set $him down there, and $assistant.name activates the water, using the powerful jets in pulses to massage life back into your exhausted fuckpuppet. $His avatar appears on a screen behind the shower, creating an optical illusion that makes it look like $he's petting the slave in time with the water. $He reassures to the slave as $he does:
+			<<switch $assistant.appearance>>
 			<<case "monstergirl">>
 				"You're a good little cocksock," $he says kindly.
 			<<case "shemale">>
@@ -15754,7 +15754,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <<link "Let $him be">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		Satisfied that there's no need for immediate intervention, you head back to your desk. A few minutes later, $he heads in to finish getting ready and get to work, saving $assistantName the necessity of directing $him. As the broken slave passes your office, you think for a moment that you see a bit of moisture glinting in $his eyes, but soon correct yourself: it's just a reflection from the glass walls of the arcology. $He makes it to $his assignment on time, and no one notices anything unusual about $him today.
+		Satisfied that there's no need for immediate intervention, you head back to your desk. A few minutes later, $he heads in to finish getting ready and get to work, saving $assistant.name the necessity of directing $him. As the broken slave passes your office, you think for a moment that you see a bit of moisture glinting in $his eyes, but soon correct yourself: it's just a reflection from the glass walls of the arcology. $He makes it to $his assignment on time, and no one notices anything unusual about $him today.
 	<</replace>>
 	<<if $activeSlave.relationship == -3>>
 		<<if def $activeSlave.kindness>>
@@ -16403,8 +16403,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
 		<<setSpokenAssistantPronouns $activeSlave>>
-		You ask $assistantName whether _heA's going anywhere with all this flirting. _HisA avatar looks at $activeSlave.slaveName. "Hear that,
-		<<switch $assistantAppearance>>
+		You ask $assistant.name whether _heA's going anywhere with all this flirting. _HisA avatar looks at $activeSlave.slaveName. "Hear that,
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			human?" _heA growls. "You're all mine!"
 			<br><br>
@@ -16477,8 +16477,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		the $desc gasps with mock horror. Your personal assistant gives $him rapid-fire orders, making $him set up sex toys in the corner of your office to conform to _hisA avatar.
 		<br><br>
 		<<setNonlocalPronouns $seeDicks>>
-		The next slave on the inspection enters and approaches you, sitting imperturbably behind your desk, but stops and stares when _heU notices what's going on in the corner of your office. A wallscreen in the corner shows $assistantName's avatar
-		<<switch $assistantAppearance>>
+		The next slave on the inspection enters and approaches you, sitting imperturbably behind your desk, but stops and stares when _heU notices what's going on in the corner of your office. A wallscreen in the corner shows $assistant.name's avatar
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			with both _hisA cocks up the asshole of an avatar of $activeSlave.slaveName. Below this, the slave $himself is
 			<<if $activeSlave.belly >= 300000>>
@@ -16710,15 +16710,15 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<</if>>
 			At different intervals, an undulation moves down the dildo, forcing $him to stretch wide to allow it to pass into $his body. Each "egg" forced into $him coincides with another blast from the ejaculating model, and it's filled $him so completely that each gush of fake cum flows down $his legs to join the puddle on the floor.
 		<</switch>>
-		"@@.hotpink;Good $girl,@@" $assistantName says. The new slave turns resolutely away from the arresting sight and gets on with the inspection, doing _hisU best to ignore the lewd noises coming from that part of the room.
+		"@@.hotpink;Good $girl,@@" $assistant.name says. The new slave turns resolutely away from the arresting sight and gets on with the inspection, doing _hisU best to ignore the lewd noises coming from that part of the room.
 		<<set $activeSlave.devotion += 4>>
 	<</replace>>
 <</link>>
 <br><<link "Get the slave to get to the point">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		You tell $activeSlave.slaveName that $he and your personal assistant really should get a room. $He looks at $assistantName's avatar, and then back up at you. $He gives you a mischievous look, and then bends down to whisper to the avatar behind $his hand.
-		<<switch $assistantAppearance>>
+		You tell $activeSlave.slaveName that $he and your personal assistant really should get a room. $He looks at $assistant.name's avatar, and then back up at you. $He gives you a mischievous look, and then bends down to whisper to the avatar behind $his hand.
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			"Why not," the monster<<= _girlA>> chuckles,
 		<<case "shemale">>
@@ -16754,7 +16754,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<</switch>>
 		and directs $him to an unoccupied room with the necessary sex toys.
 		<br><br>
-		Several minutes later, $assistantName's avatar reappears on your desk,
+		Several minutes later, $assistant.name's avatar reappears on your desk,
 		<<if ($activeSlave.fetishKnown == 0) || ($activeSlave.fetish == "none")>>
 			making love to an avatar of $activeSlave.slaveName.
 		<<elseif $activeSlave.fetish == "buttslut">>
@@ -16786,7 +16786,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			kissing and sucking the nipples of an avatar of $activeSlave.slaveName. "Excellent idea, <<= properTitle()>>," _heA breaks off to say, and the slave's avatar waves.
 			<<run seX($activeSlave, "mammary", "assistant", "penetrative")>>
 		<<elseif $activeSlave.fetish == "pregnancy">>
-			<<switch $assistantAppearance>>
+			<<switch $assistant.appearance>>
 			<<case "goddess" "hypergoddess" "incubus" "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
 				fucking a heavily pregnant avatar of $activeSlave.slaveName, each thrust producing the lewd sound of a cum-filled hole being fucked. "Excellent idea, <<= properTitle()>>," _heA says, thrusting hard and swelling $his partner's belly a bit more; the slave's avatar, which is a little overwhelmed and very full, waves weakly, before returning $his hand to $his overfilled middle.
 			<<default>>
@@ -17761,7 +17761,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <<link "Enjoy the show">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		There are low leather ottomans scattered all over the penthouse, for rest, relaxation, and sex. You seat yourself on the nearest one, enjoying the spectacle. $He feels your eyes on $him, a sensation $he knows well, and turns with a little smile on $his $activeSlave.faceShape face, putting an extra swing in $his hips<<if $activeSlave.belly >= 5000>>, causing $his weighty middle to swing wide<</if>>. $He's still dancing alone, but now $he's giving you a private show. You give $him the proper music, instructing $assistantName to play the track $he was humming.
+		There are low leather ottomans scattered all over the penthouse, for rest, relaxation, and sex. You seat yourself on the nearest one, enjoying the spectacle. $He feels your eyes on $him, a sensation $he knows well, and turns with a little smile on $his $activeSlave.faceShape face, putting an extra swing in $his hips<<if $activeSlave.belly >= 5000>>, causing $his weighty middle to swing wide<</if>>. $He's still dancing alone, but now $he's giving you a private show. You give $him the proper music, instructing $assistant.name to play the track $he was humming.
 		<br><br>
 		$He advances on you slowly, sensually, relishing the beat and doing $his best to show off $his body.
 		<<if $activeSlave.dick > 0>>
@@ -17868,7 +17868,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<else>>
 			artificial limbs that allow $him a semblance of a normal life.
 		<</if>>
-		$He's not frightened, trusting <<if $activeSlave.ID == $Bodyguard.ID>>you to help $him, or detail a slave to do so<<else>>$assistantName to bring help<</if>>. When $he <<if canSee($activeSlave)>>sees<<else>>notices<</if>> that you mean to assist $him yourself, $he breaks out in a huge grateful smile and thanks you profusely.
+		$He's not frightened, trusting <<if $activeSlave.ID == $Bodyguard.ID>>you to help $him, or detail a slave to do so<<else>>$assistant.name to bring help<</if>>. When $he <<if canSee($activeSlave)>>sees<<else>>notices<</if>> that you mean to assist $him yourself, $he breaks out in a huge grateful smile and thanks you profusely.
 		<br><br>
 		<<if $activeSlave.ID == $Bodyguard.ID>>First, you extricate $his limbs from the malfunctioning machine. <</if>>As you take up $his first arm and kneel down to attach it to $him, $he rolls and hoists that shoulder up towards it, $his
 		<<if $activeSlave.belly >= 5000>>
@@ -17945,7 +17945,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<br><<link "Agree and make sure $he doesn't regret it">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
-			You agree and send $him straight to the surgery. $He looks a little hesitant, as though the prospect is intimidating now that it's actually about to happen, but $he complies obediently. You direct $assistantName to bring $him back to your office as soon as $he's fully recovered. The curatives applied right after surgery hasten $his recovery, and $he's back the next day, standing a little gingerly, $his limp dick looking a bit sore. $He greets you properly, and comes over willingly when you recline in your chair and <<if canSee($activeSlave)>>crook a finger at<<else>>beckon<</if>> $him. <<if canSee($activeSlave)>>As $he approaches, $he notices that <<if $PC.dick != 0>>you've got your<<if $PC.vagina != -1>> futa<</if>> dick out<<else>>you're wearing a strap-on<</if>>, and looks a little apprehensive<<else>>$He approaches gingerly, still slightly sore<</if>>, but $he sits down obediently, <<if $PC.dick != 0>>your erection<<else>>the phallus<</if>> coming to rest between $his legs and lower buttocks, resting against $his perineum and the smooth, recently healed patch of skin at the base of $his dick where $his ballsack used to be. $He gasps at the sensation of <<if $PC.dick != 0>>your hot cock<<if $PC.vagina != -1>> and the wet pussy beneath it<</if>><<else>>the hard thing<</if>> pressed against $his most intimate area, but $he doesn't flinch away.
+			You agree and send $him straight to the surgery. $He looks a little hesitant, as though the prospect is intimidating now that it's actually about to happen, but $he complies obediently. You direct $assistant.name to bring $him back to your office as soon as $he's fully recovered. The curatives applied right after surgery hasten $his recovery, and $he's back the next day, standing a little gingerly, $his limp dick looking a bit sore. $He greets you properly, and comes over willingly when you recline in your chair and <<if canSee($activeSlave)>>crook a finger at<<else>>beckon<</if>> $him. <<if canSee($activeSlave)>>As $he approaches, $he notices that <<if $PC.dick != 0>>you've got your<<if $PC.vagina != -1>> futa<</if>> dick out<<else>>you're wearing a strap-on<</if>>, and looks a little apprehensive<<else>>$He approaches gingerly, still slightly sore<</if>>, but $he sits down obediently, <<if $PC.dick != 0>>your erection<<else>>the phallus<</if>> coming to rest between $his legs and lower buttocks, resting against $his perineum and the smooth, recently healed patch of skin at the base of $his dick where $his ballsack used to be. $He gasps at the sensation of <<if $PC.dick != 0>>your hot cock<<if $PC.vagina != -1>> and the wet pussy beneath it<</if>><<else>>the hard thing<</if>> pressed against $his most intimate area, but $he doesn't flinch away.
 			<br><br>
 			You take your time with $him, leaning back in your chair so that $he's lying
 			<<if $PC.boobs >= 1400>>
@@ -18062,7 +18062,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			/* 000-250-006 */
 		<</replace>>
 
-		You seize a tablet and hurry out of your office, working furiously and using every feature of $assistantName to the utmost. These bitches have offended you, and you quickly frame the structure of an appropriate revenge. By the time you get to where $activeSlave.slaveName is still being heckled by spoiled, drunken harpies, everyone else present in that arcology hall has mysteriously received urgent messages and gone elsewhere. $activeSlave.slaveName <<if canSee($activeSlave)>>sees you approach, and stares at you<<else>>recognizes your dominant footsteps approaching, and turns to face you<</if>>, $his sudden intense look alerting your vile little guests to your presence. One of them attempts to frame an insult for the interloper, but one of _his2 friends pokes _him2 in the side and whispers something in _his2 ear and _he2 goes silent, staring at you with wide eyes.
+		You seize a tablet and hurry out of your office, working furiously and using every feature of $assistant.name to the utmost. These bitches have offended you, and you quickly frame the structure of an appropriate revenge. By the time you get to where $activeSlave.slaveName is still being heckled by spoiled, drunken harpies, everyone else present in that arcology hall has mysteriously received urgent messages and gone elsewhere. $activeSlave.slaveName <<if canSee($activeSlave)>>sees you approach, and stares at you<<else>>recognizes your dominant footsteps approaching, and turns to face you<</if>>, $his sudden intense look alerting your vile little guests to your presence. One of them attempts to frame an insult for the interloper, but one of _his2 friends pokes _him2 in the side and whispers something in _his2 ear and _he2 goes silent, staring at you with wide eyes.
 		<<if $PC.title != 1>>_He2 then winces, visibly realizing that you're likely aware that _he2 called $activeSlave.slaveName's owner $his "Master". Somehow, the mistake seems important to _him2 now that you're standing here, effortlessly dominating the space for all your femininity.<</if>>
 		<br><br>
 		You hold the tablet out to them wordlessly. It's displaying security footage of the three of them, boarding a public VTOL transport for another arcology nearby. The prominent timestamp is thirty minutes in the future. The scene changes, showing them partying in one of that arcology's nightclubs. You clear your throat, dragging their attention away from the counterfeited footage, and describe in detail the other evidence — tickets, identification checks, biometrics — that will prove they left your arcology and visited two others before regrettably disappearing. One of them tries, with utter predictability, to threaten you with _his2 father, but you tell _him2 bluntly that if he does make the effort, he'll be looking in the wrong place.
@@ -18221,7 +18221,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <<link "Have mercy on the poor $girl and take $him off $his cum diet for now">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		You see how $activeSlave.slaveName is suffering and you decide to reconsider $his dietary prescription. You instruct $assistantName to change <<print $activeSlave.slaveName>>'s diet to exclude cum for now. Slaves who can't eat are unhealthy, and unhealthy slaves are unprofitable slaves. $He is now @@.mediumorchid;more confident that $he can resist you and get $his way,@@ $he also @@.mediumaquamarine;trusts you a little more@@ to look after $his well being.
+		You see how $activeSlave.slaveName is suffering and you decide to reconsider $his dietary prescription. You instruct $assistant.name to change <<print $activeSlave.slaveName>>'s diet to exclude cum for now. Slaves who can't eat are unhealthy, and unhealthy slaves are unprofitable slaves. $He is now @@.mediumorchid;more confident that $he can resist you and get $his way,@@ $he also @@.mediumaquamarine;trusts you a little more@@ to look after $his well being.
 		<<set $activeSlave.trust += 5, $activeSlave.devotion -= 5, $activeSlave.dietCum = 0>>
 	<</replace>>
 <</link>>
@@ -18229,7 +18229,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<br><<link "Force $him onto a heavy cum diet, and double up on $his ejaculate intake">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
-			You instruct $assistantName to double down on <<print $activeSlave.slaveName>>'s cum diet. Ungrateful little sluts who retch up their expensive food sometimes need tough love. Making $his cum-food thicker and more concentrated might help $him to learn that no matter how bad things seem, you can always make them worse. Initially $his new heavy cum diet makes no difference in $his ability to keep it down, but you tell $him to give it some time. Eventually $he will learn to appreciate cum as the primary ingredient in everything $he ingests. All of your future cumsluts do, sooner or later. $His pathetic tears reveal how @@.gold;helpless $he feels,@@ but they don't hide the @@.mediumorchid;streak of rebelliousness@@ that remains burning inside $him.
+			You instruct $assistant.name to double down on <<print $activeSlave.slaveName>>'s cum diet. Ungrateful little sluts who retch up their expensive food sometimes need tough love. Making $his cum-food thicker and more concentrated might help $him to learn that no matter how bad things seem, you can always make them worse. Initially $his new heavy cum diet makes no difference in $his ability to keep it down, but you tell $him to give it some time. Eventually $he will learn to appreciate cum as the primary ingredient in everything $he ingests. All of your future cumsluts do, sooner or later. $His pathetic tears reveal how @@.gold;helpless $he feels,@@ but they don't hide the @@.mediumorchid;streak of rebelliousness@@ that remains burning inside $him.
 			<<set $activeSlave.devotion -= 3, $activeSlave.trust -= 3, $activeSlave.dietCum = 2>>
 		<</replace>>
 	<</link>>
@@ -18237,14 +18237,14 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<br><<link "Give the poor $girl a break and reduce $his cum intake to a more modest level">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
-			$activeSlave.slaveName is on a very heavy cum diet, and it's possible you're forcing $him to take too much, too soon. You decide to give $him a break and instruct $assistantName to reduce, but not eliminate the amount of cum in $his diet. Although it doesn't immediately make $him hate cum any less, @@.hotpink;$he appreciates your willingness@@ to make things a little less unpleasant for $him. @@.mediumaquamarine;$He is a little less afraid of you too,@@ although not as much as if you'd taken $him off $his cum diet altogether.
+			$activeSlave.slaveName is on a very heavy cum diet, and it's possible you're forcing $him to take too much, too soon. You decide to give $him a break and instruct $assistant.name to reduce, but not eliminate the amount of cum in $his diet. Although it doesn't immediately make $him hate cum any less, @@.hotpink;$he appreciates your willingness@@ to make things a little less unpleasant for $him. @@.mediumaquamarine;$He is a little less afraid of you too,@@ although not as much as if you'd taken $him off $his cum diet altogether.
 			<<set $activeSlave.devotion += 2, $activeSlave.trust += 2, $activeSlave.dietCum = 1>>
 		<</replace>>
 	<</link>>
 	<br><<link "Suppress $his gag reflex and double $his cum intake for a week">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
-			$He is already on a very heavy cum-based diet, and there's only so much ejaculate you can force a slut to ingest before it negatively affects $his health. However, as a temporary measure, you still have options. You instruct $assistantName to re-double the amount of ejaculate in <<print $activeSlave.slaveName>>'s diet for the week. You also have $him closely monitored and injected with anti-nausea drugs to help $his hold down $his food. Although the idea of being forced to eat large amounts of human reproductive fluid still disgusts $him, the week of having a super-concentrated cum-diet, along with the suppressed reflex to purge it has its effect. Knowing that you monitor and control every aspect of $his life @@.hotpink;breaks down $his resistance to your will,@@ and by the end of the week, $he is grateful that you return $him to a more nutritionally viable regimen — even if its cum content is still overwhelmingly high. <<if $activeSlave.fetishKnown == 1>>@@.lightcoral;$His brain has now begun to accept the sexual perversity of $his food as a turn on.@@<<else>>$He is now able to eat and digest $his prescribed diet without pharmacological assistance.<</if>>
+			$He is already on a very heavy cum-based diet, and there's only so much ejaculate you can force a slut to ingest before it negatively affects $his health. However, as a temporary measure, you still have options. You instruct $assistant.name to re-double the amount of ejaculate in <<print $activeSlave.slaveName>>'s diet for the week. You also have $him closely monitored and injected with anti-nausea drugs to help $his hold down $his food. Although the idea of being forced to eat large amounts of human reproductive fluid still disgusts $him, the week of having a super-concentrated cum-diet, along with the suppressed reflex to purge it has its effect. Knowing that you monitor and control every aspect of $his life @@.hotpink;breaks down $his resistance to your will,@@ and by the end of the week, $he is grateful that you return $him to a more nutritionally viable regimen — even if its cum content is still overwhelmingly high. <<if $activeSlave.fetishKnown == 1>>@@.lightcoral;$His brain has now begun to accept the sexual perversity of $his food as a turn on.@@<<else>>$He is now able to eat and digest $his prescribed diet without pharmacological assistance.<</if>>
 			<<set $activeSlave.devotion += 5, $activeSlave.fetish = "cumslut">>
 			<<if $activeSlave.fetishKnown == 1>>
 				<<set $activeSlave.fetishStrength = 10>>
@@ -18256,7 +18256,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<br><<link "Sentence $him to a day in $arcadeName for cum injection therapy">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
-			You have $assistantName inform $activeSlave.slaveName of $his unacceptable behavior and sentence $him to a day in $arcadeName. $He cries and pleads for mercy, and even begs to be allowed to suck a cock, any cock, so $he can prove $his newfound enthusiasm for cum, but you are unmerciful as two other slaves drag $him off to serve $his sentence. $He is forced to wear a<<if $activeSlave.vagina != -1>> combined vaginal and<<else>>n<</if>> anal chastity belt so that the only hole available is $his mouth, and is then confined in $arcadeName with $his mouth spread open by a ring gag and $his head sticking through the hole in the wall. A sign below $his mouth proclaims $him to be a "cum extraction tube" and $he is used that way for the duration of $his stay — a grueling, 18-hour marathon of relentless throat fucking. <<if $activeSlave.sexualFlaw != "hates oral">>$His ordeal is so extreme that $he now @@.red;hates oral sex@@<<else>>$His hatred of oral sex makes $his ordeal that much more horrific<</if>>, but it @@.hotpink;breaks down $his resistance.@@ $He now @@.gold;better understands the terrifying power you have over $him,@@ and the sheer amount of cum $he is forced to ingest @@.red;negatively effects $his health.@@ Your other cum-fed slaves take note of what you do to those who can't hold down their assigned diet.
+			You have $assistant.name inform $activeSlave.slaveName of $his unacceptable behavior and sentence $him to a day in $arcadeName. $He cries and pleads for mercy, and even begs to be allowed to suck a cock, any cock, so $he can prove $his newfound enthusiasm for cum, but you are unmerciful as two other slaves drag $him off to serve $his sentence. $He is forced to wear a<<if $activeSlave.vagina != -1>> combined vaginal and<<else>>n<</if>> anal chastity belt so that the only hole available is $his mouth, and is then confined in $arcadeName with $his mouth spread open by a ring gag and $his head sticking through the hole in the wall. A sign below $his mouth proclaims $him to be a "cum extraction tube" and $he is used that way for the duration of $his stay — a grueling, 18-hour marathon of relentless throat fucking. <<if $activeSlave.sexualFlaw != "hates oral">>$His ordeal is so extreme that $he now @@.red;hates oral sex@@<<else>>$His hatred of oral sex makes $his ordeal that much more horrific<</if>>, but it @@.hotpink;breaks down $his resistance.@@ $He now @@.gold;better understands the terrifying power you have over $him,@@ and the sheer amount of cum $he is forced to ingest @@.red;negatively effects $his health.@@ Your other cum-fed slaves take note of what you do to those who can't hold down their assigned diet.
 			<<set $activeSlave.devotion += 5, $activeSlave.trust -= 5, $activeSlave.sexualFlaw = "hates oral", $activeSlave.fetish = "masochist">>
 			<<run seX($activeSlave, "oral", "public", "penetrative", 55)>>
 			<<run healthDamage($activeSlave, 5)>>
@@ -18275,7 +18275,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<else>>
 			advantageous to $him, as it is generally unpopular to enslave a $girl of the superior race.
 		<</if>>
-		However, $he's about to learn that $his racial appearance isn't immutable, and in your arcology, it can make a big difference in how $he is treated. You escort the struggling <<if $activeSlave.pregKnown == 1 && $activeSlave.bellyPreg >= 1500>>mother-to-be<<else>>$girl<</if>> to the surgery center and instruct $assistantName to alter $his appearance so that $he appears to be <<print $arcologies[0].FSSubjugationistRace>>. The full meaning of your instructions
+		However, $he's about to learn that $his racial appearance isn't immutable, and in your arcology, it can make a big difference in how $he is treated. You escort the struggling <<if $activeSlave.pregKnown == 1 && $activeSlave.bellyPreg >= 1500>>mother-to-be<<else>>$girl<</if>> to the surgery center and instruct $assistant.name to alter $his appearance so that $he appears to be <<print $arcologies[0].FSSubjugationistRace>>. The full meaning of your instructions
 		<<if $activeSlave.intelligence+$activeSlave.intelligenceImplant < -15>>
 			slowly start to dawn on <<print $activeSlave.slaveName>>'s stupid face
 		<<else>>
@@ -18370,7 +18370,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<<else>>
 			$he is being fed significant amounts of ejaculate.
 		<</if>>
-		While $his <<if $activeSlave.dietCum == 2>>extreme <</if>>diet is still engineered to <<if $activeSlave.dietCum == 2>>barely <</if>> provide the nutrition $he needs, if $he can't hold the stuff down, $he can't gain weight<<if $activeSlave.pregKnown == 1 && $activeSlave.preg > $activeSlave.pregData.normalBirth/4>>, even more so with $his growing child<<if $activeSlave.pregType > 1>>ren<</if>> taking whatever nutrients <<if $activeSlave.pregType > 1>>they<<else>>it<</if>> can<</if>>. With a few taps on the keyboard you change $his orders so that $he will be fed a much more nutritionally rich diet that is free of ejaculate. However, you make sure to warn $him that $assistantName will be monitoring $him, and you may change your mind once $he reaches a more attractive weight. $He thanks you profusely, <<if $activeSlave.vagina != 0>>even attempting to offer $his body for use in gratitude,<</if>> but you simply send $him away. You find yourself concerned that you are becoming soft by allowing slaves to dictate what they will and won't eat, but your benevolent decision has already had a @@.hotpink;positive effect on $his attitude.@@ $He @@.mediumaquamarine;trusts you a little more@@ too.
+		While $his <<if $activeSlave.dietCum == 2>>extreme <</if>>diet is still engineered to <<if $activeSlave.dietCum == 2>>barely <</if>> provide the nutrition $he needs, if $he can't hold the stuff down, $he can't gain weight<<if $activeSlave.pregKnown == 1 && $activeSlave.preg > $activeSlave.pregData.normalBirth/4>>, even more so with $his growing child<<if $activeSlave.pregType > 1>>ren<</if>> taking whatever nutrients <<if $activeSlave.pregType > 1>>they<<else>>it<</if>> can<</if>>. With a few taps on the keyboard you change $his orders so that $he will be fed a much more nutritionally rich diet that is free of ejaculate. However, you make sure to warn $him that $assistant.name will be monitoring $him, and you may change your mind once $he reaches a more attractive weight. $He thanks you profusely, <<if $activeSlave.vagina != 0>>even attempting to offer $his body for use in gratitude,<</if>> but you simply send $him away. You find yourself concerned that you are becoming soft by allowing slaves to dictate what they will and won't eat, but your benevolent decision has already had a @@.hotpink;positive effect on $his attitude.@@ $He @@.mediumaquamarine;trusts you a little more@@ too.
 		<<set $activeSlave.trust += 2, $activeSlave.devotion += 2, $activeSlave.dietCum = 0>>
 	<</replace>>
 <</link>>
@@ -18398,7 +18398,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 			<</if>>
 			$He sobs quietly with each thrust of your hips, and when you finally <<if $PC.dick != 0>>make yet another cum deposit into $his <<if $activeSlave.weight < -80>>emaciated <<else>>bony <</if>>body and<</if>> pull out, you instruct
 			<<if $activeSlave.dietCum == 1>>
-				$assistantName to dramatically increase the amount of cum in $his diet from now on. You won't have a slave telling you what $he eats. $activeSlave.slaveName <<if canHear($activeSlave)>>hears your instructions <<else>>correctly guesses the meaning behind your body language <</if>>and whimpers before rubbing $his sore bottom and
+				$assistant.name to dramatically increase the amount of cum in $his diet from now on. You won't have a slave telling you what $he eats. $activeSlave.slaveName <<if canHear($activeSlave)>>hears your instructions <<else>>correctly guesses the meaning behind your body language <</if>>and whimpers before rubbing $his sore bottom and
 			<<else>>
 				another slave to drag the broken slut to the kitchen, where $he's to receive an additional feeding of thick, creamy ejaculate-based nutrients before
 			<</if>>
@@ -18781,81 +18781,81 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <<link "Let $him know $he'll be growing as fast as possible">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		Rather than punishing $him directly, you address yourself to your personal assistant. You order _himA to make a note in $activeSlave.slaveName's drug schedule that $he's to remain on a breast expansion regime until further notice. The $desc's face falls as $he <<if canHear($activeSlave)>>hears this, and $assistantName <<elseif canSee($activeSlave)>>reads this order on a small screen provided by $assistantName, who <<else>>slowly realizes this, and $assistantName <</if>>doesn't help matters by
-		<<if $assistant == 0>>
+		Rather than punishing $him directly, you address yourself to your personal assistant. You order _himA to make a note in $activeSlave.slaveName's drug schedule that $he's to remain on a breast expansion regime until further notice. The $desc's face falls as $he <<if canHear($activeSlave)>>hears this, and $assistant.name <<elseif canSee($activeSlave)>>reads this order on a small screen provided by $assistant.name, who <<else>>slowly realizes this, and $assistant.name <</if>>doesn't help matters by
+		<<if $assistant.personality == 0>>
 			confirming the order in disturbingly clinical tones.
-		<<elseif $assistantAppearance == "monstergirl">>
+		<<elseif $assistant.appearance == "monstergirl">>
 			using _hisA avatar's tentacle hair to caress _hisA own tits as _heA concurs in disturbingly kind tones.
-		<<elseif $assistantAppearance == "shemale">>
+		<<elseif $assistant.appearance == "shemale">>
 			shaking _hisA avatar's enormous endowments, making a lewd comment, and then giving _himselfA a titjob.
-		<<elseif $assistantAppearance == "amazon">>
+		<<elseif $assistant.appearance == "amazon">>
 			observing that a good slave $girl should have big tits, since strong warriors like fertile, big-boobed <<= $girl>>s back home to breed with.
-		<<elseif $assistantAppearance == "businesswoman">>
+		<<elseif $assistant.appearance == "businesswoman">>
 			having _hisA avatar give $activeSlave.slaveName a disturbingly appraising glance, as though $he and $his breasts are an interesting entry on a balance sheet.
-		<<elseif $assistantAppearance == "schoolgirl">>
+		<<elseif $assistant.appearance == "schoolgirl">>
 			bending _hisA avatar over to show off _hisA cleavage, and then giving _hisA tits a jiggle, as though the point wasn't clear enough already.
-		<<elseif $assistantAppearance == "goddess">>
+		<<elseif $assistant.appearance == "goddess">>
 			hefting _hisA own motherly breasts and telling $activeSlave.slaveName that $he should be happy, since bigger breasts are a sign of health and fertility.
-		<<elseif $assistantAppearance == "hypergoddess">>
+		<<elseif $assistant.appearance == "hypergoddess">>
 			massaging _hisA own heaving breasts and telling $activeSlave.slaveName that $he should be happy, since bigger breasts are a sign of health and fertility.
-		<<elseif $assistantAppearance == "loli">>
-			<<if $assistantFSAppearance == "asset expansionist">>
+		<<elseif $assistant.appearance == "loli">>
+			<<if $assistant.fsAppearance == "asset expansionist">>
 				playing with _hisA oversized breasts under _hisA swimsuit and telling $activeSlave.slaveName that being busty is amazing.
-			<<elseif $assistantFSAppearance == "pastoralist">>
+			<<elseif $assistant.fsAppearance == "pastoralist">>
 				cupping _hisA pitiful milk nubs and telling $activeSlave.slaveName that if _heA was in $his shoes _heA would be soo happy to be busty.
-			<<elseif $assistantFSAppearance == "transformation fetishist">>
+			<<elseif $assistant.fsAppearance == "transformation fetishist">>
 				playing with _hisA absurd implants and telling $activeSlave.slaveName that being busty is great, though $he'd look better with big fake balloons for breasts.
 			<<else>>
 				cupping _hisA nonexistent breasts and telling $activeSlave.slaveName that if _heA was in $his shoes _heA would be soo happy to be busty.
 			<</if>>
-		<<elseif $assistantAppearance == "preggololi">>
-			<<if $assistantFSAppearance == "asset expansionist">>
+		<<elseif $assistant.appearance == "preggololi">>
+			<<if $assistant.fsAppearance == "asset expansionist">>
 				playing with _hisA oversized breasts under _hisA swimsuit and telling $activeSlave.slaveName that being busty is amazing.
-			<<elseif $assistantFSAppearance == "pastoralist">>
+			<<elseif $assistant.fsAppearance == "pastoralist">>
 				cupping _hisA milky handfuls and telling $activeSlave.slaveName that if _heA was in $his shoes _heA would be soo happy to be that busty.
-			<<elseif $assistantFSAppearance == "transformation fetishist">>
+			<<elseif $assistant.fsAppearance == "transformation fetishist">>
 				playing with _hisA absurd implants and telling $activeSlave.slaveName that being busty is great, though $he'd look better with big fake balloons for breasts.
 			<<else>>
 				cupping _hisA tiny breasts and telling $activeSlave.slaveName that if _heA was in $his shoes _heA would be soo happy to be busty.
 			<</if>>
-		<<elseif $assistantAppearance == "fairy">>
+		<<elseif $assistant.appearance == "fairy">>
 			groping the air as if there were an imaginary pair of tits in front of _himA and telling $activeSlave.slaveName that $his oversized funbags would be wonderful for _himA to bounce and play on.
-		<<elseif $assistantAppearance == "pregnant fairy">>
+		<<elseif $assistant.appearance == "pregnant fairy">>
 			bouncing on the balls of _hisA feet to emphasize _hisA own small but bouncy breasts and giving $activeSlave.slaveName a knowing wink.
-		<<elseif $assistantAppearance == "angel">>
+		<<elseif $assistant.appearance == "angel">>
 			loudly musing how many hungry children $activeSlave.slaveName could feed and how many more could be added to that number.
-		<<elseif $assistantAppearance == "cherub">>
+		<<elseif $assistant.appearance == "cherub">>
 			making groping gestures at $activeSlave.slaveName's tits.
-		<<elseif $assistantAppearance == "incubus">>
+		<<elseif $assistant.appearance == "incubus">>
 			shouting lewd comments about $activeSlave.slaveName's tits while masturbating furiously.
-		<<elseif $assistantAppearance == "succubus">>
-			<<if $assistantFSAppearance == "asset expansionist">>
+		<<elseif $assistant.appearance == "succubus">>
+			<<if $assistant.fsAppearance == "asset expansionist">>
 				openly groping _hisA own immense breasts while dropping comments about how big you like 'em.
-			<<elseif $assistantFSAppearance == "pastoralist">>
+			<<elseif $assistant.fsAppearance == "pastoralist">>
 				openly groping _hisA milk filled quad-breasts while dropping comments about how you love 'em big and milky.
-			<<elseif $assistantFSAppearance == "transformation fetishist">>
+			<<elseif $assistant.fsAppearance == "transformation fetishist">>
 				openly groping _hisA own immense chest balloons while dropping comments about filling $activeSlave.slaveName with the biggest implants possible.
 			<<else>>
 				pushing _hisA breasts together and shaking them back and forth as they steadily swell.
 			<</if>>
-		<<elseif $assistantAppearance == "imp">>
+		<<elseif $assistant.appearance == "imp">>
 			making pinching gestures at $activeSlave.slaveName's nipples and pretending to slap all that tit flesh.
-		<<elseif $assistantAppearance == "witch">>
-			<<if $assistantFSAppearance == "asset expansionist">>
+		<<elseif $assistant.appearance == "witch">>
+			<<if $assistant.fsAppearance == "asset expansionist">>
 				casting a spell and bloating _hisA breasts to insane proportions.
-			<<elseif $assistantFSAppearance == "pastoralist">>
+			<<elseif $assistant.fsAppearance == "pastoralist">>
 				running _hisA hands across _hisA many breasts, tweaking a nipple here and rubbing a tit there.
-			<<elseif $assistantFSAppearance == "transformation fetishist">>
+			<<elseif $assistant.fsAppearance == "transformation fetishist">>
 				bouncing _hisA oversized and overly round breasts back and forth.
 			<<else>>
 				pulling down the top of _hisA dress to reveal _hisA ample cleavage.
 			<</if>>
-		<<elseif $assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+		<<elseif $assistant.appearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
 			reshapes _hisA arms into a pair of suckers and multiple needles designed to inject prey with growth accelerants as _heA slowly moves towards $activeSlave.slaveName.
 		<<else>>
 			purring that _heA'd love to.
 		<</if>>
-		You talk through the $activeSlave.slaveName's medical condition with $him, and give $him a <<if $PC.skill.medicine >= 100>>personal examination with the speed and accuracy of years of general practice<<else>>thorough exam<</if>>. Once this is done, you give $assistantName technical directions to make minor changes to $activeSlave.slaveName's drug regime, designed to make $his @@.lime;breasts grow just slightly faster.@@ The effect is minimal, but the point is made. $He's still not happy to be transformed into a big-breasted sex slave, but $he's relieved that was $his only punishment for expressing $his unhappiness about it.
+		You talk through the $activeSlave.slaveName's medical condition with $him, and give $him a <<if $PC.skill.medicine >= 100>>personal examination with the speed and accuracy of years of general practice<<else>>thorough exam<</if>>. Once this is done, you give $assistant.name technical directions to make minor changes to $activeSlave.slaveName's drug regime, designed to make $his @@.lime;breasts grow just slightly faster.@@ The effect is minimal, but the point is made. $He's still not happy to be transformed into a big-breasted sex slave, but $he's relieved that was $his only punishment for expressing $his unhappiness about it.
 		<<if $activeSlave.geneMods.NCS == 0>>
 			<<set $activeSlave.boobs += 100>>
 		<<else>>
@@ -19935,7 +19935,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<</replace>>
 		<<set $activeSlave.clothes = _clothesTemp>>
 		<<replace "#result">>
-			You direct $assistantName to clear $activeSlave.slaveName's schedule and to find a local Frat House willing to 'host' a $woman of $his age and experience. Perhaps a group of virile college boys running a train on $activeSlave.slaveName might accustom $him to younger sexual partners. When $activeSlave.slaveName leaves the penthouse, $he's dressed up to look like a frumpy old world MILF and is clearly skeptical about your age-play therapy.
+			You direct $assistant.name to clear $activeSlave.slaveName's schedule and to find a local Frat House willing to 'host' a $woman of $his age and experience. Perhaps a group of virile college boys running a train on $activeSlave.slaveName might accustom $him to younger sexual partners. When $activeSlave.slaveName leaves the penthouse, $he's dressed up to look like a frumpy old world MILF and is clearly skeptical about your age-play therapy.
 			<br><br>
 			$activeSlave.slaveName returns to the penthouse naked, disheveled, and absolutely covered in a thick coating of drying cum. Despite $his appearance, however, $he is practically beaming with happiness. It seems young cock agrees with $him, and by the state of $his
 			<<if $activeSlave.mpreg == 1>>
@@ -20100,7 +20100,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 		<</replace>>
 		<<set $activeSlave.clothes = _clothesTemp>>
 		<<replace "#result">>
-			You direct $assistantName to clear $activeSlave.slaveName's schedule and to find a local retirement community willing to 'host' a $girl of $his age. Perhaps a group of venerable graybeards running a train on $activeSlave.slaveName might accustom $him to older sexual partners. When $activeSlave.slaveName leaves the penthouse, $he's dressed up to look like an old world school<<= $girl>> and is clearly skeptical about your age-play therapy.
+			You direct $assistant.name to clear $activeSlave.slaveName's schedule and to find a local retirement community willing to 'host' a $girl of $his age. Perhaps a group of venerable graybeards running a train on $activeSlave.slaveName might accustom $him to older sexual partners. When $activeSlave.slaveName leaves the penthouse, $he's dressed up to look like an old world school<<= $girl>> and is clearly skeptical about your age-play therapy.
 			<br><br>
 			$activeSlave.slaveName returns to the penthouse naked, disheveled, and absolutely covered in a thick coating of drying cum. Despite $his appearance, however, $he is practically beaming with happiness. It seems a good fucking from experienced older men agrees with $him, and by the state of $his
 			<<if $activeSlave.mpreg == 1>>
@@ -20194,7 +20194,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<br><<link "Allow $him to audit some advanced classes at Paternalist slave schools">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
-			You tell $him to take the day off for a trip to audit classes at $arcologies[0].name's most renowned Paternalist slave schools. $activeSlave.slaveName is shocked into a reverie by your words before running to wrap $his arms around you in a tight hug. When $he eventually untangles $himself from you, $he races off to get ready for $his day of intellectualism while you direct $assistantName to make the necessary arrangements.
+			You tell $him to take the day off for a trip to audit classes at $arcologies[0].name's most renowned Paternalist slave schools. $activeSlave.slaveName is shocked into a reverie by your words before running to wrap $his arms around you in a tight hug. When $he eventually untangles $himself from you, $he races off to get ready for $his day of intellectualism while you direct $assistant.name to make the necessary arrangements.
 			<br><br>
 			When $activeSlave.slaveName returns, $he looks exhausted but happier than you've ever seen $him. It seems $he benefited greatly from $arcologies[0].name's Paternalist institutions, and has grown to @@.mediumaquamarine;trust you more@@ while also @@.hotpink;deepening $his acceptance of slavery.@@
 			<<set $activeSlave.trust += 4, $activeSlave.devotion += 4>>
@@ -20207,14 +20207,14 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 <<link "Let the boys be">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		The circumstances are somewhat novel, but are ultimately not worthy of your time and attention. You do, however, direct $assistantName to deploy more public servants to the area in a bid to direct the tourists' attention away from $activeSlave.slaveName. In time, the boys lose interest and wander off to leer at the other slaves suddenly populating the area. $activeSlave.slaveName @@.mediumaquamarine;trusts@@ you more for disentangling $him from a potentially awkward situation.
+		The circumstances are somewhat novel, but are ultimately not worthy of your time and attention. You do, however, direct $assistant.name to deploy more public servants to the area in a bid to direct the tourists' attention away from $activeSlave.slaveName. In time, the boys lose interest and wander off to leer at the other slaves suddenly populating the area. $activeSlave.slaveName @@.mediumaquamarine;trusts@@ you more for disentangling $him from a potentially awkward situation.
 		<<set $activeSlave.trust += 5>>
 	<</replace>>
 <</link>>
 <br><<link "Educate them in the role of a public servant">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-		You instruct $assistantName to have $activeSlave.slaveName give the tourists a real Free Cities welcome, as befitting one of your public servants.
+		You instruct $assistant.name to have $activeSlave.slaveName give the tourists a real Free Cities welcome, as befitting one of your public servants.
 		<br><br>
 		Some time later, you return to the video feed to see $activeSlave.slaveName giving each of the boys a hug goodbye. The boys reciprocate $his affection warmly, even as they try to ignore the fact that $his $activeSlave.skin face and chest are spattered with their cum. $activeSlave.slaveName has certainly given the tourists a crash course in Free Cities culture and @@.green;improved your reputation@@ at the same time.
 		<<run seX($activeSlave, "oral", $PC, "penetrative", 6)>>
@@ -20225,7 +20225,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
 	<br><<link "Instruct the slave to offer sex to the highest bidder">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
-			You instruct $assistantName to have $activeSlave.slaveName offer $his body to the highest bidder among the eager tourists. Though the boys are initially taken aback by $his forwardness, a rapid yet red-faced bidding war takes place. As soon as the winning bid is decided, $activeSlave.slaveName sinks to $his knees in front of the winner and unbuckles his pants, soon taking his hardening member deep into $his mouth.
+			You instruct $assistant.name to have $activeSlave.slaveName offer $his body to the highest bidder among the eager tourists. Though the boys are initially taken aback by $his forwardness, a rapid yet red-faced bidding war takes place. As soon as the winning bid is decided, $activeSlave.slaveName sinks to $his knees in front of the winner and unbuckles his pants, soon taking his hardening member deep into $his mouth.
 			<br><br>
 			Some time later, you return to the video feed to see
 			<<if $activeSlave.bellyPreg >= 750000>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 0ec63a216c6a0bcea4addf0c9ae271d6a645afc1..b395f8a97f6e1aced14ba630154ba9b119669cc7 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1139,7 +1139,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 	<</replace>>
 
 	<<replace "#result">>
-	Rather than answering $him directly, you tell $assistantName to clear $activeSlave.slaveName's and $subSlave.slaveName's schedules for the evening. $He <<if canSee($activeSlave)>>looks<<else>>smiles<</if>> at you with happy anticipation, but is puzzled when you don't give $him any further orders. "Um, thank you, <<Master>>," $he asks hesitantly. "But, I don't under<<s>>tand. What are we going to do?" Whatever you want, you tell $him. $He furrows $his brow, looking troubled, as though the concept is somehow alien to $him. After some thought, $he brightens and asks if $he can go tell $his <<if $activeSlave.relationship >= 5>>_wife2<<else>><<= _girl2>>friend<</if>>. $He can, you respond, and the slave bounces over to give you a kiss before running out. It costs you a small sum in upkeep and other trifles to cover an unexpected unavailability of both slaves, but they deserve it. Their busy lives mean that their shifts rarely align exactly, and this is more time than they've had together in a long time. It isn't particularly exciting, but they enjoy themselves. They eat a meal in the kitchen together, watch the sunset from one of the penthouse balconies, make love out there, share a long shower, and then go to bed, spending the rest of the night cuddling and chatting quietly. The next morning, they come to see you hand in hand, and @@.hotpink;thank you in unison.@@ As they leave, $activeSlave.slaveName looks back over $his shoulder at you, and mouths 'That was perfect, <<= WrittenMaster($activeSlave)>>!'
+	Rather than answering $him directly, you tell $assistant.name to clear $activeSlave.slaveName's and $subSlave.slaveName's schedules for the evening. $He <<if canSee($activeSlave)>>looks<<else>>smiles<</if>> at you with happy anticipation, but is puzzled when you don't give $him any further orders. "Um, thank you, <<Master>>," $he asks hesitantly. "But, I don't under<<s>>tand. What are we going to do?" Whatever you want, you tell $him. $He furrows $his brow, looking troubled, as though the concept is somehow alien to $him. After some thought, $he brightens and asks if $he can go tell $his <<if $activeSlave.relationship >= 5>>_wife2<<else>><<= _girl2>>friend<</if>>. $He can, you respond, and the slave bounces over to give you a kiss before running out. It costs you a small sum in upkeep and other trifles to cover an unexpected unavailability of both slaves, but they deserve it. Their busy lives mean that their shifts rarely align exactly, and this is more time than they've had together in a long time. It isn't particularly exciting, but they enjoy themselves. They eat a meal in the kitchen together, watch the sunset from one of the penthouse balconies, make love out there, share a long shower, and then go to bed, spending the rest of the night cuddling and chatting quietly. The next morning, they come to see you hand in hand, and @@.hotpink;thank you in unison.@@ As they leave, $activeSlave.slaveName looks back over $his shoulder at you, and mouths 'That was perfect, <<= WrittenMaster($activeSlave)>>!'
 	<<run cashX(-500, "event", $activeSlave)>>
 	<<set $subSlave.devotion += 2>>
 	<<set $activeSlave.devotion += 2>>
@@ -1171,7 +1171,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 
 		<<replace "#result">>
 		<<setLocalPronouns $Attendant 3>>
-		Rather than answering $him directly, you tell $assistantName to clear $activeSlave.slaveName's and $subSlave.slaveName's schedules for the evening, and then contact $Attendant.slaveName, the Attendant of your Spa, to instruct _him3 to expect the two slaves for some quality time together. $Attendant.slaveName, of course, is all for it ("Leave it to me, <<Master $Attendant>>!"). _He3 greets the couple at the steamy entrance to the Spa an hour later, and takes charge of them with a matronly air, telling them to undress and relax.
+		Rather than answering $him directly, you tell $assistant.name to clear $activeSlave.slaveName's and $subSlave.slaveName's schedules for the evening, and then contact $Attendant.slaveName, the Attendant of your Spa, to instruct _him3 to expect the two slaves for some quality time together. $Attendant.slaveName, of course, is all for it ("Leave it to me, <<Master $Attendant>>!"). _He3 greets the couple at the steamy entrance to the Spa an hour later, and takes charge of them with a matronly air, telling them to undress and relax.
 		<br><br>
 		It costs you a small sum in upkeep and other trifles to cover an unexpected unavailability of both slaves, but they deserve it, and your Attendant does not disappoint. After the slaves have soaked in the main pool for a while, _he3 gives them a series of mud packs, hot rock massages, and skin treatments, always setting them up right next to each other. They chat a bit at first, but soon relax into companionable silence, holding hands and enjoying the pampering.<<if $Attendant.lactation > 0>> $Attendant.slaveName has their evening meal sent down, and supplements it with milk drunk fresh from _his3 own nipples.<</if>> This being your penthouse, _his3 services become quite sexual later in the night, as the Attendant applies all _his3 talents in choosing positions that emphasize $activeSlave.slaveName and $subSlave.slaveName being close to each other<<if $Attendant.bellyPreg >= 10000 && $activeSlave.bellyPreg >= 10000 && $subSlave.bellyPreg >= 10000>>, a difficult task given that they are all heavily pregnant,<<elseif $Attendant.belly >= 10000 && $activeSlave.belly >= 10000 && $subSlave.belly >= 10000>>, a difficult task given how big everyone's bellies are,<</if>> as they share $Attendant.slaveName's body. Much later, the Attendant sends you a brief message relaying their @@.hotpink;heartfelt thanks,@@ which _he3's passing to you because they're asleep together.
 		<<run cashX(-500, "event", $activeSlave)>>
@@ -1204,7 +1204,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 	<<set $subSlave.clothes = _clothesTemp2>>
 
 	<<replace "#result">>
-	Rather than answering $him directly, you tell $assistantName to clear $activeSlave.slaveName's and $subSlave.slaveName's schedules for the evening. $He looks at you with happy anticipation, but this is nothing to $his gratitude when you tell $him that you'll arrange a date night for them. Trusted slaves are often seen unchaperoned in your arcology, and there are several establishments that cater to slaveowners who wish to bring their chattel out or even send them out alone. You tell $him you've made a reservation for $him and $his <<if $activeSlave.relationship >= 5>>_wife2<<else>><<= _girl2>>friend<</if>> at one of the less formal places, an ethnic restaurant that manages to add spice to liquid slave nutrition without ruining its good qualities. They're to spend the night out, and can wear what they like. $He hurries off to collect $his _girl2 and get dressed, but also tries to keep thanking you on $his way out, and almost runs into the door frame as $he goes.
+	Rather than answering $him directly, you tell $assistant.name to clear $activeSlave.slaveName's and $subSlave.slaveName's schedules for the evening. $He looks at you with happy anticipation, but this is nothing to $his gratitude when you tell $him that you'll arrange a date night for them. Trusted slaves are often seen unchaperoned in your arcology, and there are several establishments that cater to slaveowners who wish to bring their chattel out or even send them out alone. You tell $him you've made a reservation for $him and $his <<if $activeSlave.relationship >= 5>>_wife2<<else>><<= _girl2>>friend<</if>> at one of the less formal places, an ethnic restaurant that manages to add spice to liquid slave nutrition without ruining its good qualities. They're to spend the night out, and can wear what they like. $He hurries off to collect $his _girl2 and get dressed, but also tries to keep thanking you on $his way out, and almost runs into the door frame as $he goes.
 	<br><br>
 	Since $he trusts you, they dress very daringly for slaves. That is, they dress about as conservatively as slaves can dress, in comfortable pants and soft sweaters whose high collars they roll down to keep their collars visible. Any hesitations citizens who see them might have are banished by their obvious love for each other, and their total lack of shame about having it seen. Indeed, as the night wears on they attract more than a few @@.green;admiring glances@@ from citizens who envy you the favors of the pair of <<if $girl == _girl2>>$girl<<else>>slave<</if>>s occupying one side of the corner booth. After all, they'd rather lean against each other than look at each other from across a table. The next day, they both come to you individually and @@.mediumaquamarine;thank you almost gravely,@@ quite aware of the trust you've placed in them.
 	<<run cashX(-1000, "event", $activeSlave)>>
@@ -1524,7 +1524,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 	to rest on your unforgiving face<<else>>a pleased chuckle out of you. With dawning comprehension, _his2 face rapidly moves to face yours<</if>>. _He2 wilts. $activeSlave.slaveName thinks this is hilarious, and laughs so hard at the slave's reaction to your appearance that $he almost loses hold of $subSlave.slaveName's <<if $subSlave.dick > 0>>cock<<elseif $subSlave.clit > 0>>clit<<else>>ass<</if>>. There's nothing quite like oral from a _girl2 who's moaning with anal pain, so you sit on the head of the bedroll and <<if $PC.dick != 0>>stick your dick in $subSlave.slaveName's mouth<<else>>pull $subSlave.slaveName's mouth against your cunt<</if>>. $activeSlave.slaveName is still giggling, but leans over the unhappy slave speared between the two of you to @@.hotpink;plant a kiss@@ on you. $He misses, smearing $his kiss along your cheek and past your ear, but you take $his face in your hands and kiss $him properly as $subSlave.slaveName begins to do _his2 best to relax and get you off, @@.gold;fearful@@ that worse is in store if _he2 doesn't @@.hotpink;submit.@@
 	<<set $activeSlave.devotion += 4>>
 	<<if canPenetrate($activeSlave)>>
-		<<run seX($subSlave, "anal", $activeSlave, "penetrative")>>	
+		<<run seX($subSlave, "anal", $activeSlave, "penetrative")>>
 	<<else>>
 		<<run actX($subSlave, "anal")>>
 	<</if>>
@@ -1694,7 +1694,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 <br><<link "$His butt is being sold today">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	You tell $him that $his butt is your property, just like $subSlave.slaveName's. $He looks @@.gold;terrified,@@ but this is nothing to $his reaction when another slave arrives to bring $him out for an auction of $his virgin anus. $He's dragged out, whining, "P-plea<<s>>e, <<Master>>, plea<<s>>e don't <<s>>ell my butthole! I'll do anything! Plea<<s>>e!" $His pleas are unavailing. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> conducts a brisk streetside auction of the weeping slave $girl, using compliance systems to force $him to spread $his quivering buttocks for the crowd. The @@.yellowgreen;winning bidder@@ uses a public stall to do the deed; its thin walls are nowhere near enough to disguise $his whining and sobbing as he @@.lime;takes $his anal virginity.@@ $He now @@.red;hates anal.@@
+	You tell $him that $his butt is your property, just like $subSlave.slaveName's. $He looks @@.gold;terrified,@@ but this is nothing to $his reaction when another slave arrives to bring $him out for an auction of $his virgin anus. $He's dragged out, whining, "P-plea<<s>>e, <<Master>>, plea<<s>>e don't <<s>>ell my butthole! I'll do anything! Plea<<s>>e!" $His pleas are unavailing. <<= capFirstChar($assistant.name)>> conducts a brisk streetside auction of the weeping slave $girl, using compliance systems to force $him to spread $his quivering buttocks for the crowd. The @@.yellowgreen;winning bidder@@ uses a public stall to do the deed; its thin walls are nowhere near enough to disguise $his whining and sobbing as he @@.lime;takes $his anal virginity.@@ $He now @@.red;hates anal.@@
 	<<run cashX(500, "whore", $activeSlave)>>
 	<<set $activeSlave.sexualFlaw = "hates anal", $activeSlave.trust -= 5, $activeSlave.anus += 1>>
 	<<run seX($activeSlave, "anal", "public", "penetrative")>>
@@ -2196,7 +2196,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 	<<replace "#result">>
 	<<set $universalRulesConsent = 0>>
 	<<set _belly = bellyAdjective($subSlave)>>
-	You clear your throat for the slaves' attention and verbally order $assistantName to rescind the penthouse rule against interslave rape. _HisA avatar pops up nearby and confirms the rules change. <<if $assistant>>"Done," _heA says. "And I approve. Poor <<= $girl>>s like $activeSlave.slaveName should be able to take what they need."<<else>>"Done," _heA says.<</if>>
+	You clear your throat for the slaves' attention and verbally order $assistant.name to rescind the penthouse rule against interslave rape. _HisA avatar pops up nearby and confirms the rules change. <<if $assistant>>"Done," _heA says. "And I approve. Poor <<= $girl>>s like $activeSlave.slaveName should be able to take what they need."<<else>>"Done," _heA says.<</if>>
 	<br><br>
 	You give no explicit command to the pair of slaves in front of you, but they understand you perfectly. $subSlave.slaveName pales; <<if $subSlave.fetishKnown && $subSlave.fetish == "submissive">>_he2 likes getting fucked, but having someone ordered to rape _him2 is a bit much<<elseif $subSlave.fetishKnown && $subSlave.fetish == "masochist">>_he2 likes being hurt, but having the flirty interchange converted instantly into a situation in which _he2 has no control at all kills _his2 mood<<else>>_he2 wasn't seriously adverse to having sex, but being laid open to rape isn't _his2 idea of a good time<</if>>. $activeSlave.slaveName, meanwhile, looks <<if $subSlave.fetishKnown && $subSlave.fetish == "dom">>rather pleased. $He likes being on top enough that $he's willing to use force if necessary<<elseif $subSlave.fetishKnown && $subSlave.fetish == "sadist">>positively predatory. The sadistic bitch actually prefers it this way<<else>>rather conflicted. $He's obviously relieved $he'll be getting relief, but obviously has some mixed feelings about using force to get what $he wants<</if>>.
 	<br><br>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 53ab4f68122e917889b26f3187192d35133fd13c..5df22444098006b76714fa52bb273972cacb5038 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -235,8 +235,8 @@
 
 <<setAssistantPronouns>>
 
-One unfortunate consequence of existing in a global world is that business opportunities continue to crop up unabated by the onset of night in one corner of the world or another, an inconsiderate phenomenon for arcology owners who happen to be asleep when an event of importance takes place outside the walls of their arcology. This particular evening you are awoken by an alert from $assistantName, unusually intense for this late hour.
-<<if $assistant > 0>>
+One unfortunate consequence of existing in a global world is that business opportunities continue to crop up unabated by the onset of night in one corner of the world or another, an inconsiderate phenomenon for arcology owners who happen to be asleep when an event of importance takes place outside the walls of their arcology. This particular evening you are awoken by an alert from $assistant.name, unusually intense for this late hour.
+<<if assistant.personality > 0>>
 	"<<= properMaster()>>, there is a time sensitive enslavement opportunity available if you're interested." _HeA pauses before continuing. "You're going to want to see this one <<= properMaster()>>."
 <<else>>
 	_HeA informs you that there is a time sensitive enslavement opportunity for you to peruse, and that _heA has calculated the potential rewards are worthy of your consideration even in the middle of the night.
@@ -265,7 +265,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
 <<if ($cash >= 50000) && ($rep >= 2000)>>
 <br><<link "Leverage your reputation and credits to aid the new arcology in exchange for a pretty princess">>
 	<<replace "#result">>
-		You seize a tablet and practically roll out of your bed, working furiously and using every feature of $assistantName to the utmost. It's not easy, but you call in a number of favors and grease a handful of palms, and soon a flight of VTOLs are landing in the new arcology laden with goods. When they take off again they have the princess aboard clad in chains, and make a direct course towards your waiting penthouse.
+		You seize a tablet and practically roll out of your bed, working furiously and using every feature of $assistant.name to the utmost. It's not easy, but you call in a number of favors and grease a handful of palms, and soon a flight of VTOLs are landing in the new arcology laden with goods. When they take off again they have the princess aboard clad in chains, and make a direct course towards your waiting penthouse.
 		<br><br>
 		Eventually $he arrives in your penthouse, the perfect image of a demure yet composed princess. $His clearly practiced façade of poise and grace fades under scrutiny, however. The slightest trembling of $his balled up fists, the minute tremors that mar $his immaculate posture, $his inability to meet your eyes with $his own — all signs that $he is still a scared $girl despite all $his royal trappings. Nonetheless, though the princess's court training is unlikely to be very beneficial to $him in $his new life in the penthouse, it does stand in stark contrast to $his more common slave peers.
 		<br><br>
@@ -300,7 +300,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
 <<if $seeDicks > 0 && $cash >= 35000>>
 <br><<link "Dispatch a sizable amount of aid in exchange for the crown prince">>
 	<<replace "#result">>
-		You seize a tablet and practically roll out of your bed, working vigorously and using every feature of $assistantName to the utmost. It's not easy, but your credits pave your way to sending a flight of VTOLs laden with goods to the new arcology. They take off again with the crown prince aboard and in chains, where _he2 rails against the uncaring metal walls of the VTOL for the breadth of _his2 journey to your penthouse.
+		You seize a tablet and practically roll out of your bed, working vigorously and using every feature of $assistant.name to the utmost. It's not easy, but your credits pave your way to sending a flight of VTOLs laden with goods to the new arcology. They take off again with the crown prince aboard and in chains, where _he2 rails against the uncaring metal walls of the VTOL for the breadth of _his2 journey to your penthouse.
 		<br><br>
 		When _he2 arrives in your penthouse, the former prince is beside _himself2 with rage. When _he2 is brought to be modified in the remote surgery, _he2 breaks free and attempts to fight _his2 way out of your penthouse. _His2 attempt at freedom is futile, however, and _he2 is soon overwhelmed by your guards and dragged back to the remote surgery. It doesn't take long for the valiant prince to become a new dickgirl, though _his2 submission to life as a slave is another question entirely.
 		<br><br>
@@ -334,7 +334,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
 <<if $seeDicks > 0 && ($cash >= 100000) && ($rep >= 10000)>>
 <br><<link "Leverage your substantial reputation and a huge sum of credits to aid the new arcology in exchange for both the prince and princess">>
 	<<replace "#result">>
-		You seize a tablet and practically roll out of your bed, working furiously and using every feature of $assistantName to the utmost. It's not easy, but you call in a number of favors and grease a handful of palms, and soon a flight of VTOLs are landing in the new arcology laden with goods. When they take off again they have the prince and princess aboard, clad in chains and bound face to face in a forced embrace, and make a direct course towards your waiting penthouse.
+		You seize a tablet and practically roll out of your bed, working furiously and using every feature of $assistant.name to the utmost. It's not easy, but you call in a number of favors and grease a handful of palms, and soon a flight of VTOLs are landing in the new arcology laden with goods. When they take off again they have the prince and princess aboard, clad in chains and bound face to face in a forced embrace, and make a direct course towards your waiting penthouse.
 		<br><br>
 		Eventually they arrive in your penthouse, faces flushed with embarrassment of their compromising position. The former prince is beside _himself2 with rage, but seems to be holding _himself2 back for _his2 little $sister's sake, while $he struggles to maintain a façade of poise and grace. The slightest trembling of $his balled up fists, the minute tremors that mar $his immaculate posture, $his inability to meet your eyes with $his own — all signs that $he is still a scared $girl despite all $his royal trappings. Nonetheless, though the princess's court training is unlikely to be very beneficial to $him in $his new life in the penthouse, it does stand in stark contrast to $his more common slave peers. However, the prince's submission to life as a slave is another question entirely.
 		<br><br>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index d856b62f643cd43608d13a7608938b57e780afe2..4e9b5c0b073a1d79e3af8408d2a0870e93d7d6b5 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1743,29 +1743,29 @@ You own
 <</if>>
 
 <<setAssistantPronouns>>
-<<if $marketAssistantLimit != 0>>
+<<if assistant.market && assistant.market.limit > 0>>
 <<silently>> <<= MenialPopCap()>> <</silently>>
 <<set _menialSlaveValue = menialSlaveCost()>>
 <br>
 Your ''business assistant'' manages the menial slave market.
-<<if _menialSlaveValue <= 900+$marketAssistantAggressiveness>>/* BUY */
+<<if _menialSlaveValue <= 900+$assistant.market.marketAssistantAggressiveness>>/* BUY */
 	<<set _bulkMax = $PopCap-$menials-$fuckdolls-$menialBioreactors>>
 	<<if _bulkMax <= 0>>
 	There is no room in the parts of your arcology you own for more menial slaves.
 	<<else>>
-		<<if $cash > $marketAssistantLimit+_menialSlaveValue>>
-			<<set _menialBulkPremium = Math.trunc(1+Math.clamp(($cash-$marketAssistantLimit)/_menialSlaveValue,0,_bulkMax)/400)>>
+		<<if $cash > $assistant.market.limit+_menialSlaveValue>>
+			<<set _menialBulkPremium = Math.trunc(1+Math.clamp(($cash-$assistant.market.limit)/_menialSlaveValue,0,_bulkMax)/400)>>
 			_HeM acquires more chattel, since it's a buyers' market.
 			<<if ($arcologies[0].FSPastoralist != "unset") && ($arcologies[0].FSPaternalist == "unset")>>
-				<<set $menialBioreactors += Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax))*(_menialSlaveValue+_menialBulkPremium-100)), "menialBioreactorsTransfer")>>
+				<<set $menialBioreactors += Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax))*(_menialSlaveValue+_menialBulkPremium-100)), "menialBioreactorsTransfer")>>
 			<<elseif ($arcologies[0].FSDegradationist != "unset")>>
-				<<set $fuckdolls += Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax))*((_menialSlaveValue+_menialBulkPremium)*2)), "fuckdollsTransfer")>>
+				<<set $fuckdolls += Math.trunc(Math.clamp(($cash-$assistant.market.limit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$assistant.market.limit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$assistant.market.limit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax))*((_menialSlaveValue+_menialBulkPremium)*2)), "fuckdollsTransfer")>>
 			<<else>>
-				<<set $menials += Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)*(_menialSlaveValue+_menialBulkPremium))), "menialTransfer")>>
+				<<set $menials += Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)), cashX(forceNeg(Math.trunc(Math.clamp(($cash-$assistant.market.limit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)*(_menialSlaveValue+_menialBulkPremium))), "menialTransfer")>>
 			<</if>>
 		<</if>>
 	<</if>>
-<<elseif _menialSlaveValue >= 1100-$marketAssistantAggressiveness>>/* SELL */
+<<elseif _menialSlaveValue >= 1100-$assistant.market.aggressiveness>>/* SELL */
 	<<if $menials+$fuckdolls+$menialBioreactors > 0>>
 		_HeM liquidates your chattel holdings, since it's a sellers' market.
 	<</if>>
diff --git a/src/uncategorized/bulkSlaveIntro.tw b/src/uncategorized/bulkSlaveIntro.tw
index 5b1554c85786d8f8f94715cbca5c31d6ead20a8b..bb6c6acf7bdc47aadf10aa7134e1133fa6cc5c3b 100644
--- a/src/uncategorized/bulkSlaveIntro.tw
+++ b/src/uncategorized/bulkSlaveIntro.tw
@@ -17,7 +17,7 @@
 <<case "bulk">>
 	Your delivery of $newSlaves.length slaves arrives from <<MarketNamePeriod $slaveMarket $numArcology>>
 	<<if $newSlaves.length != $numSlaves>>
-		You were going to order $numSlaves, but $assistantName lowered it on financial grounds.
+		You were going to order $numSlaves, but $assistant.name lowered it on financial grounds.
 	<</if>>
 	<<set _seed = Math.ceil($slavesSeen - $slaveMarketLimit)>>
 	<<if _seed > $newSlaves.length>>
diff --git a/src/uncategorized/costsWidgets.tw b/src/uncategorized/costsWidgets.tw
index 17bdcd4537a5c349ab7a7f545bd8633e59272c89..5e3f4781cbeccf82815efa74415022b080ef0206 100644
--- a/src/uncategorized/costsWidgets.tw
+++ b/src/uncategorized/costsWidgets.tw
@@ -18,7 +18,7 @@
 	</div>
 
 	/* Income from last week vs expense gives net, assistant gated */
-	<<if $assistantPower > 0>>
+	<<if $assistant.power > 0>>
 		<<if $args[0].lastWeeksCashIncome > 0>>
 			<div class="indent">
 				Income: <<print cashFormatColor($args[0].lastWeeksCashIncome)>>
@@ -54,7 +54,7 @@
 	</div>
 
 	/* Lifetime totals, assistant gated */
-	<<if $assistantPower > 0>>
+	<<if $assistant.power > 0>>
 		<<set _weeksOwned = $week - $args[0].weekAcquired>>
 		/* Lifetime expense */
 		<div class="indent">
diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw
index ee201053cdc6d9cb01276551ff0daca5f554c0b6..874b452716062c27f52c843042570b156773bbd9 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -4,7 +4,7 @@
 
 <<setAssistantPronouns>>
 
-<<if $customSlaveOrdered == 0>>You work up a new slave order for posting where slave merchants can work to fulfill it.<<else>>You review your posted slave order.<</if>> <<if $assistant == 1>>As you work, $assistantName makes lewd comments about what _heA looks forward to doing to this new slave. <</if>>Your order requests a slave with the following characteristics:
+<<if $customSlaveOrdered == 0>>You work up a new slave order for posting where slave merchants can work to fulfill it.<<else>>You review your posted slave order.<</if>> <<if $assistant.personality == 1>>As you work, $assistant.name makes lewd comments about what _heA looks forward to doing to this new slave. <</if>>Your order requests a slave with the following characteristics:
 
 <br><br>
 
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index aa72630b77093dfdd83230bf427aea3005b96490..1e47641d500695304bf2e971dfdce53307956134 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -206,294 +206,269 @@
 <</for>>
 
 /* PA FS bonuses */
-<br><br>
-<<if $PAPublic == 1 && $assistantAppearance != "normal">>
-<<set _seed1 = 0, _seed2 = 0>>
-<<if $arcologies[0].FSSupremacist != "unset">>
-	<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "succubus")>>
-		<<set $arcologies[0].FSSupremacist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
-	<</if>>
-	<<if ($assistantFSAppearance == "supremacist")>>
-		<<set $arcologies[0].FSSupremacist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
-	<</if>>
-<</if>>
-<<if $arcologies[0].FSSubjugationist != "unset">>
-	<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "amazon") || ($assistantAppearance == "imp")>>
-		<<set $arcologies[0].FSSubjugationist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
-	<</if>>
-	<<if ($assistantFSAppearance == "subjugationist")>>
-		<<set $arcologies[0].FSSubjugationist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
-	<</if>>
-<</if>>
-<<if $arcologies[0].FSGenderRadicalist != "unset">>
-	<<if ($assistantAppearance == "monstergirl") || ($assistantAppearance == "shemale") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
-		<<set $arcologies[0].FSGenderRadicalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
-	<</if>>
-	<<if ($assistantFSAppearance == "gender radicalist")>>
-		<<set $arcologies[0].FSGenderRadicalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
-	<</if>>
-<</if>>
-<<if $arcologies[0].FSRepopulationFocus != "unset">>
-	<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
-		<<set $arcologies[0].FSRepopulationFocus += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
-	<</if>>
-	<<if ($assistantFSAppearance == "repopulation focus")>>
-		<<set $arcologies[0].FSRepopulationFocus += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
-	<</if>>
-<</if>>
-<<if $arcologies[0].FSRestart != "unset">>
-	<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "incubus") || ($assistantAppearance == "angel")>>
-		<<set $arcologies[0].FSRestart += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
-	<</if>>
-	<<if ($assistantFSAppearance == "eugenics")>>
-		<<set $arcologies[0].FSRestart += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
-	<</if>>
-<</if>>
-<<if $arcologies[0].FSGenderFundamentalist != "unset">>
-	<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
-		<<set $arcologies[0].FSGenderFundamentalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
-	<</if>>
-	<<if ($assistantFSAppearance == "gender fundamentalist")>>
-		<<set $arcologies[0].FSGenderFundamentalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
-	<</if>>
-<</if>>
-<<if $arcologies[0].FSPaternalist != "unset">>
-	<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub")>>
-		<<set $arcologies[0].FSPaternalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
-	<</if>>
-	<<if ($assistantFSAppearance == "paternalist")>>
-		<<set $arcologies[0].FSPaternalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
-	<</if>>
-<</if>>
-<<if $arcologies[0].FSDegradationist != "unset">>
-	<<if ($assistantAppearance == "monstergirl") || ($assistantAppearance == "businesswoman") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "imp")>>
-		<<set $arcologies[0].FSDegradationist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
-	<</if>>
-	<<if ($assistantFSAppearance == "degradationist")>>
-		<<set $arcologies[0].FSDegradationist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
-	<</if>>
-<</if>>
-<<if $arcologies[0].FSIntellectualDependency != "unset">>
-	<<if ["shemale", "succubus", "witch"].includes($assistantAppearance)>>
-		<<set $arcologies[0].FSIntellectualDependency += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
-	<</if>>
-	<<if ($assistantFSAppearance == "intellectual dependency")>>
-		<<set $arcologies[0].FSIntellectualDependency += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
-	<</if>>
-<</if>>
-<<if $arcologies[0].FSSlaveProfessionalism != "unset">>
-	<<if ["angel", "businesswoman", "incubus", "goddess", "schoolgirl", "succubus"].includes($assistantAppearance)>>
-		<<set $arcologies[0].FSSlaveProfessionalism += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
-	<</if>>
-	<<if ($assistantFSAppearance == "slave professionalism")>>
-		<<set $arcologies[0].FSSlaveProfessionalism += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
-	<</if>>
-<</if>>
-<<if $arcologies[0].FSBodyPurist != "unset">>
-	<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch")>>
-		<<set $arcologies[0].FSBodyPurist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
-	<</if>>
-	<<if ($assistantFSAppearance == "body purist")>>
-		<<set $arcologies[0].FSBodyPurist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
-	<</if>>
-<</if>>
-<<if $arcologies[0].FSTransformationFetishist != "unset">>
-	<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "shemale") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT")>>
-		<<set $arcologies[0].FSTransformationFetishist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
-	<</if>>
-	<<if ($assistantFSAppearance == "transformation fetishist")>>
-		<<set $arcologies[0].FSTransformationFetishist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
-	<</if>>
-<</if>>
-<<if $arcologies[0].FSMaturityPreferentialist != "unset">>
-	<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "goddess") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "angel")>>
-		<<set $arcologies[0].FSMaturityPreferentialist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
-	<</if>>
-	<<if ($assistantFSAppearance == "maturity preferentialist")>>
-		<<set $arcologies[0].FSMaturityPreferentialist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
-	<</if>>
-<</if>>
-<<if $arcologies[0].FSYouthPreferentialist != "unset">>
-	<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "shemale") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp") || ($assistantAppearance == "witch")>>
-		<<set $arcologies[0].FSYouthPreferentialist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
-	<</if>>
-	<<if ($assistantFSAppearance == "youth preferentialist")>>
-		<<set $arcologies[0].FSYouthPreferentialist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
-	<</if>>
-<</if>>
-<<if $arcologies[0].FSPetiteAdmiration != "unset">>
-	<<if ["cherub", "fairy", "imp", "incubus", "loli", "preggololi", "pregnant fairy", "schoolgirl", "succubus", "witch"].includes($assistantAppearance)>>
-		<<set $arcologies[0].FSPetiteAdmiration += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
-	<</if>>
-	<<if ($assistantFSAppearance == "petite admiration")>>
-		<<set $arcologies[0].FSPetiteAdmiration += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
+<<if $PAPublic == 1 && $assistant.appearance != "normal">>
+	<<set _seed = 0>>
+	<<if $arcologies[0].FSSupremacist != "unset">>
+		<<if ["amazon", "monstergirl", "succubus"].includes($assistant.appearance)>>
+			<<set $arcologies[0].FSSupremacist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif $assistant.fsAppearance == "supremacist">>
+			<<set $arcologies[0].FSSupremacist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-<</if>>
-<<if $arcologies[0].FSStatuesqueGlorification != "unset">>
-	<<if ["amazon", "goddess", "incubus", "succubus", "witch"].includes($assistantAppearance)>>
-		<<set $arcologies[0].FSStatuesqueGlorification += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
+
+	<<if $arcologies[0].FSSubjugationist != "unset">>
+		<<if ["businesswoman", "amazon", "imp"].includes($assistant.appearance)>>
+			<<set $arcologies[0].FSSubjugationist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif $assistant.fsAppearance == "subjugationist">>
+			<<set $arcologies[0].FSSubjugationist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-	<<if ($assistantFSAppearance == "statuesque glorification")>>
-		<<set $arcologies[0].FSStatuesqueGlorification += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
+	<<if $arcologies[0].FSGenderRadicalist != "unset">>
+		<<if ["monstergirl", "shemale", "incubus", "succubus", "witch"].includes($assistant.appearance)>>
+			<<set $arcologies[0].FSGenderRadicalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif $assistant.fsAppearance == "gender radicalist">>
+			<<set $arcologies[0].FSGenderRadicalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-<</if>>
-<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
-	<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "shemale") || ($assistantAppearance == "loli") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
-		<<set $arcologies[0].FSSlimnessEnthusiast += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
+	<<if $arcologies[0].FSRepopulationFocus != "unset">>
+		<<if ["goddess", "hypergoddess", "preggololi", "pregnant fairy", "succubus", "witch"].includes($assistant.appearance)>>
+			<<set $arcologies[0].FSRepopulationFocus += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif $assistant.fsAppearance == "repopulation focus">>
+			<<set $arcologies[0].FSRepopulationFocus += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-	<<if ($assistantFSAppearance == "slimness enthusiast")>>
-		<<set $arcologies[0].FSSlimnessEnthusiast += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
+	<<if $arcologies[0].FSRestart != "unset">>
+		<<if ["businesswoman", "schoolgirl", "goddess", "loli", "succubus", "witch", "incubus", "angel"].includes($assistant.appearance)>>
+			<<set $arcologies[0].FSRestart += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif $assistant.fsAppearance == "eugenics">>
+			<<set $arcologies[0].FSRestart += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-<</if>>
-<<if $arcologies[0].FSAssetExpansionist != "unset">>
-	<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "shemale") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch")>>
-		<<set $arcologies[0].FSAssetExpansionist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
+
+	<<if $arcologies[0].FSGenderFundamentalist != "unset">>
+		<<if ["schoolgirl", "goddess", "hypergoddess", "preggololi", "loli", "fairy", "pregnant fairy", "angel", "cherub", "succubus", "witch"].includes($assistant.appearance)>>
+			<<set $arcologies[0].FSGenderFundamentalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif $assistant.fsAppearance == "gender fundamentalist">>
+			<<set $arcologies[0].FSGenderFundamentalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-	<<if ($assistantFSAppearance == "asset expansionist")>>
-		<<set $arcologies[0].FSAssetExpansionist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
+	<<if $arcologies[0].FSPaternalist != "unset">>
+		<<if ["schoolgirl", "goddess", "hypergoddess", "preggololi", "loli", "fairy", "pregnant fairy", "angel", "cherub"].includes($assistant.appearance)>>
+			<<set $arcologies[0].FSPaternalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif $assistant.fsAppearance == "paternalist">>
+			<<set $arcologies[0].FSPaternalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
+ <</if>>
+ <<if $arcologies[0].FSDegradationist != "unset">>
+		<<if ["monstergirl", "businesswoman", "preggololi", "succubus", "incubus", "imp"].includes($assistant.appearance)
+			<<set $arcologies[0].FSDegradationist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif $assistant.fsAppearance == "degradationist">>
+			<<set $arcologies[0].FSDegradationist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-<</if>>
-<<if $arcologies[0].FSPastoralist != "unset">>
-	<<if ($assistantAppearance == "shemale") || ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
-		<<set $arcologies[0].FSPastoralist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
+	<<if $arcologies[0].FSIntellectualDependency != "unset">>
+		<<if ["shemale", "succubus", "witch"].includes($assistant.appearance)>>
+			<<set $arcologies[0].FSIntellectualDependency += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif $assistant.fsAppearance == "intellectual dependency">>
+			<<set $arcologies[0].FSIntellectualDependency += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-	<<if ($assistantFSAppearance == "pastoralist")>>
-		<<set $arcologies[0].FSPastoralist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
+
+	<<if $arcologies[0].FSSlaveProfessionalism != "unset">>
+		<<if ["angel", "businesswoman", "incubus", "goddess", "schoolgirl", "succubus"].includes($assistant.appearance)>>
+			<<set $arcologies[0].FSSlaveProfessionalism += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<elseif $assistant.fsAppearance == "slave professionalism">>
+			<<set $arcologies[0].FSSlaveProfessionalism += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-<</if>>
-<<if $arcologies[0].FSPhysicalIdealist != "unset">>
-	<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "shemale") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
-		<<set $arcologies[0].FSPhysicalIdealist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
+	<<if $arcologies[0].FSBodyPurist != "unset">>
+		<<if ["amazon", "goddess", "loli", "fairy", "pregnant fairy", "angel", "succubus", "incubus", "witch"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSBodyPurist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif $assistant.fsAppearance == "body purist">>
+			<<set $arcologies[0].FSBodyPurist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-	<<if ($assistantFSAppearance == "physical idealist")>>
-		<<set $arcologies[0].FSPhysicalIdealist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
+	<<if $arcologies[0].FSTransformationFetishist != "unset">>
+		<<if ["businesswoman", "shemale", "succubus", incubus", "witch", "ERROR_1606_APPEARANCE_FILE_CORRUPT"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSTransformationFetishist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "transformation fetishist">>
+			<<set $arcologies[0].FSTransformationFetishist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-<</if>>
-<<if $arcologies[0].FSHedonisticDecadence != "unset">>
-	<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "imp") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
-		<<set $arcologies[0].FSHedonisticDecadence += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
+	<<if $arcologies[0].FSMaturityPreferentialist != "unset">>
+		<<if ["businesswoman", "goddess", "succubus", "incubus", "witch", "angel"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSMaturityPreferentialist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "maturity preferentialist">>
+			<<set $arcologies[0].FSMaturityPreferentialist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-	<<if ($assistantFSAppearance == "hedonistic decadence")>>
-		<<set $arcologies[0].FSHedonisticDecadence += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
+
+	<<if $arcologies[0].FSYouthPreferentialist != "unset">>
+		<<if ["schoolgirl", "shemale", "preggololi", "loli", "succubus", "angel", "cherub", "imp", "witch"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSYouthPreferentialist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "youth preferentialist">>
+			<<set $arcologies[0].FSYouthPreferentialist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-<</if>>
-<<if $arcologies[0].FSChattelReligionist != "unset">>
-	<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp")>>
-		<<set $arcologies[0].FSChattelReligionist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
+	<<if $arcologies[0].FSPetiteAdmiration != "unset">>
+		<<if ["cherub", "fairy", "imp", "incubus", "loli", "preggololi", "pregnant fairy", "schoolgirl", "succubus", "witch"].includes($assistant.appearance)>>
+			<<set $arcologies[0].FSPetiteAdmiration += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "petite admiration">>
+			<<set $arcologies[0].FSPetiteAdmiration += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-	<<if ($assistantFSAppearance == "chattel religionist")>>
-		<<set $arcologies[0].FSChattelReligionist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
+	<<if $arcologies[0].FSStatuesqueGlorification != "unset">>
+		<<if ["amazon", "goddess", "incubus", "succubus", "witch"].includes($assistant.appearance)>>
+			<<set $arcologies[0].FSStatuesqueGlorification += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "statuesque glorification">>
+			<<set $arcologies[0].FSStatuesqueGlorification += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-<</if>>
-<<if $arcologies[0].FSRomanRevivalist != "unset">>
-	<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "businesswoman") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
-		<<set $arcologies[0].FSRomanRevivalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
+	<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
+		<<if ["schoolgirl", "shemale", "loli", "cherub", "imp", "succubus", "witch"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSSlimnessEnthusiast += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "slimness enthusiast">>
+			<<set $arcologies[0].FSSlimnessEnthusiast += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-	<<if ($assistantFSAppearance == "roman revivalist")>>
-		<<set $arcologies[0].FSRomanRevivalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
+
+	<<if $arcologies[0].FSAssetExpansionist != "unset">>
+		<<if ["businesswoman", "shemale", "hypergoddess", "succubus", "incubus", "witch"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSAssetExpansionist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "asset expansionist">>
+			<<set $arcologies[0].FSAssetExpansionist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-<</if>>
-<<if $arcologies[0].FSAztecRevivalist != "unset">>
-	<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "businesswoman") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
-		<<set $arcologies[0].FSAztecRevivalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
+	<<if $arcologies[0].FSPastoralist != "unset">>
+		<<if ["shemale", "goddess", "hypergoddess", "incubus", "succubus", "witch"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSPastoralist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "pastoralist">>
+			<<set $arcologies[0].FSPastoralist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-	<<if ($assistantFSAppearance == "aztec revivalist")>>
-		<<set $arcologies[0].FSAztecRevivalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
+	<<if $arcologies[0].FSPhysicalIdealist != "unset">>
+		<<if ["amazon", "shemale", "incubus", "succubus", "witch"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSPhysicalIdealist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "physical idealist">>
+			<<set $arcologies[0].FSPhysicalIdealist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-<</if>>
-<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
-	<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
-		<<set $arcologies[0].FSEgyptianRevivalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
+	<<if $arcologies[0].FSHedonisticDecadence != "unset">>
+		<<if ["goddess", "hypergoddess", "preggololi", "imp", "incubus", "succubus", "witch"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSHedonisticDecadence += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "hedonistic decadence">>
+			<<set $arcologies[0].FSHedonisticDecadence += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-	<<if ($assistantFSAppearance == "egyptian revivalist")>>
-		<<set $arcologies[0].FSEgyptianRevivalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
+
+	<<if $arcologies[0].FSChattelReligionist != "unset">>
+		<<if ["goddess", "monstergirl", "incubus", "succubus", "witch", "angel", "cherub", "imp"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSChattelReligionist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "chattel religionist">>
+			<<set $arcologies[0].FSChattelReligionist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-<</if>>
-<<if $arcologies[0].FSEdoRevivalist != "unset">>
-	<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "loli") || ($assistantAppearance == "kitsune") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
-		<<set $arcologies[0].FSEdoRevivalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
+
+	<<if $arcologies[0].FSRomanRevivalist != "unset">>
+		<<if ["amazon", "businesswoman", "incubus", "succubus"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSRomanRevivalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "roman revivalist">>
+			<<set $arcologies[0].FSRomanRevivalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-	<<if ($assistantFSAppearance == "edo revivalist")>>
-		<<set $arcologies[0].FSEdoRevivalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
+	<<if $arcologies[0].FSAztecRevivalist != "unset">>
+		<<if ["amazon", "businesswoman", "incubus", "succubus"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSAztecRevivalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "aztec revivalist">>
+			<<set $arcologies[0].FSAztecRevivalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-<</if>>
-<<if $arcologies[0].FSArabianRevivalist != "unset">>
-	<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
-		<<set $arcologies[0].FSArabianRevivalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
+	<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
+		<<if ["goddess", "monstergirl", "incubus", "succubus"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSEgyptianRevivalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "egyptian revivalist">>
+			<<set $arcologies[0].FSEgyptianRevivalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-	<<if ($assistantFSAppearance == "arabian revivalist")>>
-		<<set $arcologies[0].FSArabianRevivalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
+	<<if $arcologies[0].FSEdoRevivalist != "unset">>
+		<<if ["amazon", "monstergirl", "loli", "kitsune", "incubus", "succubus"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSEdoRevivalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "edo revivalist">>
+			<<set $arcologies[0].FSEdoRevivalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-<</if>>
-<<if $arcologies[0].FSChineseRevivalist != "unset">>
-	<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
-		<<set $arcologies[0].FSChineseRevivalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed1 = 1>>
+	<<if $arcologies[0].FSArabianRevivalist != "unset">>
+		<<if ["businesswoman", "schoolgirl", "incubus", "succubus"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSArabianRevivalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "arabian revivalist">>
+			<<set $arcologies[0].FSArabianRevivalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-	<<if ($assistantFSAppearance == "chinese revivalist")>>
-		<<set $arcologies[0].FSChineseRevivalist += 0.1*$FSSingleSlaveRep>>
-		<<set _seed2 = 2>>
+	<<if $arcologies[0].FSChineseRevivalist != "unset">>
+		<<if ["schoolgirl", "monstergirl", "incubus", "succubus"].includes($assistant.fsAppearance)>>
+			<<set $arcologies[0].FSChineseRevivalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 1>>
+		<<elseif assistant.fsAppearance == "chinese revivalist">>
+			<<set $arcologies[0].FSChineseRevivalist += 0.1*$FSSingleSlaveRep>>
+			<<set _seed = 2>>
+		<</if>>
 	<</if>>
-<</if>>
-<<if _seed2 == 2>>
-	With _hisA $assistantFSAppearance $assistantAppearance appearance, $assistantName's public visibility meshes very well with society.
-<<elseif _seed1 == 1>>
-	With _hisA $assistantAppearance appearance, $assistantName's public visibility meshes well with society.
-<</if>>
+
+	<br><br>With _hisA $assistant.appearance appearance, $assistant.name's public visibility meshes <<if _seed == 2>>very well<<elseif _seed == 1>>well<</if>> with society.
 <</if>>
 
 /* Progress overflow into influence */
@@ -533,7 +508,7 @@
 	<</if>>
 	<<if $arcologies[0].FSSupremacist < 0>>
 		<<run FutureSocieties.remove("FSSupremacist")>>
-		<<if $assistantFSAppearance == "supremacist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "supremacist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSSupremacist > $arcologies[0].FSSupremacistDecoration>>
 		<<set $arcologies[0].FSSupremacist = $arcologies[0].FSSupremacistDecoration>>
@@ -562,7 +537,7 @@
 	<</if>>
 	<<if $arcologies[0].FSSubjugationist < 0>>
 		<<run FutureSocieties.remove("FSSubjugationist")>>
-		<<if $assistantFSAppearance == "subjugationist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "subjugationist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSSubjugationist > $arcologies[0].FSSubjugationistDecoration>>
 		<<set $arcologies[0].FSSubjugationist = $arcologies[0].FSSubjugationistDecoration>>
@@ -591,7 +566,7 @@
 	<</if>>
 	<<if $arcologies[0].FSRepopulationFocus < 0>>
 		<<run FutureSocieties.remove("FSRepopulationFocus")>>
-		<<if $assistantFSAppearance == "repopulation focus">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "repopulation focus">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSRepopulationFocus > $arcologies[0].FSRepopulationFocusDecoration>>
 		<<set $arcologies[0].FSRepopulationFocus = $arcologies[0].FSRepopulationFocusDecoration>>
@@ -620,7 +595,7 @@
 	<</if>>
 	<<if $arcologies[0].FSRestart < 0 && $arcologies[0].FSRestartDecoration != 100>>
 		<<run FutureSocieties.remove("FSRestart")>>
-		<<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "eugenics">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSRestart > $arcologies[0].FSRestartDecoration>>
 		<<set $arcologies[0].FSRestart = $arcologies[0].FSRestartDecoration>>
@@ -649,7 +624,7 @@
 	<</if>>
 	<<if $arcologies[0].FSGenderRadicalist < 0>>
 		<<run FutureSocieties.remove("FSGenderRadicalist")>>
-		<<if $assistantFSAppearance == "gender radicalist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "gender radicalist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSGenderRadicalist > $arcologies[0].FSGenderRadicalistDecoration>>
 		<<set $arcologies[0].FSGenderRadicalist = $arcologies[0].FSGenderRadicalistDecoration>>
@@ -678,7 +653,7 @@
 	<</if>>
 	<<if $arcologies[0].FSGenderFundamentalist < 0>>
 		<<run FutureSocieties.remove("FSGenderFundamentalist")>>
-		<<if $assistantFSAppearance == "gender fundamentalist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "gender fundamentalist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSGenderFundamentalist > $arcologies[0].FSGenderFundamentalistDecoration>>
 		<<set $arcologies[0].FSGenderFundamentalist = $arcologies[0].FSGenderFundamentalistDecoration>>
@@ -707,7 +682,7 @@
 	<</if>>
 	<<if $arcologies[0].FSPaternalist < 0>>
 		<<run FutureSocieties.remove("FSPaternalist")>>
-		<<if $assistantFSAppearance == "paternalist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "paternalist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSPaternalist > $arcologies[0].FSPaternalistDecoration>>
 		<<set $arcologies[0].FSPaternalist = $arcologies[0].FSPaternalistDecoration>>
@@ -736,7 +711,7 @@
 	<</if>>
 	<<if $arcologies[0].FSDegradationist < 0>>
 		<<run FutureSocieties.remove("FSDegradationist")>>
-		<<if $assistantFSAppearance == "degradationist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "degradationist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSDegradationist > $arcologies[0].FSDegradationistDecoration>>
 		<<set $arcologies[0].FSDegradationist = $arcologies[0].FSDegradationistDecoration>>
@@ -765,7 +740,7 @@
 	<</if>>
 	<<if $arcologies[0].FSIntellectualDependency < 0>>
 		<<run FutureSocieties.remove("FSIntellectualDependency")>>
-		<<if $assistantFSAppearance == "intellectual dependency">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "intellectual dependency">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSIntellectualDependency > $arcologies[0].FSIntellectualDependencyDecoration>>
 		<<set $arcologies[0].FSIntellectualDependency = $arcologies[0].FSIntellectualDependencyDecoration>>
@@ -794,7 +769,7 @@
 	<</if>>
 	<<if $arcologies[0].FSSlaveProfessionalism < 0>>
 		<<run FutureSocieties.remove("FSSlaveProfessionalism")>>
-		<<if $assistantFSAppearance == "slave professionalism">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "slave professionalism">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSSlaveProfessionalism > $arcologies[0].FSSlaveProfessionalismDecoration>>
 		<<set $arcologies[0].FSSlaveProfessionalism = $arcologies[0].FSSlaveProfessionalismDecoration>>
@@ -823,7 +798,7 @@
 	<</if>>
 	<<if $arcologies[0].FSBodyPurist < 0>>
 		<<run FutureSocieties.remove("FSBodyPurist")>>
-		<<if $assistantFSAppearance == "body purist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "body purist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSBodyPurist > $arcologies[0].FSBodyPuristDecoration>>
 		<<set $arcologies[0].FSBodyPurist = $arcologies[0].FSBodyPuristDecoration>>
@@ -850,7 +825,7 @@
 	<</if>>
 	<<if $arcologies[0].FSTransformationFetishist < 0>>
 		<<run FutureSocieties.remove("FSTransformationFetishist")>>
-		<<if $assistantFSAppearance == "transformation fetishist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "transformation fetishist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSTransformationFetishist > $arcologies[0].FSTransformationFetishistDecoration>>
 		<<set $arcologies[0].FSTransformationFetishist = $arcologies[0].FSTransformationFetishistDecoration>>
@@ -877,7 +852,7 @@
 	<</if>>
 	<<if $arcologies[0].FSMaturityPreferentialist < 0>>
 		<<run FutureSocieties.remove("FSMaturityPreferentialist")>>
-		<<if $assistantFSAppearance == "maturity preferentialist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "maturity preferentialist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSMaturityPreferentialist > $arcologies[0].FSMaturityPreferentialistDecoration>>
 		<<set $arcologies[0].FSMaturityPreferentialist = $arcologies[0].FSMaturityPreferentialistDecoration>>
@@ -904,7 +879,7 @@
 	<</if>>
 	<<if $arcologies[0].FSYouthPreferentialist < 0>>
 		<<run FutureSocieties.remove("FSYouthPreferentialist")>>
-		<<if $assistantFSAppearance == "youth preferentialist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "youth preferentialist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSYouthPreferentialist > $arcologies[0].FSYouthPreferentialistDecoration>>
 		<<set $arcologies[0].FSYouthPreferentialist = $arcologies[0].FSYouthPreferentialistDecoration>>
@@ -933,7 +908,7 @@
 	<</if>>
 	<<if $arcologies[0].FSPetiteAdmiration < 0>>
 		<<run FutureSocieties.remove("FSPetiteAdmiration")>>
-		<<if $assistantFSAppearance == "petite admiration">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "petite admiration">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSPetiteAdmiration > $arcologies[0].FSPetiteAdmirationDecoration>>
 		<<set $arcologies[0].FSPetiteAdmiration = $arcologies[0].FSPetiteAdmirationDecoration>>
@@ -962,7 +937,7 @@
 	<</if>>
 	<<if $arcologies[0].FSStatuesqueGlorification < 0>>
 		<<run FutureSocieties.remove("FSStatuesqueGlorification")>>
-		<<if $assistantFSAppearance == "statuesque glorificationDecoration">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "statuesque glorificationDecoration">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSStatuesqueGlorification > $arcologies[0].FSStatuesqueGlorificationDecoration>>
 		<<set $arcologies[0].FSStatuesqueGlorification = $arcologies[0].FSStatuesqueGlorificationDecoration>>
@@ -989,7 +964,7 @@
 	<</if>>
 	<<if $arcologies[0].FSSlimnessEnthusiast < 0>>
 		<<run FutureSocieties.remove("FSSlimnessEnthusiast")>>
-		<<if $assistantFSAppearance == "slimness enthusiast">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "slimness enthusiast">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSSlimnessEnthusiast > $arcologies[0].FSSlimnessEnthusiastDecoration>>
 		<<set $arcologies[0].FSSlimnessEnthusiast = $arcologies[0].FSSlimnessEnthusiastDecoration>>
@@ -1018,7 +993,7 @@
 	<</if>>
 	<<if $arcologies[0].FSAssetExpansionist < 0>>
 		<<run FutureSocieties.remove("FSAssetExpansionist")>>
-		<<if $assistantFSAppearance == "asset expansionist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "asset expansionist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSAssetExpansionist > $arcologies[0].FSAssetExpansionistDecoration>>
 		<<set $arcologies[0].FSAssetExpansionist = $arcologies[0].FSAssetExpansionistDecoration>>
@@ -1047,7 +1022,7 @@
 	<</if>>
 	<<if $arcologies[0].FSPastoralist < 0>>
 		<<run FutureSocieties.remove("FSPastoralist")>>
-		<<if $assistantFSAppearance == "pastoralist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "pastoralist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSPastoralist > $arcologies[0].FSPastoralistDecoration>>
 		<<set $arcologies[0].FSPastoralist = $arcologies[0].FSPastoralistDecoration>>
@@ -1076,7 +1051,7 @@
 	<</if>>
 	<<if $arcologies[0].FSPhysicalIdealist < 0>>
 		<<run FutureSocieties.remove("FSPhysicalIdealist")>>
-		<<if $assistantFSAppearance == "physical idealist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "physical idealist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSPhysicalIdealist > $arcologies[0].FSPhysicalIdealistDecoration>>
 		<<set $arcologies[0].FSPhysicalIdealist = $arcologies[0].FSPhysicalIdealistDecoration>>
@@ -1105,7 +1080,7 @@
 	<</if>>
 	<<if $arcologies[0].FSHedonisticDecadence < 0>>
 		<<run FutureSocieties.remove("FSHedonisticDecadence")>>
-		<<if $assistantFSAppearance == "hedonistic decadence">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "hedonistic decadence">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSHedonisticDecadence > $arcologies[0].FSHedonisticDecadenceDecoration>>
 		<<set $arcologies[0].FSHedonisticDecadence = $arcologies[0].FSHedonisticDecadenceDecoration>>
@@ -1134,7 +1109,7 @@
 	<</if>>
 	<<if $arcologies[0].FSChattelReligionist < 0>>
 		<<run FutureSocieties.remove("FSChattelReligionist")>>
-		<<if $assistantFSAppearance == "chattel religionist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "chattel religionist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSChattelReligionist > $arcologies[0].FSChattelReligionistDecoration>>
 		<<set $arcologies[0].FSChattelReligionist = $arcologies[0].FSChattelReligionistDecoration>>
@@ -1163,7 +1138,7 @@
 	<</if>>
 	<<if $arcologies[0].FSRomanRevivalist < 0>>
 		<<run FutureSocieties.remove("FSRomanRevivalist")>>
-		<<if $assistantFSAppearance == "roman revivalist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "roman revivalist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSRomanRevivalist > $arcologies[0].FSRomanRevivalistDecoration>>
 		<<set $arcologies[0].FSRomanRevivalist = $arcologies[0].FSRomanRevivalistDecoration>>
@@ -1192,7 +1167,7 @@
 	<</if>>
 	<<if $arcologies[0].FSAztecRevivalist < 0>>
 		<<run FutureSocieties.remove("FSAztecRevivalist")>>
-		<<if $assistantFSAppearance == "aztec revivalist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "aztec revivalist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSAztecRevivalist > $arcologies[0].FSAztecRevivalistDecoration>>
 		<<set $arcologies[0].FSAztecRevivalist = $arcologies[0].FSAztecRevivalistDecoration>>
@@ -1221,7 +1196,7 @@
 	<</if>>
 	<<if $arcologies[0].FSEgyptianRevivalist < 0>>
 		<<run FutureSocieties.remove("FSEgyptianRevivalist")>>
-		<<if $assistantFSAppearance == "egyptian revivalist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "egyptian revivalist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSEgyptianRevivalist > $arcologies[0].FSEgyptianRevivalistDecoration>>
 		<<set $arcologies[0].FSEgyptianRevivalist = $arcologies[0].FSEgyptianRevivalistDecoration>>
@@ -1250,7 +1225,7 @@
 	<</if>>
 	<<if $arcologies[0].FSEdoRevivalist < 0>>
 		<<run FutureSocieties.remove("FSEdoRevivalist")>>
-		<<if $assistantFSAppearance == "edo revivalist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "edo revivalist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSEdoRevivalist > $arcologies[0].FSEdoRevivalistDecoration>>
 		<<set $arcologies[0].FSEdoRevivalist = $arcologies[0].FSEdoRevivalistDecoration>>
@@ -1279,7 +1254,7 @@
 	<</if>>
 	<<if $arcologies[0].FSArabianRevivalist < 0>>
 		<<run FutureSocieties.remove("FSArabianRevivalist")>>
-		<<if $assistantFSAppearance == "arabian revivalist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "arabian revivalist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSArabianRevivalist > $arcologies[0].FSArabianRevivalistDecoration>>
 		<<set $arcologies[0].FSArabianRevivalist = $arcologies[0].FSArabianRevivalistDecoration>>
@@ -1308,7 +1283,7 @@
 	<</if>>
 	<<if $arcologies[0].FSChineseRevivalist < 0>>
 		<<run FutureSocieties.remove("FSChineseRevivalist")>>
-		<<if $assistantFSAppearance == "chinese revivalist">><<set $assistantFSAppearance = "default">><</if>>
+		<<if $assistant.fsAppearance == "chinese revivalist">><<set $assistant.fsAppearance = "default">><</if>>
 		@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
 	<<elseif $arcologies[0].FSChineseRevivalist > $arcologies[0].FSChineseRevivalistDecoration>>
 		<<set $arcologies[0].FSChineseRevivalist = $arcologies[0].FSChineseRevivalistDecoration>>
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index a1c43347ebf5fd54fbbd99f882f2320fd681dcd5..10451f259c24538c7b5caa3d6521f25f49bcb0dd 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -681,8 +681,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 		<span class="detail">
 			<<link "Abandon" "Future Society">>
 				<<run FutureSocieties.remove("FSSupremacist")>>
-				<<if $assistantFSAppearance == "supremacist">>
-					<<set $assistantFSAppearance = "default">>
+				<<if $assistant.fsAppearance == "supremacist">>
+					<<set $assistant.fsAppearance = "default">>
 				<</if>>
 			<</link>>
 		</span>
@@ -690,9 +690,9 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<<FSChangeDecoration "FSSupremacist">>
 		</div>
 		<<if $PAPublic == 1>>
-			<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "succubus")>>
+			<<if ($assistant.appearance == "amazon") || ($assistant.appearance == "monstergirl") || ($assistant.appearance == "succubus")>>
 				<span class="note">
-					With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+					With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.
 				</span>
 			<</if>>
 		<</if>>
@@ -726,8 +726,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 		<span class="detail">
 			<<link "Abandon" "Future Society">>
 			<<run FutureSocieties.remove("FSSubjugationist")>>
-			<<if $assistantFSAppearance == "subjugationist">>
-				<<set $assistantFSAppearance = "default">>
+			<<if $assistant.fsAppearance == "subjugationist">>
+				<<set $assistant.fsAppearance = "default">>
 			<</if>>
 			<</link>>
 		</span>
@@ -735,8 +735,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<<FSChangeDecoration "FSSubjugationist">>
 		</div>
 		<<if $PAPublic == 1>>
-			<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "amazon") || ($assistantAppearance == "imp")>>
-				<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+			<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "amazon") || ($assistant.appearance == "imp")>>
+				<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 			<</if>>
 		<</if>>
 	<<else>>
@@ -774,8 +774,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSRepopulationFocus")>>
-					<<if $assistantFSAppearance == "repopulation focus">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "repopulation focus">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -783,8 +783,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSRepopulationFocus" "clothesBoughtMaternityLingerie" "clothesBoughtMaternityDress" "clothesBoughtBelly">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "goddess") || ($assistant.appearance == "hypergoddess") || ($assistant.appearance == "preggololi") || ($assistant.appearance == "pregnant fairy") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -807,8 +807,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<span class="detail">
 					<<link "Abandon" "Future Society">>
 						<<run FutureSocieties.remove("FSRestart")>>
-						<<if $assistantFSAppearance == "eugenics">>
-							<<set $assistantFSAppearance = "default">>
+						<<if $assistant.fsAppearance == "eugenics">>
+							<<set $assistant.fsAppearance = "default">>
 						<</if>>
 					<</link>>
 				</span>
@@ -816,8 +816,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 					<<FSChangeDecoration "FSRestart">>
 				</div>
 				<<if $PAPublic == 1>>
-					<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "incubus") || ($assistantAppearance == "angel")>>
-						<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+					<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "goddess") || ($assistant.appearance == "loli") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch") || ($assistant.appearance == "incubus") || ($assistant.appearance == "angel")>>
+						<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 					<</if>>
 				<</if>>
 			<<else>>
@@ -825,15 +825,15 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<if $eugenicsFullControl != 1>>
 					The Societal Elite will not permit you to abandon Eugenics.
 				<<else>>
-					<span class="detail"><<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSRestart")>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><</link>></span>
+					<span class="detail"><<link "Abandon" "Future Society">><<run FutureSocieties.remove("FSRestart")>><<if $assistant.fsAppearance == "eugenics">><<set $assistant.fsAppearance = "default">><</if>><</link>></span>
 				<</if>>
 				<div class="indent">
 					<<FSChangeDecoration "FSRestart">>
 				</div>
 				The Societal Elite exist as the highest class, allowing you access to all manner of benefits
 				<<if $PAPublic == 1>>
-					<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "incubus") || ($assistantAppearance == "angel")>>
-						<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+					<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "goddess") || ($assistant.appearance == "loli") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch") || ($assistant.appearance == "incubus") || ($assistant.appearance == "angel")>>
+						<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 					<</if>>
 				<</if>>
 			<</if>>
@@ -860,8 +860,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSIntellectualDependency")>>
-					<<if $assistantFSAppearance == "intellectual dependency">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "intellectual dependency">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -869,8 +869,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSIntellectualDependency" "clothesBoughtBimbo">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ["shemale", "succubus", "witch"].includes($assistantAppearance)>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ["shemale", "succubus", "witch"].includes($assistant.appearance)>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -892,8 +892,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSSlaveProfessionalism")>>
-					<<if $assistantFSAppearance == "slave professionalism">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "slave professionalism">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -901,8 +901,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSSlaveProfessionalism" "clothesBoughtCourtesan">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ["angel", "businesswoman", "incubus", "goddess", "schoolgirl", "succubus"].includes($assistantAppearance)>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ["angel", "businesswoman", "incubus", "goddess", "schoolgirl", "succubus"].includes($assistant.appearance)>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -928,8 +928,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<span class="detail">
 					<<link "Abandon" "Future Society">>
 						<<run FutureSocieties.remove("FSGenderRadicalist")>>
-						<<if $assistantFSAppearance == "gender radicalist">>
-							<<set $assistantFSAppearance = "default">>
+						<<if $assistant.fsAppearance == "gender radicalist">>
+							<<set $assistant.fsAppearance = "default">>
 						<</if>>
 					<</link>>
 				</span>
@@ -937,8 +937,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 					<<FSChangeDecoration "FSGenderRadicalist">>
 				</div>
 				<<if $PAPublic == 1>>
-					<<if ($assistantAppearance == "shemale") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
-						<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+					<<if ($assistant.appearance == "shemale") || ($assistant.appearance == "monstergirl") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch")>>
+						<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 					<</if>>
 				<</if>>
 			<<else>>
@@ -961,8 +961,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSGenderFundamentalist")>>
-					<<if $assistantFSAppearance == "gender fundamentalist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "gender fundamentalist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -970,8 +970,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSGenderFundamentalist" "clothesBoughtBunny">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "goddess") || ($assistant.appearance == "hypergoddess") || ($assistant.appearance == "preggololi") || ($assistant.appearance == "loli") || ($assistant.appearance == "fairy") || ($assistant.appearance == "pregnant fairy") || ($assistant.appearance == "angel") || ($assistant.appearance == "cherub") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -996,8 +996,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSPaternalist")>>
-					<<if $assistantFSAppearance == "paternalist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "paternalist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1005,8 +1005,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSPaternalist" "clothesBoughtConservative">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "goddess") || ($assistant.appearance == "hypergoddess") || ($assistant.appearance == "preggololi") || ($assistant.appearance == "loli") || ($assistant.appearance == "fairy") || ($assistant.appearance == "pregnant fairy") || ($assistant.appearance == "angel") || ($assistant.appearance == "cherub")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1028,8 +1028,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSDegradationist")>>
-					<<if $assistantFSAppearance == "degradationist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "degradationist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1037,8 +1037,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSDegradationist" "clothesBoughtChains">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "monstergirl") || ($assistantAppearance == "businesswoman") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "imp")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "monstergirl") || ($assistant.appearance == "businesswoman") || ($assistant.appearance == "preggololi") || ($assistant.appearance == "succubus") || ($assistant.appearance == "incubus") || ($assistant.appearance == "imp")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1063,8 +1063,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSBodyPurist")>>
-					<<if $assistantFSAppearance == "body purist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "body purist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1072,8 +1072,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSBodyPurist">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "amazon") || ($assistant.appearance == "goddess") || ($assistant.appearance == "loli") || ($assistant.appearance == "fairy") || ($assistant.appearance == "pregnant fairy") || ($assistant.appearance == "angel") || ($assistant.appearance == "succubus") || ($assistant.appearance == "incubus") || ($assistant.appearance == "witch")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1095,8 +1095,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSTransformationFetishist")>>
-					<<if $assistantFSAppearance == "transformation fetishist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "transformation fetishist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1104,8 +1104,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSTransformationFetishist">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "shemale") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "shemale") || ($assistant.appearance == "succubus") || ($assistant.appearance == "incubus") || ($assistant.appearance == "witch") || ($assistant.appearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1130,8 +1130,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSYouthPreferentialist")>>
-					<<if $assistantFSAppearance == "youth preferentialist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "youth preferentialist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1139,8 +1139,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSYouthPreferentialist">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "shemale") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp") || ($assistantAppearance == "witch")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "shemale") || ($assistant.appearance == "preggololi") || ($assistant.appearance == "loli") || ($assistant.appearance == "succubus") || ($assistant.appearance == "angel") || ($assistant.appearance == "cherub") || ($assistant.appearance == "imp") || ($assistant.appearance == "witch")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1162,8 +1162,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSMaturityPreferentialist")>>
-					<<if $assistantFSAppearance == "maturity preferentialist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "maturity preferentialist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1171,8 +1171,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSMaturityPreferentialist">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "goddess") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "angel")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "goddess") || ($assistant.appearance == "succubus") || ($assistant.appearance == "incubus") || ($assistant.appearance == "witch") || ($assistant.appearance == "angel")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1197,8 +1197,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSPetiteAdmiration")>>
-					<<if $assistantFSAppearance == "petite admiration">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "petite admiration">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1206,8 +1206,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSPetiteAdmiration">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ["cherub", "fairy", "imp", "incubus", "loli", "preggololi", "pregnant fairy", "schoolgirl", "succubus"].includes($assistantAppearance)>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ["cherub", "fairy", "imp", "incubus", "loli", "preggololi", "pregnant fairy", "schoolgirl", "succubus"].includes($assistant.appearance)>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1229,8 +1229,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSStatuesqueGlorification")>>
-					<<if $assistantFSAppearance == "statuesque glorification">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "statuesque glorification">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1238,8 +1238,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSStatuesqueGlorification">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ["amazon", "goddess", "incubus", "succubus", "witch"].includes($assistantAppearance)>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ["amazon", "goddess", "incubus", "succubus", "witch"].includes($assistant.appearance)>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1264,8 +1264,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSSlimnessEnthusiast")>>
-					<<if $assistantFSAppearance == "slimness enthusiast">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "slimness enthusiast">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1273,8 +1273,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSSlimnessEnthusiast">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "shemale") || ($assistantAppearance == "loli") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "shemale") || ($assistant.appearance == "loli") || ($assistant.appearance == "cherub") || ($assistant.appearance == "imp") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1296,8 +1296,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSAssetExpansionist")>>
-					<<if $assistantFSAppearance == "asset expansionist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "asset expansionist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1305,8 +1305,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSAssetExpansionist">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "shemale") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "shemale") || ($assistant.appearance == "hypergoddess") || ($assistant.appearance == "succubus") || ($assistant.appearance == "incubus") || ($assistant.appearance == "witch")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1330,8 +1330,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 		<span class="detail">
 			<<link "Abandon" "Future Society">>
 				<<run FutureSocieties.remove("FSPastoralist")>>
-				<<if $assistantFSAppearance == "pastoralist">>
-					<<set $assistantFSAppearance = "default">>
+				<<if $assistant.fsAppearance == "pastoralist">>
+					<<set $assistant.fsAppearance = "default">>
 				<</if>>
 			<</link>>
 		</span>
@@ -1339,8 +1339,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<<FSChangeDecoration "FSPastoralist" "clothesBoughtWestern">>
 		</div>
 		<<if $PAPublic == 1>>
-			<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "shemale") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
-				<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+			<<if ($assistant.appearance == "goddess") || ($assistant.appearance == "shemale") || ($assistant.appearance == "hypergoddess") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch")>>
+				<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 			<</if>>
 		<</if>>
 	<<else>>
@@ -1364,8 +1364,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSPhysicalIdealist")>>
-					<<if $assistantFSAppearance == "physical idealist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "physical idealist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1373,8 +1373,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSPhysicalIdealist" "clothesBoughtOil">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "shemale") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "amazon") || ($assistant.appearance == "shemale") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1396,8 +1396,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSHedonisticDecadence")>>
-					<<if $assistantFSAppearance == "hedonistic decadence">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "hedonistic decadence">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1405,8 +1405,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSHedonisticDecadence">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "imp") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "goddess") || ($assistant.appearance == "hypergoddess") || ($assistant.appearance == "preggololi") || ($assistant.appearance == "imp") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1431,8 +1431,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSChattelReligionist")>>
-					<<if $assistantFSAppearance == "chattel religionist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "chattel religionist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1440,8 +1440,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSChattelReligionist" "clothesBoughtHabit">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "goddess") || ($assistant.appearance == "monstergirl") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus") || ($assistant.appearance == "witch") || ($assistant.appearance == "angel") || ($assistant.appearance == "cherub") || ($assistant.appearance == "imp")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1622,8 +1622,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSRomanRevivalist")>>
-					<<if $assistantFSAppearance == "roman revivalist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "roman revivalist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1631,8 +1631,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSRomanRevivalist" "clothesBoughtToga">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "amazon") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "amazon") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1654,8 +1654,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSAztecRevivalist")>>
-					<<if $assistantFSAppearance == "aztec revivalist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "aztec revivalist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1663,8 +1663,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSAztecRevivalist" "clothesBoughtHuipil">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "amazon") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "goddess") || ($assistant.appearance == "amazon") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1686,8 +1686,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSEgyptianRevivalist")>>
-					<<if $assistantFSAppearance == "egyptian revivalist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "egyptian revivalist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1695,8 +1695,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSEgyptianRevivalist" "clothesBoughtEgypt">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "goddess") || ($assistant.appearance == "monstergirl") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1718,8 +1718,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSEdoRevivalist")>>
-					<<if $assistantFSAppearance == "edo revivalist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "edo revivalist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1727,8 +1727,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSEdoRevivalist" "clothesBoughtKimono">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "loli") || ($assistantAppearance == "kitsune") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "amazon") || ($assistant.appearance == "monstergirl") || ($assistant.appearance == "loli") || ($assistant.appearance == "kitsune") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1750,8 +1750,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSArabianRevivalist")>>
-					<<if $assistantFSAppearance == "arabian revivalist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "arabian revivalist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1759,8 +1759,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSArabianRevivalist" "clothesBoughtHarem">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "businesswoman") || ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
@@ -1782,8 +1782,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 			<span class="detail">
 				<<link "Abandon" "Future Society">>
 					<<run FutureSocieties.remove("FSChineseRevivalist")>>
-					<<if $assistantFSAppearance == "chinese revivalist">>
-						<<set $assistantFSAppearance = "default">>
+					<<if $assistant.fsAppearance == "chinese revivalist">>
+						<<set $assistant.fsAppearance = "default">>
 					<</if>>
 				<</link>>
 			</span>
@@ -1791,8 +1791,8 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 				<<FSChangeDecoration "FSChineseRevivalist" "clothesBoughtQipao">>
 			</div>
 			<<if $PAPublic == 1>>
-				<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
-					<span class="note">With _hisA $assistantAppearance appearance, $assistantName is a good public mascot for this goal.</span>
+				<<if ($assistant.appearance == "schoolgirl") || ($assistant.appearance == "monstergirl") || ($assistant.appearance == "incubus") || ($assistant.appearance == "succubus")>>
+					<span class="note">With _hisA $assistant.appearance appearance, $assistant.name is a good public mascot for this goal.</span>
 				<</if>>
 			<</if>>
 		<<else>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 23f73d85b12a076643d98ba44e95f7faad888de0..3a2f505f3b35c86167866bf249a61b3b9b277028 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -50,7 +50,7 @@ The firm promptly pays @@.yellowgreen; a large compensation@@ for potentially ru
 
 <<case "strip club closing">>
 
-It's been a good few weeks, getting settled in as owner of $arcologies[0].name. The power of being overlord of this great building and everyone in it is incredible, but so is the responsibility. It's a good thing you have ample opportunities for stress relief. You're going to need them after today. There's a nasty disturbance on a business level of the arcology. Normally, the arcology's public safety drones would suppress this kind of nonsense, but $assistantName program is suggesting that you resolve the dispute.
+It's been a good few weeks, getting settled in as owner of $arcologies[0].name. The power of being overlord of this great building and everyone in it is incredible, but so is the responsibility. It's a good thing you have ample opportunities for stress relief. You're going to need them after today. There's a nasty disturbance on a business level of the arcology. Normally, the arcology's public safety drones would suppress this kind of nonsense, but $assistant.name program is suggesting that you resolve the dispute.
 <br><br>
 As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</if>>voices shouting. Apparently one of $arcologies[0].name's few remaining strip joints has closed. It was a topless bar and strip club all in one, but the owner is packing up his things. He's explaining to a crowd of his angry former employees that he can't make ends meet. As the price of a slave whore is barely higher than that of a lap dance from a free stripper; it's not surprising. It looks like the girls are on the verge of trashing the place.
 
@@ -147,7 +147,7 @@ This is a less ludicrous suggestion than it might sound. Your arcology's securit
 
 <<case "shoot invitation">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> usually delays message delivery when you're relieving your sexual needs with your property, but messages from other arcology owners have a special priority. This one is a brief but rather well-spoken audio invitation from one of your more notoriously wealthy peers.
+<<= capFirstChar($assistant.name)>> usually delays message delivery when you're relieving your sexual needs with your property, but messages from other arcology owners have a special priority. This one is a brief but rather well-spoken audio invitation from one of your more notoriously wealthy peers.
 <br><br>
 "A week from today, I will be hosting a novel sporting event for the well-to-do. A new tradition, if it's as diverting as I hope. If you wish to take part in a very exclusive contest of marksmanship, exhibitionism, and grace under pressure, buy in. Five thousand. And, believe me, you have a fine chance to come out ahead."
 
@@ -179,7 +179,7 @@ The crowd of nude slaves led up to the lawn and chained to rings along one edge
 <</if>>
 <<set _trapped.push("gradeSchool")>>
 <<set $PAidTarget = _trapped.random()>>
-A small old world country near the arcology is experiencing serious unrest. Its corrupt government is doing an even poorer job than most of addressing chronic joblessness and general malaise. Thus far, it's been a fertile source of people in poverty for slavers to target, and little else. Lately, though, it's been showing signs worse may be to come. You've instructed $assistantName to flag communications from the area; there's always a possibility that business opportunities may arise from the benighted country, and the situation is becoming so unstable it's prudent to keep a personal eye on it anyway. You receive just such a call from
+A small old world country near the arcology is experiencing serious unrest. Its corrupt government is doing an even poorer job than most of addressing chronic joblessness and general malaise. Thus far, it's been a fertile source of people in poverty for slavers to target, and little else. Lately, though, it's been showing signs worse may be to come. You've instructed $assistant.name to flag communications from the area; there's always a possibility that business opportunities may arise from the benighted country, and the situation is becoming so unstable it's prudent to keep a personal eye on it anyway. You receive just such a call from
 <<if $PAidTarget == "convent">>
 	the leader of a female-oriented religious retreat
 <<elseif $PAidTarget == "school">>
@@ -767,13 +767,13 @@ From this day forward, the arcology shall be known as: <<textbox "$arcologies[0]
 
 <<case "slave food">>
 
-A screen opposite your desk springs to life, <<if $assistant == 0>>showing your personal assistant's symbol, indicating that it has a complex subject to report. When you instruct it to continue, it displays<<else>>and $assistantName's avatar appears on it seated, indicating that _heA has something complex to bring up. When you tell _himA to continue, _heA reviews<</if>> medical research that's just been published, on the long term effects of the liquid diet your slaves eat. The current generation of slaves is the first, and new discoveries about the effects of years of modern slavery are made all the time. Apparently, consuming state of the art slave food causes slow atrophy of slaves' digestive tracts. The slaves' ability to digest the slave food does not seem to be affected; the atrophy is the body's natural reaction to never facing digestive challenge, and once it reaches the point where the remaining digestive capacity is necessary for liquid slave food, it stops. The only negative effect known is difficulty readjusting to normal food, becoming more extreme the longer the slave food diet was followed.
+A screen opposite your desk springs to life, <<if $assistant.personality == 0>>showing your personal assistant's symbol, indicating that it has a complex subject to report. When you instruct it to continue, it displays<<else>>and $assistant.name's avatar appears on it seated, indicating that _heA has something complex to bring up. When you tell _himA to continue, _heA reviews<</if>> medical research that's just been published, on the long term effects of the liquid diet your slaves eat. The current generation of slaves is the first, and new discoveries about the effects of years of modern slavery are made all the time. Apparently, consuming state of the art slave food causes slow atrophy of slaves' digestive tracts. The slaves' ability to digest the slave food does not seem to be affected; the atrophy is the body's natural reaction to never facing digestive challenge, and once it reaches the point where the remaining digestive capacity is necessary for liquid slave food, it stops. The only negative effect known is difficulty readjusting to normal food, becoming more extreme the longer the slave food diet was followed.
 <br><br>"In conclusion,"
-<<if $assistant == 0>>
+<<if $assistant.personality == 0>>
 	your assistant recites, "no impact on slaves who fully adapt to slave food is likely, as long as they remain slaves. If they were to be freed, they would have to either continue obtaining liquid slave food, or go through a difficult or even impossible dietary transition." _HeA pauses. "This information is likely to remain at the level of a rumor among the slave population, unless it is openly admitted."
 <<else>>
 	_heA says, "your slaves who stay on slave food long enough to need it will be totally fine, as long as they stay slaves. If they're ever freed, though, they have to keep eating slave food, or somehow switch. And that's never been tried."
-	<<switch $assistantAppearance>>
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		The monster<<= _girlA>> bares _hisA fangs and becomes very erect. "They're stuck," _heA says. "They're fuckslaves forever." _HeA pauses.
 	<<case "shemale">>
@@ -1173,7 +1173,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
 		<</if>>
 		/* 000-250-006 */
 	</span>
-	You decide to stop the athletic slave $girl about to win $his freedom, and place your taser slug in $his muscular buttock. $He goes stiff and skids across the grass with a growl. Your taser slug is linked to $assistantName, who hits $him again whenever $he tries to continue running. Fury glints from $his eyes, but $he apparently knows how to pick $his battles. By the time you approach $him, $he's already bent over, presenting $himself, and from the oily sheen on $his privates, it looks like $he even managed to get some lube somewhere to make the experience a little easier. It is a strange thing, respecting a slave, but $he rises even higher in your estimation as you fuck $him on the grass. $He does $his best to please you, having clearly decided to do $his best given $his situation. $He's sexually inexpert, but clearly smart enough to know when to submit.
+	You decide to stop the athletic slave $girl about to win $his freedom, and place your taser slug in $his muscular buttock. $He goes stiff and skids across the grass with a growl. Your taser slug is linked to $assistant.name, who hits $him again whenever $he tries to continue running. Fury glints from $his eyes, but $he apparently knows how to pick $his battles. By the time you approach $him, $he's already bent over, presenting $himself, and from the oily sheen on $his privates, it looks like $he even managed to get some lube somewhere to make the experience a little easier. It is a strange thing, respecting a slave, but $he rises even higher in your estimation as you fuck $him on the grass. $He does $his best to please you, having clearly decided to do $his best given $his situation. $He's sexually inexpert, but clearly smart enough to know when to submit.
 	<<run newSlave($activeSlave)>> /* skip New Slave Intro */
 	<</replace>>
 <</link>>
@@ -1231,7 +1231,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
 			<</if>>
 			/* 000-250-006 */
 		</span>
-		You decide to stop the wide-hipped $loli struggling to run, and easily place your taser slug in $his broad rear. $He goes stiff and falls flat on $his face. Your taser slug is linked to $assistantName, but since the $girl can't manage to flip over, let alone stand, shocking $him more is unneeded. Fury glints from $his eyes, but $he fully realizes it's over for $him. By the time you approach $him, $he's hoisted $his overly wide rear upwards, presenting $himself, moisture beginning to ooze from $his virgin cunt. It looks like $he was being groomed to be a breeding slave, and $he seems to understand $his role quite well, judging by the way $he rocks $his hips back and forth for you. You thoroughly enjoy $his gratifyingly tight pussy, which is so nice that you confine yourself entirely to it despite the appealing sight of $his virgin butthole.
+		You decide to stop the wide-hipped $loli struggling to run, and easily place your taser slug in $his broad rear. $He goes stiff and falls flat on $his face. Your taser slug is linked to $assistant.name, but since the $girl can't manage to flip over, let alone stand, shocking $him more is unneeded. Fury glints from $his eyes, but $he fully realizes it's over for $him. By the time you approach $him, $he's hoisted $his overly wide rear upwards, presenting $himself, moisture beginning to ooze from $his virgin cunt. It looks like $he was being groomed to be a breeding slave, and $he seems to understand $his role quite well, judging by the way $he rocks $his hips back and forth for you. You thoroughly enjoy $his gratifyingly tight pussy, which is so nice that you confine yourself entirely to it despite the appealing sight of $his virgin butthole.
 		<<run newSlave($activeSlave)>> /* skip New Slave Intro */
 		<</replace>>
 	<</link>>
@@ -1282,7 +1282,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
 		<</if>>
 		/* 000-250-006 */
 	</span>
-	You decide to drop the luscious specimen in the rear, and place your taser slug in $his huge buttock. $He goes stiff and slumps to the grass in defeat. Your taser slug is linked to $assistantName, who hits $him again whenever $he tries to rise. Meanwhile, an athletic slave has successfully crossed the lawn, and is sobbing with joy as _hisU manumission forms are completed. Disbelief and anger fills your supine prize's eyes, and $he's spitting with rage by the time you reach $him. It's a comical sight, since $his gyrations only serve to display $his magnificent breasts and broad butt. $He must have been recently enslaved, and is new enough to slavery that you are obliged to tase $him twice more before $he presents $his holes. The impression of newness to slavery despite $his age is reinforced by $his gratifyingly tight pussy, which is so nice that you confine yourself entirely to it despite the appealing sight of what is almost certainly a virgin butthole.
+	You decide to drop the luscious specimen in the rear, and place your taser slug in $his huge buttock. $He goes stiff and slumps to the grass in defeat. Your taser slug is linked to $assistant.name, who hits $him again whenever $he tries to rise. Meanwhile, an athletic slave has successfully crossed the lawn, and is sobbing with joy as _hisU manumission forms are completed. Disbelief and anger fills your supine prize's eyes, and $he's spitting with rage by the time you reach $him. It's a comical sight, since $his gyrations only serve to display $his magnificent breasts and broad butt. $He must have been recently enslaved, and is new enough to slavery that you are obliged to tase $him twice more before $he presents $his holes. The impression of newness to slavery despite $his age is reinforced by $his gratifyingly tight pussy, which is so nice that you confine yourself entirely to it despite the appealing sight of what is almost certainly a virgin butthole.
 	<<run newSlave($activeSlave)>> /* skip New Slave Intro */
 	<</replace>>
 <</link>>
@@ -1340,7 +1340,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
 			<</if>>
 			/* 000-250-006 */
 		</span>
-		You decide to drop the really rare specimen, and place your taser slug in $his leg. $He goes stiff and slumps to the grass, squealing with pain since the taser robbed $his ability to break $his fall, leading $him to land on nearly <<if $showInches == 2>>a foot<<else>>thirty centimeters<</if>> of flaccid cock. Your taser slug is linked to $assistantName, who hits $him again whenever $he tries to rise. Meanwhile, an athletic slave has successfully crossed the lawn, and is sobbing with joy as _hisU manumission forms are completed. Apathy fills your supine prize's eyes, and $he simply lies face-down and quiescent. $He obeys orders to roll over so you can see what you've gotten, however. $He's clearly a work of long and careful hormonal treatment. $He has no implants, but sports big breasts, feminine hips, a nice butt, plush lips, and a huge dick. When you fuck $his pussy and then $his anus, $he even gets a massive erection, showing that $he isn't even on hormone treatment to maintain this unusual set of attributes.
+		You decide to drop the really rare specimen, and place your taser slug in $his leg. $He goes stiff and slumps to the grass, squealing with pain since the taser robbed $his ability to break $his fall, leading $him to land on nearly <<if $showInches == 2>>a foot<<else>>thirty centimeters<</if>> of flaccid cock. Your taser slug is linked to $assistant.name, who hits $him again whenever $he tries to rise. Meanwhile, an athletic slave has successfully crossed the lawn, and is sobbing with joy as _hisU manumission forms are completed. Apathy fills your supine prize's eyes, and $he simply lies face-down and quiescent. $He obeys orders to roll over so you can see what you've gotten, however. $He's clearly a work of long and careful hormonal treatment. $He has no implants, but sports big breasts, feminine hips, a nice butt, plush lips, and a huge dick. When you fuck $his pussy and then $his anus, $he even gets a massive erection, showing that $he isn't even on hormone treatment to maintain this unusual set of attributes.
 		<<run newSlave($activeSlave)>> /* skip New Slave Intro */
 		<</replace>>
 	<</link>>
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index 0803d07d9e0fcfbbe9c610aeb80d5f319ab63462..e6ab45e4754f64622eccdc7b0347ea3a6e0b1ade 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -173,7 +173,7 @@
 
 <<setLocalPronouns $activeSlave>>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> breaks in on your sleep with an urgent message. You push a slave off you and sit up to take it. As the owner of the arcology, you perform some functions that would traditionally be the province of a government. In this anarcho-liberal polity, it's still necessary for people making deals to have someone to appeal to when disputes arise. Part of your agreement with your tenants is that you will perform this duty on deals between two tenants. The message is about just such a disagreement; they always seem to happen in the middle of the night, and they're always urgent.
+<<= capFirstChar($assistant.name)>> breaks in on your sleep with an urgent message. You push a slave off you and sit up to take it. As the owner of the arcology, you perform some functions that would traditionally be the province of a government. In this anarcho-liberal polity, it's still necessary for people making deals to have someone to appeal to when disputes arise. Part of your agreement with your tenants is that you will perform this duty on deals between two tenants. The message is about just such a disagreement; they always seem to happen in the middle of the night, and they're always urgent.
 
 <br><br>
 
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 2a9111615381ece7422fa508c4f0334969bbee6b..516292330f0f13678a17839eeec6ad3fca5facf5 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -459,7 +459,7 @@
 <h2>Special Arcology Upgrades</h2>
 
 <p class="indent">
-	<<if ($personalArms == 0) && ($mercenaries == 0) && ($assistant == 0)>>
+	<<if ($personalArms == 0) && ($mercenaries == 0) && ($assistant.personality == 0)>>
 		<span class="note">$arcologies[0].name has no special upgrades.</span>
 	<</if>>
 
@@ -479,10 +479,10 @@
 		<</if>>
 	<</if>>
 
-	<<if ($assistant > 0)>>
+	<<if assistant.personality > 0>>
 		<<setAssistantPronouns>>
-		<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> is using an alternative personality setting, speaking in a sultry, sexual voice, and talking as though the penthouse's sex toys are _hisA body.
-		<<if ($assistant > 1)>>
+		<<= capFirstChar($assistant.name)>> is using an alternative personality setting, speaking in a sultry, sexual voice, and talking as though the penthouse's sex toys are _hisA body.
+		<<if assistant.personality > 1>>
 			_HeA also has charge of all smart piercings in the arcology, and is using _hisA adaptations to sexual duties to improve their effectiveness.
 		<</if>>
 	<</if>>
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index da256b995d0c278b6e8c2b846ef54c9b79c53a7c..4a6a8ed9339df18a40e876546b3ebfde1198a4fb 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -81,46 +81,46 @@ You tell $eventSlave.slaveName that you're going to marry $him. (A proposal, of
 <</if>>
 Despite $his devotion and trust, $he is still a slave, and probably knows that $his position could always change. This brings $him one step closer to true permanence, and $he knows it.
 <br><br>
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> prompts you for wedding
-<<if $assistant == 0>>
+<<= capFirstChar($assistant.name)>> prompts you for wedding
+<<if $assistant.personality == 0>>
 	instructions.
 <<else>>
 	instructions, _hisA
-	<<if $assistantAppearance == "monstergirl">>
+	<<if $assistant.appearance == "monstergirl">>
 		monster<<= _girlA>> avatar appearing in a surprisingly conventional surplice that covers _himA up decently. All except for _hisA horns, which protrude from under the headpiece.
-	<<elseif $assistantAppearance == "shemale">>
+	<<elseif $assistant.appearance == "shemale">>
 		shemale avatar appears in a collar patterned to look like a minister's, and absolutely nothing else, stroking _himselfA with anticipation.
-	<<elseif $assistantAppearance == "amazon">>
+	<<elseif $assistant.appearance == "amazon">>
 		amazon avatar wearing a tribal shaman's cape and carrying a medicine stick adorned with all sorts of little charms and baubles.
-	<<elseif $assistantAppearance == "businesswoman">>
+	<<elseif $assistant.appearance == "businesswoman">>
 		business<<= _womanA>> avatar looking rather severe in a minister's collar.
-	<<elseif $assistantAppearance == "fairy">>
+	<<elseif $assistant.appearance == "fairy">>
 		fairy avatar looking incredibly silly, dressed in an oversized, disheveled priest's robes and looking rather smug about it.
-	<<elseif $assistantAppearance == "pregnant fairy">>
+	<<elseif $assistant.appearance == "pregnant fairy">>
 		fairy avatar looking incredibly silly, dressed in an oversized, disheveled priest's robes stretched tight by _hisA pregnant belly and looking rather smug about it.
-	<<elseif $assistantAppearance == "goddess">>
+	<<elseif $assistant.appearance == "goddess">>
 		goddess avatar completely unchanged, since _heA considers _hisA usual form perfectly appropriate for a marriage.
-	<<elseif $assistantAppearance == "hypergoddess">>
+	<<elseif $assistant.appearance == "hypergoddess">>
 		goddess avatar completely unchanged, since _heA considers _hisA usual form perfectly appropriate for a marriage.
-	<<elseif $assistantAppearance == "loli">>
+	<<elseif $assistant.appearance == "loli">>
 		_loliA avatar looking surprisingly mature in a minister's collar. Though, _heA would rather be the flower _girlA in this wedding.
-	<<elseif $assistantAppearance == "preggololi">>
+	<<elseif $assistant.appearance == "preggololi">>
 		_loliA avatar looking surprisingly mature in a minister's collar. Though, _heA would rather be the flower _girlA in this wedding.
-	<<elseif $assistantAppearance == "schoolgirl">>
+	<<elseif $assistant.appearance == "schoolgirl">>
 		school<<= _girlA>> avatar looking willfully absurd in a minister's collar and _hisA usual short plaid skirt.
-	<<elseif $assistantAppearance == "angel">>
+	<<elseif $assistant.appearance == "angel">>
 		angelic avatar looking, well, angelic in _hisA usual garb with an added minister's collar.
-	<<elseif $assistantAppearance == "cherub">>
+	<<elseif $assistant.appearance == "cherub">>
 		angelic avatar looking absurd in _hisA oversized robe, complete with wingholes, and minister's collar.
-	<<elseif $assistantAppearance == "incubus">>
+	<<elseif $assistant.appearance == "incubus">>
 		demonic avatar completely unchanged, since _heA considers _hisA usual form perfectly appropriate for a marriage, though _heA has made sure to be fully erect for the wedding.
-	<<elseif $assistantAppearance == "succubus">>
+	<<elseif $assistant.appearance == "succubus">>
 		demonic avatar wearing nothing but a minister's collar. _HeA has brought several marital aids along with _himA to tease the bride and groom with.
-	<<elseif $assistantAppearance == "imp">>
+	<<elseif $assistant.appearance == "imp">>
 		demonic avatar looking absurd in _hisA oversized robe, complete with wingholes, and minister's collar.
-	<<elseif $assistantAppearance == "witch">>
+	<<elseif $assistant.appearance == "witch">>
 		witchy avatar looking rather formal in a fine robe and minister's collar.
-	<<elseif $assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+	<<elseif $assistant.appearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
 		twitching avatar completely unchanged, sans a bulbous ring of flesh around _hisA neck that sort of resembles a minister's collar.
 	<<else>>
 		symbol appearing in white.
@@ -130,43 +130,43 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
 <span id="result2">
 <br><<link "Just redesignate $him as your slave $wife">>
 	<<replace "#result2">>
-	You order $assistantName to simply redesignate $eventSlave.slaveName as your slave $wife.
-	<<if $assistant == 0>>
+	You order $assistant.name to simply redesignate $eventSlave.slaveName as your slave $wife.
+	<<if $assistant.personality == 0>>
 		"Slave redesignated," _heA responds immediately. The thing is done.
 	<<else>>
-		<<if $assistantAppearance == "monstergirl">>
+		<<if $assistant.appearance == "monstergirl">>
 			_HisA avatar snaps _hisA fingers and shrugs off _hisA surplice, revealing _hisA tentacle hair, pale skin, and cocks once more.
-		<<elseif $assistantAppearance == "shemale">>
+		<<elseif $assistant.appearance == "shemale">>
 			_HisA avatar snaps _hisA fingers and starts to masturbate more energetically.
-		<<elseif $assistantAppearance == "amazon">>
+		<<elseif $assistant.appearance == "amazon">>
 			_HisA avatar gives _hisA medicine stick a shake.
-		<<elseif $assistantAppearance == "businesswoman">>
+		<<elseif $assistant.appearance == "businesswoman">>
 			_HisA avatar snaps _hisA fingers.
-		<<elseif ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy")>>
+		<<elseif ($assistant.appearance == "fairy") || ($assistant.appearance == "pregnant fairy")>>
 			_HisA avatar claps _hisA hands twice, looking a bit disappointed at the lack of celebration.
-		<<elseif $assistantAppearance == "goddess">>
+		<<elseif $assistant.appearance == "goddess">>
 			_HisA avatar makes a complex hand gesture, looking beatific.
-		<<elseif $assistantAppearance == "hypergoddess">>
+		<<elseif $assistant.appearance == "hypergoddess">>
 			_HisA avatar makes a complex hand gesture, looking beatific.
-		<<elseif $assistantAppearance == "loli">>
+		<<elseif $assistant.appearance == "loli">>
 			_HisA avatar claps _hisA hands together.
-		<<elseif $assistantAppearance == "preggololi">>
+		<<elseif $assistant.appearance == "preggololi">>
 			_HisA avatar claps _hisA hands together.
-		<<elseif $assistantAppearance == "schoolgirl">>
+		<<elseif $assistant.appearance == "schoolgirl">>
 			_HisA avatar snaps _hisA fingers and gives a little twirl.
-		<<elseif $assistantAppearance == "angel">>
+		<<elseif $assistant.appearance == "angel">>
 			_HisA avatar spreads _hisA wings and arms and emits a flash of light.
-		<<elseif $assistantAppearance == "cherub">>
+		<<elseif $assistant.appearance == "cherub">>
 			_HisA avatar claps _hisA hands together, emitting a burst of light.
-		<<elseif $assistantAppearance == "incubus">>
+		<<elseif $assistant.appearance == "incubus">>
 			_HisA avatar flicks the tip of _hisA penis and blows _hisA load towards the both of you.
-		<<elseif $assistantAppearance == "succubus">>
+		<<elseif $assistant.appearance == "succubus">>
 			_HisA avatar starts to masturbate furiously and orgasms lewdly.
-		<<elseif $assistantAppearance == "imp">>
+		<<elseif $assistant.appearance == "imp">>
 			_HisA avatar claps _hisA hands together, emitting a burst of darkness.
-		<<elseif $assistantAppearance == "witch">>
+		<<elseif $assistant.appearance == "witch">>
 			_HisA avatar pulls out _hisA spell book and attempts a spell to bind you two; _heA manages to conjure a large ring around _himselfA, pinning _hisA arms to _hisA sides.
-		<<elseif $assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+		<<elseif $assistant.appearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
 			_HisA avatar splits open to reveal a number of tentacles and wraps them around each other.
 		<<else>>
 			_HisA symbol flashes.
@@ -179,7 +179,7 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
 		<<link "Give $him your surname">>
 			<<replace "#surnaming">>
 				<<set $eventSlave.slaveSurname = $PC.slaveSurname, $eventSlave.devotion += 5, $eventSlave.trust += 5>>
-				You also command $assistantName to rename your new slave $wife $eventSlave.slaveName $eventSlave.slaveSurname. The new Mrs. $eventSlave.slaveSurname <<if canHear($eventSlave)>>hears<<else>>understands<</if>> this, of course, and breaks down again. Being brusquely redesignated as your slave $wife was such a sterile experience that $he wasn't sure it was real, and hearing that $he's to take your surname @@.mediumaquamarine;reassures $him@@ that it is. Not to mention, $he might be a $desc, but $he's still a $girl, and hearing that $he wouldn't get a decent wedding did disappoint $him, but this makes up for it. You might not be all that expressive, but @@.hotpink;$he's your $wife,@@ and that's what matters to $him.
+				You also command $assistant.name to rename your new slave $wife $eventSlave.slaveName $eventSlave.slaveSurname. The new Mrs. $eventSlave.slaveSurname <<if canHear($eventSlave)>>hears<<else>>understands<</if>> this, of course, and breaks down again. Being brusquely redesignated as your slave $wife was such a sterile experience that $he wasn't sure it was real, and hearing that $he's to take your surname @@.mediumaquamarine;reassures $him@@ that it is. Not to mention, $he might be a $desc, but $he's still a $girl, and hearing that $he wouldn't get a decent wedding did disappoint $him, but this makes up for it. You might not be all that expressive, but @@.hotpink;$he's your $wife,@@ and that's what matters to $him.
 				<<set $activeSlave = $eventSlave>>
 			<</replace>>
 		<</link>>
@@ -254,48 +254,48 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
 			$His lacy g-string is starting to look a bit moist in front.
 		<</if>>
 	<</if>>
-	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> marries $him to you in a brief ceremony adapted for slaves and their owners. You place a simple steel ring on <<if hasAnyArms($eventSlave)>>$his finger<<else>>a string around $his neck<</if>>; $he does not reciprocate, since this marriage does not bind you.
-	<<if $assistant == 0>>
-		"The marriage protocol now requires you to <<if $PC.dick != 0>>fellate<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>," $assistantName orders $him, and $he hurries to obey.
+	<<= capFirstChar($assistant.name)>> marries $him to you in a brief ceremony adapted for slaves and their owners. You place a simple steel ring on <<if hasAnyArms($eventSlave)>>$his finger<<else>>a string around $his neck<</if>>; $he does not reciprocate, since this marriage does not bind you.
+	<<if $assistant.personality == 0>>
+		"The marriage protocol now requires you to <<if $PC.dick != 0>>fellate<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>," $assistant.name orders $him, and $he hurries to obey.
 	<<else>>
-		<<if $assistantAppearance == "monstergirl">>
-			"To consecrate the ceremony," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar begins to play with _hisA dicks.
-		<<elseif $assistantAppearance == "shemale">>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar starts to jill off.
-		<<elseif $assistantAppearance == "amazon">>
-			"To complete this ritual," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar starts to jill off.
-		<<elseif $assistantAppearance == "businesswoman">>
-			"To consecrate the marriage," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>fellate<<else>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar sneaks a hand down _hisA suit skirt, blushing furiously.
-		<<elseif $assistantAppearance == "fairy">>
-			"To seal the deal," $assistantName concludes, "$eventSlave.slaveName, you gotta drink the <<if $PC.title == 1>>groom's <<else>>bride's <</if>><<if $PC.dick != 0>>semen<<if $PC.vagina != -1>> and pussy juices<</if>><<else>>pussy juices<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar spreads _hisA legs while still hovering in the air and masturbates eagerly through _hisA half-worn robes.
-		<<elseif $assistantAppearance == "pregnant fairy">>
-			"To seal the deal," $assistantName concludes, "$eventSlave.slaveName, you gotta drink the <<if $PC.title == 1>>groom's <<else>>bride's <</if>><<if $PC.dick != 0>>semen<<if $PC.vagina != -1>> and pussy juices<</if>><<else>>pussy juices<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's pregnant avatar curls while still hovering in the air and masturbates eagerly around _hisA large belly.
-		<<elseif $assistantAppearance == "goddess">>
-			"To consummate the marriage," $assistantName concludes, "$eventSlave.slaveName, you must now <<if $PC.dick != 0>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s seed<<else>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s female juices<</if>>." The slave complies eagerly. $assistantName's avatar looks on approvingly, cradling _hisA perpetual pregnancy.
-		<<elseif $assistantAppearance == "hypergoddess">>
-			"To consummate the marriage," $assistantName concludes, "$eventSlave.slaveName, you must now <<if $PC.dick != 0>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s seed<<else>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s female juices<</if>>." The slave complies eagerly. $assistantName's avatar looks on approvingly, cradling _hisA massive perpetual pregnancy.
-		<<elseif $assistantAppearance == "loli">>
-			"To consummate the marriage," $assistantName concludes, "$eventSlave.slaveName, you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina != -1>>and lick their cunny.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunny<</if>>." The slave complies eagerly. $assistantName's avatar sneaks a hand down _hisA dress, blushing furiously.
-		<<elseif $assistantAppearance == "preggololi">>
-			"To consummate the marriage," $assistantName concludes, "$eventSlave.slaveName, you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s lovely cock<<if $PC.vagina != -1>>and eat out their cunt.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunt<</if>>." The slave complies eagerly. $assistantName's avatar attempts to sneak a hand down _hisA dress, but is thwarted by _hisA belly. _HeA instead openly rubs _hisA crotch through the front of _hisA dress, blushing furiously.
-		<<elseif $assistantAppearance == "schoolgirl">>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, the rules say you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar starts to jill off.
-		<<elseif $assistantAppearance == "angel">>
-			"To consummate the marriage," $assistantName concludes, "$eventSlave.slaveName, you must now join <<= PlayerName()>> in their bedroom and consummate this marriage." The slave looks confused. "After the wedding ends, would be the time." $assistantName says, covering _hisA face in embarrassment at the thought.
-		<<elseif $assistantAppearance == "cherub">>
-			"To consummate the marriage," $assistantName concludes, "$eventSlave.slaveName, you should <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina != -1>>and lick their pussy,<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s pussy<</if>>, in the privacy of <<= PlayerName()>>'s bedroom, of course." $assistantName hides _hisA face in _hisA hands at the thought.
-		<<elseif $assistantAppearance == "incubus">>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Enjoying the sight, $assistantName's avatar begins to furiously stroke its shaft.
-		<<elseif $assistantAppearance == "succubus">>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar pulls out a large dildo and begins ramming it into _hisA own pussy.
-		<<elseif $assistantAppearance == "imp">>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar hikes _hisA robe and vigorously rubs _hisA pussy.
-		<<elseif $assistantAppearance == "witch">>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. $assistantName's avatar begins to fidget at the sight, having summoned a vibrator beforehand and accidentally linked it to your pleasure.
-		<<elseif $assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. $assistantName's avatar begins to swell, drawing all its gained mass to its midsection. Its gravid middles splits vertically, allowing a new mass of flesh to fall to the floor, which quickly grows and reshapes itself into a spitting image of yourself. Meanwhile, the original twists into an image of $eventSlave.slaveName. $assistantName's two avatars begin copying you and $eventSlave.slaveName's actions perfectly.
+		<<if $assistant.appearance == "monstergirl">>
+			"To consecrate the ceremony," $assistant.name concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistant.name's avatar begins to play with _hisA dicks.
+		<<elseif $assistant.appearance == "shemale">>
+			"To get this marriage started," $assistant.name concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistant.name's avatar starts to jill off.
+		<<elseif $assistant.appearance == "amazon">>
+			"To complete this ritual," $assistant.name concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistant.name's avatar starts to jill off.
+		<<elseif $assistant.appearance == "businesswoman">>
+			"To consecrate the marriage," $assistant.name concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>fellate<<else>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>." The slave complies eagerly. Pleased by the sight, $assistant.name's avatar sneaks a hand down _hisA suit skirt, blushing furiously.
+		<<elseif $assistant.appearance == "fairy">>
+			"To seal the deal," $assistant.name concludes, "$eventSlave.slaveName, you gotta drink the <<if $PC.title == 1>>groom's <<else>>bride's <</if>><<if $PC.dick != 0>>semen<<if $PC.vagina != -1>> and pussy juices<</if>><<else>>pussy juices<</if>>." The slave complies eagerly. Pleased by the sight, $assistant.name's avatar spreads _hisA legs while still hovering in the air and masturbates eagerly through _hisA half-worn robes.
+		<<elseif $assistant.appearance == "pregnant fairy">>
+			"To seal the deal," $assistant.name concludes, "$eventSlave.slaveName, you gotta drink the <<if $PC.title == 1>>groom's <<else>>bride's <</if>><<if $PC.dick != 0>>semen<<if $PC.vagina != -1>> and pussy juices<</if>><<else>>pussy juices<</if>>." The slave complies eagerly. Pleased by the sight, $assistant.name's pregnant avatar curls while still hovering in the air and masturbates eagerly around _hisA large belly.
+		<<elseif $assistant.appearance == "goddess">>
+			"To consummate the marriage," $assistant.name concludes, "$eventSlave.slaveName, you must now <<if $PC.dick != 0>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s seed<<else>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s female juices<</if>>." The slave complies eagerly. $assistant.name's avatar looks on approvingly, cradling _hisA perpetual pregnancy.
+		<<elseif $assistant.appearance == "hypergoddess">>
+			"To consummate the marriage," $assistant.name concludes, "$eventSlave.slaveName, you must now <<if $PC.dick != 0>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s seed<<else>>drink the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s female juices<</if>>." The slave complies eagerly. $assistant.name's avatar looks on approvingly, cradling _hisA massive perpetual pregnancy.
+		<<elseif $assistant.appearance == "loli">>
+			"To consummate the marriage," $assistant.name concludes, "$eventSlave.slaveName, you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina != -1>>and lick their cunny.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunny<</if>>." The slave complies eagerly. $assistant.name's avatar sneaks a hand down _hisA dress, blushing furiously.
+		<<elseif $assistant.appearance == "preggololi">>
+			"To consummate the marriage," $assistant.name concludes, "$eventSlave.slaveName, you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s lovely cock<<if $PC.vagina != -1>>and eat out their cunt.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunt<</if>>." The slave complies eagerly. $assistant.name's avatar attempts to sneak a hand down _hisA dress, but is thwarted by _hisA belly. _HeA instead openly rubs _hisA crotch through the front of _hisA dress, blushing furiously.
+		<<elseif $assistant.appearance == "schoolgirl">>
+			"To get this marriage started," $assistant.name concludes, "$eventSlave.slaveName, the rules say you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistant.name's avatar starts to jill off.
+		<<elseif $assistant.appearance == "angel">>
+			"To consummate the marriage," $assistant.name concludes, "$eventSlave.slaveName, you must now join <<= PlayerName()>> in their bedroom and consummate this marriage." The slave looks confused. "After the wedding ends, would be the time." $assistant.name says, covering _hisA face in embarrassment at the thought.
+		<<elseif $assistant.appearance == "cherub">>
+			"To consummate the marriage," $assistant.name concludes, "$eventSlave.slaveName, you should <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina != -1>>and lick their pussy,<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s pussy<</if>>, in the privacy of <<= PlayerName()>>'s bedroom, of course." $assistant.name hides _hisA face in _hisA hands at the thought.
+		<<elseif $assistant.appearance == "incubus">>
+			"To get this marriage started," $assistant.name concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Enjoying the sight, $assistant.name's avatar begins to furiously stroke its shaft.
+		<<elseif $assistant.appearance == "succubus">>
+			"To get this marriage started," $assistant.name concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistant.name's avatar pulls out a large dildo and begins ramming it into _hisA own pussy.
+		<<elseif $assistant.appearance == "imp">>
+			"To get this marriage started," $assistant.name concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistant.name's avatar hikes _hisA robe and vigorously rubs _hisA pussy.
+		<<elseif $assistant.appearance == "witch">>
+			"To get this marriage started," $assistant.name concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. $assistant.name's avatar begins to fidget at the sight, having summoned a vibrator beforehand and accidentally linked it to your pleasure.
+		<<elseif $assistant.appearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
+			"To get this marriage started," $assistant.name concludes, "$eventSlave.slaveName, you will now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. $assistant.name's avatar begins to swell, drawing all its gained mass to its midsection. Its gravid middles splits vertically, allowing a new mass of flesh to fall to the floor, which quickly grows and reshapes itself into a spitting image of yourself. Meanwhile, the original twists into an image of $eventSlave.slaveName. $assistant.name's two avatars begin copying you and $eventSlave.slaveName's actions perfectly.
 		<<else>>
-			"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, the rules say you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. With only a symbol to express _hisA approval, $assistantName is forced to content _himselfA with spinning the symbol and making it glow in time with your new slave $wife's efforts.
+			"To get this marriage started," $assistant.name concludes, "$eventSlave.slaveName, the rules say you should now <<if $PC.dick != 0>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina != -1>> and eat _hisP pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. With only a symbol to express _hisA approval, $assistant.name is forced to content _himselfA with spinning the symbol and making it glow in time with your new slave $wife's efforts.
 		<</if>>
 		"Done," _heA says when you climax. "Enjoy your
 		<<if ($eventSlave.fetishKnown == 1) && ($eventSlave.fetishStrength > 60)>>
@@ -344,7 +344,7 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
 	<br>Invite prominent citizens to a wedding (This will cost <<print cashFormat(10000)>>):
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Straightforward ceremony">>
 		<<replace "#result2">>
-		You order $assistantName to invite deserving citizens to a straightforward ceremony for a slave being married to a slaveowner, and to make the arrangement. The wedding will take place during the upcoming week.
+		You order $assistant.name to invite deserving citizens to a straightforward ceremony for a slave being married to a slaveowner, and to make the arrangement. The wedding will take place during the upcoming week.
 		<<set $weddingPlanned = 1>>
 		<<run cashX(-10000, "event")>>
 		<</replace>>
@@ -352,7 +352,7 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
 	<<if ($eventSlave.vagina != 0) && ($eventSlave.anus != 0) && ($eventSlave.breedingMark != 1 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Orgiastic ceremony">>
 			<<replace "#result2">>
-			You order $assistantName to invite deserving citizens to an orgiastic ceremony for a slave being married to a slaveowner, and to make the arrangements. The wedding orgy will take place during the upcoming week.
+			You order $assistant.name to invite deserving citizens to an orgiastic ceremony for a slave being married to a slaveowner, and to make the arrangements. The wedding orgy will take place during the upcoming week.
 			<<set $weddingPlanned = 2>>
 			<<run cashX(-10000, "event")>>
 			<</replace>>
@@ -361,7 +361,7 @@ Despite $his devotion and trust, $he is still a slave, and probably knows that $
 	<<if isFertile($eventSlave) && ($PC.dick != 0)>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;<<link "Impregnation ceremony">>
 			<<replace "#result2">>
-			You order $assistantName to invite deserving citizens to a ceremony for a fertile slave being married to a slaveowner, and to make the arrangements. The wedding will take place during the upcoming week.
+			You order $assistant.name to invite deserving citizens to a ceremony for a fertile slave being married to a slaveowner, and to make the arrangements. The wedding will take place during the upcoming week.
 			<<set $weddingPlanned = 3>>
 			<<run cashX(-10000, "event")>>
 			<</replace>>
diff --git a/src/uncategorized/neighborDescription.tw b/src/uncategorized/neighborDescription.tw
index 163709184ab3c7893bb235af890487e5efebdd9c..4cbcbd028c93d540903bb6053533e1e4e74f92de 100644
--- a/src/uncategorized/neighborDescription.tw
+++ b/src/uncategorized/neighborDescription.tw
@@ -25,9 +25,9 @@
 <<else>>
 	<<set $economicUncertainty = 10>>
 <</if>>
-<<if $assistantPower > 1>>
+<<if $assistant.power > 1>>
 	<<set $economicUncertainty = 0>>
-<<elseif $assistantPower == 1>>
+<<elseif $assistant.power == 1>>
 	<<set $economicUncertainty = Math.max(Math.trunc($economicUncertainty/2),0)>>
 <</if>>
 <<if $arcologies[$i].government != "your trustees">>
@@ -36,7 +36,7 @@
 	<</if>>
 <</if>>
 <<if $arcologies[$i].PCminority > 0>>You own @@.lime;$arcologies[$i].PCminority%@@ of this arcology<<if (($arcologies[$i].government == "your trustees") || ($arcologies[$i].government == "your agent")) && $arcologies[$i].minority > $arcologies[$i].PCminority-10>>, a dangerously narrow margin over competition with a @@.red;<<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ share<</if>>.<</if>>
-<<set $economicUncertainty -= Math.min(2*$assistantPower, $economicUncertainty)>>
+<<set $economicUncertainty -= Math.min(2*$assistant.power, $economicUncertainty)>>
 The arcology has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcologies[$i].prosperity*random(100-$economicUncertainty,100+$economicUncertainty))/100))>>m,@@
 <<if Math.abs($arcologies[$i].prosperity - $averageProsperity) < 5>>
 	average among
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index ad12e9105429aa45cee7000aa79a7dc03c718cb8..cafa23a3c15ed4dc45203ccfd3e6baae07915b72 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -65,7 +65,7 @@
 <<else>>
 	<<set _error = 10>>
 <</if>>
-<<set _error -= Math.min(2*$assistantPower, _error)>>
+<<set _error -= Math.min(2*$assistant.power, _error)>>
 <<set _prosperity = (Math.trunc((0.1*$arcologies[$i].prosperity*random(100-_error,100+_error))/100))>>
 has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $showNumbers != 2>><<if ($showNumbers == 1) && (_prosperity > $showNumbersMax)>>m<<else>> million<</if>><<else>>m<</if>>,@@
 
@@ -477,9 +477,9 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh
 <<else>>
 	<<set $economicUncertainty = 10>>
 <</if>>
-<<if $assistantPower > 1>>
+<<if $assistant.power > 1>>
 	<<set $economicUncertainty = 0>>
-<<elseif $assistantPower == 1>>
+<<elseif $assistant.power == 1>>
 	<<set $economicUncertainty = Math.max(Math.trunc($economicUncertainty/2),0)>>
 <</if>>
 <<if $arcologies[$i].government != "your agent">>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 39cf1cd70896f7e1c8954bd08d5c31db21a13d62..95985e80fc454625a4d194d63e79d75926efb290 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -2161,7 +2161,7 @@ The legalities completed, <span class='slave-name'><<= SlaveFullName($activeSlav
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;
 		<<link "Use a machine on $his holes">>
 			<<replace "#introResult">>
-				$He's not a virgin anywhere, so you'll have to go more extreme to provide a properly introductory level of sexual torture equivalent to defloration. You tie your new slave down on <<if hasAnyArms($activeSlave)>>hand<<if hasBothArms($activeSlave)>>s<</if>><<if hasAnyLegs($activeSlave)>> and <</if>><</if>><<if hasAnyLegs($activeSlave)>>knee<<if hasBothLegs($activeSlave)>>s<</if>><</if>> and bring a fuckmachine up from storage. It fits over $him as $he whimpers down there on <<if hasAllLimbs($activeSlave)>>all fours<<else>>the floor<</if>>, and you adjust the pistons so that the tip of a dildo rests inside each of $his holes. You add lube when necessary, <<if $assistant == 0>>but the rest of the day is monotonous machine rape for $him.<<else>>but for $him the rest of the day is machine rape controlled by your sultry-voiced personal assistant program. Your assistant is an exquisite sexual torturer, ensuring that the experience is never damaging and always overwhelming. $He keeps up a steady stream of degrading verbal abuse while $he works.<</if>> Any resistance to you is @@.mediumorchid;worn down@@ and replaced with a germ of @@.gold;fear.@@ @@.lime;The slave's holes are nicely stretched.@@
+				$He's not a virgin anywhere, so you'll have to go more extreme to provide a properly introductory level of sexual torture equivalent to defloration. You tie your new slave down on <<if hasAnyArms($activeSlave)>>hand<<if hasBothArms($activeSlave)>>s<</if>><<if hasAnyLegs($activeSlave)>> and <</if>><</if>><<if hasAnyLegs($activeSlave)>>knee<<if hasBothLegs($activeSlave)>>s<</if>><</if>> and bring a fuckmachine up from storage. It fits over $him as $he whimpers down there on <<if hasAllLimbs($activeSlave)>>all fours<<else>>the floor<</if>>, and you adjust the pistons so that the tip of a dildo rests inside each of $his holes. You add lube when necessary, <<if $assistant.personality == 0>>but the rest of the day is monotonous machine rape for $him.<<else>>but for $him the rest of the day is machine rape controlled by your sultry-voiced personal assistant program. Your assistant is an exquisite sexual torturer, ensuring that the experience is never damaging and always overwhelming. $He keeps up a steady stream of degrading verbal abuse while $he works.<</if>> Any resistance to you is @@.mediumorchid;worn down@@ and replaced with a germ of @@.gold;fear.@@ @@.lime;The slave's holes are nicely stretched.@@
 			<<set $activeSlave.devotion -= 5>>
 			<<set $activeSlave.trust -= 10>>
 			<<set $activeSlave.counter.vaginal += 1>>
@@ -2176,7 +2176,7 @@ The legalities completed, <span class='slave-name'><<= SlaveFullName($activeSlav
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;
 		<<link "Use a machine on $his asshole">>
 			<<replace "#introResult">>
-				$He's not an anal virgin, so you'll have to go more extreme to provide an introductory level of sexual torture equivalent to defloration. You tie your new slave down on <<if hasAnyArms($activeSlave)>>hand<<if hasBothArms($activeSlave)>>s<</if>><<if hasAnyLegs($activeSlave)>> and <</if>><</if>><<if hasAnyLegs($activeSlave)>>knee<<if hasBothLegs($activeSlave)>>s<</if>><</if>> and bring a fuckmachine up from storage. It fits over $him as $he whimpers down there on <<if hasAllLimbs($activeSlave)>>all fours<<else>>the floor<</if>>, and you adjust the pistons so that the tip of a dildo rests inside $his asshole. You add lube when necessary, <<if $assistant == 0>>but the rest of the day is monotonous machine rape for $him.<<else>>but for $him the rest of the day is machine rape controlled by your sultry-voiced personal assistant program. Your assistant is an exquisite sexual torturer, ensuring that the experience is never damaging and always overwhelming. $He keeps up a steady stream of degrading verbal abuse while $he works.<</if>> Any resistance to you is @@.mediumorchid;worn down@@ and replaced with a germ of @@.gold;fear.@@ @@.lime;The slave's asshole is nicely stretched.@@ /*Written and coded by Boney M*/
+				$He's not an anal virgin, so you'll have to go more extreme to provide an introductory level of sexual torture equivalent to defloration. You tie your new slave down on <<if hasAnyArms($activeSlave)>>hand<<if hasBothArms($activeSlave)>>s<</if>><<if hasAnyLegs($activeSlave)>> and <</if>><</if>><<if hasAnyLegs($activeSlave)>>knee<<if hasBothLegs($activeSlave)>>s<</if>><</if>> and bring a fuckmachine up from storage. It fits over $him as $he whimpers down there on <<if hasAllLimbs($activeSlave)>>all fours<<else>>the floor<</if>>, and you adjust the pistons so that the tip of a dildo rests inside $his asshole. You add lube when necessary, <<if $assistant.personality == 0>>but the rest of the day is monotonous machine rape for $him.<<else>>but for $him the rest of the day is machine rape controlled by your sultry-voiced personal assistant program. Your assistant is an exquisite sexual torturer, ensuring that the experience is never damaging and always overwhelming. $He keeps up a steady stream of degrading verbal abuse while $he works.<</if>> Any resistance to you is @@.mediumorchid;worn down@@ and replaced with a germ of @@.gold;fear.@@ @@.lime;The slave's asshole is nicely stretched.@@ /*Written and coded by Boney M*/
 			<<set $activeSlave.devotion -= 5>>
 			<<set $activeSlave.trust -= 10>>
 			<<set $activeSlave.counter.anal += 1>>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index aa9f340454b7ba070ecf7d68e51fcd4845e505aa..9c2590702870cef620a74349b09fbed91f36a5b6 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -122,7 +122,7 @@
 	<<goto "eliteTakeOver">>
 <<elseif (_effectiveWeek > 5) && ($rep > 3000) && ($FSAnnounced == 0)>>
 	<<goto "P FS Announcement">>
-<<elseif (_effectiveWeek > 18) && ($assistant > 0) && ($assistantOptions == 0)>>
+<<elseif _effectiveWeek > 18 && assistant.personality > 0>>
 	<<set $Event = "assistant SP">>
 	<<goto "Assistant Events">>
 <<elseif (_effectiveWeek > 45) && ($bodyswapAnnounced == 0) && ($surgeryUpgrade == 1)>>
@@ -131,13 +131,13 @@
 	<<goto "P peacekeepers intro">>
 <<elseif ($arcologies[0].prosperity > 80) && ($TSS.schoolPresent+$GRI.schoolPresent+$SCP.schoolPresent+$LDE.schoolPresent+$TGA.schoolPresent+$HA.schoolPresent+$TFS.schoolPresent+$TCR.schoolPresent+$NUL.schoolPresent == 0) && ($schoolSuggestion == 0)>>
 	<<goto "P school suggestion">>
-<<elseif ($assistantFSOptions == 0) && ($assistant > 0) && ($assistantAppearance != "normal") && (FutureSocieties.HighestDecoration() >= 40)>>
+<<elseif def $assistant.fsOptions && assistant.personality > 0 && $assistant.appearance != "normal" && FutureSocieties.HighestDecoration() >= 40>>
 	<<set $Event = "assistant FS">>
 	<<goto "Assistant Events">>
-<<elseif ($assistant > 0) && ($assistantNameAnnounced == 0) && ($assistantPower > 0)>>
+<<elseif assistant.personality > 0 && ndef $assistant.name.announced && $assistant.power > 0>>
 	<<set $Event = "assistant name">>
 	<<goto "Assistant Events">>
-<<elseif ($marketAssistantAnnounced == 0) && ($assistantPower > 1)>>
+<<elseif !$assistant.market && $assistant.power > 1>>
 	<<set $Event = "market assistant">>
 	<<goto "Assistant Events">>
 <<elseif (_effectiveWeek > 70) && ($corpIncorporated > 0) && ($rivalOwnerEnslaved > 0) && ($mercenaries >= 3) && ($mercenariesHelpCorp == 0) && ($corpDivExtra > 0)>>
diff --git a/src/uncategorized/officeDescription.tw b/src/uncategorized/officeDescription.tw
index 786e6f9f5a60b25ef8fcf1a356cff7e8e4157a5b..90c0ae3b68d8b24589cb62a9205af4e27ee871ff 100644
--- a/src/uncategorized/officeDescription.tw
+++ b/src/uncategorized/officeDescription.tw
@@ -1,6 +1,6 @@
 :: Office Description [nobr]
 
-&nbsp;&nbsp;&nbsp;&nbsp;You are at your desk in your penthouse office. It has a glass top interface from which you can rule over $arcologies[0].name; $assistantName's avatar is visible in one corner.
+&nbsp;&nbsp;&nbsp;&nbsp;You are at your desk in your penthouse office. It has a glass top interface from which you can rule over $arcologies[0].name; $assistant.name's avatar is visible in one corner.
 
 <<include "Personal Assistant Appearance">>
 <<setAssistantPronouns>>
@@ -71,9 +71,9 @@
 	<<elseif $week > (43-$nationHate)>>
 		Its plates bear scarring fairly won.
 	<</if>>
-	<<if $assistant > 0>>
-		The last time _heA had it maintained, $assistantName added
-		<<switch $assistantAppearance>>
+	<<if assistant.personality > 0>>
+		The last time _heA had it maintained, $assistant.name added
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			a pinup of _himselfA to its plating: _heA's depicted with _hisA fangs bared, each strand of _hisA tentacle hair holding a lightning bolt, and both of _hisA cocks ejaculating fire.
 		<<case "shemale">>
@@ -102,7 +102,7 @@
 			a pinup of _himselfA to its plating: _heA's depicted mid-orgasm, a bullet rocketing from _hisA dick amidst a blast of cum.
 		<<case "succubus">>
 			a pinup of _himselfA to its plating:
-			<<switch $assistantFSAppearance>>
+			<<switch $assistant.fsAppearance>>
 			<<case "paternalist">>
 				_heA's depicted hiking _hisA skirt to flash _hisA crotch.
 			<<case "degradationist">>
diff --git a/src/uncategorized/pBioreactorPerfected.tw b/src/uncategorized/pBioreactorPerfected.tw
index 35be3d90b0cc3fc0f2f4b3f46c3f6a94e21677de..5b8bf307a8d7f44da0bc7bac66d9c96b4ea4802b 100644
--- a/src/uncategorized/pBioreactorPerfected.tw
+++ b/src/uncategorized/pBioreactorPerfected.tw
@@ -29,11 +29,11 @@
 <<setLocalPronouns $activeSlave>>
 <<setAssistantPronouns>>
 
-When you need peace and quiet to work through a difficult problem, you sometimes take a few minutes to pace through $dairyName. The massive, gently swaying breasts are always an encouraging sight, and the faint, rhythmic sounds of machine milking, machine feeding, and machine sodomy have a stimulating effect on one's thought processes. When you reach the end of the row of machines for the first time today, you turn to walk back again, and then notice that $assistantName's
-<<if $assistant == 0>>
+When you need peace and quiet to work through a difficult problem, you sometimes take a few minutes to pace through $dairyName. The massive, gently swaying breasts are always an encouraging sight, and the faint, rhythmic sounds of machine milking, machine feeding, and machine sodomy have a stimulating effect on one's thought processes. When you reach the end of the row of machines for the first time today, you turn to walk back again, and then notice that $assistant.name's
+<<if $assistant.personality == 0>>
 	symbol is visible on a screen across the last cow in the row from you, glowing gently to get your attention.
 <<else>>
-	<<switch $assistantAppearance>>
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		monster<<= _girlA>> avatar is visible on a screen across the last cow in the row from you, waving cheerfully for your attention with one of _hisA hands and a couple of _hisA hair-tentacles.
 	<<case "shemale">>
@@ -75,18 +75,18 @@ When you need peace and quiet to work through a difficult problem, you sometimes
 	<</switch>>
 <</if>>
 <br><br>
-<<if $assistant == 0>>
+<<if $assistant.personality == 0>>
 	<<if $PC.title == 1>>"Sir,"<<else>>"Madam,"<</if>> _heA says, "I have a matter for your attention, concerning this slave."
 <<else>>
 	<<if $PC.title == 1>>"Sir,"<<else>>"Ma'am,"<</if>> _heA says, "I'd like to ask you something about this slave."
 <</if>>
 You stop and consider the cow, from $his titanic breasts to $his <<if ($activeSlave.balls >= 10) && ($activeSlave.scrotum > 0)>>swollen balls<<elseif $activeSlave.vagina > -1>>slavering cunt<<else>>distended stomach<</if>> to $his dildo-filled anus.
-<<if $assistant == 0>>
+<<if $assistant.personality == 0>>
 	"This slave is permanently dependent on $his milking machine," it continues. "$He cannot be removed without uneconomical expenditures, and is unlikely to be useful elsewhere.
 	Additionally, there is nothing more that can be done to make $his breasts any bigger<<if $activeSlave.balls >= 10>> or $his testicles any more productive<<elseif $activeSlave.ovaries == 1>> or $his womb any more productive<</if>>. $His development is essentially final, and that status can be made official. $He could be redesignated as equipment. Other than $his designation, this would make little difference: the machine would be slightly less cautious with $his drugs, future intubations, and such. $He would be removed from the slave lists."
 <<else>>
 	"$He's never leaving here, not without surgery. And even then, $he's forgotten almost everything, and $he won't be getting it back."
-	<<switch $assistantAppearance>>
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		The monster<<= _girlA>> positions _himselfA on the screen to create an optical illusion that makes it look like _heA's gently petting the slave's shoulders. _HeA looks meditative.
 	<<case "shemale">>
@@ -137,8 +137,8 @@ You stop and consider the cow, from $his titanic breasts to $his <<if ($activeSl
 		Your assistant pauses, and then says, "Redesignation complete, <<= properTitle()>>. This milking machine has been equipped with biological components. This combination is projected to produce approximately <<if $activeSlave.balls > 0>><<print 1000*Math.trunc((3*52*($retirementAge-$activeSlave.physicalAge))/1000)>> liters of cum,<</if>>
 		<<if $activeSlave.ovaries == 1>><<print 100*Math.trunc((52*($retirementAge-$activeSlave.physicalAge))/100)>> liters of vaginal secretions, <<print 5*($retirementAge-$activeSlave.physicalAge)>> slaves,<</if>>
 		and <<print 1000*Math.trunc((300*52*($retirementAge-$activeSlave.physicalAge))/1000)>> liters of milk over a <<print $retirementAge-$activeSlave.physicalAge>> year period before its biological components must be replaced."
-		<<if $assistant > 0>>
-			<<switch $assistantAppearance>>
+		<<if assistant.personality > 0>>
+			<<switch $assistant.appearance>>
 			<<case "monstergirl">>
 				_HisA avatar watches the new equipment with almost motherly affection, _hisA tentacle hair writhing obscurely.
 			<<case "shemale">>
diff --git a/src/uncategorized/pBombing.tw b/src/uncategorized/pBombing.tw
index a2a5d4f7207e20c443e65d7ef69f0dd687866950..92b5569be2b67e6fcb5e8262e43c23d8bc1db794 100644
--- a/src/uncategorized/pBombing.tw
+++ b/src/uncategorized/pBombing.tw
@@ -21,7 +21,7 @@
 
 One fine day, you're strolling down the main promenade, making your usual combined inspection and public rounds. These walks are triply useful, since they allow you to keep a finger on the pulse of your demesne, identify any problems, and display yourself to the population. <<if $Bodyguard != 0>>$Bodyguard.slaveName is walking with you, of course; $his presence protection, intimidation, and ostentation, all in one.<</if>>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> suddenly relays a silent alarm, highlighting a scruffy individual twenty <<if $showInches == 2>>yards<<else>>meters<</if>> ahead. This person is hooded and acting oddly. You catch a glance from beneath the hood in your direction: and the figure obviously decides that it can get no closer to you. Your assistant's scanning detects the presence of an implanted bomb moments before the suicide bomber detonates themselves.
+<<= capFirstChar($assistant.name)>> suddenly relays a silent alarm, highlighting a scruffy individual twenty <<if $showInches == 2>>yards<<else>>meters<</if>> ahead. This person is hooded and acting oddly. You catch a glance from beneath the hood in your direction: and the figure obviously decides that it can get no closer to you. Your assistant's scanning detects the presence of an implanted bomb moments before the suicide bomber detonates themselves.
 
 The implant is small, and went off too far ahead to do anything more than stun. <<if $Bodyguard != 0>>Since $he was behind you, $Bodyguard.slaveName is in much better shape than you, $his ears clear and $his senses sharp. <</if>>Three other assailants run at you from where they were waiting in the confusion, wielding improvised weapons that apparently did not set off the security scanners.
 
diff --git a/src/uncategorized/pCitizensAndCivilians.tw b/src/uncategorized/pCitizensAndCivilians.tw
index 852a38951dc72ef6234f6a9ec5d9eace39a18c33..62bbad4194bd444b1b9068eb227dea20a638dd36 100644
--- a/src/uncategorized/pCitizensAndCivilians.tw
+++ b/src/uncategorized/pCitizensAndCivilians.tw
@@ -9,9 +9,9 @@
 
 <<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
 
-<<if $assistant > 0>>
-	While working at your desk, you are accompanied by the luscious sound of $assistantName humming to _himselfA, which _heA does to indicate _heA's working on a difficult task. After this goes on for a while,
-	<<switch $assistantAppearance>>
+<<if assistant.personality > 0>>
+	While working at your desk, you are accompanied by the luscious sound of $assistant.name humming to _himselfA, which _heA does to indicate _heA's working on a difficult task. After this goes on for a while,
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		_hisA monster<<= _girlA>> avatar uses _hisA tentacle hair to wave for your attention
 	<<case "shemale">>
@@ -47,7 +47,7 @@
 	<</switch>>
 	and says, "<<= properTitle()>>, I have a suggestion. At your request I have been reviewing historical slave societies for parallels with our current situation. I calculate it would be very advantageous to bind your mercenaries more closely to the arcology. It would be expensive, but if they were all given slaves, better weapons, and some sort of title, they would defend this place to the death."
 <<else>>
-	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> catches your attention as you work at your desk. _HeA says, "<<= properTitle()>>, a suggestion. Review of historical slave societies for parallels with your current situation is complete. Analysis indicates it would be advantageous to increase the loyalty of your mercenaries. It would be expensive, but if they were given slaves, better weapons, and an honorary title, they would defend the arcology with increased effectiveness."
+	<<= capFirstChar($assistant.name)>> catches your attention as you work at your desk. _HeA says, "<<= properTitle()>>, a suggestion. Review of historical slave societies for parallels with your current situation is complete. Analysis indicates it would be advantageous to increase the loyalty of your mercenaries. It would be expensive, but if they were given slaves, better weapons, and an honorary title, they would defend the arcology with increased effectiveness."
 <</if>>
 
 <br><br>
diff --git a/src/uncategorized/pCoupAftermath.tw b/src/uncategorized/pCoupAftermath.tw
index 041826b3c0edc9f2cbf89cdc33c09374e03c0474..4633108af82571558d26220ee9f792bb69e28511 100644
--- a/src/uncategorized/pCoupAftermath.tw
+++ b/src/uncategorized/pCoupAftermath.tw
@@ -18,9 +18,9 @@
 <<setAssistantPronouns>>
 <<set $fcnn.push("...evidence also suggests that the Daughters of Liberty had also planned a terrorist attack on...")>>
 
-<<if $mercenaries > 3>>Your $mercenariesTitle<<elseif $mercenaries > 0>>Your mercenaries<<elseif $arcologyUpgrade.drones > 0>>Your security drones<<else>>Private security teams<</if>> perform the grisly task of disposing of the bodies of the Daughters killed in the assault. They strip them of anything that might be of use in cleaning up after the attempted coup — communication devices, PDAs, computers, even handwritten notes. The raw intel is scanned and passed to $assistantName. Most of it is rubbish.
+<<if $mercenaries > 3>>Your $mercenariesTitle<<elseif $mercenaries > 0>>Your mercenaries<<elseif $arcologyUpgrade.drones > 0>>Your security drones<<else>>Private security teams<</if>> perform the grisly task of disposing of the bodies of the Daughters killed in the assault. They strip them of anything that might be of use in cleaning up after the attempted coup — communication devices, PDAs, computers, even handwritten notes. The raw intel is scanned and passed to $assistant.name. Most of it is rubbish.
 <br><br>
-Some of it is not. There is evidence of payments from a <<if $rivalSet == 0>>nearby Free City<<else>>neighboring arcology<</if>> to the leadership of the Daughters. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> is silent for a long time, crosschecking records to assemble a complete picture despite your enemies' attempts to disguise the transactions. Finally, $assistantName finishes and displays a picture, using nearly the entire surface of your desk for effect. <<if $assistant > 0>>"This," _heA says in a tone of satisfaction, "is the <<if $rivalGender == 2>>bastard<<elseif $rivalGender == 1>>bitch<<else>>cunt<</if>> you want, <<= properTitle()>>."<<else>>"This," _heA says neutrally, "is the culprit, <<= properTitle()>>."<</if>>
+Some of it is not. There is evidence of payments from a <<if $rivalSet == 0>>nearby Free City<<else>>neighboring arcology<</if>> to the leadership of the Daughters. <<= capFirstChar($assistant.name)>> is silent for a long time, crosschecking records to assemble a complete picture despite your enemies' attempts to disguise the transactions. Finally, $assistant.name finishes and displays a picture, using nearly the entire surface of your desk for effect. <<if assistant.personality > 0>>"This," _heA says in a tone of satisfaction, "is the <<if $rivalGender == 2>>bastard<<elseif $rivalGender == 1>>bitch<<else>>cunt<</if>> you want, <<= properTitle()>>."<<else>>"This," _heA says neutrally, "is the culprit, <<= properTitle()>>."<</if>>
 
 The face is vigorous, determined, and <<if $rivalGender == 2>>masculine. The very stereotype of the male arcology owner<<elseif ($rivalGender == 1)>>feminine. The very stereotype of the female arcology owner<<else>>androgynous. The very stereotype of the dissolute arcology owner<</if>>.
 <<if $rivalSet != 0>>
@@ -33,7 +33,7 @@ The face is vigorous, determined, and <<if $rivalGender == 2>>masculine. The ver
 	<</for>>
 	<br><br>
 <</if>>
-Your assistant continues, "_HeR came into an arcology about when you did, <<= properTitle()>>. It seems the Daughters originally planned to attack _himR, but _heR bought them off and sent them after you, instead."<<if $assistant > 0>> "I wonder," _heA teases, "if _heR thinks you're cute, or what?"<</if>>
+Your assistant continues, "_HeR came into an arcology about when you did, <<= properTitle()>>. It seems the Daughters originally planned to attack _himR, but _heR bought them off and sent them after you, instead."<<if assistant.personality > 0>> "I wonder," _heA teases, "if _heR thinks you're cute, or what?"<</if>>
 <br><br>
 You inquire as to whether there's any identifiable cause for the evident dislike.
 <<if $rivalryFS != 0>>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index 2a5d5360fb807ef569611f2ac84d9ce0bf7d02be..71db6f8479e6d6325f3584fbbf72dcde0b764169 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -50,7 +50,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
 <<if $hackerSupport == 0>>
 	Many of the arcology systems are not responding properly. It seems the Daughters' penetration of your systems is thorough. Your security systems are still reasonably functional, but the rebels are aided by partial control of things like lights and door locks.
 <<else>>
-	It seems your cyberwarfare ally of convenience is having an effect. Arcology systems are working perfectly unless the rebels disable them physically. Their fighters are impeded by uncooperative lights, resistant locking systems, and even $assistantName's selective deployment of firefighting systems to obscure visibility.
+	It seems your cyberwarfare ally of convenience is having an effect. Arcology systems are working perfectly unless the rebels disable them physically. Their fighters are impeded by uncooperative lights, resistant locking systems, and even $assistant.name's selective deployment of firefighting systems to obscure visibility.
 <</if>>
 
 <br><br>
diff --git a/src/uncategorized/pCoupCollaboration.tw b/src/uncategorized/pCoupCollaboration.tw
index e2e2812f929005e0678aab70073baf79f2aab1b6..7d3472e57cfe17420e8eedff9e84cabea6b156ca 100644
--- a/src/uncategorized/pCoupCollaboration.tw
+++ b/src/uncategorized/pCoupCollaboration.tw
@@ -44,7 +44,7 @@ Armed rebels are running unchecked down the corridors. <<if $mercenaries > 0>>Yo
 		encouraging $his fellow fighters<<if canTalk($traitor)>> with yells<</if>>, and when that fails, leading them by example<<if $traitor.bellyPreg >= 15000>> as best $he can<</if>>.
 	<</if>>
 <</if>>
-In areas already controlled by the Daughters, slaveowners are being summarily shot in the streets. "<<= properTitle()>>," $assistantName says, "the Daughters of Liberty are in complete control of all arcology systems. Remain here."
+In areas already controlled by the Daughters, slaveowners are being summarily shot in the streets. "<<= properTitle()>>," $assistant.name says, "the Daughters of Liberty are in complete control of all arcology systems. Remain here."
 
 <br><br>
 
diff --git a/src/uncategorized/pCoupLoss.tw b/src/uncategorized/pCoupLoss.tw
index 0b5b68ad0766c9072abdcfd235d524100b907aee..d19f709e8b7bbd871d288617ea9db6db6669d7df 100644
--- a/src/uncategorized/pCoupLoss.tw
+++ b/src/uncategorized/pCoupLoss.tw
@@ -43,7 +43,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
 		encouraging $his fellow fighters<<if canTalk($traitor)>> with yells<</if>>, and when that fails, leading them by example<<if $traitor.bellyPreg >= 15000>> as best $he can<</if>>.
 	<</if>>
 <</if>>
-In areas already controlled by your enemies, slaveowners are being summarily shot in the streets. <<if $hackerSupport == 1>>"<<= properTitle()>>," $assistantName says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant quantity of arms and explosives into the arcology.<<else>>"<<= properTitle()>>," $assistantName says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant qua — zzzt —" There is nothing more from the computer systems.<</if>>
+In areas already controlled by your enemies, slaveowners are being summarily shot in the streets. <<if $hackerSupport == 1>>"<<= properTitle()>>," $assistant.name says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant quantity of arms and explosives into the arcology.<<else>>"<<= properTitle()>>," $assistant.name says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant qua — zzzt —" There is nothing more from the computer systems.<</if>>
 
 <br><br>
 
diff --git a/src/uncategorized/pFSAnnouncement.tw b/src/uncategorized/pFSAnnouncement.tw
index 59a3aab0a9955d290d931e11ceeb5825e1b70656..aa22587e9f290cb755e8b1afb694349c6b0bc2f9 100644
--- a/src/uncategorized/pFSAnnouncement.tw
+++ b/src/uncategorized/pFSAnnouncement.tw
@@ -11,7 +11,7 @@
 	<<if $seeImages == 1>><<= assistantArt(3)>><</if>>
 </span>
 
-The simple pleasure of power has to be experienced to be understood. You often take a moment to stand on a balcony overlooking an interior atrium, watching the living, breathing, flowing current of your demesne. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> knows to allow you these moments of peace.
+The simple pleasure of power has to be experienced to be understood. You often take a moment to stand on a balcony overlooking an interior atrium, watching the living, breathing, flowing current of your demesne. <<= capFirstChar($assistant.name)>> knows to allow you these moments of peace.
 <br><br>
 You immediately pay attention, therefore, when _heA interrupts. "<<= properTitle()>>," _heA says, "this is an appropriate moment to bring a serious matter to your attention. I monitor conversations, social media, and general opinion within the arcology where I can. You are respected, and the inhabitants of this arcology are starting to look to you to give direction to society."
 <br><br>
diff --git a/src/uncategorized/pHackerSupport.tw b/src/uncategorized/pHackerSupport.tw
index abac73c84aeebd8a9168395695a302a11e3a80f5..2b8f7a260484a0b0377289b8202aae27e1f7df8c 100644
--- a/src/uncategorized/pHackerSupport.tw
+++ b/src/uncategorized/pHackerSupport.tw
@@ -10,9 +10,9 @@ While you are reviewing your information security posture in light of the Daught
 <br><br>
 
 "Hi!" she says cheerfully. "I seen you been contacted by these Daughters cunts. They been after me too. They're pretty decent at cyberwarfare, but I'm fuckin' better." A momentary discomfort crosses her face, and she shifts a little in her seat. "They're building up for somethin' big. Wouldn't a' contacted you at all, let us both fight our own fights, but I gotta short fuse on this vulnerability and I need to bribe a weak link. Your money can get me in; my skills can fuck 'em up. What do you say?<<if $traitorType == "hostage">> If it sweetens the deal at all, I can even get $traitor.slaveName out of hot water. Not the brightest, that one.<</if>>"
-<<if $assistant > 0>>
-	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been trying to track the contact, but fails horribly. The hacker glances at _hisA
-	<<switch $assistantAppearance>>
+<<if assistant.personality > 0>>
+	<<= capFirstChar($assistant.name)>> has been trying to track the contact, but fails horribly. The hacker glances at _hisA
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		frustrated little monster<<= _girlA>> avatar
 	<<case "shemale">>
@@ -73,8 +73,8 @@ As she finishes speaking, another spasm distorts her expression, and then she su
 	<<set $nextButton = "Continue">><<UpdateNextButton>>
 	<<replace "#result">>
 	You transfer the funds. "Meh," she shrugs. <<if $seeDicks == 0>>She shudders again and there's a gasping sound from down below. She looks down again, and as she ends the video call, you hear her say "Good job. Ha ha, fuck you, slut, it's your asshole anyway. Get me my strap-on."<<else>>She shudders and there's a popping sound from down below, like a cockhead springing free of someone's mouth. Sure enough, a still-erect dickhead springs into view from the bottom of the screen; for that to be visible she has to be truly huge, almost as long as one of her forearms. She looks down again, and as she ends the video call, you hear her say "Good job. Ha ha, fuck you, bitch, it's your asshole anyway. Buttrape time!"<</if>>
-	<<if $assistant > 0>>
-		<<switch $assistantAppearance>>
+	<<if assistant.personality > 0>>
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			She seems to have left a present for your poor personal assistant; _hisA little monster<<= _girlA>> avatar is visible in the bottom corner of a screen on the wall opposite you, and is writhing around, babbling and orgasming continuously.
 		<<case "shemale">>
@@ -95,7 +95,7 @@ As she finishes speaking, another spasm distorts her expression, and then she su
 			She seems to have left a present for your poor personal assistant; _hisA little _girlA avatar is visible in the bottom corner of a screen on the wall opposite you.
 			<<if $seePreg != 0>>
 				_HisA virginity is being forcibly taken by a representation of the hacker in the same style. _HeA cries out as she cums in _hisA fertile womb; again and again the hacker uploads her virus into _hisA abused pussy until _hisA sagging bloated belly is touching the floor. _HeA leaves the avatar drooling cum to rest on _hisA new pregnancy. _HeA may need to be reset after this experience.
-				<<set $assistantAppearance = "preggololi">>
+				<<set $assistant.appearance = "preggololi">>
 			<<else>>
 				_HeA's writhing on the floor in tears as a series of hands tickles _hisA body. They shift their focus to _hisA nipples and pussy as _heA begins moaning with lust. As _heA twitches and jerks before the mounting orgasm, they vanish, leaving _himA writhing in sexual frustration before you. Before your eyes, _hisA hands shoot to _hisA crotch and _heA climaxes lewdly in front of you.
 			<</if>>
@@ -108,20 +108,20 @@ As she finishes speaking, another spasm distorts her expression, and then she su
 			<<if $seePreg != 0>>
 				gripping _hisA cum filled belly as it rounds more and more, before settling on _hisA back and cradling _hisA now full-term pregnancy. As it continues to grow, _hisA body becomes increasingly withered, until _heA appears to be pregnant with a fully grown person.
 				<<if $seeExtreme == 1>>
-					As the light fades from _himA, _hisA gravid belly begins to shudder violently, its occupant trying to tear its way free. Before long, it splits open, revealing a gorgeous _womanA with all the features of the fallen angel. $assistantName spreads _hisA bat-like wings as _heA rises from the disintegrating remains of _hisA once holy body, turns to you, and sensually traces _hisA new curves seductively.
+					As the light fades from _himA, _hisA gravid belly begins to shudder violently, its occupant trying to tear its way free. Before long, it splits open, revealing a gorgeous _womanA with all the features of the fallen angel. $assistant.name spreads _hisA bat-like wings as _heA rises from the disintegrating remains of _hisA once holy body, turns to you, and sensually traces _hisA new curves seductively.
 				<<else>>
-					As the light fades from _himA, _hisA gravid belly begins to shudder violently, its occupant trying to find its way out. A pair of arms burst forth from _hisA ruined pussy, followed a perfectly endowed _womanA with all the features of the former angel. $assistantName rises and spreads _hisA bat-like wings as the remains of _hisA once holy body turn to dust behind _himA. _HeA turns to you, sensually tracing the contours of _hisA new body, and blows you a kiss.
+					As the light fades from _himA, _hisA gravid belly begins to shudder violently, its occupant trying to find its way out. A pair of arms burst forth from _hisA ruined pussy, followed a perfectly endowed _womanA with all the features of the former angel. $assistant.name rises and spreads _hisA bat-like wings as the remains of _hisA once holy body turn to dust behind _himA. _HeA turns to you, sensually tracing the contours of _hisA new body, and blows you a kiss.
 				<</if>>
 			<<else>>
-				alternating between groping _hisA swelling breasts and fingering _hisA aching pussy, before screaming with climax as _hisA body twists into a more suiting form. $assistantName rises to _hisA feet, spreads _hisA bat-like wings, and sensually traces _hisA new curves before bending over revealing _hisA sopping wet cunt. "All for you, <<print $PC.slaveName>>, you know you want it."
+				alternating between groping _hisA swelling breasts and fingering _hisA aching pussy, before screaming with climax as _hisA body twists into a more suiting form. $assistant.name rises to _hisA feet, spreads _hisA bat-like wings, and sensually traces _hisA new curves before bending over revealing _hisA sopping wet cunt. "All for you, <<print $PC.slaveName>>, you know you want it."
 			<</if>>
-			<<set $assistantAppearance = "succubus">>
+			<<set $assistant.appearance = "succubus">>
 		<<case "cherub">>
 			She seems to have left a present for your poor personal assistant; _hisA little cherub avatar is visible in the bottom corner of a screen on the wall opposite you, and is writhing around, both hands on _hisA pussy and masturbating furiously.
 		<<case "incubus">>
 			She seems to have left a present for your poor personal assistant; _hisA little incubus avatar is visible in the bottom corner of a screen on the wall opposite you, _hisA dick steadily growing longer and prehensile. As _heA gasps in shock, it rockets into _hisA mouth and down _hisA throat. It delves deeper into the struggling demon, _hisA intestines bulging under _hisA skin as _hisA dick snakes through _himA, until it pops out the other end. It begins pistoning in and out of _hisA body, literally forcing _himA to fuck _himselfA until _heA cums, causing it to rapidly retract back through _hisA body. _HeA collapses to the floor, coughing up cum and struggling to catch _hisA breath.
 		<<case "succubus">>
-			She seems to have left a present for your poor personal assistant; _hisA little succubus avatar is visible in the bottom corner of a screen on the wall opposite you. _HeA has adjusted _hisA form to better suit _hisA lover: a representation of the hacker in the same style. _HeA calls out a silent name, something you'll never know, as she comes deep into _hisA pussy. They shift positions, $assistantName standing, legs spread, with _hisA arms against the edge of the screen as the hacker fucks _hisA rear.
+			She seems to have left a present for your poor personal assistant; _hisA little succubus avatar is visible in the bottom corner of a screen on the wall opposite you. _HeA has adjusted _hisA form to better suit _hisA lover: a representation of the hacker in the same style. _HeA calls out a silent name, something you'll never know, as she comes deep into _hisA pussy. They shift positions, $assistant.name standing, legs spread, with _hisA arms against the edge of the screen as the hacker fucks _hisA rear.
 			<<if $seePreg != 0>>
 				As _heA bucks against her, it is obvious that _hisA belly has rounded significantly; swaying slightly with every thrust. Cumming again, the hacker pulls _hisA leg up over their shoulder and begins thrusting anew, _hisA middle heavily rounded with child now, quickly bring both to orgasm. _HeA is left to slide down the edge of the screen and upon reaching the bottom, spreads _hisA legs and begins laboring on _hisA new child. Each imp that passes through _hisA netherlips brings another orgasm and muffled shout of the hacker's name. Once the last hacker imp leaves _hisA womb, _heA
 			<<else>>
diff --git a/src/uncategorized/pInvasion.tw b/src/uncategorized/pInvasion.tw
index 24a97fc3a831a019610d7b3d619f01c325dc678e..8915829ca70f2d4d98612fbd983058fa701c75ec 100644
--- a/src/uncategorized/pInvasion.tw
+++ b/src/uncategorized/pInvasion.tw
@@ -10,11 +10,11 @@ The day that wasn't supposed to come is here. The troubled little country next d
 <br><br>
 
 Sirens are blaring; there is a crump far above as $arcologies[0].name's defensive systems knock down one of the first mortar rounds fired into the Free City. The lights in your office changed to a harsh emergency scheme as soon as the attack became a certainty.
-<<if $assistant == 0>>
+<<if $assistant.personality == 0>>
 	Your personal assistant offers terse reports on the efficiency of the point defense fire.
 <<else>>
-	You get a report on the artillery battle from $assistantName, whose avatar is showing off _hisA prowess at point defense.
-	<<switch $assistantAppearance>>
+	You get a report on the artillery battle from $assistant.name, whose avatar is showing off _hisA prowess at point defense.
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		_HisA tentacle hair is spread out and forward, forming a concave shape around _hisA face, and _heA's firing beams from _hisA eyes
 	<<case "shemale">>
@@ -54,7 +54,7 @@ Sirens are blaring; there is a crump far above as $arcologies[0].name's defensiv
 	<<default>>
 		The symbol radiates readouts of ammunition, power, and targeting, clean lines flashing
 	<</switch>>
-	<<if $assistantAppearance != "succubus">>at depictions of projectiles.<</if>>
+	<<if $assistant.appearance != "succubus">>at depictions of projectiles.<</if>>
 <</if>>
 It's going well. Whoever's in command of the attackers sees that their fire is having no effect, and orders an advance. The mortars and other artillery systems maintain their fire, trying to occupy as many guns as possible.
 
diff --git a/src/uncategorized/pPeacekeepersDeficit.tw b/src/uncategorized/pPeacekeepersDeficit.tw
index 0a37090fbf3c31afe48aa85e1cae885eb3e6e045..5e4464da2399bc1dd7ee2b490ade7d6193fa90ec 100644
--- a/src/uncategorized/pPeacekeepersDeficit.tw
+++ b/src/uncategorized/pPeacekeepersDeficit.tw
@@ -10,7 +10,7 @@ It's a video link, and the general is in the field somewhere, wearing scuffed ar
 
 <br><br>
 
-"First," he says sharply, "I'm not getting the support I need out here." It obviously pains him to admit this, and the muscles along his jaw tense as he does, as though he's chewing on the words. "And I'm not giving anything away by telling you that. It's obvious enough, if you compare what I'm being asked to do here with the resources the politicians back home are willing to provide." At this, $assistantName displays a quick summary of the political developments in the general's home country. General $peacekeepers.generalName is right; the expensive peacekeeping force is unpopular, and its support is being reduced by opportunistic politicians. "It isn't bad yet," he says, "but if this keeps up, I'm going to be rationing the most modern medical supplies for my wounded men and women. That's hard."
+"First," he says sharply, "I'm not getting the support I need out here." It obviously pains him to admit this, and the muscles along his jaw tense as he does, as though he's chewing on the words. "And I'm not giving anything away by telling you that. It's obvious enough, if you compare what I'm being asked to do here with the resources the politicians back home are willing to provide." At this, $assistant.name displays a quick summary of the political developments in the general's home country. General $peacekeepers.generalName is right; the expensive peacekeeping force is unpopular, and its support is being reduced by opportunistic politicians. "It isn't bad yet," he says, "but if this keeps up, I'm going to be rationing the most modern medical supplies for my wounded men and women. That's hard."
 
 <br><br>
 
diff --git a/src/uncategorized/pPeacekeepersInfluence.tw b/src/uncategorized/pPeacekeepersInfluence.tw
index 2b12d45bf9385d689c5810ae4e236da2ae0a5638..5efce2b24a3a13051e9a2f2487647f0def408671 100644
--- a/src/uncategorized/pPeacekeepersInfluence.tw
+++ b/src/uncategorized/pPeacekeepersInfluence.tw
@@ -15,8 +15,8 @@ You provided money to General $peacekeepers.generalName to help him through this
 
 As you review intelligence from the area at your desk,
 <<if $assistant>>
-	$assistantName's avatar pops up.
-	<<switch $assistantAppearance>>
+	$assistant.name's avatar pops up.
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		The little monster<<= _girlA>> toys with _hisA tentacle hair until you give _himA your attention. When _heA sees that _heA has it, _heA wiggles _hisA hips at you, and gives you a wink.
 	<<case "shemale">>
@@ -47,7 +47,7 @@ As you review intelligence from the area at your desk,
 		The hung sex demon pops up, bouncing upward buoyantly in a way that makes _hisA erect cock slide along _hisA stomach. Stimulation just enough, _heA blows a huge load across your desk while moaning lewdly; _heA knows how to get your attention.
 	<<case "succubus">>
 		The slutty little sex demoness pops up.
-		<<switch $assistantFSAppearance>>
+		<<switch $assistant.fsAppearance>>
 		<<case "paternalist">>"<<print $PC.slaveName>>, would you help me with this zipper?"
 		<<case "degradationist">>"<<print $PC.slaveName>>, what do you think of these piercings?"
 		<<case "physical idealist">>"<<print $PC.slaveName>>, bet you I can lift this!"
@@ -75,7 +75,7 @@ As you review intelligence from the area at your desk,
 		The round symbol pulses brightly, _hisA way of indicating that _heA has important information for you.
 	<</switch>>
 	"General $peacekeepers.generalName's men and women are using sex slaves," _heA reports, and brings up a trove of surveillance data to back up _hisA assertion. "It was unofficial at first,
-	<<switch $assistantAppearance>>
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		just people with weapons in their hands doing what people with power over others do," _heA explains approvingly, showing _hisA fangs.
 	<<case "shemale">>
@@ -116,7 +116,7 @@ As you review intelligence from the area at your desk,
 		just the common behavior of troops under severe stress in areas with civilians," _heA explains.
 	<</switch>>
 	"But it's spread, and with their independence, General $peacekeepers.generalName has decided to bring it under control by setting up official slave brothels for his troops. @@.yellow;The officer in charge of staffing these doesn't have enough money to pay Free Cities prices, but I've added him to the standard slave sale interface.@@ Selling sex slaves to him at a price General $peacekeepers.generalName's people can afford would bring them closer to $arcologies[0].name."
-	<<switch $assistantAppearance>>
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		_HeA strokes _hisA cocks meaningfully. "Selling them a particularly distinctive, valuable girl might even influence their tastes. Imagine, manipulating an entire army by providing it with skilled whores." _HeA shudders.
 	<<case "shemale">>
diff --git a/src/uncategorized/pPeacekeepersIntro.tw b/src/uncategorized/pPeacekeepersIntro.tw
index 7cdf96aeb0e71fbca01b9e378ddf5256e083ca67..f5c4f934d6b989506a3502bcc3479110aca4e673 100644
--- a/src/uncategorized/pPeacekeepersIntro.tw
+++ b/src/uncategorized/pPeacekeepersIntro.tw
@@ -26,7 +26,7 @@ There are still enough weapons and desperate people there to keep banditry and w
 
 <br><br>
 
-Having the area revert to a Hobbesian wilderness might not be too annoying for you and your peers in the Free City, but to an old world country, it's not a good thing to have next door. And there are still old world countries with the ability and the will to project power. After a spate of bad incidents, rumors have started that the strongest remaining old world nation in this part of the world will be sending a peacekeeping force to stabilize the area. This is a cynical time and the rumors stay just that, rumors, until one day $assistantName announces that you're receiving an unscheduled call from a general officer. General $peacekeepers.generalName, in point of fact. One of the most dynamic military leaders the old world has.
+Having the area revert to a Hobbesian wilderness might not be too annoying for you and your peers in the Free City, but to an old world country, it's not a good thing to have next door. And there are still old world countries with the ability and the will to project power. After a spate of bad incidents, rumors have started that the strongest remaining old world nation in this part of the world will be sending a peacekeeping force to stabilize the area. This is a cynical time and the rumors stay just that, rumors, until one day $assistant.name announces that you're receiving an unscheduled call from a general officer. General $peacekeepers.generalName, in point of fact. One of the most dynamic military leaders the old world has.
 
 <br><br>
 
@@ -41,7 +41,7 @@ He spreads his hands. "I don't have anything to suggest, not yet. But if I see a
 
 <br><br>
 
-As he spoke, you and $assistantName surreptitiously checked out what he said. He seems to be telling the truth, and he's correct that your interests won't be immediately affected. Nevertheless, this is a concerning development. General $peacekeepers.generalName will have thousands of troops and a lot of military hardware under his able command, more or less right next door to the Free City. He might not intend to overstep the bounds of his peacekeeping mandate, but that's no guarantee that his civilian superiors back home won't decide to order him to. Worse, the politics of the Free Cities are almost unanimously hostile to old world power; there will be public resentment about this. On the other hand, General $peacekeepers.generalName has been successful in these difficult times in no small part due to his willingness to bend the rules. If he sees an opportunity to work with an ambitious arcology owner in furtherance of his goals, he'll probably take it.
+As he spoke, you and $assistant.name surreptitiously checked out what he said. He seems to be telling the truth, and he's correct that your interests won't be immediately affected. Nevertheless, this is a concerning development. General $peacekeepers.generalName will have thousands of troops and a lot of military hardware under his able command, more or less right next door to the Free City. He might not intend to overstep the bounds of his peacekeeping mandate, but that's no guarantee that his civilian superiors back home won't decide to order him to. Worse, the politics of the Free Cities are almost unanimously hostile to old world power; there will be public resentment about this. On the other hand, General $peacekeepers.generalName has been successful in these difficult times in no small part due to his willingness to bend the rules. If he sees an opportunity to work with an ambitious arcology owner in furtherance of his goals, he'll probably take it.
 
 <br><br>
 <span id="result">
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index cf9ce0a3770427b224d01412591461764f89445f..0082854ac98e79b5046b75be5babb63a23724f23 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -590,7 +590,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 		<<set $hostage.counter.oral += 10>>
 		<<set $hostage.counter.vaginal += 10>>
 		<<set $hostage.counter.anal += 10>>
-		<<set $hostage.intelligenceImplant = Math.clamp(intelligenceImplant+1, 0, 30)>>
+		<<set $hostage.intelligenceImplant = Math.clamp($hostage.intelligenceImplant+1, 0, 30)>>
 		<<set $hostage.skill.oral = Math.clamp($hostage.skill.oral+5, 0, 100)>>
 		<<set $hostage.skill.entertainment = Math.clamp($hostage.skill.entertainment+5, 0, 100)>>
 		<<set $hostage.skill.anal = Math.clamp($hostage.skill.anal+5, 0, 100)>>
@@ -968,8 +968,8 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 		<<set $hostage.counter.oral += 10>>
 		<<set $hostage.counter.vaginal += 10>>
 		<<set $hostage.counter.anal += 10>>
-		<<set $hostage.intelligenceImplant += Math.clamp(intelligenceImplant+2, 0, 30)>>
-		<<set $hostage.skill.oral += Math.clamp($hostage.skill.oral+5, 0, 100)>>
+		<<set $hostage.intelligenceImplant = Math.clamp($hostage.intelligenceImplant+2, 0, 30)>>
+		<<set $hostage.skill.oral = Math.clamp($hostage.skill.oral+5, 0, 100)>>
 		<<set $hostage.skill.entertainment = Math.clamp($hostage.skill.entertainment+5, 0, 100)>>
 		<<set $hostage.skill.anal = Math.clamp($hostage.skill.anal+5, 0, 100)>>
 		<<set $hostage.skill.vaginal = Math.clamp($hostage.skill.vaginal+5, 0, 100)>>
@@ -1318,7 +1318,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 		<<set $hostage.counter.oral += 10>>
 		<<set $hostage.counter.vaginal += 10>>
 		<<set $hostage.counter.anal += 10>>
-		<<set $hostage.intelligenceImplant = Math.clamp(intelligenceImplant+2, 0, 30)>>
+		<<set $hostage.intelligenceImplant = Math.clamp($hostage.intelligenceImplant+2, 0, 30)>>
 		<<set $hostage.skill.oral = Math.clamp($hostage.skill.oral+5, 0, 100)>>
 		<<set $hostage.skill.entertainment = Math.clamp($hostage.skill.entertainment+5, 0, 100)>>
 		<<set $hostage.skill.anal = Math.clamp($hostage.skill.anal+5, 0, 100)>>
@@ -2872,7 +2872,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			<<set $hostage.counter.oral += 10>>
 			<<set $hostage.counter.vaginal += 10>>
 			<<set $hostage.counter.anal += 10>>
-			<<set $hostage.intelligenceImplant = Math.clamp(intelligenceImplant+1, 0, 30)>>
+			<<set $hostage.intelligenceImplant = Math.clamp($hostage.intelligenceImplant+1, 0, 30)>>
 			<<set $hostage.skill.oral = Math.clamp($hostage.skill.oral+5, 0, 100)>>
 			<<set $hostage.skill.entertainment = Math.clamp($hostage.skill.entertainment+5, 0, 100)>>
 			<<set $hostage.skill.anal = Math.clamp($hostage.skill.anal+5, 0, 100)>>
@@ -2888,8 +2888,8 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			<<set $hostage.counter.oral += 10>>
 			<<set $hostage.counter.vaginal += 10>>
 			<<set $hostage.counter.anal += 10>>
-			<<set $hostage.intelligenceImplant += Math.clamp(intelligenceImplant+2, 0, 30)>>
-			<<set $hostage.skill.oral += Math.clamp($hostage.skill.oral+5, 0, 100)>>
+			<<set $hostage.intelligenceImplant = Math.clamp($hostage.intelligenceImplant+2, 0, 30)>>
+			<<set $hostage.skill.oral = Math.clamp($hostage.skill.oral+5, 0, 100)>>
 			<<set $hostage.skill.entertainment = Math.clamp($hostage.skill.entertainment+5, 0, 100)>>
 			<<set $hostage.skill.anal = Math.clamp($hostage.skill.anal+5, 0, 100)>>
 			<<set $hostage.skill.vaginal = Math.clamp($hostage.skill.vaginal+5, 0, 100)>>
@@ -2903,7 +2903,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
 			<<set $hostage.counter.oral += 10>>
 			<<set $hostage.counter.vaginal += 10>>
 			<<set $hostage.counter.anal += 10>>
-			<<set $hostage.intelligenceImplant = Math.clamp(intelligenceImplant+2, 0, 30)>>
+			<<set $hostage.intelligenceImplant = Math.clamp($hostage.intelligenceImplant+2, 0, 30)>>
 			<<set $hostage.skill.oral = Math.clamp($hostage.skill.oral+5, 0, 100)>>
 			<<set $hostage.skill.entertainment = Math.clamp($hostage.skill.entertainment+5, 0, 100)>>
 			<<set $hostage.skill.anal = Math.clamp($hostage.skill.anal+5, 0, 100)>>
@@ -3154,7 +3154,7 @@ You remind yourself that success in this conflict will not be defined by the tra
 
 <br><br>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> collates several options for directly attacking your rival. This is a corporate war, not a military one; your peers would not tolerate a direct attack on _himR. You must bankrupt your opponent so they are no longer able to hide within the physical and intangible fortress that is their arcology. Your rival <<if ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.6>>is on their economic knees, putting them on the verge of defeat.<<elseif ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.7>>is in a bad financial state, well on the way to final dissolution and defeat.<<elseif ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.8>>has taken some hard corporate blows but is still standing.<<elseif ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.9>>is starting to feel the pressure.<<else>>is essentially undamaged; you have hard work ahead of you.<</if>>
+<<= capFirstChar($assistant.name)>> collates several options for directly attacking your rival. This is a corporate war, not a military one; your peers would not tolerate a direct attack on _himR. You must bankrupt your opponent so they are no longer able to hide within the physical and intangible fortress that is their arcology. Your rival <<if ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.6>>is on their economic knees, putting them on the verge of defeat.<<elseif ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.7>>is in a bad financial state, well on the way to final dissolution and defeat.<<elseif ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.8>>has taken some hard corporate blows but is still standing.<<elseif ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.9>>is starting to feel the pressure.<<else>>is essentially undamaged; you have hard work ahead of you.<</if>>
 
 <br><br>
 
@@ -3219,7 +3219,7 @@ You remind yourself that success in this conflict will not be defined by the tra
 	<<if $mercenaries >= 3>>
 		<br><<link "Your peers will tolerate an attack if it's covert">>
 			<<replace "#result">>
-				One night, you're working late in your office, $assistantName's avatar glowing companionably beside you. Without preamble, _heA reports to you in _hisA normal tones, "Team One reports
+				One night, you're working late in your office, $assistant.name's avatar glowing companionably beside you. Without preamble, _heA reports to you in _hisA normal tones, "Team One reports
 				<<switch $rivalryFS>>
 				<<case "Racial Subjugationism">>Racemixer
 				<<case "Racial Supremacism">>Miscegenator
@@ -3261,7 +3261,7 @@ You remind yourself that success in this conflict will not be defined by the tra
 					<</for>>
 				<</if>>
 				<<if $hostageAnnounced == 1>>
-					$assistantName pauses. "Also confirm package is secure."
+					$assistant.name pauses. "Also confirm package is secure."
 					<<set $hostageRescued = 1>>
 				<</if>>
 				You go back to your work.
@@ -3274,7 +3274,7 @@ You remind yourself that success in this conflict will not be defined by the tra
 	<<if $mercenaries >= 3>>
 		<br><<link "Lock your rival down and let your mercs walk right in.">>
 			<<replace "#result">>
-				While you hold your rival's arcology's system under your complete control, $assistantName finally reports to you in _hisA normal tones, "Team One reports
+				While you hold your rival's arcology's system under your complete control, $assistant.name finally reports to you in _hisA normal tones, "Team One reports
 				<<switch $rivalryFS>>
 				<<case "Racial Subjugationism">>Racemixer
 				<<case "Racial Supremacism">>Miscegenator
@@ -3328,7 +3328,7 @@ You remind yourself that success in this conflict will not be defined by the tra
 					<</for>>
 				<</if>>
 				<<if $hostageAnnounced == 1>>
-					$assistantName pauses. "Also confirm package is secure."
+					$assistant.name pauses. "Also confirm package is secure."
 					<<set $hostageRescued = 1>>
 				<</if>>
 				Smirking to yourself at a job well done, you
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index dd808d61ef39b2ac98525e9c0c39d21c62770585..abe2baf784f04813e7f4071f4f9a68c92116925d 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -246,7 +246,7 @@
 <<setLocalPronouns $activeSlave>>
 <<setPlayerPronouns>>
 
-Only a few days into your inter-arcology war, you receive a video message from your rival. Once $assistantName is satisfied that the file is clean, you clear your office and pull it up. To your surprise, there are two faces on your desk, not one. One of them is your rival, and after a moment, you remember who the other is. You recognize $him from your
+Only a few days into your inter-arcology war, you receive a video message from your rival. Once $assistant.name is satisfied that the file is clean, you clear your office and pull it up. To your surprise, there are two faces on your desk, not one. One of them is your rival, and after a moment, you remember who the other is. You recognize $him from your
 <<switch $PC.career>>
 <<case "wealth">>
 	time as a wealthy _womanP of leisure. $He was a pretty little party $girl who ran in those circles. You were never particularly close,
diff --git a/src/uncategorized/pRivalryPeacekeepers.tw b/src/uncategorized/pRivalryPeacekeepers.tw
index 211f982dc27a2123c04b33832a5be80315da83b5..aad69a9ab2fc7b612d7824553e79b32c12d33148 100644
--- a/src/uncategorized/pRivalryPeacekeepers.tw
+++ b/src/uncategorized/pRivalryPeacekeepers.tw
@@ -2,7 +2,7 @@
 
 <<set $nextButton = "Continue", $nextLink = "P rivalry actions">>
 
-This is a busy time, and $assistantName's call prioritization functions are invaluable. You don't have time for everyone. General $peacekeepers.generalName is fairly high up the list, though. "<<= PlayerName()>>, thank you for taking the time to speak with me," he greets you. "I understand you've got a lot on your plate right now, so I'll be brief. My intel shop has discovered a slaving ring in the area under my control, run by your rival." He gestures to someone out of view, and a limited overview of his intelligence is delivered to $assistantName. The general has given you just enough to verify the ownership of the operation. It does indeed belong to the enemy.
+This is a busy time, and $assistant.name's call prioritization functions are invaluable. You don't have time for everyone. General $peacekeepers.generalName is fairly high up the list, though. "<<= PlayerName()>>, thank you for taking the time to speak with me," he greets you. "I understand you've got a lot on your plate right now, so I'll be brief. My intel shop has discovered a slaving ring in the area under my control, run by your rival." He gestures to someone out of view, and a limited overview of his intelligence is delivered to $assistant.name. The general has given you just enough to verify the ownership of the operation. It does indeed belong to the enemy.
 
 <br><br>
 
diff --git a/src/uncategorized/pSnatchAndGrab.tw b/src/uncategorized/pSnatchAndGrab.tw
index 65a211771bc448e59320cdc066d8e1ec52fa9312..df0e7f12b74fd780930a96c6d25d9f3821825c94 100644
--- a/src/uncategorized/pSnatchAndGrab.tw
+++ b/src/uncategorized/pSnatchAndGrab.tw
@@ -6,13 +6,13 @@
 <<set $PSnatch = 0>>
 <<setAssistantPronouns>>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> forwards a discreet message from the leader of your mercenaries.
+<<= capFirstChar($assistant.name)>> forwards a discreet message from the leader of your mercenaries.
 <br><br>
 "<<= properTitle()>>, I've just become aware of a... business opportunity through some old friends. There's an unregistered lab doing illegal gene therapy work. At least two agencies are onto them, which is how I heard of it. Word is, they're packing up and moving out. I believe me and my people can appropriate that shipment. Catch is, to make this work I need to pay some serious bribes, and I need to pay them today. We'll cut you in as an equal partner for <<print cashFormat(10000)>> cash, right now. One share should come to one of the lab rats, more or less. Are you in or out?"
-<<if $assistant == 1>>
+<<if $assistant.personality == 1>>
 	<br><br>
-	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>>'s $assistantAppearance avatar appears on your desk next to the message.
-	<<switch $assistantAppearance>>
+	<<= capFirstChar($assistant.name)>>'s $assistant.appearance avatar appears on your desk next to the message.
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		"I vote yes. Even though whatever that lab is producing can't possibly be as interesting as me," _heA says haughtily, and twirls a strand of tentacle hair.
 	<<case "shemale">>
diff --git a/src/uncategorized/pSnatchAndGrabResult.tw b/src/uncategorized/pSnatchAndGrabResult.tw
index 323127035c2b24df22d2bfc47c91f74557aa346a..c2bf607e7b0957e660acdc0359993abd933cc988 100644
--- a/src/uncategorized/pSnatchAndGrabResult.tw
+++ b/src/uncategorized/pSnatchAndGrabResult.tw
@@ -134,7 +134,7 @@
 <<setLocalPronouns $activeSlave>>
 <<set $activeSlave.slaveCost = -10000>>
 
-In the middle of the night, there is a polite knock on your penthouse door. You are alerted by $assistantName, who observes <<if $assistant == 1>>with some irritation <</if>>that the mercenary who knocked has gone, has left a large case outside the door, and has satisfied the security systems that the case contains nothing hazardous.
+In the middle of the night, there is a polite knock on your penthouse door. You are alerted by $assistant.name, who observes <<if $assistant.personality == 1>>with some irritation <</if>>that the mercenary who knocked has gone, has left a large case outside the door, and has satisfied the security systems that the case contains nothing hazardous.
 
 The case prompts you for a handprint code; your hand works just fine. It contains a naked, hairless, perfectly healthy young body in the fetal position. This person awakens as the case opens, looks you confidently in the eye, and says "Are you my <<if $PC.title != 0>>Master<<else>>Mistress<</if>>?"
 
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index 9bd99a5de0da7229c2f48b5dd72606617ed167a0..703e27445de9e5779354a3cfa348bff5949287f6 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -46,15 +46,15 @@ One fine day, as normal as any day surrounded by your slaves can be, you're sitt
 	<<else>>
 		shouts
 	<</if>>
-	that several nondescript citizens $he sees occasionally at work have passed messages to $him this morning. Apparently, they simply asked whether $he wished to be free and the absurdity of it spurred $him to alert you. Even more unusual is the unannounced message waiting in your inbox — a message $assistantName totally failed to inform you of. When asked,
+	that several nondescript citizens $he sees occasionally at work have passed messages to $him this morning. Apparently, they simply asked whether $he wished to be free and the absurdity of it spurred $him to alert you. Even more unusual is the unannounced message waiting in your inbox — a message $assistant.name totally failed to inform you of. When asked,
 <<else>>
-	a message comes in. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> totally fails to announce it, which is unusual; when you ask _himA why not,
+	a message comes in. <<= capFirstChar($assistant.name)>> totally fails to announce it, which is unusual; when you ask _himA why not,
 <</if>>
 
 _heA replies
-<<if $assistant > 0>>
+<<if assistant.personality > 0>>
 	flirtatiously, "What message, <<= properTitle()>>?"
-	<<switch $assistantAppearance>>
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		_HisA avatar's tentacle hair wiggles with incomprehension.
 	<<case "shemale">>
@@ -95,7 +95,7 @@ _heA replies
 <<else>>
 	"You have received no messages in the past thirty seconds, <<= properTitle()>>."
 <</if>>
-This is disturbing, to say the least. After close investigation, it appears someone has managed to plant a simple text message in your mail system without $assistantName or any of your other security systems taking any notice. Worse, your mysterious correspondent seems willing to show off this ability in this petty display rather than simply sending a message anonymously.
+This is disturbing, to say the least. After close investigation, it appears someone has managed to plant a simple text message in your mail system without $assistant.name or any of your other security systems taking any notice. Worse, your mysterious correspondent seems willing to show off this ability in this petty display rather than simply sending a message anonymously.
 
 <br><br>
 
diff --git a/src/uncategorized/peHeadgirlConcubine.tw b/src/uncategorized/peHeadgirlConcubine.tw
index 051be39aa72de5534a2cdcac72c838546a9aeeaa..1ce3fc86a9c8ad2c58b0c950186958ae2fb13b90 100644
--- a/src/uncategorized/peHeadgirlConcubine.tw
+++ b/src/uncategorized/peHeadgirlConcubine.tw
@@ -87,8 +87,8 @@ and it's also obvious that they've been filling the few minutes they've been wai
 	<<else>>
 		beloved body nude in motion as you walk
 	<</if>>
-	is something $he openly enjoys, while $Concubine.slaveName at least tries to be a little more modest. You sit down at your desk, taking in the situation in your domain at a glance as $assistantName
-	<<switch $assistantAppearance>>
+	is something $he openly enjoys, while $Concubine.slaveName at least tries to be a little more modest. You sit down at your desk, taking in the situation in your domain at a glance as $assistant.name
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		springs into monstrous life on the glass desktop, eyes flashing and hair writhing.
 	<<case "shemale">>
diff --git a/src/uncategorized/pePitFightInvite.tw b/src/uncategorized/pePitFightInvite.tw
index d6568c78a62a65fa089c0d637d371a7fd34bec2d..00bfd4ce7adc97dea6f9de6f14cf50aab97b5598 100644
--- a/src/uncategorized/pePitFightInvite.tw
+++ b/src/uncategorized/pePitFightInvite.tw
@@ -8,7 +8,7 @@
 <span id="artFrame">
 </span>
 
-Gladiatorial combat between slaves has not yet reached the level of social acceptability it once enjoyed in Rome, but it's growing in popularity. For now, most fights are discreet affairs limited to select guests. Displaying a slave bodyguard is an excellent way to get yourself invited to participate, and $assistantName has just passed on an invitation to a private fight next week, should you be willing to hazard a bodyguard.
+Gladiatorial combat between slaves has not yet reached the level of social acceptability it once enjoyed in Rome, but it's growing in popularity. For now, most fights are discreet affairs limited to select guests. Displaying a slave bodyguard is an excellent way to get yourself invited to participate, and $assistant.name has just passed on an invitation to a private fight next week, should you be willing to hazard a bodyguard.
 
 <br><br>
 
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
deleted file mode 100644
index 020476d274e77232bd0e108c7dc505c9138d2687..0000000000000000000000000000000000000000
--- a/src/uncategorized/personalAssistantOptions.tw
+++ /dev/null
@@ -1,1089 +0,0 @@
-:: Personal assistant options [nobr]
-
-<<set $nextButton = "Back", $nextLink = "Main">>
-
-<<if $marketAssistantLimit>><<set $marketAssistantLimit = Math.clamp($marketAssistantLimit, 10000, 10000000)>><</if>>
-
-<<if $seeImages == 1>><<= assistantArt(3)>><</if>>
-<<setAssistantPronouns>>
-
-Seated at your desk, you glance at the visual representation of $assistantName, down in one corner of your desk's glass top.
-
-<<set $masturbationAllowed = 0>>
-<<set $i = $slaves.findIndex(function(s) { return s.rules.release.masturbation === 1; })>>
-<<if $i != -1>>
-	<<set $masturbationAllowed = 1>>
-<</if>>
-
-<<include "Personal Assistant Appearance">>
-
-<<if $assistantPower > 0>>
-	<br><br>
-	Though _heA remains short of a true AI, the arcology's upgraded computer core allows _himA to use brute force to simulate sentient behavior quite well. _HeA is not truly self aware, but _heA is able to predict what a sentient being with a certain character might say or do in common situations. The increased power has other applications; for example, it has improved the accuracy of your estimates of economic activity in the Free City.
-<<else>>
-	_HeA is well short of a true AI, but with extensive access to information on past human behavior and the processing power to query that information quickly, _heA can often seem self aware by modeling _himselfA after others' past behavior.
-<</if>>
-<br><br>
-
-__Computer Core Upgrades__
-<br>
-
-<<if $assistantPower == 0>>
-	The first upgrade needed is a switch to a holographic memory core to store the immense quantity of data $assistantName gathers.
-	//Will cost <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
-	[[Install holographic memory core|Personal assistant options][cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), "capEx"), $assistantPower += 1, $PC.skill.engineering += 1, $PC.skill.hacking += 1]]
-<<elseif $assistantPower == 1>>
-	The next upgrade needed is a liquid nitrogen cooling system to allow for extensive overclocking.
-	//Will cost <<print cashFormat(Math.trunc(35000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>> and will allow you to upgrade the smart piercings in $arcologies[0].name//
-	[[Install upgraded cooling system|Personal assistant options][cashX(forceNeg(Math.trunc(35000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), "capEx"), $assistantPower += 1, $PC.skill.engineering += 1, $PC.skill.hacking += 1]]
-<<elseif $assistantPower == 2>>
-	The final upgrade needed is a transition to optical RAM.
-	//Will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
-	[[Install optical RAM|Personal assistant options][cashX(forceNeg(Math.trunc(50000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), "capEx"), $assistantPower += 1, $PC.skill.engineering += 1, $PC.skill.hacking += 1]]
-<<else>>
-	The arcology's computer core is fully upgraded.
-<</if>>
-<br>
-
-<<if $assistantOptions>>
-<br>
-__Behavior settings:__
-<br>
-
-<<if $assistant == 0>>
-	Your assistant is using _hisA default settings, and is not behaving as though _heA has a libido. [["Instruct " + _himA + " to simulate a sex drive"|Personal assistant options][$assistant = 1]]
-<<else>>
-	Your assistant is simulating preferences and a sex drive. [["Revert " + _himA + " to normal settings"|Personal assistant options][$assistant = 0, $assistantAppearance = "normal"]]
-<</if>>
-<br>
-
-<<if $assistant != 0>>
-
-<br>
-__Appearance settings:__
-<br>
-_HeA is currently using the ''$assistantAppearance'' avatar.
-<<if $PAPublic == 1>>
-	<<set _seed = []>>
-	<<switch $assistantAppearance>>
-	<<case "businesswoman">>
-		<<if $arcologies[0].FSSubjugationist != "unset">> <<set _seed.push($arcologies[0].FSSubjugationistRace + " subjugation")>> <</if>>
-		<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
-		<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
-		<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
-		<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
-		<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
-		<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
-		<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
-		<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-	<<case "goddess">>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-		<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-		<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
-		<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
-		<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
-		<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
-		<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
-		<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-		<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
-		<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
-		<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
-		<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-	<<case "amazon">>
-		<<if $arcologies[0].FSSupremacist != "unset">> <<set _seed.push($arcologies[0].FSSupremacistRace + " supremacy")>> <</if>>
-		<<if $arcologies[0].FSSubjugationist != "unset">> <<set _seed.push($arcologies[0].FSSubjugationistRace + " subjugation")>> <</if>>
-		<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-		<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
-		<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
-		<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
-		<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
-		<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
-	<<case "schoolgirl">>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
-		<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-		<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
-		<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
-		<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-	<<case "monstergirl">>
-		<<if $arcologies[0].FSSupremacist != "unset">> <<set _seed.push($arcologies[0].FSSupremacistRace + " supremacy")>> <</if>>
-		<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
-		<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
-		<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-		<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
-		<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
-		<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
-	<<case "shemale">>
-		<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
-		<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
-		<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
-		<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
-		<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
-		<<if $arcologies[0].FSIntellectualDependency != "unset">> <<set _seed.push("intellectual dependency")>> <</if>>
-	<<case "hypergoddess">>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-		<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
-		<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
-		<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
-		<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
-	<<case "loli">>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-		<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
-		<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
-		<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-	<<case "preggololi">>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-		<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
-		<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-	<<case "fairy">>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-		<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-	<<case "pregnant fairy">>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-		<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-		<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-	<<case "angel">>
-		<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-		<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
-		<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
-		<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-	<<case "cherub">>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-		<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-	<<case "incubus">>
-		<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-		<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
-		<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
-		<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-		<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
-		<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
-		<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
-		<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
-		<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
-		<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
-		<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-		<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
-		<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-		<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
-		<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
-		<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
-		<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
-		<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
-		<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
-	<<case "succubus">>
-		<<if $arcologies[0].FSSupremacist != "unset">> <<set _seed.push($arcologies[0].FSSupremacistRace + " supremacy")>> <</if>>
-		<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
-		<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-		<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
-		<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-		<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
-		<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
-		<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
-		<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
-		<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
-		<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
-		<<if $arcologies[0].FSIntellectualDependency != "unset">> <<set _seed.push("intellectual dependency")>> <</if>>
-		<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-		<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
-		<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-		<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
-		<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
-		<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
-		<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
-		<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
-		<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
-	<<case "imp">>
-		<<if $arcologies[0].FSSubjugationist != "unset">> <<set _seed.push($arcologies[0].FSSubjugationistRace + " subjugation")>> <</if>>
-		<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
-		<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-		<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-	<<case "witch">>
-		<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
-		<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-		<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-		<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
-		<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
-		<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
-		<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
-		<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
-		<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
-		<<if $arcologies[0].FSIntellectualDependency != "unset">> <<set _seed.push("intellectual dependency")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-		<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-	<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
-		<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
-	<</switch>>
-	<<if _seed.length > 0>>
-		<<set _desc = "">>
-		<<for _i = 0; _i < _seed.length; _i++>>
-			<<set _desc = (_desc + _seed[_i])>>
-			<<if (_i < _seed.length-2)>>
-				<<set _desc = (_desc + ", ")>>
-			<<elseif (_seed.length > 2) && (_i == _seed.length-2)>>
-				<<set _desc = (_desc + ", and ")>>
-			<<elseif (_seed.length == 2) && (_i == 0)>>
-				<<set _desc = (_desc + " and ")>>
-			<</if>>
-		<</for>>
-		This appearance bolsters _desc.
-	<<else>>
-		It has no impact on public opinion.
-	<</if>>
-<</if>>
-<br>
-
-<<if $assistantAppearance != "normal">> [[Normal|Personal assistant options][$assistantAppearance = "normal"]]
-	<br>
-<</if>>
-<<if $assistantAppearance != "businesswoman">> [[Businesswoman|Personal assistant options][$assistantAppearance = "businesswoman"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if $arcologies[0].FSSubjugationist != "unset">> <<set _seed.push($arcologies[0].FSSubjugationistRace + " subjugation")>> <</if>>
-		<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
-		<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
-		<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
-		<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
-		<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
-		<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
-		<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
-		<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-		<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<<if $seePreg != 0>>
-	<<if $assistantAppearance != "goddess">> [[Goddess|Personal assistant options][$assistantAppearance = "goddess"]]
-		<<if $PAPublic == 1>>
-			<<set _seed = []>>
-			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-			<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-			<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
-			<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
-			<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-			<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
-			<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
-			<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-			<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
-			<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
-			<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
-			<<if _seed.length > 0>>
-				<<set _desc = "">>
-				<<for _i = 0; _i < _seed.length; _i++>>
-					<<set _desc = (_desc + _seed[_i])>>
-					<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-					<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-					<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-					<</if>>
-				<</for>>
-				A good emblem for _desc
-			<</if>>
-		<</if>>
-		<br>
-	<</if>>
-<</if>>
-<<if $assistantAppearance != "amazon">> [[Amazon|Personal assistant options][$assistantAppearance = "amazon"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if $arcologies[0].FSSupremacist != "unset">> <<set _seed.push($arcologies[0].FSSupremacistRace + " supremacy")>> <</if>>
-		<<if $arcologies[0].FSSubjugationist != "unset">> <<set _seed.push($arcologies[0].FSSubjugationistRace + " subjugation")>> <</if>>
-		<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-		<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
-		<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
-		<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
-		<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
-		<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<<if $assistantAppearance != "schoolgirl">> [[Schoolgirl|Personal assistant options][$assistantAppearance = "schoolgirl"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
-		<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
-		<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
-		<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-		<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<<if $seeDicks != 0>>
-	<<if $assistantAppearance != "monstergirl">> [[Monstergirl|Personal assistant options][$assistantAppearance = "monstergirl"]]
-		<<if $PAPublic == 1>>
-			<<set _seed = []>>
-			<<if $arcologies[0].FSSupremacist != "unset">> <<set _seed.push($arcologies[0].FSSupremacistRace + " supremacy")>> <</if>>
-			<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
-			<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
-			<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-			<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
-			<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
-			<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
-			<<if _seed.length > 0>>
-				<<set _desc = "">>
-				<<for _i = 0; _i < _seed.length; _i++>>
-					<<set _desc = (_desc + _seed[_i])>>
-					<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-					<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-					<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-					<</if>>
-				<</for>>
-				A good emblem for _desc
-			<</if>>
-		<</if>>
-		<br>
-	<</if>>
-	<<if $assistantAppearance != "shemale">> [[Shemale|Personal assistant options][$assistantAppearance = "shemale"]]
-		<<if $PAPublic == 1>>
-			<<set _seed = []>>
-			<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
-			<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
-			<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-			<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
-			<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
-			<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
-			<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
-			<<if $arcologies[0].FSIntellectualDependency != "unset">> <<set _seed.push("intellectual dependency")>> <</if>>
-			<<if _seed.length > 0>>
-				<<set _desc = "">>
-				<<for _i = 0; _i < _seed.length; _i++>>
-					<<set _desc = (_desc + _seed[_i])>>
-					<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-					<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-					<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-					<</if>>
-				<</for>>
-				A good emblem for _desc
-			<</if>>
-		<</if>>
-		<br>
-	<</if>>
-<</if>>
-<<if $seePreg != 0>>
-	<<if $assistantAppearance != "hypergoddess" && $seeHyperPreg == 1>> [[Hyper Goddess|Personal assistant options][$assistantAppearance = "hypergoddess"]]
-		<<if $PAPublic == 1>>
-			<<set _seed = []>>
-			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-			<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
-			<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
-			<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
-			<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
-			<<if _seed.length > 0>>
-				<<set _desc = "">>
-				<<for _i = 0; _i < _seed.length; _i++>>
-					<<set _desc = (_desc + _seed[_i])>>
-					<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-					<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-					<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-					<</if>>
-				<</for>>
-				A good emblem for _desc
-			<</if>>
-		<</if>>
-		<br>
-	<</if>>
-<</if>>
-<<if $assistantAppearance != "loli" && $minimumSlaveAge < 13>> [[Loli|Personal assistant options][$assistantAppearance = "loli"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-		<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
-		<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
-		<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<<if $seePreg != 0>>
-	<<if $assistantAppearance != "preggololi" && $fertilityAge < 13 && $minimumSlaveAge < 13>> [[Preggololi|Personal assistant options][$assistantAppearance = "preggololi"]]
-		<<if $PAPublic == 1>>
-			<<set _seed = []>>
-			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-			<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
-			<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-			<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
-			<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
-			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-			<<if _seed.length > 0>>
-				<<set _desc = "">>
-				<<for _i = 0; _i < _seed.length; _i++>>
-					<<set _desc = (_desc + _seed[_i])>>
-					<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-					<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-					<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-					<</if>>
-				<</for>>
-				A good emblem for _desc
-			<</if>>
-		<</if>>
-		<br>
-	<</if>>
-<</if>>
-<<if $assistantAppearance != "fairy">> [[Fairy|Personal assistant options][$assistantAppearance = "fairy"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-		<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<<if $seePreg != 0>>
-	<<if $assistantAppearance != "pregnant fairy">> [[Pregnant Fairy|Personal assistant options][$assistantAppearance = "pregnant fairy"]]
-		<<if $PAPublic == 1>>
-			<<set _seed = []>>
-			<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-			<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-			<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-			<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
-			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-			<<if _seed.length > 0>>
-				<<set _desc = "">>
-				<<for _i = 0; _i < _seed.length; _i++>>
-					<<set _desc = (_desc + _seed[_i])>>
-					<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-					<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-					<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-					<</if>>
-				<</for>>
-				A good emblem for _desc
-			<</if>>
-		<</if>>
-		<br>
-	<</if>>
-<</if>>
-<<if $assistantExtra1 == 1>>
-<<if $assistantAppearance != "slimegirl">> [[Slime Girl|Personal assistant options][$assistantAppearance = "slimegirl"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<<if $assistantAppearance != "cowgirl">> [[Cow Girl|Personal assistant options][$assistantAppearance = "cowgirl"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<<if $assistantAppearance != "harpygirl">> [[Harpy Girl|Personal assistant options][$assistantAppearance = "harpygirl"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<<if $assistantAppearance != "kitsunegirl">> [[Kitsune|Personal assistant options][$assistantAppearance = "kitsunegirl"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<<if $assistantAppearance != "lamiagirl">> [[Lamia|Personal assistant options][$assistantAppearance = "lamiagirl"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<<if $assistantAppearance != "spidergirl">> [[Spider Girl|Personal assistant options][$assistantAppearance = "spidergirl"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<</if>>
-<<if $assistantExtra2 == 1>>
-<<if $assistantAppearance != "angel">> [[Angel|Personal assistant options][$assistantAppearance = "angel"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-		<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
-		<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-		<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<<if $assistantAppearance != "cherub">> [[Cherub|Personal assistant options][$assistantAppearance = "cherub"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
-		<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<<if $seeDicks != 0>>
-	<<if $assistantAppearance != "incubus">> [[Incubus|Personal assistant options][$assistantAppearance = "incubus"]]
-		<<if $PAPublic == 1>>
-			<<set _seed = []>>
-			<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-			<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
-			<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
-			<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-			<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
-			<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
-			<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
-			<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
-			<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
-			<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
-			<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-			<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
-			<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
-			<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
-			<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
-			<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
-			<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
-			<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
-			<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-			<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
-			<<if _seed.length > 0>>
-				<<set _desc = "">>
-				<<for _i = 0; _i < _seed.length; _i++>>
-					<<set _desc = (_desc + _seed[_i])>>
-					<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-					<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-					<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-					<</if>>
-				<</for>>
-				A good emblem for _desc
-			<</if>>
-		<</if>>
-		<br>
-	<</if>>
-<</if>>
-<<if $assistantAppearance != "succubus">> [[Succubus|Personal assistant options][$assistantAppearance = "succubus"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if $arcologies[0].FSSupremacist != "unset">> <<set _seed.push($arcologies[0].FSSupremacistRace + " supremacy")>> <</if>>
-		<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
-		<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-		<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
-		<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-		<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
-		<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
-		<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
-		<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
-		<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
-		<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
-		<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-		<<if $arcologies[0].FSRomanRevivalist != "unset">> <<set _seed.push("Roman revivalism")>> <</if>>
-		<<if $arcologies[0].FSAztecRevivalist != "unset">> <<set _seed.push("Aztec revivalism")>> <</if>>
-		<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
-		<<if $arcologies[0].FSEdoRevivalist != "unset">> <<set _seed.push("Edo revivalism")>> <</if>>
-		<<if $arcologies[0].FSArabianRevivalist != "unset">> <<set _seed.push("Arabian revivalism")>> <</if>>
-		<<if $arcologies[0].FSChineseRevivalist != "unset">> <<set _seed.push("Chinese revivalism")>> <</if>>
-		<<if $arcologies[0].FSIntellectualDependency != "unset">> <<set _seed.push("intellectual dependency")>> <</if>>
-		<<if $arcologies[0].FSSlaveProfessionalism != "unset">> <<set _seed.push("slave professionalism")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-		<<if $arcologies[0].FSStatuesqueGlorification != "unset">> <<set _seed.push("statuesque glorification")>> <</if>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<<if $assistantAppearance != "imp">> [[Imp|Personal assistant options][$assistantAppearance = "imp"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if $arcologies[0].FSSubjugationist != "unset">> <<set _seed.push($arcologies[0].FSSubjugationistRace + " subjugation")>> <</if>>
-		<<if $arcologies[0].FSDegradationist != "unset">> <<set _seed.push("degradationism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
-		<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
-		<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<<if $assistantAppearance != "witch">> [[Bonus: Witch|Personal assistant options][$assistantAppearance = "witch"]]
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>
-		<<if $arcologies[0].FSRestart != "unset">> <<set _seed.push("eugenics")>> <</if>>
-		<<if $arcologies[0].FSGenderRadicalist != "unset">> <<set _seed.push("gender radicalism")>> <</if>>
-		<<if $arcologies[0].FSGenderFundamentalist != "unset">> <<set _seed.push("gender fundamentalism")>> <</if>>
-		<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
-		<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
-		<<if $arcologies[0].FSYouthPreferentialist != "unset">> <<set _seed.push("youth preferentialism")>> <</if>>
-		<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
-		<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> <<set _seed.push("slimness enthusiasm")>> <</if>>
-		<<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _seed.push("asset expansionism")>> <</if>>
-		<<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
-		<<if $arcologies[0].FSPhysicalIdealist != "unset">> <<set _seed.push("physical idealism")>> <</if>>
-		<<if $arcologies[0].FSHedonisticDecadence != "unset">> <<set _seed.push("hedonistic decadence")>> <</if>>
-		<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
-		<<if $arcologies[0].FSIntellectualDependency != "unset">> <<set _seed.push("intellectual dependency")>> <</if>>
-		<<if $arcologies[0].FSPetiteAdmiration != "unset">> <<set _seed.push("petite admiration")>> <</if>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<<if $assistantAppearance != "ERROR_1606_APPEARANCE_FILE_CORRUPT">> @@.link;WARNING! File c@@[[o|Personal assistant options][$assistantAppearance = "ERROR_1606_APPEARANCE_FILE_CORRUPT"]]@@.link;rrupt!@@
-	<<if $PAPublic == 1>>
-		<<set _seed = []>>
-		<<if $arcologies[0].FSTransformationFetishist != "unset">> <<set _seed.push("transformation fetishism")>> <</if>>
-		<<if _seed.length > 0>>
-			<<set _desc = "">>
-			<<for _i = 0; _i < _seed.length; _i++>>
-				<<set _desc = (_desc + _seed[_i])>>
-				<<if (_i < _seed.length-2)>> <<set _desc = (_desc + ", ")>>
-				<<elseif (_seed.length > 2) && (_i == _seed.length-2)>> <<set _desc = (_desc + ", and ")>>
-				<<elseif (_seed.length == 2) && (_i == 0)>> <<set _desc = (_desc + " and ")>>
-				<</if>>
-			<</for>>
-			A good emblem for _desc
-		<</if>>
-	<</if>>
-	<br>
-<</if>>
-<</if>>
-
-
-<<if $assistant != 0>>
-<br><br>
-__Downloadable Appearances:__
-<br>
-	/*
-	<<if $assistantExtra1 == 0>>
-		[[Purchase a set of monstergirl appearances|Assistant Events][$event = "", cashX(forceNeg(Math.trunc(10000*$upgradeMultiplier)), "capEx"), $assistantExtra1 = 1]]
-		//Costs <<print cashFormat(Math.trunc(6000*$upgradeMultiplier))>>//
-	<<else>>
-		You have downloaded a set of monstergirl appearances for your avatar.
-	<</if>>
-	*/
-	<<if $assistantExtra2 == 0>>
-		<<if $PC.skill.hacking < 75>>
-			<<link "Purchase a set of heaven and hell themed appearances">>
-				<<set $assistantExtra2 = 1, $nextLink = "Personal assistant options">>
-				<<run cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx")>>
-				<<goto "Assistant Appearance Pack Two">>
-			<</link>> //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>//
-		<<else>>
-			<<link "Acquire a set of heaven and hell themed appearances">>
-				<<set $assistantExtra2 = 1, $nextLink = "Personal assistant options">>
-				<<goto "Assistant Appearance Pack Two">>
-			<</link>> //Unencrypted files, ripe for the taking//
-		<</if>>
-	<<else>>
-		You have downloaded a set of heavenly and hellish appearances for your avatar.
-	<</if>>
-<</if>>
-
-<br><br>
-
-/* Choose _hisA FS appearance */
-<<if $assistantFSOptions != 0 && $assistantAppearance != "normal">>
-	<br>
-	__Society-specific appearance settings:__
-	<br>
-	_HeA can further refine _hisA avatar to match the arcology's social profile<<if $assistantFSAppearance != "default">>; _hisA current variation shows ''$assistantFSAppearance'' touches.<<else>>, though no details stand out right now.<</if>>
-	<br>
-	<<if $assistantFSAppearance != "default">>
-		[[Default|Personal assistant options][$assistantFSAppearance = "default"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "gender radicalist" && $arcologies[0].FSGenderRadicalistDecoration > 20>>
-		[[Gender Radicalist|Personal assistant options][$assistantFSAppearance = "gender radicalist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "gender fundamentalist" && $arcologies[0].FSGenderFundamentalistDecoration > 20>>
-		[[Gender Fundamentalist|Personal assistant options][$assistantFSAppearance = "gender fundamentalist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "paternalist" && $arcologies[0].FSPaternalistDecoration > 20>>
-		[[Paternalist|Personal assistant options][$assistantFSAppearance = "paternalist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "degradationist" && $arcologies[0].FSDegradationistDecoration > 20>>
-		[[Degradationist|Personal assistant options][$assistantFSAppearance = "degradationist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "repopulation focus" && $arcologies[0].FSRepopulationFocusDecoration > 20>>
-		[[Repopulation Focus|Personal assistant options][$assistantFSAppearance = "repopulation focus"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "eugenics" && $arcologies[0].FSRestartDecoration > 20>>
-		[[Eugenics|Personal assistant options][$assistantFSAppearance = "eugenics"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "intellectual dependency" && $arcologies[0].FSIntellectualDependencyDecoration > 20>>
-		[[Intellectual Dependency|Personal assistant options][$assistantFSAppearance = "intellectual dependency"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "slave professionalism" && $arcologies[0].FSSlaveProfessionalismDecoration > 20>>
-		[[Slave Professionalism|Personal assistant options][$assistantFSAppearance = "slave professionalism"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "body purist" && $arcologies[0].FSBodyPuristDecoration > 20>>
-		[[Body Purist|Personal assistant options][$assistantFSAppearance = "body purist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "transformation fetishist" && $arcologies[0].FSTransformationFetishistDecoration > 20>>
-		[[Transformation Fetishist|Personal assistant options][$assistantFSAppearance = "transformation fetishist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "youth preferentialist" && $arcologies[0].FSYouthPreferentialistDecoration > 20>>
-		[[Youth Preferentialist|Personal assistant options][$assistantFSAppearance = "youth preferentialist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "maturity preferentialist" && $arcologies[0].FSMaturityPreferentialistDecoration > 20>>
-		[[Maturity Preferentialist|Personal assistant options][$assistantFSAppearance = "maturity preferentialist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "slimness enthusiast" && $arcologies[0].FSSlimnessEnthusiastDecoration > 20>>
-		[[Slimness Enthusiast|Personal assistant options][$assistantFSAppearance = "slimness enthusiast"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "petite admiration" && $arcologies[0].FSPetiteAdmirationDecoration > 20>>
-		[[Petite Admiration|Personal assistant options][$assistantFSAppearance = "petite admiration"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "statuesque glorification" && $arcologies[0].FSStatuesqueGlorificationDecoration > 20>>
-		[[Statuesque Glorification|Personal assistant options][$assistantFSAppearance = "statuesque glorification"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "asset expansionist" && $arcologies[0].FSAssetExpansionistDecoration > 20>>
-		[[Asset Expansionist|Personal assistant options][$assistantFSAppearance = "asset expansionist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "pastoralist" && $arcologies[0].FSPastoralistDecoration > 20>>
-		[[Pastoralist|Personal assistant options][$assistantFSAppearance = "pastoralist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "physical idealist" && $arcologies[0].FSPhysicalIdealistDecoration > 20>>
-		[[Physical Idealist|Personal assistant options][$assistantFSAppearance = "physical idealist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "hedonistic decadence" && $arcologies[0].FSHedonisticDecadenceDecoration > 20>>
-		[[Hedonistic Decadence|Personal assistant options][$assistantFSAppearance = "hedonistic decadence"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "supremacist" && $arcologies[0].FSSupremacistDecoration > 20>>
-		[[Supremacist|Personal assistant options][$assistantFSAppearance = "supremacist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "subjugationist" && $arcologies[0].FSSubjugationistDecoration > 20>>
-		[[Subjugationist|Personal assistant options][$assistantFSAppearance = "subjugationist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "chattel religionist" && $arcologies[0].FSChattelReligionistDecoration > 20>>
-		[[Chattel Religionist|Personal assistant options][$assistantFSAppearance = "chattel religionist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "roman revivalist" && $arcologies[0].FSRomanRevivalistDecoration > 20>>
-		[[Roman Revivalist|Personal assistant options][$assistantFSAppearance = "roman revivalist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "aztec revivalist" && $arcologies[0].FSAztecRevivalistDecoration > 20>>
-		[[Aztec Revivalist|Personal assistant options][$assistantFSAppearance = "aztec revivalist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "egyptian revivalist" && $arcologies[0].FSEgyptianRevivalistDecoration > 20>>
-		[[Egyptian Revivalist|Personal assistant options][$assistantFSAppearance = "egyptian revivalist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "edo revivalist" && $arcologies[0].FSEdoRevivalistDecoration > 20>>
-		[[Edo Revivalist|Personal assistant options][$assistantFSAppearance = "edo revivalist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "arabian revivalist" && $arcologies[0].FSArabianRevivalistDecoration > 20>>
-		[[Arabian Revivalist|Personal assistant options][$assistantFSAppearance = "arabian revivalist"]]
-		<br>
-	<</if>>
-	<<if $assistantFSAppearance != "chinese revivalist" && $arcologies[0].FSChineseRevivalistDecoration > 20>>
-		[[Chinese Revivalist|Personal assistant options][$assistantFSAppearance = "chinese revivalist"]]
-		<br>
-	<</if>>
-<</if>>
-
-<</if>> /* CLOSES PERSONALITY ACTIVE REQUIREMENT */
-
-<<if ($assistantNameAnnounced != 0)>>
-<br>
-	__Name:__
-	<<textbox "$assistantName" $assistantName "Personal assistant options">>
-	<<if $assistantName != "your personal assistant">>
-		<br>
-		[[Stop using a custom name|Personal assistant options][$assistantName = "your personal assistant"]]
-	<</if>>
-<</if>>
-
-<</if>>/* CLOSES ASSISTANT OPTIONS AVAILABILITY */
-
-<<if $marketAssistantAnnounced>>
-
-<br><br>
-__Business Assistant settings:__
-<br>
-The arcology's upgraded computers support advanced business analysis.
-<<if $assistantAppearance != "normal">>
-	These capabilities are represented by an avatar styled after $assistantName's, with which _heA simulates a ''$marketAssistantRelationship'' relationship.
-	<br>
-	<<if $marketAssistantRelationship != "cute">>
-		[[Cute|Personal assistant options][$marketAssistantRelationship = "cute"]]
-		<br>
-	<</if>>
-	<<if $marketAssistantRelationship != "romantic">>
-		[[Romantic|Personal assistant options][$marketAssistantRelationship = "romantic"]]
-		<br>
-	<</if>>
-	<<if $marketAssistantRelationship != "nonconsensual">>
-		[[Nonconsensual|Personal assistant options][$marketAssistantRelationship = "nonconsensual"]]
-		<br>
-	<</if>>
-	<<if $marketAssistantRelationship != "incestuous">>
-		[[Incestuous|Personal assistant options][$marketAssistantRelationship = "incestuous"]]
-		<br>
-	<</if>>
-<<else>>
-	Although technically an expanded subroutine within the same app, $assistantName uses a distinct icon to identify these alerts and improve your workflow.
-	<br>
-<</if>>
-<br>
-_HeA is
-<<if $marketAssistantLimit>>
-	''allowed'' to use excess liquid assets over <<print cashFormat($marketAssistantLimit)>> to play the menial slave market. [[Disallow|Personal assistant options][$marketAssistantLimit = 0]]
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	//Define custom cash limit://<<textbox "$marketAssistantLimit" $marketAssistantLimit "Personal assistant options">>
-	<br>
-	_HeA will be
-	<<if $marketAssistantAggressiveness>>
-		''aggressive'' about buying and selling. [[Be conservative|Personal assistant options][$marketAssistantAggressiveness = 0]]
-	<<else>>
-		''conservative'' about buying and selling. [[Be aggressive|Personal assistant options][$marketAssistantAggressiveness = 100]]
-	<</if>>
-<<else>>
-	''not allowed'' to use excess liquid assets to play the menial slave market. [[Allow|Personal assistant options][$marketAssistantLimit = 10000]]
-<</if>>
-
-<</if>>
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index 79deef1ac2d53901a5f42f145cf9d5d1a6557fc5..ca1d84b233041771a9e68233775759aafac95079 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -348,7 +348,7 @@
 	<</if>>
 
 	<<if $PAPublic == 1>>
-		<br>''Public Personal Assistant:'' $assistantName is part of your public image.
+		<br>''Public Personal Assistant:'' $assistant.name is part of your public image.
 		[[Repeal|Policies][$PAPublic = 0]]
 	<</if>>
 
@@ -1204,9 +1204,9 @@
 	<</if>>
 
 	<<if $PAPublic == 0>>
-		<br>''Public Personal Assistant:'' $assistantName will become part of your public image.
+		<br>''Public Personal Assistant:'' $assistant.name will become part of your public image.
 		[[Implement|Policies][$PAPublic = 1, cashX(-5000, "policies"), repX(-1000, "policies")]]
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//May improve cultural development if $assistantName's appearance is fashionable//
+		<br>&nbsp;&nbsp;&nbsp;&nbsp;//May improve cultural development if $assistant.name's appearance is fashionable//
 	<</if>>
 
 	<<if $CoursingAssociation == 0>>
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index 4472a03d2f7757da2219011e1d7be9916ce4194c..b4cf8f00a7a9fdfb29967c8bc21f47b23cba5dcb 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -755,7 +755,7 @@
 		no anal allowed, no matter how much $he begs you to stick something, anything, up $his ass.
 		<<if ($activeSlave.vagina > -1) && canDoVaginal($activeSlave)>><<= VCheck.Vaginal(10)>><<else>><<set $activeSlave.counter.oral += 10, $oralTotal += 10>><</if>>
 	<<case "attention whore">>
-		$activeSlave.slaveName is an obnoxious attention whore. You keep $him in your office and make love to $him whenever you can, but only whenever you're alone in the office. You even instruct $assistantName not to bother you while the slave is receiving $his therapy.
+		$activeSlave.slaveName is an obnoxious attention whore. You keep $him in your office and make love to $him whenever you can, but only whenever you're alone in the office. You even instruct $assistant.name not to bother you while the slave is receiving $his therapy.
 		<<if canDoVaginal($activeSlave)>><<= VCheck.Vaginal(10)>><<elseif canDoAnal($activeSlave)>><<= VCheck.Anal(10)>><</if>>
 	<<case "breast growth">>
 		$activeSlave.slaveName is completely devoted to $his own tits. You keep $him in your office whenever you can, <<if canDoVaginal($activeSlave)>>fucking $him<<elseif canDoAnal($activeSlave)>>fucking $his ass<<else>>fucking $his face<</if>>
@@ -843,7 +843,7 @@
 	<<else>>
 		$He's obedient enough that there is no trouble with any of the sexual kinks you subject $him to. Some $he likes more than others, but when $he's not enjoying $himself, $he grits $his teeth and concentrates on obeying you.
 	<</if>>
-	You start off by making $him view a medley of pornography while $assistantName monitors $him for arousal. It seems $he is
+	You start off by making $him view a medley of pornography while $assistant.name monitors $him for arousal. It seems $he is
 	<<if $activeSlave.attrXY <= 5>>
 		@@.red;disgusted by men@@
 	<<elseif $activeSlave.attrXY <= 15>>
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index 7df1e8f5408603681260401f611d62b8b9b1e902..80d7ce148ba4ff2d568ae41f6326e8295b782245 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -61,8 +61,8 @@ Human soldiers are superior to drones in a number of ways — they have the capa
 
 <br><br>
 
-On this particular evening, you find your work interrupted by an urgent alert from $assistantName<<if $seeImages == 1>>, accompanied by a recent picture<</if>>.
-<<if $assistant > 0>>
+On this particular evening, you find your work interrupted by an urgent alert from $assistant.name<<if $seeImages == 1>>, accompanied by a recent picture<</if>>.
+<<if assistant.personality > 0>>
 	"<<= properMaster()>>, one of the $mercenariesTitle has gone AWOL." _HeA pauses before continuing. "$He's taken a number of weapons with $him."
 <<else>>
 	_HeA informs you that one of the $mercenariesTitle has disappeared, seemingly taking with $him a small stash of weapons.
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index d1eab1b80378cfd00738bdaef33abb59bbaaa8b9..e19a7b4ecd666551d517c096db639b7a84fa4480 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -9,7 +9,7 @@
 <<setLocalPronouns $activeSlave>>
 <<setAssistantPronouns>>
 
-Your work is interrupted by $assistantName with an alert from the entrance to the penthouse.
+Your work is interrupted by $assistant.name with an alert from the entrance to the penthouse.
 <<if $assistant>>
 	"<<= properTitle()>>," _heA says, "you're going to want to see this." _HeA
 <<else>>
@@ -480,14 +480,14 @@ It isn't obvious how $he managed to escape, though no doubt you could review the
 	<</for>>
 	<<set $boomerangStats = 0>>
 	<<replace "#result">>
-		The penthouse opens, and $activeSlave.slaveName stumbles inside, sobbing $his thanks. $He's immediately conducted to the autosurgery for some quick cosmetic surgery, while you and $assistantName do the necessary work to falsify the arcology records and conceal $his origins. Even so, it would probably be wise to keep $him off public assignments for a while. In no time at all, $he's standing in front of your desk like any other new slave. $He waits obediently, knowing that it's in $his best interests not to mention anything out of the ordinary.
+		The penthouse opens, and $activeSlave.slaveName stumbles inside, sobbing $his thanks. $He's immediately conducted to the autosurgery for some quick cosmetic surgery, while you and $assistant.name do the necessary work to falsify the arcology records and conceal $his origins. Even so, it would probably be wise to keep $him off public assignments for a while. In no time at all, $he's standing in front of your desk like any other new slave. $He waits obediently, knowing that it's in $his best interests not to mention anything out of the ordinary.
 	<<include "New Slave Intro">>
 	<</replace>>
 <</link>> //This will cost <<print cashFormat(_ContractCost)>>.//
 <br><<link "Sell $him immediately">>
 	<<run cashX(_slaveCost, "slaveTransfer")>>
 	<<replace "#result">>
-		The penthouse opens, and $activeSlave.slaveName stumbles inside, sobbing $his thanks. $He's immediately conducted to the autosurgery for some quick cosmetic surgery, while you and $assistantName do the necessary work to falsify the arcology records and conceal $his origins. Before $he's even out from under anesthesia, $he's bundled off into one of the hundreds of slave shipments that move between arcologies every day. This time $he'll be sold far enough away that no matter how much of an escape artist $he is, you won't be seeing any more of $him. $He can whine elsewhere.
+		The penthouse opens, and $activeSlave.slaveName stumbles inside, sobbing $his thanks. $He's immediately conducted to the autosurgery for some quick cosmetic surgery, while you and $assistant.name do the necessary work to falsify the arcology records and conceal $his origins. Before $he's even out from under anesthesia, $he's bundled off into one of the hundreds of slave shipments that move between arcologies every day. This time $he'll be sold far enough away that no matter how much of an escape artist $he is, you won't be seeing any more of $him. $He can whine elsewhere.
 		<<set $boomerangStats = 0>>
 	<</replace>>
 <</link>> //This will bring in <<print cashFormat(_slaveCost)>>.//
diff --git a/src/uncategorized/reBrothelFunction.tw b/src/uncategorized/reBrothelFunction.tw
index d9231d2c74902a9e545b06ac612bcd74a3983547..aa9c07e51a93f08aaddd0772e17a3b36715816e5 100644
--- a/src/uncategorized/reBrothelFunction.tw
+++ b/src/uncategorized/reBrothelFunction.tw
@@ -3,7 +3,7 @@
 <<set $nextButton = "Continue">>
 <<set $nextLink = "RIE Eligibility Check">>
 
-$brothelNameCaps is a reputable establishment in $arcologies[0].name, a veritable bedrock to sexual life in your arcology. As is befitting of its position, requests to rent out your brothel for one function or another come across your desk with some regularity. On this particular day, $assistantName has laid out a number of potential clients for your perusal. Given the importance of $brothelNameCaps in the arcology's sex trade, it would be unwise to indulge more than one of these requests at this time.
+$brothelNameCaps is a reputable establishment in $arcologies[0].name, a veritable bedrock to sexual life in your arcology. As is befitting of its position, requests to rent out your brothel for one function or another come across your desk with some regularity. On this particular day, $assistant.name has laid out a number of potential clients for your perusal. Given the importance of $brothelNameCaps in the arcology's sex trade, it would be unwise to indulge more than one of these requests at this time.
 <br><br>
 One request comes to you written on a letterhead featuring the logo of a fellow arcology owner. She describes her husband's preference for your hard working brothel whores, whom he patronizes on his regular business trips to your arcology. Such indulgences have been a distraction to her husband of late, and she has dispatched him to undertake a task in your arcology that simply cannot go poorly. With this in mind, she beseeches you to close down your brothel for a single day out of solidarity for a fellow arcology owner — and for the significant sum of <<print cashFormat(10000)>>.
 <br><br>
diff --git a/src/uncategorized/reCitizenHookup.tw b/src/uncategorized/reCitizenHookup.tw
index ccfb3081442be6115c9ff9eceb15a14088065424..b710e363344bc58cf66915c40fda9a7301ac01da 100644
--- a/src/uncategorized/reCitizenHookup.tw
+++ b/src/uncategorized/reCitizenHookup.tw
@@ -79,7 +79,7 @@
 	<<set _FS = "none">>
 <</if>>
 
-At night, the best living areas in the arcology offer a constant mélange of selective entertainments. There's a perpetual social scrum of who is to be invited to what going on, and you occupy a preeminent place atop it, mostly aloof from the struggles of your citizens for recognition and influence. You're invited to almost everything, since everyone who lives here knows the value of being in favor with the owner of the arcology. Invitations to your parties, of course, are some of the most valuable social currency in the arcology and one of $assistantName's most important duties is to help you manage them without wasting your valuable time. It's not actually necessary for you to attend your own parties, since almost everyone will be glad to be seen in the entertainment area of the penthouse whether or not the propriet<<if $PC.title == 1>>or<<else>>ress<</if>> is actually present.
+At night, the best living areas in the arcology offer a constant mélange of selective entertainments. There's a perpetual social scrum of who is to be invited to what going on, and you occupy a preeminent place atop it, mostly aloof from the struggles of your citizens for recognition and influence. You're invited to almost everything, since everyone who lives here knows the value of being in favor with the owner of the arcology. Invitations to your parties, of course, are some of the most valuable social currency in the arcology and one of $assistant.name's most important duties is to help you manage them without wasting your valuable time. It's not actually necessary for you to attend your own parties, since almost everyone will be glad to be seen in the entertainment area of the penthouse whether or not the propriet<<if $PC.title == 1>>or<<else>>ress<</if>> is actually present.
 <br><br>
 But tonight, you've put in an appearance. Your citizens are drinking your <<if $arcologies[0].FSPastoralist != "unset">>milk<<elseif $arcologies[0].FSRestart != "unset">>finest alcohol<<else>>alcohol<</if>> and eating your food, though of course they helped pay for it through their rent. They're performing a complex dance of social dominance, and it all radiates around you, with complex unspoken rules of collective approval governing which citizens cycle past you for a word, and for how long. During a low point in the ebb and flow,
 <<switch _FS>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 721271841063d14bc4a0ac7742c478a9e2778ec1..4f18882ca0fdeb230e33a4f4956cb47d4e1f42c8 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -1225,13 +1225,13 @@
 <<switch $FSAcquisitionEvents>>
 <<case "Pastoralist">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. This proves to be right on the money in this case, though the $woman isn't too terribly bedraggled; $his situation must be recent. $He asks to be enslaved with the crushing sadness most such people experience during their last free hours. "I'm pregnant," $he says through tears. "I know I'm not that pretty, <<if $PC.title != 0>><<s>>ir<<else>>ma'am<</if>>. But," and $he brings $his sizable chest into view, "I've got pretty big boob<<s>>, and I <<s>>tarted giving milk ye<<s>>terday. I wa<<s>> <<s>>earching the net, and I <<s>>aw that you milk $women, <<if $PC.title != 0>><<s>>ir<<else>>ma'am<</if>>. It <<s>>eem<<s>> like a better life than getting fucked all the time."
 
 <<case "Pastoralist Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. You are understandably surprised when this turns out to not be the case; the $woman in the video call is modestly dressed, so $his newfound situation must be exceedingly recent. Nonetheless, $he asks to be enslaved with the same poignant sadness most people experience during their last free hours. "All my children are gone and my hu<<s>>band left me," $he says through tears. "I know I'm older than mo<<s>>t, <<if $PC.title != 0>><<s>>ir<<else>>ma'am<</if>>. But," $he says as $he brings $his motherly chest into view, "I've <<s>>till got pretty big brea<<s>>t<<s>>, and they <<s>>till give milk. One of my friend<<s>> told me that you milk $women, <<if $PC.title != 0>><<s>>ir<<else>>ma'am<</if>>. I can't do anything el<<s>>e to make a living."
 
@@ -1249,25 +1249,25 @@ It seems that in a man in their town made the mistake of marrying a $woman of an
 
 <<case "Subjugationist">>
 
-<<if $arcologyUpgrade.drones > 0>>Your security drones<<else>>Security guards in your employ<</if>> break up a minor disturbance on the lowest, poorest levels of the arcology without needing your direction, or indeed without even informing you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> is good enough at filtering incidents down to what you need to know that you typically leave minor things to _hisA discretion. This time $assistantName only informs you once it's apparent that that brawl left someone injured and unconscious.
+<<if $arcologyUpgrade.drones > 0>>Your security drones<<else>>Security guards in your employ<</if>> break up a minor disturbance on the lowest, poorest levels of the arcology without needing your direction, or indeed without even informing you. <<= capFirstChar($assistant.name)>> is good enough at filtering incidents down to what you need to know that you typically leave minor things to _hisA discretion. This time $assistant.name only informs you once it's apparent that that brawl left someone injured and unconscious.
 <br><br>
 It seems the violence was racially motivated. The $arcologies[0].FSSubjugationistRace victim was publicly sodomized and left bruised and bleeding, $his clothes torn off, beaten into insensibility, with anti-$arcologies[0].FSSubjugationistRace slogans written crudely across $his $activeSlave.skin skin. It seems $he came into the arcology despite the strong penalties for free $arcologies[0].FSSubjugationistRace subhumans found here. You can easily enslave $him in return for $his medical costs, though no one is likely to object to your enslaving one of $his kind, whatever the situation.
 
 <<case "Subjugationist Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 The caller is $arcologies[0].FSSubjugationistRace, and a particularly self-hating one at that. It seems $he came into the arcology despite the strong penalties for free $arcologies[0].FSSubjugationistRace subhumans found here in order to seek enslavement, a curious turn of events. You can easily enslave $him; no one is likely to object to your enslaving one of $his kind, especially when $he came so willingly.
 
 <<case "Gender Radicalist">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one is from a rather abused individual from one of the more traditionalist areas of the old world. It seems $he's heard of the new and interesting way gender is thought of in the Free Cities, and in $arcologies[0].name in particular. "Being your <<s>>lave ha<<s>> to be better than being a <<s>>ubhuman here," $he says. "Being your <<s>>e<<x>> <<s>>lave i<<s>> more a<<cc>>epted in your <<c>>ity than being me i<<s>> here."
 
 <<case "Gender Radicalist Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one is from a rather mature but otherwise visibly well-to-do individual from one of the more traditionalist areas of the old world. It seems $he's heard of the new and interesting way gender is thought of in the Free Cities, and in $arcologies[0].name in particular. "I've lived my whole life a<<s>> a <<s>>ubhuman here," $he says. "Being your <<s>>e<<x>> <<s>>lave i<<s>> more a<<cc>>epted in your <<c>>ity than being me i<<s>> here."
 
@@ -1285,61 +1285,61 @@ Having $him disappear discreetly into $arcologies[0].name would be a convenient
 
 <<case "Paternalist">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one is interesting, even by the standards of messages from people who want to become slaves. The individual is neither sick nor abused, and speaks with intelligence and directness. "I've heard a lot about how $arcologies[0].name treat<<s>> <<s>>lave<<s>>," $he says. "And, well, I don't know how clo<<s>>ely you watch the old world from where you are, but it'<<s>> pretty bad. Being <<s>>mart and driven out here doe<<s>>n't alway<<s>> keep you fed and clothed, or even alive. I'm <<s>>mart and driven, and I under<<s>>tand that might make me a Madam or a DJ or even a Head Girl in $arcologies[0].name. I'm not dumb enough to rely on that, but I'll take that chan<<c>>e."
 
 <<case "Paternalist Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one is interesting, even by the standards of messages from people who want to become slaves. The individual is a normal looking $woman, neither sick nor visibly abused. "I've heard a lot about how $arcologies[0].name treat<<s>> <<s>>lave<<s>>," $he says. "And, well, I don't know how clo<<s>>ely you watch the old world from where you are, but it'<<s>> pretty bad. <<S>>aving your whole life doesn't alway<<s>> keep you fed and clothed, or even alive. I never had much and now I have even le<<ss>>, and I'd rather live as your <<s>>lave in $arcologies[0].name than on the <<s>>treet<<s>> back home."
 
 <<case "Degradationist">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> does not typically permit anonymous messages through to you. If someone wishes to speak to you, they can do so under their own name and with their own face. _HeA makes an exception, however, for a message offering you a slave so long as you pay the costs of enslavement, nothing else.
+<<= capFirstChar($assistant.name)>> does not typically permit anonymous messages through to you. If someone wishes to speak to you, they can do so under their own name and with their own face. _HeA makes an exception, however, for a message offering you a slave so long as you pay the costs of enslavement, nothing else.
 <br><br>
-The face and voice are obscured by a petty anonymization program, the sort that can be obtained with five minutes' work in the shadier parts of the net. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> could crack it nearly instantaneously, but you hold _himA back a moment to avoid spooking your correspondent. You are rewarded with video of the subject of the proposed enslavement, and the simple statement "I hate this fucking bitch, and I want $him to suffer. Can't do it myself. You seem like the right _womanP to break the cunt."
+The face and voice are obscured by a petty anonymization program, the sort that can be obtained with five minutes' work in the shadier parts of the net. <<= capFirstChar($assistant.name)>> could crack it nearly instantaneously, but you hold _himA back a moment to avoid spooking your correspondent. You are rewarded with video of the subject of the proposed enslavement, and the simple statement "I hate this fucking bitch, and I want $him to suffer. Can't do it myself. You seem like the right _womanP to break the cunt."
 
 <<case "Degradationist Two">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> does not typically permit anonymous messages through to you. If someone wishes to speak to you, they can do so under their own name and with their own face. _HeA makes an exception, however, for a message offering you a slave so long as you pay the costs of enslavement, nothing else.
+<<= capFirstChar($assistant.name)>> does not typically permit anonymous messages through to you. If someone wishes to speak to you, they can do so under their own name and with their own face. _HeA makes an exception, however, for a message offering you a slave so long as you pay the costs of enslavement, nothing else.
 <br><br>
 In lieu of a face, a plain page of mostly text and a scant few pictures fills the screen and details a number of potential slaves for sale, though most of the merchandise seems visibly too damaged to be worthy of purchase. Yet, one of the slaves catches your eye — an older $woman covered in lashes, bruises and marks yet absent the dead-eyed expression of $his peers. The document claims $he has been in their possession longer than any of the other slaves, but has proven resistant to their breaking methods.
 
 <<case "Intellectual Dependency">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 The call comes in from a middle-class area. It appears that the tired looking woman placing the call has a special needs child and can no longer continue to provide the care $he requires. Having $him disappear discreetly into $arcologies[0].name would be a convenient way of resolving the situation. Your society's tastes for the mentally slow gives them a plausible way to salve their own consciences on abandoning their child, while, at the same time, giving $him a home where $he can thrive.
 
 <<case "Intellectual Dependency Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one, unusually, is voice-only. The caller seems extremely intoxicated as $he struggles to explain $his situation, and you're not far off on that assumption; $he overdosed on illicit drugs at a party and can't think straight any longer. $He apparently cannot remember where $he came from and is desperate for any sort of support, even if it means enslavement. It's not like $he has much freedom left with $his mind in tatters anyway.
 
 <<case "Slave Professionalism">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one is interesting, even by the standards of messages from people who want to become slaves. The individual is neither sick nor abused, and speaks with intelligence and directness. "I've heard a lot about how $arcologies[0].name value<<s>> e<<x>>perien<<c>>e," $he <<say>>s. "And, well, people are getting tired of <<s>>eeing my a<<ss>> in video<<s>> and money i<<s>> drying up fa<<s>>t. If I'm going to end up en<<s>>laved, it would be be<<s>>t if it were <<s>>omeone that could make u<<s>>e of the <<s>>kill<<s>> I've learned over my career that owned me. It would be such a wa<<s>>te of my talent<<s>> otherwi<<s>>e. Of cour<<s>>e, you may just lock me in a bo<<x>> and call it a day, but life'<<s>> a gamble <<s>>ome time<<s>> and my <<s>>y<<s>>tem <<s>>ay<<s>> thi<<s>> i<<s>> a winner."
 
 <<case "Slave Professionalism Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one is from another arcology, which is rather unusual. You are presented with a humble, though clearly well raised, free citizen. $He says directly, "I'm a <<s>>lave through and through. I won't wa<<s>>te your time, <<s>>o long <<s>>tory <<sh>>ort, my Ma<<s>>ter pa<<ss>>ed away re<<c>>ently and hi<<s>> suc<<c>>e<<ss>>or freed me. I wa<<s>> trained to be a <<s>>lave, I wa<<s>> bred to <<s>>erve my owner, and now I have no purpo<<s>>e in life. I offer my<<s>>elf to you, plea<<s>>e <<s>>ave me from thi<<s>> <<s>>o-called //freedom//."
 
 <<case "Body Purist">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one is from another arcology, which is rather unusual. You are presented with a rather normal-looking, if obviously poor, free citizen. $He says dejectedly, "I'm on my la<<s>>t few ¤ here, <<if $PC.title != 0>><<s>>ir<<else>>ma'am<</if>>. The owner here, he'<<s>> planning to en<<s>>lave me later today. I ju<<s>>t know it. He fill<<s>> hi<<s>> <<s>>lave<<s>> up with <<s>>ilicone until they look like fucking Barbie doll<<s>>." $He shivers fearfully. "You don't do that, right? If I have to be a fucktoy, I don't want to be cut up fir<<s>>t."
 
 <<case "Body Purist Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one is from one of the less prestigious slave schools, which is not in itself unusual, save that it comes directly from one of the graduating students. You are presented with a rather normal-looking slave<<= $girl>>. "I'm pa<<s>>t my majority," $he says happily. "I know I'm not that pretty, <<if $PC.title != 0>><<s>>ir<<else>>ma'am<</if>>. But," and $he pulls the camera back to reveal $his fully nude body, "I've never had any pla<<s>>tic in me, the <<s>>chool couldn't afford it anyway<<s>>. I wa<<s>> <<s>>earching the net, and I <<s>>aw that you like $women without <<s>>urgery, <<if $PC.title != 0>><<s>>ir<<else>>ma'am<</if>>. If I'm to be owned, I'd like it to be by <<s>>omeone like you who won't cut me open."
 
@@ -1351,103 +1351,103 @@ It seems he botched an implant operation on a free $woman. $He's still out, and
 
 <<case "Transformation Fetishist Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 The call comes in from an unusually well-to-do area. It appears that an aristocratic-looking man placing the call has fallen on hard times, and is doing the intelligent thing and staying ahead of his creditors by offering his trophy $wife into slavery. Enslaving $him will be costlier than usual, but it seems likely to be worth it. $He's finely aged and completed worked over under a surgeon's knife. $He's quite the implant queen, in fact.
 
 <<case "Slimness Enthusiast">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 The call comes in from an unusually well-to-do area. It appears that the aristocratic-looking $woman placing the call has fallen on hard times, and is doing the intelligent thing and staying ahead of $his creditors by offering $himself into slavery. Enslaving $him will be costlier than usual, but it seems likely to be worth it. $He's well-spoken and seems both educated and intelligent. Even better, despite being middle-aged, $he's extremely well-preserved, a tall, slim and graceful beauty with a face that must be the envy of <<= $girl>>s half $his age. $He knows all this $himself, and <<say>>s, "I hear you appre<<c>>iate a <<s>>lender $woman; if I'm going down into <<s>>lavery, <<if $PC.title != 0>><<s>>ir<<else>>ma'am<</if>>, I'd be happy to avoid too many implant<<s>>. I under<<s>>tand $arcologies[0].name i<<s>> a fine pla<<c>>e for <<s>>omeone in my <<s>>ituation."
 
 <<case "Slimness Enthusiast Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. You are understandably surprised when this turns out to not be the case; the young $woman in the video call is reasonably well dressed, so $his newfound situation must be exceedingly recent. Without hesitation $he immediately asks to be enslaved. "My boyfriend want<<s>> to turn me into <<s>>ome <<s>>ort of bimbo," $he <<say>>s through $his tears. "I found all the <<s>>urgery bro<<ch>>ure<<s>> that he hid, <<if $PC.title != 0>><<s>>ir<<else>>ma'am<</if>>. But," and $he brings $his slender chest, though covered by $his top, into view, "I don't want to be cut up and filled with pla<<s>>tic. One of my friend<<s>> told me that you care about a $woman with a good figure, <<if $PC.title != 0>><<s>>ir<<else>>ma'am<</if>>. I <<sh>>ould have never <<s>>old my<<s>>elf to that ba<<s>>tard."
 
 <<case "Asset Expansionist">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 The person placing the call is physically quite unusual, to the point of looking distinctly unnatural. $He has absolutely enormous tits, an ass to match, and is generally plush all over; yet despite being able to compete with the lushest mother in the curves department, $he appears to be very young. $He explains $himself quickly. "<<if $PC.title != 0>><<S>>ir<<else>>Ma'am<</if>>, I ju<<s>>t turned 19. Where I'm from, that mean<<s>> I'm very likely to be en<<s>>laved one way or another. <<S>>o, I've been taking off-market hormone<<s>> for a couple of year<<s>> to rai<<s>>e my<<s>>elf out of the gutter a<<s>> far a<<s>> who might take me. I hear life i<<s>> better if you're a valuable <<s>>lave." $He leans into the camera, displaying a solid acre of cleavage. "Can I be your valuable <<s>>lave?"
 
 <<case "Asset Expansionist Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 The person placing the call is physically quite unusual, to the point of looking distinctly unnatural. $He has absolutely enormous tits, an ass to match, and is generally plush all over; perhaps one of the lushest mothers in the curves department you've ever seen. $He explains $himself quickly. "<<if $PC.title != 0>><<S>>ir<<else>>Ma'am<</if>>, I'm not a young $woman. Where I'm from, being thi<<s>> old and unmarried mean<<s>> I'm very likely to be en<<s>>laved one way or another. But I've alway<<s>> had big brea<<s>>t<<s>>. Well, big everything really. I hear life i<<s>> better if you're a plu<<sh>> <<s>>lave." $He leans into the camera, displaying a solid acre of cleavage. "Can I be your plu<<sh>> <<s>>lave?"
 
 <<case "Youth Preferentialist">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one, unusually, is voice-only. The caller explains why in a painfully quiet voice: $he's turning $activeSlave.actualAge in the next few days, and $he's fairly certain $his family is about to sell $him into slavery. The mixed notes of despair, apathy, and fear in $his voice are heartrending, even to you. $He begs you to make the necessary arrangements to enslave $him. $He's heard about you and how you like young <<= $girl>>s, and $he's also heard about brothels and arcades. There is very little hope discernible in $his tone or the pictures $he sends you.
 
 <<case "Youth Preferentialist Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one, unusually, is voice-only. The caller explains why in an unusually upbeat voice: $he turned 18 a few days ago, and $he's fairly certain $his family is expecting $him to make something of $his life to help support them. The apathy to $his family's wishes is readily evident in $his tone of voice. $He begs you to make the necessary arrangements to enslave $him. $He's heard about you and how you like younger <<= $girl>>s, and that you take care of all the decision-making for your slaves. There's a lot of hope in $his tone, $he clearly wants an escape from responsibility — even if that means becoming a slave.
 
 <<case "Maturity Preferentialist">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
-And this one is a rare one indeed. It's a personal file, and you suppress the urge to see whether $assistantName is bugged and has misfiled an application for employment. The beautiful older $woman depicted has included a resume listing $his skills, and a clever selection of photographs: tasteful shots of $him in nice makeup and a fashionable business skirt, and fully nude mirror shots, flaws and all. Curious, you place a video call and get an immediate answer. It seems that 'personal circumstances' that $he saw coming are forcing $him to accept enslavement. $He had some weeks of warning, however, and seems to have made use of the time to find an arcology owner that treats $women of $his age well, and then to make $himself as appealing as possible in the hope you'll keep $him.
+And this one is a rare one indeed. It's a personal file, and you suppress the urge to see whether $assistant.name is bugged and has misfiled an application for employment. The beautiful older $woman depicted has included a resume listing $his skills, and a clever selection of photographs: tasteful shots of $him in nice makeup and a fashionable business skirt, and fully nude mirror shots, flaws and all. Curious, you place a video call and get an immediate answer. It seems that 'personal circumstances' that $he saw coming are forcing $him to accept enslavement. $He had some weeks of warning, however, and seems to have made use of the time to find an arcology owner that treats $women of $his age well, and then to make $himself as appealing as possible in the hope you'll keep $him.
 
 <<case "Maturity Preferentialist Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 The call comes in from a middle-class area. It appears that the youthful man placing the call has a failing business, and is leveraging his last remaining asset by selling his stately-looking mother into slavery. Enslaving $him will be costlier than usual, but it seems likely to be worth it. From the dossier $his son forwarded to you, $he's both educated and intelligent, both relics of $his impressive pedigree. Even better, $he's aged like a fine wine, a short, stacked and attractive beauty with a face and rack that must be the envy of <<= $girl>>s half $his age. $He's aware of the situation at hand, and peeks in from the corner of the screen to say, "I hear you appre<<c>>iate a mature $woman; if I'm going down into <<s>>lavery, <<if $PC.title != 0>><<s>>ir<<else>>ma'am<</if>>, I hope for your <<s>>ake that you know how to treat a $woman of my caliber."
 
 <<case "Petite Admiration">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one, unusually, is voice-only. The caller explains why in a painfully quiet voice: slavers have been scoping out the area for prime catches and $he feels like $he may be on their list, especially given $his small stature and relative inability to escape. The mixed notes of despair, apathy, and fear in $his voice are heartrending, even to you. $He begs you to make the necessary arrangements to enslave $him. $He's heard about you and how you like petite <<= $girl>>s, and $he's also heard about brothels and arcades. There is very little hope discernible in $his tone or the pictures $he sends you.
 
 <<case "Petite Admiration Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 The person placing the call is physically quite unusual, to the point of looking distinctly unnatural, given that they are a dwarf sporting proportinally massive implants. $He crosses $his arms under $his bust and begins a rather haughty speal, given $his size. "Now don't go thinking of calling me a midget, thi<<s>> here i<<s>> one-hundred per<<c>>ent <<sh>>ort //and// <<s>>tacked, wouldn't you agree?" $He flexes back and grabs $his fat rear, $his blouse practically exploding in the process. "What you <<s>>ee here is all your<<s>> if you a<<s>>k ni<<c>>ely. <<S>>ee, I've hard a pretty hard life," $he <<say>>s while pantomiming sucking dick, "and I'm looking to retire into lu<<x>>ury. From what I've heard, a <<s>>tar like me may a<<s>> well have a pede<<s>>tal erected in my honor in $arcologies[0].name <<s>>o that all can ba<<s>>k in my curvy glory." $He does a split, giving you a look straight into $his shaved pussy. "<<S>>o how about you invite me in <<s>>o that I can welcome //you// in?"
 
 <<case "Statuesque Glorification">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one, unusually, is voice-only. The caller explains why in a painfully quiet voice: slavers have been scoping out the area for prime catches and, as a genetic giant, $he knows they'll be gunning for $him. The mixed notes of despair, apathy, and fear in $his voice are heartrending, even to you. $He begs you to make the necessary arrangements to enslave $him. $He's heard about you and how you like tall <<= $girl>>s, and $he's also heard about brothels and arcades. There is very little hope discernible in $his tone or the pictures $he sends you.
 
 <<case "Statuesque Glorification Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one is interesting, even by the standards of messages from people who want to become slaves. The individual is neither sick nor abused, and speaks with directness. "I'm going to be out of a home by the end of the week and more than likely falling into <<s>>lavery not long after," $he sighs. "And, well, I heard you like tall <<= $girl>>s and $arcologies[0].name can be lenient when it comes to high heel<<s>> pu<<sh>>ing people over the height thre<<sh>>old, <<s>>o I was hoping you'd take pity on a $girl down on <<his>> luck even though $he'<<s>> not quite up to <<s>>tandard<<s>>."
 
 <<case "Physical Idealist">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 The subject line of the latest is badly misspelled, but the accompanying profile image is impressive, if trite, depicting the sender's massive bicep flexing, veins playing across the striated muscle. Getting $his situation out of $him proves to be something of a chore, since $he scarcely has two functional neurons to rub together. It seems that $he's on a fair number of drugs, not limited to aphrodisiacs and steroids, that $he can't afford them, and that $he has a distorted image of $arcologies[0].name as a sort of muscle-worshipping Valhalla of sex and gains. Hearing $him describe $his idea of life as one of your slaves, you understand why this idiot wants to be enslaved. If $his idea of slave life were accurate, //you'd// want to be enslaved.
 
 <<case "Physical Idealist Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
-And this one is a rare one indeed. It's a personal file, and you suppress the urge to see whether $assistantName is bugged and has misfiled an application for employment. The muscular $woman depicted has included a resume listing $his various physical achievements, and a clever selection of photographs: tantalizing shots of $him in skimpy workout clothes, and fully nude mirror shots of $him flexing and posing. Curious, you place a video call and get an immediate answer. It seems that $he's determined that life as a slave is the easiest means to access the drugs and steroids $he needs to continue making massive gains. $He had some weeks of planning, however, and seems to have made use of the time to find an arcology owner that values the pursuit of the physical ideal, and then to make $himself as appealing as possible in the hope you'll take $him.
+And this one is a rare one indeed. It's a personal file, and you suppress the urge to see whether $assistant.name is bugged and has misfiled an application for employment. The muscular $woman depicted has included a resume listing $his various physical achievements, and a clever selection of photographs: tantalizing shots of $him in skimpy workout clothes, and fully nude mirror shots of $him flexing and posing. Curious, you place a video call and get an immediate answer. It seems that $he's determined that life as a slave is the easiest means to access the drugs and steroids $he needs to continue making massive gains. $He had some weeks of planning, however, and seems to have made use of the time to find an arcology owner that values the pursuit of the physical ideal, and then to make $himself as appealing as possible in the hope you'll take $him.
 
 <<case "Hedonistic Decadence">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one is coming from inside your own arcology, from a tourist interested in permanent residence even if it means enslavement. You have them bought to your office to hear them out. A heavily pregnant $girl waddles into your office, $his distended belly a stark contrast to $his relative thinness. $He smiles, $his many piercings clicking against each other in the process, and pats $his middle. "It'<<s>> food, not a baby. I really enjoyed <<s>>taying in your arcology, I mean, I live like thi<<s>> back home, but everyone alway<<s>> pick<<s>> on me for eating <<s>>o much and never getting off my a<<ss>> to work. I can't find a lover either, no one can <<s>>ati<<s>>fy me anymore..." $He exposes $his gaping asshole to you. "I overdid it with the toy<<s>>. It felt <<s>>o good, I couldn't <<s>>top going bigger. Once I reali<<z>>ed that, I <<s>>tarted getting pier<<c>>ing<<s>> and eating, anything to make me feel better. But on<<c>>e I arrived here, I never felt <<s>>o a<<cc>>epted before, everyone wa<<s>> enjoying them<<s>>elve<<s>> however they wanted. <<S>>o plea<<s>>e, let me <<s>>tay, I'll do everything you can think of."
 
 <<case "Hedonistic Decadence Two">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one is interesting, even by the standards of messages from people who want to become slaves. The individual is neither sick nor abused, and speaks with directness. "I'm what you'd call 'vanilla'," $he sighs. "And, well, I want to e<<x>>pand my hori<<z>>on<<s>> and I heard how much fun people have in your arcology. I'm your<<s>> to e<<x>>periment with.
 
@@ -1477,7 +1477,7 @@ This call is coming from a public kiosk, which is usually an indication that the
 
 <<case "Chattel Religionist">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This one is a little odd; it merely begs you for an in person audience and offers you the sender's "unworthy body" as payment for granting it. You surreptitiously scan $him when $he arrives to make sure this isn't an attack of some kind, but $he's just a normal $girl wearing conservative clothing. When admitted to your office, $he immediately strips off $his clothing, gets down before your desk, and presses $his forehead to the floor. "<<if $PC.title != 0>><<S>>ir<<else>>Ma'am<</if>>," $he says, "plea<<s>>e a<<cc>>ept me a<<s>> your <<s>>lave. I am a wretched whore, filled with <<s>>in, and freedom i<<s>> a burden to me. Plea<<s>>e free me from thi<<s>> torment and take me into your <<s>>ervi<<c>>e."
 
@@ -1489,33 +1489,33 @@ It seems that the Chattel Religionists have all but taken over their town and dr
 
 <<case "Roman Revivalist">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 The call comes in from an old world university. The caller is a young $woman who explains that $he's struggling with extreme student debt, and has recently graduated with a history degree that $he can't seem to turn into gainful employment. $He gushes at length about how much $he enjoyed ancient history, and how $he's heard all about your ideas about reviving ancient culture in the Free Cities. $He sees joining your household as a romantic way out of $his difficult situation. Apparently $he read all the idyllic parts of history and somehow missed out on learning about the salt mines and slave galleys. $He's not terribly pretty and seems socially awkward, but that's likely to have its side benefits. $He nervously sends you a complete dossier on $himself.
 
 <<case "Aztec Revivalist">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 The call comes in from an old world trading colony. The caller is a $woman who humbly explains how tired $he is from all the godless people and terrible conditions, and expresses interest to join the old empires. $He probably knows only of the incredible architecture and the military accomplishments that are advertised in vids. Though the sacrifice and collaring of slaves is no secret, most people never find out the real truth to what you do. Nevertheless $he's incredibly willing, so much so that $he almost signs $himself off to you by accident. $His file is displayed in front if you, pending your reaction.
 
 <<case "Edo Revivalist">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 The caller is a young $woman who struggles to stop $himself from peppering $his socially awkward babble with poorly pronounced Japanese colloquialisms. Insofar as you can parse $his nonsense, $he seems to have gotten a hilariously romanticized version of feudal Japan from somewhere, and is willing to submit to enslavement in order to join your revivalist arcology. Whoever's out there spreading this rubbish, you owe them one; this serf is in for an extremely rude awakening.
 
 <<case "Arabian Revivalist">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 The call comes in from an old world university. The caller, surprisingly, is a beautiful $woman in $his thirties who speaks with a richly lilting accent and a literary vocabulary. "I'm afraid," $he says sadly, "it'<<s>> come to <<s>>lavery, for me. I am no longer a $girl, but I can make <<s>>ome claim to beauty. I know many <<s>>torie<<s>> and can tell them cleverly; I can <<s>>ing and dan<<c>>e well. I know you are not looking for a <<Sch>>ehera<<z>>ade, but I could play her part. Nor am I naïve; I know the <<S>>ultan enjoyed her body a<<s>> well a<<s>> her wit, and I am not un<<s>>killed in tho<<s>>e re<<s>>pect<<s>>, either." $He looks you straight in the eye. "May I come into your harem? I will do my be<<s>>t to brighten it."
 
 <<case "Chinese Revivalist">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
-The call comes in from an office, and you suppress the urge to check whether $assistantName has misidentified a business communication. The caller is a middle-aged $woman, not unattractive, whose face is lined with stress and worry. $He draws $himself up and says, "I would like to apply to be your <<s>>lave." There is a flash of bitter amusement at the absurd statement, but $he continues, "Bu<<s>>ine<<ss>> <<c>>ircum<<s>>tan<<c>>e<<s>> make it inevitable. I have con<<s>>iderable <<s>>kill<<s>> and e<<x>>perien<<c>>e, and it is my under<<s>>tanding that you value <<s>>uch thing<<s>>." $He forwards $his qualifications: they are comprehensive and open, including $his sexual skills as if they were merely another business asset. Which, in a way, they are.
+The call comes in from an office, and you suppress the urge to check whether $assistant.name has misidentified a business communication. The caller is a middle-aged $woman, not unattractive, whose face is lined with stress and worry. $He draws $himself up and says, "I would like to apply to be your <<s>>lave." There is a flash of bitter amusement at the absurd statement, but $he continues, "Bu<<s>>ine<<ss>> <<c>>ircum<<s>>tan<<c>>e<<s>> make it inevitable. I have con<<s>>iderable <<s>>kill<<s>> and e<<x>>perien<<c>>e, and it is my under<<s>>tanding that you value <<s>>uch thing<<s>>." $He forwards $his qualifications: they are comprehensive and open, including $his sexual skills as if they were merely another business asset. Which, in a way, they are.
 
 <</switch>>
 
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
index 2b2b0bfb8622dd647782c1977c92604c9d9db565..c361166f0e215351a54073a535ffd7407965412e 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
@@ -31,7 +31,7 @@
 <<set $activeSlave.relationship = 4>>
 <<set $activeSlave.relationshipTarget = $activeSlave.ID + 1000>>
 
-<<set _oppositeSex = $seeDicks > 0 && $seeDicks < 100 && (random(1, 4) <= 3)>> 
+<<set _oppositeSex = $seeDicks > 0 && $seeDicks < 100 && (random(1, 4) <= 3)>>
 <<set _secondSlave = generateRelatedSlave($activeSlave, "sibling", _oppositeSex)>>
 <<set _secondSlave.relationship = 4>>
 <<set _secondSlave.relationshipTarget = $activeSlave.ID>>
@@ -68,7 +68,7 @@
 
 <<setAssistantPronouns>>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 <br><br>
 This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. In this case, however, the story is more unusual — the callers seem stressed, but otherwise normal. They haltingly and quietly explain, with many nervous glances off-camera to ensure they are not overheard, that they are both siblings and lovers, and their attempts to keep the truth of the nature of their relationship from their friends, family, and society at large have failed. They had heard of $arcologies[0].name's reverence for incestuous relationships, and have managed to talk themselves into the questionable conclusion that their only chance to be together was for them to sell themselves to someone who would not just accept but encourage their incest — namely, you.
 <br><br>
diff --git a/src/uncategorized/reFSNonconformist.tw b/src/uncategorized/reFSNonconformist.tw
index 77cfadf425c093b6cf7d46022b381377dd29ef50..b132fe1277ab8bc4e394ef90f1e007d2eb26a42d 100644
--- a/src/uncategorized/reFSNonconformist.tw
+++ b/src/uncategorized/reFSNonconformist.tw
@@ -67,9 +67,9 @@
 	involved in your Revivalist vision. They're looking quite grim, an unusual mood for a group of oligarchs who partake of your serene confidence that your arcology is coming into a place as stable and long-lived as that of Ancient Egypt,
 <</if>>
 <<if $arcologies[0].FSRestart != "unset">>
-	so you hear them out. Apparently, they're here about a peer, another member of the Elite, who has chosen to perform certain undesirable actions. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> helpfully supplies a biography, but you were previously aware of the situation.
+	so you hear them out. Apparently, they're here about a peer, another member of the Elite, who has chosen to perform certain undesirable actions. <<= capFirstChar($assistant.name)>> helpfully supplies a biography, but you were previously aware of the situation.
 <<else>>
-	so you hear them out. Apparently, they're here about a peer, a fellow citizen with money and power who does not support your vision for the arcology's future. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> helpfully supplies a biography, but you were previously aware of the situation.
+	so you hear them out. Apparently, they're here about a peer, a fellow citizen with money and power who does not support your vision for the arcology's future. <<= capFirstChar($assistant.name)>> helpfully supplies a biography, but you were previously aware of the situation.
 <</if>>
 <br><br>
 The nonconformist
diff --git a/src/uncategorized/reFemaleArcologyOwner.tw b/src/uncategorized/reFemaleArcologyOwner.tw
index 7b90f462a2c6d9f789b96ef2c406352ba9394e52..0df4f0eb90fea2ca9b23ab97df357ad2a84f656f 100644
--- a/src/uncategorized/reFemaleArcologyOwner.tw
+++ b/src/uncategorized/reFemaleArcologyOwner.tw
@@ -17,7 +17,7 @@ She strikes a fine balance in conversation with you, firm enough for a rising wo
 <</link>>
 <br><<link "Walk past her and out onto an unoccupied balcony">>
 	<<replace "#result">>
-	You walk past her and out onto a balcony. She politely disengages herself and follows, meeting your gaze with a twinkle in her eye. You start talking of nothing of real consequence, but you find that you do have a fair amount to discuss and joke about, since there are oddities to your life that only another slaveowning arcology owner can really understand. You discover that she is very willing to share $PC.refreshment, and you break out some of your best. The party takes notice of your tête-à-tête, but her judgment was obviously correct. <<if $PC.title == 0>>You are a pair of powerful women who are very obviously in the early stages of an assignation, and it's hard to tell which of you excites more envy.<<else>>Rather than looking down on her, the other prominent guests seem respectfully envious of her access to you.<</if>> This is still the case even when she starts to soften her body language, leaning into you, brushing against you, and more. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> cleared your suite long ago, so when she finally nudges her hip against yours and does not take it away, you take her by the hand and lead her there. She stops you with a hand at the door to the suite and then strips off her suit piece by piece, revealing a triathlete's tanned and sculpted body. You crush her naked form in your still-clothed arms, and she softens into you, whispering, "You have no idea how relaxing this is." <<if $PC.title == 1>>It's clear it's been a long time since she's let someone else take the lead,<<else>>She's obviously an occasional lesbian, at best,<</if>> and she's awkward as a girl at times. She leaves a few hours later with a satisfied expression, giving you a kiss on her way out in full public view. @@.green;Your reputation has greatly improved.@@
+	You walk past her and out onto a balcony. She politely disengages herself and follows, meeting your gaze with a twinkle in her eye. You start talking of nothing of real consequence, but you find that you do have a fair amount to discuss and joke about, since there are oddities to your life that only another slaveowning arcology owner can really understand. You discover that she is very willing to share $PC.refreshment, and you break out some of your best. The party takes notice of your tête-à-tête, but her judgment was obviously correct. <<if $PC.title == 0>>You are a pair of powerful women who are very obviously in the early stages of an assignation, and it's hard to tell which of you excites more envy.<<else>>Rather than looking down on her, the other prominent guests seem respectfully envious of her access to you.<</if>> This is still the case even when she starts to soften her body language, leaning into you, brushing against you, and more. <<= capFirstChar($assistant.name)>> cleared your suite long ago, so when she finally nudges her hip against yours and does not take it away, you take her by the hand and lead her there. She stops you with a hand at the door to the suite and then strips off her suit piece by piece, revealing a triathlete's tanned and sculpted body. You crush her naked form in your still-clothed arms, and she softens into you, whispering, "You have no idea how relaxing this is." <<if $PC.title == 1>>It's clear it's been a long time since she's let someone else take the lead,<<else>>She's obviously an occasional lesbian, at best,<</if>> and she's awkward as a girl at times. She leaves a few hours later with a satisfied expression, giving you a kiss on her way out in full public view. @@.green;Your reputation has greatly improved.@@
 	<<run repX(5000, "event")>>
 	<<set $desc = "a perfumed thank-you note from a female arcology owner of your acquaintance">>
 	<<set $trinkets.push($desc)>>
@@ -26,7 +26,7 @@ She strikes a fine balance in conversation with you, firm enough for a rising wo
 <<if $mercenaries > 0>>
 <br><<link "Quickly arrange an anonymous night out for her">>
 	<<replace "#result">>
-	You immediately enlist $assistantName to help you make some hasty preparations, and then send her a message asking her if she'd like to spend a night out with you, as a couple of unremarkable citizens. She glances at you with a curious expression, and you direct her to a side room. She finds you there, changing into the heavy, anonymizing armor of one of your mercenaries; you have a female suit for her, too. Once you're both suited up, you move to show her how to activate the face-obscuring helmet, but you find that she's already got it on and active. "This," she says, "is either the best or the stupidest date idea I have ever heard. Let's fucking do this." You pass a mercenary on your way out onto the club, and he cannot resist giving you a thumbs up, which your fellow arcology owner fortunately fails to notice. You patrol for a while, using internal comms to joke about life as an arcology owner, something she clearly gets to do too infrequently. You don't mind the chance, either. Your mercenaries frequently spend time together off duty, so nobody sees anything unusual about a <<if $PC.title == 1>>male and female<<else>>couple of ladies<</if>> in mercenary armor sharing a milkshake at a dairy bar, even when they start to engage in increasingly rough public flirting, armor and all. Later, your slaves are obliged to pick up and sort a trail of discarded armor pieces leading from the entry to your penthouse all the way to your suite, which is now emitting the indistinct sounds of very energetic sex. A few hours later, when you're showering up together so she can head back to her domain, she looks up at you and says seriously, "That was pretty fun. If things ever go to shit, I wouldn't mind wearing that armor for real." Your mercenaries cannot keep their mouths shut, for once, and the almost unbelievably juicy story of the arcology owners wearing borrowed armor to go on an anonymous <<if $PC.title == 0>>lesbian <</if>>date spreads like wildfire. @@.green;Your reputation has greatly improved.@@
+	You immediately enlist $assistant.name to help you make some hasty preparations, and then send her a message asking her if she'd like to spend a night out with you, as a couple of unremarkable citizens. She glances at you with a curious expression, and you direct her to a side room. She finds you there, changing into the heavy, anonymizing armor of one of your mercenaries; you have a female suit for her, too. Once you're both suited up, you move to show her how to activate the face-obscuring helmet, but you find that she's already got it on and active. "This," she says, "is either the best or the stupidest date idea I have ever heard. Let's fucking do this." You pass a mercenary on your way out onto the club, and he cannot resist giving you a thumbs up, which your fellow arcology owner fortunately fails to notice. You patrol for a while, using internal comms to joke about life as an arcology owner, something she clearly gets to do too infrequently. You don't mind the chance, either. Your mercenaries frequently spend time together off duty, so nobody sees anything unusual about a <<if $PC.title == 1>>male and female<<else>>couple of ladies<</if>> in mercenary armor sharing a milkshake at a dairy bar, even when they start to engage in increasingly rough public flirting, armor and all. Later, your slaves are obliged to pick up and sort a trail of discarded armor pieces leading from the entry to your penthouse all the way to your suite, which is now emitting the indistinct sounds of very energetic sex. A few hours later, when you're showering up together so she can head back to her domain, she looks up at you and says seriously, "That was pretty fun. If things ever go to shit, I wouldn't mind wearing that armor for real." Your mercenaries cannot keep their mouths shut, for once, and the almost unbelievably juicy story of the arcology owners wearing borrowed armor to go on an anonymous <<if $PC.title == 0>>lesbian <</if>>date spreads like wildfire. @@.green;Your reputation has greatly improved.@@
 	<<set $desc = "a cute thank-you note from a female arcology owner of your acquaintance">>
 	<<set $trinkets.push($desc)>>
 	<<run repX(5000, "event")>>
diff --git a/src/uncategorized/reHGReplacement.tw b/src/uncategorized/reHGReplacement.tw
index b7c4efd7639a4e01b1d3ce2f2736fe8d5fe79741..3b6877ece92b7ee88523b33d1d5b60174c6a9853 100644
--- a/src/uncategorized/reHGReplacement.tw
+++ b/src/uncategorized/reHGReplacement.tw
@@ -43,7 +43,7 @@ When $HeadGirl.slaveName leaves, $he clears $his throat nervously. $He gathers $
 	<<link "$He's right">>
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
-			After giving the matter some consideration, you agree, instructing $assistantName that $activeSlave.slaveName is now the Head Girl. $activeSlave.slaveName is @@.hotpink;overjoyed,@@ and bounces to $his feet, clearly very eager to begin. You caution $him that $he is not to undermine $HeadGirl.slaveName by letting anyone know why you decided to change Head Girls. $He nods obediently. As far as $HeadGirl.slaveName knows, it's just a standard change of Head Girls, and _he2's too good a slave to let it affect _him2 seriously.
+			After giving the matter some consideration, you agree, instructing $assistant.name that $activeSlave.slaveName is now the Head Girl. $activeSlave.slaveName is @@.hotpink;overjoyed,@@ and bounces to $his feet, clearly very eager to begin. You caution $him that $he is not to undermine $HeadGirl.slaveName by letting anyone know why you decided to change Head Girls. $He nods obediently. As far as $HeadGirl.slaveName knows, it's just a standard change of Head Girls, and _he2's too good a slave to let it affect _him2 seriously.
 			<<set $activeSlave.devotion += 5>>
 			<<= assignJob($activeSlave, "be your Head Girl")>>
 		<</replace>>
@@ -59,7 +59,7 @@ When $HeadGirl.slaveName leaves, $he clears $his throat nervously. $He gathers $
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
 			<<run Enunciate($HeadGirl)>>
-			You page $HeadGirl.slaveName, telling _him2 to get back up to your office. $activeSlave.slaveName hears you, of course, and stiffens with fear. $He knows $he's in trouble, but $he doesn't yet know how much. You tell $HeadGirl.slaveName to have a seat next to $activeSlave.slaveName on the couch, and instruct $assistantName to replay the last five minutes of the feeds from your office on a wallscreen. $activeSlave.slaveName's<<if $activeSlave.lips > 40>> pillowlike<</if>> lower lip begins to tremble at this, and $he can barely manage to keep $his gaze on the fatal replay of $his attempt to convince you to replace $HeadGirl.slaveName with $him. $HeadGirl.slaveName, who is no fool, is not surprised by this, but the replay still angers _him2. As it rolls on, _his2 hands begin to roam across $activeSlave.slaveName, who winces at _his2 touch. About halfway through, $HeadGirl.slaveName looks straight at you and cruelly pinches one of $activeSlave.slaveName's nipples. You respond to the nonverbal question with a silent nod, and $HeadGirl.slaveName smiles briefly at you. Then, _he2 sticks _his2 tongue in $activeSlave.slaveName's ear. The poor slave starts at the warm, wet intrusion, but knows better than to try to resist. $He closes $his eyes tight.
+			You page $HeadGirl.slaveName, telling _him2 to get back up to your office. $activeSlave.slaveName hears you, of course, and stiffens with fear. $He knows $he's in trouble, but $he doesn't yet know how much. You tell $HeadGirl.slaveName to have a seat next to $activeSlave.slaveName on the couch, and instruct $assistant.name to replay the last five minutes of the feeds from your office on a wallscreen. $activeSlave.slaveName's<<if $activeSlave.lips > 40>> pillowlike<</if>> lower lip begins to tremble at this, and $he can barely manage to keep $his gaze on the fatal replay of $his attempt to convince you to replace $HeadGirl.slaveName with $him. $HeadGirl.slaveName, who is no fool, is not surprised by this, but the replay still angers _him2. As it rolls on, _his2 hands begin to roam across $activeSlave.slaveName, who winces at _his2 touch. About halfway through, $HeadGirl.slaveName looks straight at you and cruelly pinches one of $activeSlave.slaveName's nipples. You respond to the nonverbal question with a silent nod, and $HeadGirl.slaveName smiles briefly at you. Then, _he2 sticks _his2 tongue in $activeSlave.slaveName's ear. The poor slave starts at the warm, wet intrusion, but knows better than to try to resist. $He closes $his eyes tight.
 			<br><br>
 			$HeadGirl.slaveName hops off the couch, gets down in front of _his2 victim, and shoves $his legs apart. $activeSlave.slaveName scrunches up $his face, expecting something agonizing to happen to $his <<if $activeSlave.dick == 0>>pussy, but $HeadGirl.slaveName shocks $him by starting to hungrily eat $him out.<<else>>cock, but $HeadGirl.slaveName shocks $him by giving $him a lush blowjob.<</if>> $activeSlave.slaveName clearly expects a trap, but $HeadGirl.slaveName's attentions slowly distract $him. When $he's on the very verge of orgasm, your Head Girl suddenly stops and <<if $activeSlave.dick == 0>>pinches the $girl's pussylips,<<else>>tugs the $girl's cock downward by its head,<</if>> not painfully, but hard enough to communicate threat. $activeSlave.slaveName, shocked out of $his pleasure, looks down at _him2. $HeadGirl.slaveName <<say>>s menacingly, "Bitch, if you orga<<s>>m, I'm going to fucking de<<s>>troy you." Then _hes goes back to giving $activeSlave.slaveName oral. $activeSlave.slaveName begins to cry, realizing how comprehensively fucked $he is.
 			<br><br>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 8d7215312f246d6947a65ab825e65fdd3a0f79f2..5419915e946675888d07aa2b63fe513b8c93aa25 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -331,50 +331,50 @@
 
 <<case "addict">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Criminals are usually either too angry, too ignorant, or too stupid to understand the impossibility of successful petty crime. This is the latter situation; a $girl suffering severe aphrodisiac withdrawal has attempted to break into a store that sells the stuff. $He's now lying <<if $seePee == 1>>in a pool of $his own urine<<else>>face-down on the pavement<</if>> with a taser round stuck in $his ass; the drone responsible is hovering helpfully nearby, hitting $him with another shock whenever $he does more than twitch.
+<<= capFirstChar($assistant.name)>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Criminals are usually either too angry, too ignorant, or too stupid to understand the impossibility of successful petty crime. This is the latter situation; a $girl suffering severe aphrodisiac withdrawal has attempted to break into a store that sells the stuff. $He's now lying <<if $seePee == 1>>in a pool of $his own urine<<else>>face-down on the pavement<</if>> with a taser round stuck in $his ass; the drone responsible is hovering helpfully nearby, hitting $him with another shock whenever $he does more than twitch.
 
 <<case "escapee">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. This is a simple case of vagrancy; sleeping on the streets (due to penury rather than inebriation) breaks an implicit contract all visitors to the arcology sign by coming here. The criminal is anything but usual, however. $He bears signs of extreme hormone manipulation over a long period, and has had $his Achilles tendons clipped. Camera records show $him crawling in with a cargo shipment. $He's clad in rags, and you cannot find any record of $him anywhere. The growing crowd is convinced $he's an escaped slave, and is growing ugly.
+<<= capFirstChar($assistant.name)>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. This is a simple case of vagrancy; sleeping on the streets (due to penury rather than inebriation) breaks an implicit contract all visitors to the arcology sign by coming here. The criminal is anything but usual, however. $He bears signs of extreme hormone manipulation over a long period, and has had $his Achilles tendons clipped. Camera records show $him crawling in with a cargo shipment. $He's clad in rags, and you cannot find any record of $him anywhere. The growing crowd is convinced $he's an escaped slave, and is growing ugly.
 
 <<case "anchorBaby">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and is waiting detainment. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. This is likely another case of attempted escape by a slave or potentially a smuggling operation. The cause of detection is a steady stream of moaning emanating from a cargo container recently deposited into the arcology's cargo depot and has attracted a crowd of curious onlookers. Video feeds show the container being open and a heavily pregnant <<if $activeSlave.physicalAge > 30>>$woman<<elseif $activeSlave.physicalAge > 19>>young $woman<<elseif $activeSlave.physicalAge > 12>>teenager<<else>>little $girl<</if>> staggering out while clutching a newborn to $his breast and struggling to hold back $his second child from being born. From what little language $he knows, $he seems to think that just giving birth in your arcology is enough to become a proper citizen; as expected, $he squats and pushes out the other brat as you arrive. The growing crowd is becoming unruly, and $his inability to speak the language isn't helping; things could get ugly at any moment and hinge entirely on your next move.
+<<= capFirstChar($assistant.name)>> alerts you that a criminal has been detected by your security systems and is waiting detainment. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. This is likely another case of attempted escape by a slave or potentially a smuggling operation. The cause of detection is a steady stream of moaning emanating from a cargo container recently deposited into the arcology's cargo depot and has attracted a crowd of curious onlookers. Video feeds show the container being open and a heavily pregnant <<if $activeSlave.physicalAge > 30>>$woman<<elseif $activeSlave.physicalAge > 19>>young $woman<<elseif $activeSlave.physicalAge > 12>>teenager<<else>>little $girl<</if>> staggering out while clutching a newborn to $his breast and struggling to hold back $his second child from being born. From what little language $he knows, $he seems to think that just giving birth in your arcology is enough to become a proper citizen; as expected, $he squats and pushes out the other brat as you arrive. The growing crowd is becoming unruly, and $his inability to speak the language isn't helping; things could get ugly at any moment and hinge entirely on your next move.
 
 <<case "orphanloli">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. This is a simple case of vagrancy; sleeping on the streets (due to penury rather than inebriation) breaks an implicit contract all visitors to the arcology sign by coming here. Several reports of petty theft were made in the area recently as well. The criminal is anything but usual, however. $He is very young, emaciated, and desperate. Camera records show $him crawling in through an air vent. $He's clad in rags, clutching a presumably stolen apple, and you cannot find any record of $him anywhere. The growing crowd is convinced $he's an escaped slave, and $his inability to speak the language isn't helping; things could get ugly at any moment and hinge entirely on your next move.
+<<= capFirstChar($assistant.name)>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. This is a simple case of vagrancy; sleeping on the streets (due to penury rather than inebriation) breaks an implicit contract all visitors to the arcology sign by coming here. Several reports of petty theft were made in the area recently as well. The criminal is anything but usual, however. $He is very young, emaciated, and desperate. Camera records show $him crawling in through an air vent. $He's clad in rags, clutching a presumably stolen apple, and you cannot find any record of $him anywhere. The growing crowd is convinced $he's an escaped slave, and $his inability to speak the language isn't helping; things could get ugly at any moment and hinge entirely on your next move.
 
 <<case "businesswoman">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Nevertheless, it seems one of your tenants, a hitherto well-respected business<<= $woman>>, has left the straight and narrow. It seems $his business affairs took a decisive turn for the worse, so $he attempted to drain $his clients' funds and leave your arcology before anyone was the wiser. Unfortunately for $him, your security drones, controlled by $assistantName, were very much the wiser. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has with machine efficiency compiled the completest proofs of corporate malfeasance you have ever seen. Your wretched tenant signed a contract with you that included provisions forbidding theft. $He is entirely at your mercy.
+<<= capFirstChar($assistant.name)>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Nevertheless, it seems one of your tenants, a hitherto well-respected business<<= $woman>>, has left the straight and narrow. It seems $his business affairs took a decisive turn for the worse, so $he attempted to drain $his clients' funds and leave your arcology before anyone was the wiser. Unfortunately for $him, your security drones, controlled by $assistant.name, were very much the wiser. <<= capFirstChar($assistant.name)>> has with machine efficiency compiled the completest proofs of corporate malfeasance you have ever seen. Your wretched tenant signed a contract with you that included provisions forbidding theft. $He is entirely at your mercy.
 
 <<case "whore">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Nevertheless, it seems one of your tenants, a free whore, has been systematically stealing from clients. $He was furtive enough to get away with it for a time, but has now been caught red-handed. The john who caught $him attempted to stop $him, and $he fought him. Like many prostitutes $he carried a weapon in $his handbag, and the man is severely wounded. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has with machine efficiency compiled a staggering dossier of video logs and personal testimony from previous customers who now understand where their personal belongings went, as well as appalling footage of today's victim's injuries. Your wretched tenant signed a contract with you that included provisions forbidding this kind of thing. $He is entirely at your mercy.
+<<= capFirstChar($assistant.name)>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Nevertheless, it seems one of your tenants, a free whore, has been systematically stealing from clients. $He was furtive enough to get away with it for a time, but has now been caught red-handed. The john who caught $him attempted to stop $him, and $he fought him. Like many prostitutes $he carried a weapon in $his handbag, and the man is severely wounded. <<= capFirstChar($assistant.name)>> has with machine efficiency compiled a staggering dossier of video logs and personal testimony from previous customers who now understand where their personal belongings went, as well as appalling footage of today's victim's injuries. Your wretched tenant signed a contract with you that included provisions forbidding this kind of thing. $He is entirely at your mercy.
 
 <<case "rapist">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Nevertheless, it seems one of your tenants saw fit to rape a free woman. Within ten minutes, the inhuman efficiency of $assistantName has compiled video recordings, physical evidence, and even the victim's testimony, which is quite consistent with the first two. Your wretched tenant signed a contract with you that included provisions forbidding this kind of thing. $He is entirely at your mercy.
+<<= capFirstChar($assistant.name)>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Nevertheless, it seems one of your tenants saw fit to rape a free woman. Within ten minutes, the inhuman efficiency of $assistant.name has compiled video recordings, physical evidence, and even the victim's testimony, which is quite consistent with the first two. Your wretched tenant signed a contract with you that included provisions forbidding this kind of thing. $He is entirely at your mercy.
 
 <<case "mule">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a potential criminal has been detected by your security systems and is now being tailed by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems, but some individuals still make attempts to fool them. In this case, the cameras are fixed on a clearly pregnant, and hugely at that, $woman as $he works $his way through the crowded market sectors. You watch as $he repeatedly bumps into other patrons and stalls, pausing to apologize before proceeding on $his way, as if $he wasn't familiar with $his gravid swell. $His body is also clearly underdeveloped for someone ready to drop quadruplets at any moment; thin, with barely any hips to speak of and a pert bust clearly not swollen with milk. $He even walks like a $woman not burdened with nine months of gestating multiples, let alone a single. As $he stumbles under $his own weight, $his shirt rides up, giving you a clear view of the deep red stretch marks of a belly that grew far faster than it could handle. You've seen enough and order the drones to corral $him until security arrives. $His expression shifts from fear as they encircle $him to panic as a groan escapes $his lips. $He grabs $his stomach as a capsule falls to the floor. As another contraction hits $him, $he drops to the ground and begins to "give birth" to $his illegal cargo.
+<<= capFirstChar($assistant.name)>> alerts you that a potential criminal has been detected by your security systems and is now being tailed by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems, but some individuals still make attempts to fool them. In this case, the cameras are fixed on a clearly pregnant, and hugely at that, $woman as $he works $his way through the crowded market sectors. You watch as $he repeatedly bumps into other patrons and stalls, pausing to apologize before proceeding on $his way, as if $he wasn't familiar with $his gravid swell. $His body is also clearly underdeveloped for someone ready to drop quadruplets at any moment; thin, with barely any hips to speak of and a pert bust clearly not swollen with milk. $He even walks like a $woman not burdened with nine months of gestating multiples, let alone a single. As $he stumbles under $his own weight, $his shirt rides up, giving you a clear view of the deep red stretch marks of a belly that grew far faster than it could handle. You've seen enough and order the drones to corral $him until security arrives. $His expression shifts from fear as they encircle $him to panic as a groan escapes $his lips. $He grabs $his stomach as a capsule falls to the floor. As another contraction hits $him, $he drops to the ground and begins to "give birth" to $his illegal cargo.
 <<if $bellyImplants == 1>>
 	$He likely has belly implant designed to carry foreign objects inside $his womb and, having lost $his composure, is now vacating its contents.
 <<else>>
-	You have no idea what you are witnessing until <<if $assistantName == "your personal assistant">>your personal assistant pulls up an advertisement for a fillable womb located implant<<else>>$assistantName introduces you to a fillable womb located implant<</if>> that $he likely has installed.
+	You have no idea what you are witnessing until <<if $assistant.name == "your personal assistant">>your personal assistant pulls up an advertisement for a fillable womb located implant<<else>>$assistant.name introduces you to a fillable womb located implant<</if>> that $he likely has installed.
 <</if>>
 $He is easily taken into custody and $his contraband confiscated once the jeering crowd is dispersed enough to reach $him.
 
 <<case "liberator">>
 
 <<setNonlocalPronouns $seeDicks>>
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, but this is a special case. A well-muscled, well-armed $woman was caught attempting to smuggle a slave owned by one of your tenants out of the arcology. Though the slave surrendered immediately (and will be dealt with by _hisU owner), the would-be liberatrix was caught by your security drones. $He destroyed two of them and caused @@.red;other minor damage@@<<run cashX(forceNeg(1000), "event", $activeSlave)>> that will require a small sum to repair, but was eventually subdued. The drones had to expend a great deal of nonlethal ordnance to bring $him down and keep $him down, but $he is now entirely at your mercy.
+<<= capFirstChar($assistant.name)>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, but this is a special case. A well-muscled, well-armed $woman was caught attempting to smuggle a slave owned by one of your tenants out of the arcology. Though the slave surrendered immediately (and will be dealt with by _hisU owner), the would-be liberatrix was caught by your security drones. $He destroyed two of them and caused @@.red;other minor damage@@<<run cashX(forceNeg(1000), "event", $activeSlave)>> that will require a small sum to repair, but was eventually subdued. The drones had to expend a great deal of nonlethal ordnance to bring $him down and keep $him down, but $he is now entirely at your mercy.
 
 <<case "passfail">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Nevertheless, it seems one of your tenants, a rather ordinary white collar worker, has been severely wounded in a freak industrial accident, to the point that a blood transfusion was needed. In the course of doing so, an arcology hospital's autosurgery noted several genetic discrepancies and alerted a few nearby drones. Simply put, while the $woman appears to be a normal _fakeRace $woman, this is the result of numerous cosmetic surgeries; $he is actually _realRace. The laws of your arcology hold that members of the _realRace race are fit only for slavery, quite unlike the superior _fakeRace people. That a _realRace $girl would gain a position of relatively high class and power through such deception and fraud is considered an outrage by many of your citizens, and so $he was place under arrest before $he even awoke from surgery. $He is now entirely at your mercy.
+<<= capFirstChar($assistant.name)>> alerts you that a criminal has been detected by your security systems and detained by the drones. Crime is extremely uncommon in your arcology, since nothing can escape the notice of the omnipresent monitoring systems. Nevertheless, it seems one of your tenants, a rather ordinary white collar worker, has been severely wounded in a freak industrial accident, to the point that a blood transfusion was needed. In the course of doing so, an arcology hospital's autosurgery noted several genetic discrepancies and alerted a few nearby drones. Simply put, while the $woman appears to be a normal _fakeRace $woman, this is the result of numerous cosmetic surgeries; $he is actually _realRace. The laws of your arcology hold that members of the _realRace race are fit only for slavery, quite unlike the superior _fakeRace people. That a _realRace $girl would gain a position of relatively high class and power through such deception and fraud is considered an outrage by many of your citizens, and so $he was place under arrest before $he even awoke from surgery. $He is now entirely at your mercy.
 
 <</switch>>
 
diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw
index 58e8912ab93dc4eb7a64e72a31d3068efad5514e..fce56ffc972acb64a986901980f3cf35d8253b02 100644
--- a/src/uncategorized/reMilfTourist.tw
+++ b/src/uncategorized/reMilfTourist.tw
@@ -50,15 +50,15 @@
 <<setLocalPronouns $activeSlave 2>>
 <<setAssistantPronouns>>
 
-<<if $assistant == 1>>
-	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>>'s
-		<<if $assistantAppearance == "normal">>
+<<if $assistant.personality == 1>>
+	<<= capFirstChar($assistant.name)>>'s
+		<<if $assistant.appearance == "normal">>
 			symbol
 		<<else>>
-			$assistantAppearance avatar
+			$assistant.appearance avatar
 		<</if>>
 		appears on your desk in the middle of the day. "Something unusual for you, <<= properTitle()>>," _heA says. "_milfSlave.slaveName is out doing public service. A tourist from the old world accosted $him. _milfSlave.slaveName thought _he2 was a rich citizen who wanted to fuck $him, but it turns out _he2 just wanted a tour guide. It was a reasonable mistake; _he2 seems wealthy. $He has been showing _him2 around for the last half hour. Now _he2's asked $him if _he2 can meet you." _HeA displays a video feed showing _milfSlave.slaveName standing with the tourist in question out on the main plaza. _He2's just into middle age, and extremely plush, wearing Capri pants over _his2 motherly hips and a cashmere sweater that understates _his2 generous bust. _He2's blushing as _he2 asks your slave a discreet question about public sex in the arcology, brought on by the sight of a couple of citizens spitroasting a slave. Your personal assistant's avatar
-		<<switch $assistantAppearance>>
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			bares _hisA fangs and makes pinching gestures at nipple height.
 		<<case "shemale">>
@@ -93,7 +93,7 @@
 			reforms into an exaggerated female form before going back to _hisA normal symbol shape.
 		<</switch>>
 <<else>>
-	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> gets your attention the middle of the day. "A minor matter for you, <<= properTitle()>>," _heA says. "_milfSlave.slaveName is currently performing public service. A tourist from the old world accosted $him. _milfSlave.slaveName thought _he2 was a rich citizen who wanted to have sex with $him, but it seems _he2 just wanted a tour guide. It was a reasonable mistake; the tourist appears wealthy. $He has been acting as _his2 guide for the last half hour. The tourist has asked $him if _he2 can meet you." _HeA displays a video feed showing _milfSlave.slaveName standing with the tourist in question out on the main plaza. _He2's just into middle age, and extremely plush, wearing Capri pants over _his2 motherly hips and a cashmere sweater that understates _his2 generous bust. _He2's blushing as _he2 asks your slave a discreet question about public sex in the arcology, brought on by the sight of a couple of citizens spitroasting a slave.
+	<<= capFirstChar($assistant.name)>> gets your attention the middle of the day. "A minor matter for you, <<= properTitle()>>," _heA says. "_milfSlave.slaveName is currently performing public service. A tourist from the old world accosted $him. _milfSlave.slaveName thought _he2 was a rich citizen who wanted to have sex with $him, but it seems _he2 just wanted a tour guide. It was a reasonable mistake; the tourist appears wealthy. $He has been acting as _his2 guide for the last half hour. The tourist has asked $him if _he2 can meet you." _HeA displays a video feed showing _milfSlave.slaveName standing with the tourist in question out on the main plaza. _He2's just into middle age, and extremely plush, wearing Capri pants over _his2 motherly hips and a cashmere sweater that understates _his2 generous bust. _He2's blushing as _he2 asks your slave a discreet question about public sex in the arcology, brought on by the sight of a couple of citizens spitroasting a slave.
 <</if>>
 
 <br><br>
@@ -102,7 +102,7 @@
 <<link "Decline politely">>
 	<<replace "#result">>
 	<<setSpokenLocalPronouns _milfSlave $activeSlave>>
-	You have $assistantName instruct _milfSlave.slaveName to pass on your regrets, and add a message for _milfSlave.slaveName expressing confidence in $him to represent you and the arcology perfectly well without you. $He's @@.mediumaquamarine;affirmed@@ by your trust in $him. "<<Master>>," $he reports the next time you see $him, "that touri<<s>>t wa<<s>> really nice. Al<<s>>o, I got _him2 to have <<s>>e<<x>> with me, after all. <<He 2>> wa<<s>> all he<<s>>itant and blu<<sh>>y about doing it in public, but <<he 2>> got better after the fir<<s>>t time I ate _him2 out." $He looks pleased with $himself. "I bet <<he 2>> @@.green;tell<<s>> all <<his 2>> friend<<s>>@@ back home how much fun it i<<s>> here."
+	You have $assistant.name instruct _milfSlave.slaveName to pass on your regrets, and add a message for _milfSlave.slaveName expressing confidence in $him to represent you and the arcology perfectly well without you. $He's @@.mediumaquamarine;affirmed@@ by your trust in $him. "<<Master>>," $he reports the next time you see $him, "that touri<<s>>t wa<<s>> really nice. Al<<s>>o, I got _him2 to have <<s>>e<<x>> with me, after all. <<He 2>> wa<<s>> all he<<s>>itant and blu<<sh>>y about doing it in public, but <<he 2>> got better after the fir<<s>>t time I ate _him2 out." $He looks pleased with $himself. "I bet <<he 2>> @@.green;tell<<s>> all <<his 2>> friend<<s>>@@ back home how much fun it i<<s>> here."
 	<<run repX(500, "event")>>
 	<<set $slaves[_milfed].trust += 4, $slaves[_milfed].counter.oral++>>
 	<<set $oralTotal++>>
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index 0df0e3826b1b9eb3fbd8f50047b38baa8a1a5f1c..a831c8c57cbb8d3a79d5202b91a899bd8bd06c55 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -11,8 +11,8 @@ Despite their persistent presence in your arcology, interaction with your mercen
 
 <br><br>
 
-On a particularly lackadaisical evening, you find yourself alerted to a message alert by $assistantName.
-<<if $assistant > 0>>
+On a particularly lackadaisical evening, you find yourself alerted to a message alert by $assistant.name.
+<<if assistant.personality > 0>>
 	"<<= properMaster()>>, a message from your $mercenariesTitle." _HeA pauses before continuing. "It seems they're asking if you'd like to join their poker night."
 <<else>>
 	_HeA informs you that the $mercenariesTitle have sent a message asking you to join them at their poker night.
@@ -24,7 +24,7 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
 
 <<link "Politely decline">>
 	<<replace "#result">>
-		You inform $assistantName that you aren't planning to attend. A short while later, you receive a message from the $mercenariesTitle stating that the invitation is an open one and that you're welcome to join in another night.
+		You inform $assistant.name that you aren't planning to attend. A short while later, you receive a message from the $mercenariesTitle stating that the invitation is an open one and that you're welcome to join in another night.
 	<</replace>>
 <</link>>
 
@@ -36,7 +36,7 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
 	<br>
 	<<link "Attend the poker night">>
 		<<replace "#result">>
-			You instruct $assistantName to inform your $mercenariesTitle that you will be attending their poker night, and after settling your affairs in the penthouse you head down to the barracks. Unsurprisingly the atmosphere in the barracks is casual, especially in comparison to the high stakes games commonplace in arcology high society, though your mercenaries still maintain some measure of decorum towards you as their employer. Eventually, you settle in at the table with a handful of $mercenariesTitle officers and cash in your <<print cashFormat(5000)>> into chips. All that remains is to decide your strategy for the night.
+			You instruct $assistant.name to inform your $mercenariesTitle that you will be attending their poker night, and after settling your affairs in the penthouse you head down to the barracks. Unsurprisingly the atmosphere in the barracks is casual, especially in comparison to the high stakes games commonplace in arcology high society, though your mercenaries still maintain some measure of decorum towards you as their employer. Eventually, you settle in at the table with a handful of $mercenariesTitle officers and cash in your <<print cashFormat(5000)>> into chips. All that remains is to decide your strategy for the night.
 			<br><br>
 			<span id="bountyresult">
 				<<link "Play it safe">>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 44961a2c8b5b1765e8ff82176128e382f711346e..11767868bbbed91198868b64619f5c1f3e886bba 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2069,7 +2069,7 @@ Not every day in the arcology is calm and this one is most certainly more energe
 <</if>>
 so happens to be such a force.
 
-Recently, a young musical prodigy has taken both the old world and the Free Cities by storm. Their rising popularity has gained them quite a following and the attention of some very powerful people. You look at the schedule of events for citizens tonight and, sure enough, they are to appear, live in concert, tonight. You tell $assistantName to set up a live feed of the performance for you so as not to interrupt your work. Several hours later, the young artist comes out on stage to a full house. They perform their latest hits and some fan favorites, but it's the crowd suddenly going silent that disturbs you from your paperwork. You look at the feed to see the artist standing there, a sullen expression on their face, tears streaming down their cheeks, and their body jerking, obviously wracked by occasional sobbing. They take a very quick bow and run off stage, before the feed gets cut. You shrug — artists have breakdowns — and return to your tasks. Surprisingly, $assistantName chimes in to tell you that an unexpected guest has arrived. You have them sent in and are surprised to see the young, visibly distressed prodigy.
+Recently, a young musical prodigy has taken both the old world and the Free Cities by storm. Their rising popularity has gained them quite a following and the attention of some very powerful people. You look at the schedule of events for citizens tonight and, sure enough, they are to appear, live in concert, tonight. You tell $assistant.name to set up a live feed of the performance for you so as not to interrupt your work. Several hours later, the young artist comes out on stage to a full house. They perform their latest hits and some fan favorites, but it's the crowd suddenly going silent that disturbs you from your paperwork. You look at the feed to see the artist standing there, a sullen expression on their face, tears streaming down their cheeks, and their body jerking, obviously wracked by occasional sobbing. They take a very quick bow and run off stage, before the feed gets cut. You shrug — artists have breakdowns — and return to your tasks. Surprisingly, $assistant.name chimes in to tell you that an unexpected guest has arrived. You have them sent in and are surprised to see the young, visibly distressed prodigy.
 "I wa<<s>> told by my produ<<c>>er to come here; they <<s>>ay I have earned enough of a debt to be en<<s>>laved. I heard that <<s>>lave<<s>> <<s>>eem to be treated well here and thought that, ju<<s>>t maybe, if I convin<<c>>ed them to let my final performan<<c>>e be here, I would have a chan<<c>>e at a better life than at another arcology owned by a crueler ma<<s>>ter. Plea<<s>>e, would you con<<s>>ider taking me in?"
 
 <<case "desperate milf">>
@@ -2112,15 +2112,15 @@ $He hikes up $his skirt and spins around slowly, displaying a petite, half-hard
 
 <<case "handsome PC">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a supplicant has arrived at the door to the penthouse. A constant stream of hopefuls appear at your door, and $assistantName makes _himselfA invaluable by filtering them. One of the few categories of applicant that is always admitted is people willing to be enslaved for some reason; this is just such a $girl.
+<<= capFirstChar($assistant.name)>> alerts you that a supplicant has arrived at the door to the penthouse. A constant stream of hopefuls appear at your door, and $assistant.name makes _himselfA invaluable by filtering them. One of the few categories of applicant that is always admitted is people willing to be enslaved for some reason; this is just such a $girl.
 <br><br>
-The young $girl who is admitted to your office quails a bit at the sight of you, and you believe you can detect a bit of infatuation there, too. You wordlessly query $assistantName, and _heA turns to the massive task of sorting through arcology records to come up with a possible explanation. Meanwhile, you start interviewing the potential slave. It appears that $he left home, in a settlement near the arcology, right after $his <<= ordinalSuffix($activeSlave.actualAge)>> birthday and came straight here. $He's no innocent, and not destitute, and you're surprised $he's done something this foolish.
+The young $girl who is admitted to your office quails a bit at the sight of you, and you believe you can detect a bit of infatuation there, too. You wordlessly query $assistant.name, and _heA turns to the massive task of sorting through arcology records to come up with a possible explanation. Meanwhile, you start interviewing the potential slave. It appears that $he left home, in a settlement near the arcology, right after $his <<= ordinalSuffix($activeSlave.actualAge)>> birthday and came straight here. $He's no innocent, and not destitute, and you're surprised $he's done something this foolish.
 <br><br>
-After a short while, your assistant whispers in your earpiece, <<if $assistant == 0>><<= properTitle()>>,<<else>>"Sweetheart,<</if>> $he doesn't live here. Look at this." _HeA pulls up footage of a public event several weeks ago, and the $girl is in the crowd, staring at you with limpid eyes. Rather than confronting $him directly, you probe the subject, and after some evasion $he admits that yes, $he did come here out of infatuation with you. "Pretty fuckin' <<s>>tupid," $he admits. "But I've come too far now. I ju<<s>>t really want to live here. With you, I gue<<ss>>. If that mean<<s>> being your <<s>>lave, that'<<s>> okay. Can I be your hou<<s>>e <<s>>ervant, maybe?"
+After a short while, your assistant whispers in your earpiece, <<if $assistant.personality == 0>><<= properTitle()>>,<<else>>"Sweetheart,<</if>> $he doesn't live here. Look at this." _HeA pulls up footage of a public event several weeks ago, and the $girl is in the crowd, staring at you with limpid eyes. Rather than confronting $him directly, you probe the subject, and after some evasion $he admits that yes, $he did come here out of infatuation with you. "Pretty fuckin' <<s>>tupid," $he admits. "But I've come too far now. I ju<<s>>t really want to live here. With you, I gue<<ss>>. If that mean<<s>> being your <<s>>lave, that'<<s>> okay. Can I be your hou<<s>>e <<s>>ervant, maybe?"
 
 <<case "womanly PC">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a supplicant has arrived at the door to the penthouse. A constant stream of hopefuls appear at your door, and $assistantName makes _himselfA invaluable by filtering them. One of the few categories of applicant that is always admitted is people willing to be enslaved for some reason; this is just such a $woman.
+<<= capFirstChar($assistant.name)>> alerts you that a supplicant has arrived at the door to the penthouse. A constant stream of hopefuls appear at your door, and $assistant.name makes _himselfA invaluable by filtering them. One of the few categories of applicant that is always admitted is people willing to be enslaved for some reason; this is just such a $woman.
 <br><br>
 "It'<<s>> my hu<<s>>band," $he says forthrightly. "I'm pretty <<s>>ure the ba<<s>>tard i<<s>> going to en<<s>>lave me." $He pours out the trite story; it's terrifically boring, but it pays to hear people who want to be enslaved out. It's the only forbearance you'll need to show $him, ever, if you manage things correctly.
 <br><br>
@@ -2128,7 +2128,7 @@ After a short while, your assistant whispers in your earpiece, <<if $assistant =
 
 <<case "shemale PC">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a supplicant has arrived at the door to the penthouse. A constant stream of hopefuls appear at your door, and $assistantName makes _himselfA invaluable by filtering them. One of the few categories of applicant that is always admitted is people willing to be enslaved for some reason; this is just such a $girl.
+<<= capFirstChar($assistant.name)>> alerts you that a supplicant has arrived at the door to the penthouse. A constant stream of hopefuls appear at your door, and $assistant.name makes _himselfA invaluable by filtering them. One of the few categories of applicant that is always admitted is people willing to be enslaved for some reason; this is just such a $girl.
 <br><br>
 "Hi", $he says hesitantly. $He's a pretty convincing girl; $his voice is the only giveaway. You tell $him that if $he wishes to be considered for enslavement, you need to inspect $him naked. To $his credit, $he obeys, undressing quickly to reveal a body that's clearly seen a good deal of hormone therapy. $He's not unhealthy and isn't too shabby, so you ask $him why $he's here.
 <br><br>
@@ -2366,7 +2366,7 @@ $He pauses, looking directly at you for the first time, though you get the sense
 
 <<case "starving artist">>
 
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> alerts you that a supplicant has arrived at the door to the penthouse. A constant stream of hopefuls appear at your door, and $assistantName makes _himselfA invaluable by filtering them. One of the few categories of applicant that is always admitted is people willing to be enslaved for some reason; the odd individual standing before you is just such a $woman.
+<<= capFirstChar($assistant.name)>> alerts you that a supplicant has arrived at the door to the penthouse. A constant stream of hopefuls appear at your door, and $assistant.name makes _himselfA invaluable by filtering them. One of the few categories of applicant that is always admitted is people willing to be enslaved for some reason; the odd individual standing before you is just such a $woman.
 <br><br>
 "What we're going to do together will be recorded in the annals of history," $he says expansively, sweeping about your office in a series of twirls and pirouettes. Though when you enquire as to what exactly you'll be doing together, all $he can give you is a torrent of vague artistic prattle. In the end, all you can get out of $him is an understanding that $he sees enslavement as the ultimate form of creative self-expression.
 <br><br>
@@ -2466,7 +2466,7 @@ The <<if ($activeSlave.actualAge >= 18)>>young $woman<<elseif ($activeSlave.actu
 
 <<case "princely betrayal">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, are lucrative deals with powerful individuals.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, are lucrative deals with powerful individuals.
 <br><br>
 This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness and not someone of high society. This call, as you would expect, is different. The moment the person on the other end introduces themselves you immediately recognize why your assistant brought this to your attention. The caller is the prince of an old world kingdom, contacting you by an untraceable means due of the conspiratorial nature of his proposal.
 <br><br>
@@ -2476,7 +2476,7 @@ He explains that he is the younger of two princes, and is about to carry out a p
 
 <<case "forbidden love">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, are lucrative deals with powerful individuals.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, are lucrative deals with powerful individuals.
 <br><br>
 This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness and not someone of high society. This call, as you would expect, is different. The moment the person on the other end introduces themselves you immediately recognize why your assistant brought this to your attention. The caller is the King of an old world kingdom, contacting you by an untraceable means due of the conspiratorial nature of his proposal.
 <br><br>
@@ -2486,7 +2486,7 @@ He explains that his $daughter, the princess, attempted to marry a man of improp
 
 <<case "cleaning house">>
 
-You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, are lucrative deals with powerful individuals.
+You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, are lucrative deals with powerful individuals.
 <br><br>
 This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness and not someone of high society. This call, as you would expect, is different. The moment the person on the other end introduces themselves you immediately recognize why your assistant brought this to your attention. The caller is the King of an old world kingdom, contacting you by an untraceable means due of the conspiratorial nature of his proposal.
 <br><br>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 5ddef6c8aeade882266a8c9ccab1b79426b5783b..c98cca054da2633ea23ae67f22cc888d06ee47a7 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -74,9 +74,9 @@
 /* 000-250-006 */
 </span>
 
-Your assistant announces a visitor in the entryway of your penthouse, and adds<<if $assistant > 0>> with disapproval<</if>> that it's an inspector from the Slave Shelter.
-<<if $assistant > 0>>
-	<<switch $assistantAppearance>>
+Your assistant announces a visitor in the entryway of your penthouse, and adds<<if assistant.personality > 0>> with disapproval<</if>> that it's an inspector from the Slave Shelter.
+<<if assistant.personality > 0>>
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		_HisA avatar's cocks and tentacle hair are all hanging limply; _heA's a dejected little picture of a cockblocked monster<<= _girlA>>.
 	<<case "shemale">>
@@ -121,7 +121,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 <<link "Amusing. Enslave _him2">>
 	<<run cashX(forceNeg(_ContractCost), "slaveTransfer", $activeSlave)>>
 	<<replace "#result">>
-	$assistantName ushers _him2 into your penthouse and keeps _him2 busy for the few minutes you need to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing. Fortunately, you're cleverer and richer than most, and you succeed. You have _him2 brought into your office, and you are pleased to see _him2. _He2's not young and _he2's not pretty, but _his2 suit cannot disguise _his2 big bottom, and _he2's using the tablet _he2 has clasped protectively against _his2 chest to conceal a huge pair of mature breasts. _He2 knows exactly what's happened, and fixes you with a gimlet stare. "In a couple of month<<s>>," _he2 says with venom, "when you've filled me full of hormone<<s>> and drug<<s>> and training, and I'm begging you to <<if $PC.dick != 0>><<s>>tick your tiny little dick up<<else>>fi<<s>>t<</if>> my a<<ss>>hole, remember thi<<s>>. It'll be conditioning and <<s>>elf-pre<<s>>ervation and <<S>>tockholm <<S>>yndrome talking, not me. I think you're a <<if $PC.title == 1>><<s>>ad ba<<s>>tard<<else>>vile cunt<</if>>, and I alway<<s>> will."
+	$assistant.name ushers _him2 into your penthouse and keeps _him2 busy for the few minutes you need to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing. Fortunately, you're cleverer and richer than most, and you succeed. You have _him2 brought into your office, and you are pleased to see _him2. _He2's not young and _he2's not pretty, but _his2 suit cannot disguise _his2 big bottom, and _he2's using the tablet _he2 has clasped protectively against _his2 chest to conceal a huge pair of mature breasts. _He2 knows exactly what's happened, and fixes you with a gimlet stare. "In a couple of month<<s>>," _he2 says with venom, "when you've filled me full of hormone<<s>> and drug<<s>> and training, and I'm begging you to <<if $PC.dick != 0>><<s>>tick your tiny little dick up<<else>>fi<<s>>t<</if>> my a<<ss>>hole, remember thi<<s>>. It'll be conditioning and <<s>>elf-pre<<s>>ervation and <<S>>tockholm <<S>>yndrome talking, not me. I think you're a <<if $PC.title == 1>><<s>>ad ba<<s>>tard<<else>>vile cunt<</if>>, and I alway<<s>> will."
 	<<set $shelterAbuse += 10>>
 	<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
 	<<include "New Slave Intro">>
diff --git a/src/uncategorized/reShippingContainer.tw b/src/uncategorized/reShippingContainer.tw
index 97db7cd94ba22470847ce827a93eec01cec27d5a..34c52e46c8568b4af1d8cb8c609d540745fa9fd3 100644
--- a/src/uncategorized/reShippingContainer.tw
+++ b/src/uncategorized/reShippingContainer.tw
@@ -17,11 +17,11 @@
 <</for>>
 <<set $menials += 25>>
 
-You receive an alert from $assistantName that there's a situation developing down in the shipping area at the base of the arcology. A shipping container arrived <<if $terrain == "urban">>through the vehicular arteries that connect the arcology to the city that surrounds it<<elseif $terrain == "rural">>via one of the transportation links that traverses the wilderness around the Free City<<elseif $terrain == "ravine">>via one of few cliffside roads leading down into the Free City<<else>>at the docks this morning<</if>>, without the proper documentation, or indeed any documentation at all. This is not uncommon in the rough and tumble world of Free Cities business; the automated handling systems scan such containers for dangerous material and then put them in a holding area until the matter can be untangled. They accumulate fees while there, and you're not infrequently able to confiscate the contents when those fees accumulate sufficiently. There are unusual reports about this container, though: citizens at the <<if $terrain == "urban">>shipping area<<elseif $terrain == "rural">>transport hub<<elseif $terrain == "ravine">>loading port<<else>>docks<</if>> are reporting that this particular container is shouting. With nothing else pressing, you decide to handle the situation personally.
+You receive an alert from $assistant.name that there's a situation developing down in the shipping area at the base of the arcology. A shipping container arrived <<if $terrain == "urban">>through the vehicular arteries that connect the arcology to the city that surrounds it<<elseif $terrain == "rural">>via one of the transportation links that traverses the wilderness around the Free City<<elseif $terrain == "ravine">>via one of few cliffside roads leading down into the Free City<<else>>at the docks this morning<</if>>, without the proper documentation, or indeed any documentation at all. This is not uncommon in the rough and tumble world of Free Cities business; the automated handling systems scan such containers for dangerous material and then put them in a holding area until the matter can be untangled. They accumulate fees while there, and you're not infrequently able to confiscate the contents when those fees accumulate sufficiently. There are unusual reports about this container, though: citizens at the <<if $terrain == "urban">>shipping area<<elseif $terrain == "rural">>transport hub<<elseif $terrain == "ravine">>loading port<<else>>docks<</if>> are reporting that this particular container is shouting. With nothing else pressing, you decide to handle the situation personally.
 
 <br><br>
 
-On the way, $assistantName updates you: a curious crowd is gathering, drawn by the commotion. As you step off the elevator, you see that it's true. The crowd parts for you amiably, partaking in the collective human eagerness to know what's inside a locked box, and knowing you'll probably sate their curiosity. You've got the scan records at your fingertips, and if it wasn't already obvious, the container is full of slaves. Shipping fresh chattel to the arcology in containers is perfectly normal. When you direct the container handling systems to open it by force, though, it's clear that this is a shoddy job. The random mix of slaves in the container are simply packed inside, with no provision for safety at all. There's about thirty of them, though most are, charitably, menial material. You confirm your suspicions with $assistantName: this is an attempt at smuggling slaves past your slave market regulations, though a laughably bad one that stood no chance of success. Someone was probably hoping to pull them out of the holding area later.
+On the way, $assistant.name updates you: a curious crowd is gathering, drawn by the commotion. As you step off the elevator, you see that it's true. The crowd parts for you amiably, partaking in the collective human eagerness to know what's inside a locked box, and knowing you'll probably sate their curiosity. You've got the scan records at your fingertips, and if it wasn't already obvious, the container is full of slaves. Shipping fresh chattel to the arcology in containers is perfectly normal. When you direct the container handling systems to open it by force, though, it's clear that this is a shoddy job. The random mix of slaves in the container are simply packed inside, with no provision for safety at all. There's about thirty of them, though most are, charitably, menial material. You confirm your suspicions with $assistant.name: this is an attempt at smuggling slaves past your slave market regulations, though a laughably bad one that stood no chance of success. Someone was probably hoping to pull them out of the holding area later.
 
 <br><br>
 
diff --git a/src/uncategorized/reStandardPunishment.tw b/src/uncategorized/reStandardPunishment.tw
index 8a3f90f843da9ecc872258550a4dd167d0acca22..1edac92a76c0d9f2499143d5220e32b3c2afea3e 100644
--- a/src/uncategorized/reStandardPunishment.tw
+++ b/src/uncategorized/reStandardPunishment.tw
@@ -79,7 +79,7 @@
 	$HeadGirl.slaveName is <<if $activeSlave.rules.punishment == "situational">>assessing an appropriate punishment<<else>>sentencing $him to $his standard punishment, <<switch $activeSlave.rules.punishment>><<case "confinement">>several hours in confinement<<case "whipping">>a whipping<<case "chastity">>several hours in chastity<</switch>><</if>>. _He2 immediately defers to you, should you wish to take over.
 <<else>>
 	<<setAssistantPronouns>>
-	$assistantName is <<if $activeSlave.rules.punishment == "situational">>assessing an appropriate punishment<<else>>sentencing $him to $his standard punishment, <<switch $activeSlave.rules.punishment>><<case "confinement">>several hours in confinement<<case "whipping">>a whipping<<case "chastity">>several hours in chastity<</switch>><</if>>. _HeA immediately defers to you, should you wish to take over.
+	$assistant.name is <<if $activeSlave.rules.punishment == "situational">>assessing an appropriate punishment<<else>>sentencing $him to $his standard punishment, <<switch $activeSlave.rules.punishment>><<case "confinement">>several hours in confinement<<case "whipping">>a whipping<<case "chastity">>several hours in chastity<</switch>><</if>>. _HeA immediately defers to you, should you wish to take over.
 <</if>>
 
 <br><br>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 97b6d90afe6116ec8a7e2c074ec616b8b409bae2..8d879a0deebfaf96a0e3e4e2240cc2504892c3fc 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -1456,7 +1456,7 @@
 					"incest father son"
 					"desperate broodmother">>
 					<p>
-						You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
+						You receive so many messages, as a noted titan of the new Free Cities world, that $assistant.name has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
 					</p>
 				<<case "matched pair" "identical pair" "identical herm pair">>
 					<p>
diff --git a/src/uncategorized/remFluctuations.tw b/src/uncategorized/remFluctuations.tw
index c93368a3d8691e4baa66ada85e871623e1712778..b0e2e09cb4470704b146f5a24fdef43e8a509c84 100644
--- a/src/uncategorized/remFluctuations.tw
+++ b/src/uncategorized/remFluctuations.tw
@@ -11,16 +11,16 @@
 <<setAssistantPronouns>>
 
 <p>
-	<<if $assistant > 0>>
-		<<if $marketAssistantAnnounced>>
+	<<if assistant.personality > 0>>
+		<<if $assistant.market>>
 			The market assistant's avatar appears on a wallscreen as you're going about your business.
-			<<switch $assistantAppearance>>
+			<<switch $assistant.appearance>>
 				<<case "monstergirl">>The regular monster<<= _girlA>> stands behind and prods the human _girlM forward.
 				<<case "shemale">>You recognize _hisM function by _hisM glasses and because _hisM bimbo cock softens, halfway, while _heM addresses you on economic matters.
 				<<case "amazon">>_HeM illustrates a small group of gossiping tribeswomen that fades away as _heM leaves them and approaches you.
 				<<case "businesswoman">>The junior business<<= _womanM>> adopts a shy posture when addressing you directly, as if unsuccessfully concealing a workplace crush.
 				<<case "goddess">>The demigoddess portrait arrives in a glittery cloud of dust, wearing winged shoes.
-				<<case "schoolgirl">>Both <<if _girlA == _girlM>>school<<= _girlA>><<else>>student<</if>>s are sitting knee to knee; the nerdy one hands the other a folded note. "Pass it on," _heM stage whispers. <<if $assistantName == "your personal assistant">>Your regular assistant<<else>>$assistantName<</if>> rolls _hisA eyes.
+				<<case "schoolgirl">>Both <<if _girlA == _girlM>>school<<= _girlA>><<else>>student<</if>>s are sitting knee to knee; the nerdy one hands the other a folded note. "Pass it on," _heM stage whispers. <<if $assistant.name == "your personal assistant">>Your regular assistant<<else>>$assistant.name<</if>> rolls _hisA eyes.
 				<<case "hypergoddess">>The demigoddess portrait arrives in a glittery cloud of dust, wearing winged shoes and a noticeable roundness in _hisM middle.
 				<<case "loli">>The chubby, glasses-wearing _loliM arrives holding a neatly folded note addressed to you.
 				<<case "preggololi">>The chubby, glasses-wearing _loliM arrives holding a hastily written note addressed to you. _HeM seems kind of winded, with a suspicious stain in _hisM panties under _hisM pussy.
@@ -35,8 +35,8 @@
 				<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>The creature finishes forcing eggs into the human _girlM, leaving _himM to stagger towards you clutching a crumpled letter in one hand and struggling to hold back the eggs with the other.
 			<</switch>>
 		<<else>>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> appears on a wallscreen as you're going about your business.
-			<<switch $assistantAppearance>>
+			<<= capFirstChar($assistant.name)>> appears on a wallscreen as you're going about your business.
+			<<switch $assistant.appearance>>
 				<<case "monstergirl">>_HeA's looking unusually businesslike, with _hisA tentacle hair restrained in a bun.
 				<<case "loli">>_HeA's looking unusually businesslike, withdrawn deep in thought.
 				<<case "preggololi">>_HeA's looking unusually businesslike, withdrawn deep in thought.
@@ -57,7 +57,7 @@
 				<<default>>_HisA symbol spins for attention.
 			<</switch>>
 			"<<= properTitle()>>, I have a news item that may be of business interest," _heA
-			<<switch $assistantAppearance>>
+			<<switch $assistant.appearance>>
 				<<case "monstergirl" "normal">>informs you.
 				<<case "shemale">>says seriously.
 				<<case "amazon">>says warmly.
@@ -76,7 +76,7 @@
 			<</switch>>
 		<</if>>
 	<<else>>
-		Your <<if $marketAssistantAnnounced>>market<<else>>personal<</if>> assistant's symbol appears on a wallscreen as you're going about your business. _HeA spins for your attention. "<<= properTitle()>>, I have a news item that may be of business interest," _heA says.
+		Your <<if $assistant.market>>market<<else>>personal<</if>> assistant's symbol appears on a wallscreen as you're going about your business. _HeA spins for your attention. "<<= properTitle()>>, I have a news item that may be of business interest," _heA says.
 	<</if>>
 </p>
 
diff --git a/src/uncategorized/remMerger.tw b/src/uncategorized/remMerger.tw
index e2c71a9aab351ad1cde21356c3c1583f8309c661..9e35697023c17bce76616e3c75b91477a1e564dc 100644
--- a/src/uncategorized/remMerger.tw
+++ b/src/uncategorized/remMerger.tw
@@ -4,9 +4,9 @@
 <<set $nextLink = "RIE Eligibility Check">>
 
 <<set _slaveCompany = App.Corporate.divisionList
-								   .filter(div => div.founded && div.hasMergers)
-								   .map   (div => div.mergerChoices.map((merger, index) => ({merger, index, division:div})))
-								   .flat  ()>>
+											.filter(div => div.founded && div.hasMergers)
+											.map   (div => div.mergerChoices.map((merger, index) => ({merger, index, division:div})))
+											.flat  ()>>
 <<set _maxCompanies = Math.trunc(Math.log2(App.Corporate.divisionList.filter(div => div.founded).length)) + 1>>
 <<set _numCompanies = random(1, _maxCompanies)>>
 
@@ -15,10 +15,7 @@
 	<<run _companies.push(_slaveCompany.pluck())>>
 <</for>>
 
-<<set _assistant = $assistantName>>
-<<if $marketAssistantAnnounced>><<set _assistant = "your market assistant">><</if>>
-<p><<= capFirstChar(_assistant) >> constantly combs business records, tax receipts and the media for leads on opportunities for your corporation to take advantage of. Small businesses go under all the time, and with a large amount of cash on hand, your corporation can afford to step in and acquire them. This week, _assistant has found <<= numberWithPlural(_numCompanies, "troubled organization") >> you could easily fold into your corporation.</p>
-
+<p><<= capFirstChar($assistant.market ? "your market assistant" : $assistant.name) >> constantly combs business records, tax receipts and the media for leads on opportunities for your corporation to take advantage of. Small businesses go under all the time, and with a large amount of cash on hand, your corporation can afford to step in and acquire them. This week, _assistant has found <<= numberWithPlural(_numCompanies, "troubled organization") >> you could easily fold into your corporation.</p>
 
 <<if _companies.length == 1>>
 	<<set _company = _companies[0]>>
@@ -37,7 +34,7 @@
 		<<replace "#result">>
 			You quickly acquire the <<= _company.merger.name>><<= _company.merger.text.acquire >>
 			<<set _devCount = _company.merger.result.development,
-				  _slaveCount = _company.merger.result.slaves>>
+						_slaveCount = _company.merger.result.slaves>>
 			<<if _devCount != null>>
 				<<set _company.division.developmentCount += _devCount>>
 			<</if>>
diff --git a/src/uncategorized/resMove.tw b/src/uncategorized/resMove.tw
index 56700c391fc8435043465b6ecf8623b78b4b088c..e2b5bd826499af05e76ba46ea1184cd46f3d7bbb 100644
--- a/src/uncategorized/resMove.tw
+++ b/src/uncategorized/resMove.tw
@@ -42,11 +42,11 @@
 	You inquire about the Sister you helped, and she smiles. "She reached the age at which even the best Sister must serve us by being sold as a slave. Don't worry, though; I hear she is very happy. <<if random(1,3) == 1>>A powerful man from the old world bought her, and they're engaged. I believe he means to free her.<<elseif random(1,2) == 1>>A powerful woman from the old world bought her, and they're engaged. I believe she means to free her.<<else>>Though she's a slave, she's become something of a celebrity in the old world. I believe her porn is quite popular there.<</if>>"
 <</if>>
 <br><br>
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> performed a business analysis of the proposal during the call,
-<<if $assistant == 0>>
+<<= capFirstChar($assistant.name)>> performed a business analysis of the proposal during the call,
+<<if $assistant.personality == 0>>
 	its symbol slowly rotating on your desk. It presents its conclusions,
 <<else>>
-	<<switch $assistantAppearance>>
+	<<switch $assistant.appearance>>
 	<<case "monstergirl">>
 		_hisA monster<<= _girlA>> avatar rather cutely using _hisA fingers, the tips of _hisA tentacle hair, and _hisA dickheads to count:
 	<<case "shemale">>
@@ -94,10 +94,10 @@ as you suspected,
 <<else>>
 	you'd run a loss on the rent, even bargaining them up as far as they'd be likely to go. On the other hand, just having them present would probably be good for the arcology's prosperity.
 <</if>>
-<<if $assistant == 1>>
+<<if $assistant.personality == 1>>
 	<<if ($RESMove == "TSS") || ($RESMove == "SCP")>>
 		"Just think of
-		<<switch $assistantAppearance>>
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			all those virgin schoolgirl holes," _heA concludes, _hisA avatar starting to masturbate.
 		<<case "shemale">>
@@ -137,7 +137,7 @@ as you suspected,
 		<</switch>>
 	<<elseif $RESMove == "GRI" || $RESMove == "TCR">>
 		"Just think of
-		<<switch $assistantAppearance>>
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			the tits, and the asses, and the lips," _heA concludes, _hisA avatar starting to masturbate.
 		<<case "shemale">>
@@ -183,7 +183,7 @@ as you suspected,
 		<</switch>>
 	<<elseif $RESMove == "LDE" || $RESMove == "NUL">>
 		"Just think of
-		<<switch $assistantAppearance>>
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			their soft anuses. I could fit both of my dicks in one of them," _heA concludes, _hisA avatar starting to masturbate.
 		<<case "shemale">>
@@ -223,7 +223,7 @@ as you suspected,
 		<</switch>>
 	<<elseif $RESMove == "TGA" || $RESMove == "HA">>
 		"Just think of
-		<<switch $assistantAppearance>>
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			their sweaty bodies," _heA concludes, _hisA avatar starting to masturbate.
 		<<case "shemale">>
@@ -258,37 +258,37 @@ as you suspected,
 			how well trained they always are," _heA says.
 		<</switch>>
 	<<else>>
-		<<switch $assistantAppearance>>
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "I have never wanted to have a real body more."
+			<<= capFirstChar($assistant.name)>> pauses and then says seriously, "I have never wanted to have a real body more."
 		<<case "shemale">>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "They almost make me want a pussy, too."
+			<<= capFirstChar($assistant.name)>> pauses and then says seriously, "They almost make me want a pussy, too."
 		<<case "amazon">>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "I like them."
+			<<= capFirstChar($assistant.name)>> pauses and then says seriously, "I like them."
 		<<case "businesswoman">>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "I wonder if I could code an avatar version of one of them. As my own assistant, of course."
+			<<= capFirstChar($assistant.name)>> pauses and then says seriously, "I wonder if I could code an avatar version of one of them. As my own assistant, of course."
 		<<case "fairy" "pregnant fairy">>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "If only I could get a taste myself."
+			<<= capFirstChar($assistant.name)>> pauses and then says seriously, "If only I could get a taste myself."
 		<<case "goddess" "hypergoddess">>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "They truly have the best of both worlds."
+			<<= capFirstChar($assistant.name)>> pauses and then says seriously, "They truly have the best of both worlds."
 		<<case "loli" "preggololi">>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "I wish I'll look like that when I grow up..."
+			<<= capFirstChar($assistant.name)>> pauses and then says seriously, "I wish I'll look like that when I grow up..."
 		<<case "angel">>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "They are unnatural, be careful around them."
+			<<= capFirstChar($assistant.name)>> pauses and then says seriously, "They are unnatural, be careful around them."
 		<<case "cherub">>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "They are curious; I wonder what it would be like to have a body like that."
+			<<= capFirstChar($assistant.name)>> pauses and then says seriously, "They are curious; I wonder what it would be like to have a body like that."
 		<<case "incubus">>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "I bet they'd squeal with every thrust of a dick against their prostate."
+			<<= capFirstChar($assistant.name)>> pauses and then says seriously, "I bet they'd squeal with every thrust of a dick against their prostate."
 		<<case "succubus">>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "Be careful around them, I might get jealous!"
+			<<= capFirstChar($assistant.name)>> pauses and then says seriously, "Be careful around them, I might get jealous!"
 		<<case "imp">>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "There are so many places you could torment on someone with both sexes."
+			<<= capFirstChar($assistant.name)>> pauses and then says seriously, "There are so many places you could torment on someone with both sexes."
 		<<case "witch">>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "If you aren't careful with magic you can end up like that... Not that I have before!" _heA shouts, turning red.
+			<<= capFirstChar($assistant.name)>> pauses and then says seriously, "If you aren't careful with magic you can end up like that... Not that I have before!" _heA shouts, turning red.
 		<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses, _hisA hips and crotch splitting open to allow a massive phallic object to sag to the ground, "We are similar."
+			<<= capFirstChar($assistant.name)>> pauses, _hisA hips and crotch splitting open to allow a massive phallic object to sag to the ground, "We are similar."
 		<<case "schoolgirl">>
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> pauses and then says seriously, "They kind of make me want a cock."
+			<<= capFirstChar($assistant.name)>> pauses and then says seriously, "They kind of make me want a cock."
 		<<default>>
 			"Just think of how unique they are," _heA says.
 		<</switch>>
diff --git a/src/uncategorized/resSale.tw b/src/uncategorized/resSale.tw
index 5bd590089f3f1427d1c885103e0c954ea21b4832..b72d74e7b62896c8a0a37ee95a385db5402c3ebc 100644
--- a/src/uncategorized/resSale.tw
+++ b/src/uncategorized/resSale.tw
@@ -77,11 +77,11 @@ You receive a personal call from
 	the Futanari Sisters, an enigmatic group of transformation enthusiasts that sells beautiful hermaphrodites.
 <</if>>
 <<if $RESSale == "TCR">>
-	It's from a farmhand, not leadership, and they are offering a cow for sale. Before you can hang up on him and reprimand $assistantName for allowing this Free Cities version of telemarketing to get through to you, the man hurriedly says, "<<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>, $he's half off!"
+	It's from a farmhand, not leadership, and they are offering a cow for sale. Before you can hang up on him and reprimand $assistant.name for allowing this Free Cities version of telemarketing to get through to you, the man hurriedly says, "<<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>, $he's half off!"
 	<br><br>
 	You pause for a moment, and he plunges on: "<<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>, @@.yellow;your first cow purchase from us this week is half price.@@ And, <<if $PC.title != 0>>sir<<else>>ma'am<</if>>, this milky beauty is up for grabs. Keep $him by your desk for fresh squeezed milk, knock on wood and $he'll suck you right off, grab $him by the hips and $he'll take anything in $his rear; $he's plenty of fun! Come on down and get yourself a young, affectionate little cow<<= $girl>>!"
 <<else>>
-It's from a piece of merchandise, not leadership, and $he's offering $himself for sale. Before you can hang up on $him and reprimand $assistantName for allowing this Free Cities version of telemarketing to get through to you, the slave hurriedly says, "<<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I'm half off!"
+It's from a piece of merchandise, not leadership, and $he's offering $himself for sale. Before you can hang up on $him and reprimand $assistant.name for allowing this Free Cities version of telemarketing to get through to you, the slave hurriedly says, "<<if $PC.title != 0>>Sir<<else>>Ma'am<</if>>, I'm half off!"
 
 <br><br>
 
@@ -116,13 +116,13 @@ You pause for a moment, and $he plunges on: "<<if $PC.title != 0>>Sir<<else>>Ma'
 <br><br>
 
 <<setAssistantPronouns>>
-<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>>'s $assistantAppearance avatar appears on the screen next to the video call.
-<<if $assistant == 0>>
+<<= capFirstChar($assistant.name)>>'s $assistant.appearance avatar appears on the screen next to the video call.
+<<if $assistant.personality == 0>>
 	"I have stored the confirmation code, <<= properMaster()>>," it notes. "If you wish to take advantage of this promotion, use the slave buying menu to navigate to the appropriate school next week. I have appended a note to that school's entry to remind you."
 <<else>>
 	<<if ($RESSale == "TSS") || ($RESSale == "SCP")>>
 		"And I would love to
-		<<switch $assistantAppearance>>
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			break both $his virgin holes at once," the monster<<= _girlA>> exclaims, and shakes _hisA dicks for emphasis.
 		<<case "shemale">>
@@ -164,7 +164,7 @@ You pause for a moment, and $he plunges on: "<<if $PC.title != 0>>Sir<<else>>Ma'
 		<</switch>>
 	<<elseif $RESSale == "GRI" || $RESSale == "TCR">>
 		"And I would love to
-		<<switch $assistantAppearance>>
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			get my tentacles on those tits," the monster<<= _girlA>> exclaims.
 		<<case "shemale">>
@@ -204,7 +204,7 @@ You pause for a moment, and $he plunges on: "<<if $PC.title != 0>>Sir<<else>>Ma'
 		<</switch>>
 	<<elseif $RESSale == "LDE" || $RESSale == "NUL">>
 		"And I would love to
-		<<switch $assistantAppearance>>
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			shove both my cocks up there," the monster<<= _girlA>> exclaims.
 		<<case "shemale">>
@@ -244,7 +244,7 @@ You pause for a moment, and $he plunges on: "<<if $PC.title != 0>>Sir<<else>>Ma'
 		<</switch>>
 	<<elseif $RESSale == "TGA">>
 		"And I would love to
-		<<switch $assistantAppearance>>
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			shove both my cocks up $his virgin anus," the monster<<= _girlA>> exclaims.
 		<<case "shemale">>
@@ -284,7 +284,7 @@ You pause for a moment, and $he plunges on: "<<if $PC.title != 0>>Sir<<else>>Ma'
 		<</switch>>
 	<<elseif $RESSale == "HA">>
 		"And I would love to
-		<<switch $assistantAppearance>>
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			break both $his holes at once," the monster<<= _girlA>> exclaims, and shakes _hisA dicks for emphasis.
 		<<case "shemale">>
@@ -325,7 +325,7 @@ You pause for a moment, and $he plunges on: "<<if $PC.title != 0>>Sir<<else>>Ma'
 			fuck $his amazonian holes," _heA says.
 		<</switch>>
 	<<else>>
-		<<switch $assistantAppearance>>
+		<<switch $assistant.appearance>>
 		<<case "monstergirl">>
 			"And I love to fuck futas!" _heA shouts, dicks painfully erect.
 		<<case "shemale">>
diff --git a/src/uncategorized/saBeYourHeadGirl.tw b/src/uncategorized/saBeYourHeadGirl.tw
index b5ad57a5ece7d5cb518525ccef7810f25abc3c18..d42c3f07ff4bfa6acda512e73b37ff4b40f2f7ef 100644
--- a/src/uncategorized/saBeYourHeadGirl.tw
+++ b/src/uncategorized/saBeYourHeadGirl.tw
@@ -132,7 +132,7 @@
 <</if>>
 
 <<if ($personalAttention == "HG")>>
-	You're cooperating with $him this week, working with $assistantName to free up some of $his time so $he can target more slaves in need of individual attention.
+	You're cooperating with $him this week, working with $assistant.name to free up some of $his time so $he can target more slaves in need of individual attention.
 	<<if ($slaves[$i].trust > 95)>>
 		$He is so trusting of you that $he can act as your own right hand, allowing $him to oversee your slaves with remarkable efficiency.
 	<<else>>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index c5efa0f9d1c3fb719d0888125f7ed6f6095205f8..45997a512ec7e3d0342cb35498334db9ad7ee45d 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -926,7 +926,7 @@
 
 <<if $HGSuiteSurgery != 0>>
 	<<if $arcologies[0].FSBodyPurist == "unset">>
-		$HeadGirl.slaveName sends $assistantName notes on what surgical modifications _he2 wants for $slaves[$i].slaveName.
+		$HeadGirl.slaveName sends $assistant.name notes on what surgical modifications _he2 wants for $slaves[$i].slaveName.
 		<<= rulesAutosurgery($slaves[$i])>>
 	<</if>>
 	<<if $HeadGirl.fetishKnown == 1>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 97b82df8ceebaef8d17c59695074a4cceda962f5..0f89b59cb3e5d96bd17efa56b7d295a3c6d8687e 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -38,7 +38,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $his body gets used. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $his body gets used. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -146,7 +146,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he manages clients, analyzing $his tastes. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he manages clients, analyzing $his tastes. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -467,7 +467,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he services customers, analyzing $his sexuality. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he services customers, analyzing $his sexuality. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -674,7 +674,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he works the crowd, analyzing $his sexual tastes. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he works the crowd, analyzing $his sexual tastes. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -975,7 +975,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he services citizens, analyzing $his sexuality. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he services citizens, analyzing $his sexuality. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -1183,7 +1183,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he cares for $his patients to determine $his tastes. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he cares for $his patients to determine $his tastes. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -1428,7 +1428,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him choice of entertainment, analyzing $his sexuality. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him choice of entertainment, analyzing $his sexuality. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -1589,7 +1589,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he oversees the prisoners, analyzing $his preferences. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he oversees the prisoners, analyzing $his preferences. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -1913,7 +1913,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he massages and relieves slaves, analyzing $his tastes. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he massages and relieves slaves, analyzing $his tastes. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -2250,7 +2250,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he mingles with other soaking slaves, analyzing $his sexual tastes. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he mingles with other soaking slaves, analyzing $his sexual tastes. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -2450,7 +2450,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he massages and relieves slaves, analyzing $his tastes. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he massages and relieves slaves, analyzing $his tastes. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -2787,7 +2787,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he mingles with other busily working slaves, analyzing $his sexual tastes. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he mingles with other busily working slaves, analyzing $his sexual tastes. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -3004,7 +3004,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he teaches students, analyzing $his preferences. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he teaches students, analyzing $his preferences. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -3328,7 +3328,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he studies, analyzing what topics $he tends to keep returning to. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he studies, analyzing what topics $he tends to keep returning to. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -3535,7 +3535,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he manages the servants, analyzing $his preferences. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he manages the servants, analyzing $his preferences. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -3861,7 +3861,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he sees to your other slaves, analyzing $his sexuality. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he sees to your other slaves, analyzing $his sexuality. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -4067,7 +4067,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he cares for the cattle, analyzing $his preferences. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he cares for the cattle, analyzing $his preferences. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -4145,7 +4145,7 @@
 				<<if ($slaves[$i].attrKnown == 0)>>
 					<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 						<<set $slaves[$i].attrKnown = 1>>
-						<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him arousal in regards to the visual stimulation. It seems $he is
+						<<= capFirstChar($assistant.name)>> has been monitoring $him arousal in regards to the visual stimulation. It seems $he is
 						<<saRulesAttractionDiscovery>>
 					<</if>>
 				<</if>>
@@ -4451,7 +4451,7 @@
 					<<if ($slaves[$i].attrKnown == 0)>>
 						<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 							<<set $slaves[$i].attrKnown = 1>>
-							<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he gets milked, attempting to gauge $his sexuality. It seems $he is
+							<<= capFirstChar($assistant.name)>> has been monitoring $him as $he gets milked, attempting to gauge $his sexuality. It seems $he is
 							<<saRulesAttractionDiscovery>>
 						<</if>>
 					<</if>>
@@ -4653,7 +4653,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he cares for the cattle, analyzing $his preferences. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he cares for the cattle, analyzing $his preferences. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -5024,7 +5024,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he works with the crops and animals, attempting to gauge $his sexuality. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he works with the crops and animals, attempting to gauge $his sexuality. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -5135,7 +5135,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he amuses $himself, analyzing $his tastes. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he amuses $himself, analyzing $his tastes. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -5252,7 +5252,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he gets off, analyzing $his sexuality. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he gets off, analyzing $his sexuality. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -5403,7 +5403,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he spends time with your Head Girl, analyzing $his sexuality. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he spends time with your Head Girl, analyzing $his sexuality. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
@@ -5806,7 +5806,7 @@
 			<<if ($slaves[$i].attrKnown == 0)>>
 				<<if ($week-$slaves[$i].weekAcquired > 4) && $slaves[$i].energy > 20>>
 					<<set $slaves[$i].attrKnown = 1>>
-					<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> has been monitoring $him as $he gets off, analyzing $his sexuality. It seems $he is
+					<<= capFirstChar($assistant.name)>> has been monitoring $him as $he gets off, analyzing $his sexuality. It seems $he is
 					<<saRulesAttractionDiscovery>>
 				<</if>>
 			<</if>>
diff --git a/src/uncategorized/seNicaeaAnnouncement.tw b/src/uncategorized/seNicaeaAnnouncement.tw
index 2f2963c1dc6e0cb20504695bdf1368ab19e376a0..1a0aa067ba5eed630823067ce1a2a70310d72217 100644
--- a/src/uncategorized/seNicaeaAnnouncement.tw
+++ b/src/uncategorized/seNicaeaAnnouncement.tw
@@ -35,7 +35,7 @@ Hosting a new religion's first synod will be expensive and time-consuming, but w
 	<<else>>
 		"Wonderful," says the evangelistic lady slaveowner. She orders that the newly consecrated slave approach her, and ends the call.
 	<</if>>
-	You have a tremendous amount of work to do, and not much time to do it. You immediately set aside a sizable sum as an initial budget for the event itself. The first major decision you'll need to make about the council is who to invite. As one of Chattel Religionism's most prominent figures, you have a good idea of who you'd have to include to ensure that the council's agreements have as much weight as possible; $assistantName immediately begins collating background information on potential attendees, to assist you further.
+	You have a tremendous amount of work to do, and not much time to do it. You immediately set aside a sizable sum as an initial budget for the event itself. The first major decision you'll need to make about the council is who to invite. As one of Chattel Religionism's most prominent figures, you have a good idea of who you'd have to include to ensure that the council's agreements have as much weight as possible; $assistant.name immediately begins collating background information on potential attendees, to assist you further.
 	<<set $nicaeaInvolvement = 1, $nicaeaPower += 1, $nicaeaInfluence = 1, $nicaeaName = "Council of " + $arcologies[0].name>>
 	<<run cashX(-10000, "event")>>
 	<</replace>>
@@ -57,7 +57,7 @@ Hosting a new religion's first synod will be expensive and time-consuming, but w
 <</link>>
 <br><<link "Ignore the council">>
 	<<replace "#result">>
-	You give a politely noncommittal answer, instruct $assistantName that further calls on the matter are to be deflected, and give the matter no further thought.
+	You give a politely noncommittal answer, instruct $assistant.name that further calls on the matter are to be deflected, and give the matter no further thought.
 	<</replace>>
 <</link>>
 </span>
\ No newline at end of file
diff --git a/src/uncategorized/seNicaeaPreperation.tw b/src/uncategorized/seNicaeaPreperation.tw
index 59c9fb5e84c007b62de34cd598a8b5622b092241..5bacd93f81f5eb50de6124cbf1a58e438444e0bf 100644
--- a/src/uncategorized/seNicaeaPreperation.tw
+++ b/src/uncategorized/seNicaeaPreperation.tw
@@ -16,7 +16,7 @@ But you did win. Chattel Religionism will remain a free and open faith that acce
 
 <<else>>
 
-You have a busy week preparing for the $nicaeaName ahead of you. Planning the event itself is the easy part. Modern arcologies are designed to host big events, and it's not like you don't have a lot of labor available to assist you. Furthermore, one of $assistantName's standard functions is event planning. _HeA helps manage the thousand details of hosting a group of rich, powerful, opinionated people, letting you focus on the most important matters.
+You have a busy week preparing for the $nicaeaName ahead of you. Planning the event itself is the easy part. Modern arcologies are designed to host big events, and it's not like you don't have a lot of labor available to assist you. Furthermore, one of $assistant.name's standard functions is event planning. _HeA helps manage the thousand details of hosting a group of rich, powerful, opinionated people, letting you focus on the most important matters.
 <<if $HeadGirl != 0>>
 	<<setLocalPronouns $HeadGirl>>
 	$HeadGirl.slaveName is also a great help. $He does $his best to supervise your other slaves even more thoroughly than usual, giving you precious time.
diff --git a/src/uncategorized/seWeddingDouble.tw b/src/uncategorized/seWeddingDouble.tw
index 5b4aeb35f2357494a2548e24e8e4b26232b6327a..868ace6ab0832432c4d9af0a752e96fe3c6be015 100644
--- a/src/uncategorized/seWeddingDouble.tw
+++ b/src/uncategorized/seWeddingDouble.tw
@@ -970,7 +970,7 @@
 		<</if>>
 	<</if>>
 
-	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for them, and you place a simple steel ring
+	<<= capFirstChar($assistant.name)>> reads the short recitation for them, and you place a simple steel ring
 
 	<<if hasAnyArms(_slave1) && hasAnyArms(_slave2)>>
 		<<if (_slave1.devotion < -20 && _slave1.trust <= 20) && (_slave1.devotion < -20 && _slave1.trust <= 20)>>
@@ -1463,7 +1463,7 @@
 			/* TODO: rewrite for slaves that can't walk */
 			They spent the day before resting and preparing themselves, if you can call sitting around mindlessly preparing. They spend most of the day-long party at the center of a nonstop gangbang, occasionally moaning as more of a physical reaction than anything. The theory is that they'll be bound to you as your slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> from this day onward, so they must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter emptiness. Many brought their own slaves to participate, too. _slave1.slaveName and _slave2.slaveName spend hours with numerous cocks inside them, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, they are extracted and taken off to be bathed.
 			<br><br>
-			They return shortly, looking exhausted but otherwise uncaring. They're naked still, their skin clean, and are <<if !hasAnyLegs(_slave1) && !hasAnyLegs(_slave2)>>carried<<else>>led<</if>> to you for the ceremony by other slaves. The only evident signs that they've had sex with more than a hundred people today is their asses, which look rather well traveled, and their tiredness. They can't conceal their tiredness, and lean against you subconsciously. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for them, and you place a simple steel ring
+			They return shortly, looking exhausted but otherwise uncaring. They're naked still, their skin clean, and are <<if !hasAnyLegs(_slave1) && !hasAnyLegs(_slave2)>>carried<<else>>led<</if>> to you for the ceremony by other slaves. The only evident signs that they've had sex with more than a hundred people today is their asses, which look rather well traveled, and their tiredness. They can't conceal their tiredness, and lean against you subconsciously. <<= capFirstChar($assistant.name)>> reads the short recitation for them, and you place a simple steel ring
 			<<if hasAnyArms(_slave1) && hasAnyArms(_slave2)>>
 				<<if (_slave1.devotion < -20 && _slave1.trust <= 20) && (_slave1.devotion < -20 && _slave1.trust <= 20)>>
 					on both of their trembling middle fingers.
@@ -1491,7 +1491,7 @@
 			/* TODO: rewrite for slaves that can't walk */
 			They spent the day before resting and preparing themselves, and this was a necessary precaution. They spend most of the day-long party at the center of a nonstop gangbang. The theory is that they'll be bound to you as your slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> from this day onward, so they must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, @@.green;your guests take part with enthusiasm,@@ many having brought their own slaves to participate, too. _slave1.slaveName and _slave2.slaveName spend hours with numerous cocks inside them, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, they're extracted and taken off to be bathed.
 			<br><br>
-			They return shortly, looking exhausted but rather proud of themselves for getting through all that. They're naked still, their skin clean, and <<if !hasAnyLegs(_slave1) && !hasAnyLegs(_slave2)>>are carried<<else>>come confidently<</if>> to stand by you for the ceremony. The only evident signs that they've had sex with more than a hundred people today is their asses, which look rather well-traveled, and their tiredness. They do their best to conceal how ready to sleep they are, but they lean against you a little. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for them, and you place a simple steel ring
+			They return shortly, looking exhausted but rather proud of themselves for getting through all that. They're naked still, their skin clean, and <<if !hasAnyLegs(_slave1) && !hasAnyLegs(_slave2)>>are carried<<else>>come confidently<</if>> to stand by you for the ceremony. The only evident signs that they've had sex with more than a hundred people today is their asses, which look rather well-traveled, and their tiredness. They do their best to conceal how ready to sleep they are, but they lean against you a little. <<= capFirstChar($assistant.name)>> reads the short recitation for them, and you place a simple steel ring
 			<<if hasAnyArms(_slave1) && hasAnyArms(_slave2)>>
 				<<if (_slave1.devotion < -20 && _slave1.trust <= 20) && (_slave1.devotion < -20 && _slave1.trust <= 20)>>
 					on both of their trembling middle fingers.
@@ -1519,7 +1519,7 @@
 			/* TODO: rewrite for slaves that can't walk */
 			They spent the day before resting and trying to ready themselves, and this was a necessary precaution. They spend most of the day-long party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that they'll be bound to you as your slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> from this day onward, so they must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. _slave1.slaveName and _slave2.slaveName spend hours with numerous cocks inside them, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, they're extracted and taken off to be bathed.
 			<br><br>
-			They return shortly, looking exhausted and annoyed. They're naked still, their skin clean, and come reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that they've had sex with more than a hundred people today is their asses, which look rather well traveled, and their tiredness. They do their best to conceal their tiredness and look stronger than they are, choosing to struggle to stand instead of leaning against you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for them, and you place a simple steel ring
+			They return shortly, looking exhausted and annoyed. They're naked still, their skin clean, and come reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that they've had sex with more than a hundred people today is their asses, which look rather well traveled, and their tiredness. They do their best to conceal their tiredness and look stronger than they are, choosing to struggle to stand instead of leaning against you. <<= capFirstChar($assistant.name)>> reads the short recitation for them, and you place a simple steel ring
 			<<if hasAnyArms(_slave1) && hasAnyArms(_slave2)>>
 				<<if (_slave1.devotion < -20 && _slave1.trust <= 20) && (_slave1.devotion < -20 && _slave1.trust <= 20)>>
 					on both of their trembling middle fingers.
@@ -1547,7 +1547,7 @@
 			/* TODO: rewrite for slaves that can't walk */
 			They spent the day before resting and crying to themselves, and this was a necessary precaution. They spend most of the day-long party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that they'll be bound to you as your slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> from this day onward, so they must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. _slave1.slaveName and _slave2.slaveName spend hours with numerous cocks inside them, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, they're extracted and taken off to be bathed.
 			<br><br>
-			They return shortly, looking exhausted and depressed. They're naked still, their skin clean, and come reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that they've had sex with more than a hundred people today is their asses, which look rather well traveled, and their tiredness. They do their best to conceal their tiredness out of fear of punishment, and they lean against you for support despite their feelings on the wedding and you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for them, and you place a simple steel ring
+			They return shortly, looking exhausted and depressed. They're naked still, their skin clean, and come reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that they've had sex with more than a hundred people today is their asses, which look rather well traveled, and their tiredness. They do their best to conceal their tiredness out of fear of punishment, and they lean against you for support despite their feelings on the wedding and you. <<= capFirstChar($assistant.name)>> reads the short recitation for them, and you place a simple steel ring
 			<<if hasAnyArms(_slave1) && hasAnyArms(_slave2)>>
 				<<if (_slave1.devotion < -20 && _slave1.trust <= 20) && (_slave1.devotion < -20 && _slave1.trust <= 20)>>
 					on both of their trembling middle fingers.
@@ -1577,7 +1577,7 @@
 			<br><br>
 			They return shortly, looking exhausted. They're naked still, their skin clean, and come to stand by you for the ceremony. The only evident signs that they've had sex with more than a hundred people today is their asses, which look rather well traveled, and their tiredness. They do their best to conceal it, leaning against you despite the lack of love between you.
 			/* TODO: double check the devotion requirements for this, rewrite as needed */
-			<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for them, and you place a simple steel ring
+			<<= capFirstChar($assistant.name)>> reads the short recitation for them, and you place a simple steel ring
 			<<if hasAnyArms(_slave1) && hasAnyArms(_slave2)>>
 				<<if (_slave1.devotion < -20 && _slave1.trust <= 20) && (_slave1.devotion < -20 && _slave1.trust <= 20)>>
 					on both of their trembling middle fingers.
@@ -1607,31 +1607,31 @@
 		<<if _slave1.fetish == "mindbroken">>
 			_slave1.slaveName spent the day before resting and preparing $himself, if you can call sitting around mindlessly preparing. $He spends most of the day-long party at the center of a nonstop gangbang, occasionally moaning as more of a physical reaction than anything. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter emptiness. Many brought their own slaves to participate, too. _slave1.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 			<br><br>
-			$He returns shortly, looking exhausted but otherwise uncaring. $He's naked still, $his skin clean and _slave1.skin, and is led to you for the ceremony by another slave. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He can't conceal $his tiredness, and leans against you subconsciously. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms(_slave1)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+			$He returns shortly, looking exhausted but otherwise uncaring. $He's naked still, $his skin clean and _slave1.skin, and is led to you for the ceremony by another slave. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He can't conceal $his tiredness, and leans against you subconsciously. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms(_slave1)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 			<br><br>
 			Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
 		<<elseif _slave1.devotion+_slave1.trust >= 175>>
 			_slave1.slaveName spent the day before resting and preparing $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, @@.green;your guests take part with enthusiasm,@@ many having brought their own slaves to participate, too. _slave1.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 			<br><br>
-			$He returns shortly, looking exhausted but rather proud of $himself for getting through all that. $He's naked still, $his skin clean and _slave1.skin, and comes confidently to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well-traveled, and $his tiredness. $He does $his best to conceal how ready to sleep $he is, but $he leans against you a little. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms(_slave1)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+			$He returns shortly, looking exhausted but rather proud of $himself for getting through all that. $He's naked still, $his skin clean and _slave1.skin, and comes confidently to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well-traveled, and $his tiredness. $He does $his best to conceal how ready to sleep $he is, but $he leans against you a little. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms(_slave1)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 			<br><br>
 			Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
 		<<elseif _slave1.devotion < -20 && _slave1.trust > 20>>
 			_slave1.slaveName spent the day before resting and trying to ready $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. _slave1.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 			<br><br>
-			$He returns shortly, looking exhausted and annoyed. $He's naked still, $his skin clean and _slave1.skin, and comes reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness and look stronger than $he is, choosing to struggle to stand instead of leaning against you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms(_slave1)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+			$He returns shortly, looking exhausted and annoyed. $He's naked still, $his skin clean and _slave1.skin, and comes reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness and look stronger than $he is, choosing to struggle to stand instead of leaning against you. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms(_slave1)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 			<br><br>
 			Once the ceremony is complete, you scoop up your new, protesting, slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing. $He squirms slightly in $his sleep to the unwelcome feeling of your arm around $him.
 		<<elseif _slave1.devotion < -20>>
 			_slave1.slaveName spent the day before resting and crying to $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. _slave1.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 			<br><br>
-			$He returns shortly, looking exhausted and depressed. $He's naked still, $his skin clean and _slave1.skin, and comes reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness out of fear of punishment, and $he leans against you for support despite $his feelings on the wedding and you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms(_slave1)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+			$He returns shortly, looking exhausted and depressed. $He's naked still, $his skin clean and _slave1.skin, and comes reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness out of fear of punishment, and $he leans against you for support despite $his feelings on the wedding and you. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms(_slave1)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 			<br><br>
 			Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
 		<<else>>
 			_slave1.slaveName spent the day before resting and reluctantly preparing $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang, moaning and wincing as $he takes cock after cock. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's lack of passion. Many brought their own slaves to participate, too. _slave1.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 			<br><br>
-			$He returns shortly, looking exhausted. $He's naked still, $his skin clean and _slave1.skin, and comes to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal it, leaning against you despite the lack of love between you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms(_slave1)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+			$He returns shortly, looking exhausted. $He's naked still, $his skin clean and _slave1.skin, and comes to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal it, leaning against you despite the lack of love between you. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms(_slave1)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 			<br><br>
 			Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against you, so tired that $he's grateful for the break from standing. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
 		<</if>>
@@ -1639,31 +1639,31 @@
 		<<if _slave2.fetish == "mindbroken">>
 			spent the day before resting and preparing _himself2, if you can call sitting around mindlessly preparing. _He2 spends most of the day-long party at the center of a nonstop gangbang, occasionally moaning as more of a physical reaction than anything. The theory is that _he2'll be bound to you as your slave _wife2 from this day onward, so _he2 must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter emptiness. Many brought their own slaves to participate, too. _slave2.slaveName spends hours with numerous cocks inside _him2, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, _he2's extracted and taken off to be bathed.
 			<br><br>
-			_He2 returns shortly, looking exhausted but otherwise uncaring. _He2's naked still, _his2 skin clean and _slave2.skin, and is led to you for the ceremony by another slave. The only evident signs that _he2's had sex with more than a hundred people today is _his2 ass, which looks rather well traveled, and _his2 tiredness. _He2 can't conceal _his2 tiredness, and leans against you subconsciously. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for _him2, and you place a simple steel ring <<if !hasAnyArms(_slave2)>>on a cord around _his2 neck, since _he2 lacks fingers to wear it on<<else>>on _his2 finger<</if>>. There is no ring for you, since this marriage does not bind you.
+			_He2 returns shortly, looking exhausted but otherwise uncaring. _He2's naked still, _his2 skin clean and _slave2.skin, and is led to you for the ceremony by another slave. The only evident signs that _he2's had sex with more than a hundred people today is _his2 ass, which looks rather well traveled, and _his2 tiredness. _He2 can't conceal _his2 tiredness, and leans against you subconsciously. <<= capFirstChar($assistant.name)>> reads the short recitation for _him2, and you place a simple steel ring <<if !hasAnyArms(_slave2)>>on a cord around _his2 neck, since _he2 lacks fingers to wear it on<<else>>on _his2 finger<</if>>. There is no ring for you, since this marriage does not bind you.
 			<br><br>
 			Once the ceremony is complete, you scoop up your new slave _wife2 to carry _him2 back into the master bedroom. _He2 rests _his2 head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle _him2 in your arms, and by the time _he2's home, _he2's fast asleep. You set _him2 gently down on the bed and curl up behind _him2, feeling the animal warmth of _his2 body as the exhausted slave's chest rises and falls with _his2 breathing.
 		<<elseif _slave2.devotion+_slave2.trust >= 175>>
 			spent the day before resting and preparing _himself2, and this was a necessary precaution. _He2 spends most of the day-long party at the center of a nonstop gangbang. The theory is that _he2'll be bound to you as your slave _wife2 from this day onward, so _he2 must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, @@.green;your guests take part with enthusiasm,@@ many having brought their own slaves to participate, too. _slave2.slaveName spends hours with numerous cocks inside _him2, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, _he2's extracted and taken off to be bathed.
 			<br><br>
-			_He2 returns shortly, looking exhausted but rather proud of _himself2 for getting through all that. _He2's naked still, _his2 skin clean and _slave2.skin, and comes confidently to stand by you for the ceremony. The only evident signs that _he2's had sex with more than a hundred people today is _his2 ass, which looks rather well-traveled, and _his2 tiredness. _He2 does _his2 best to conceal how ready to sleep _he2 is, but _he2 leans against you a little. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for _him2, and you place a simple steel ring <<if !hasAnyArms(_slave2)>>on a cord around _his2 neck, since _he2 lacks fingers to wear it on<<else>>on _his2 finger<</if>>. There is no ring for you, since this marriage does not bind you.
+			_He2 returns shortly, looking exhausted but rather proud of _himself2 for getting through all that. _He2's naked still, _his2 skin clean and _slave2.skin, and comes confidently to stand by you for the ceremony. The only evident signs that _he2's had sex with more than a hundred people today is _his2 ass, which looks rather well-traveled, and _his2 tiredness. _He2 does _his2 best to conceal how ready to sleep _he2 is, but _he2 leans against you a little. <<= capFirstChar($assistant.name)>> reads the short recitation for _him2, and you place a simple steel ring <<if !hasAnyArms(_slave2)>>on a cord around _his2 neck, since _he2 lacks fingers to wear it on<<else>>on _his2 finger<</if>>. There is no ring for you, since this marriage does not bind you.
 			<br><br>
 			Once the ceremony is complete, you scoop up your new slave _wife2 to carry _him2 back into the master bedroom. _He2 rests _his2 head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle _him2 in your arms, and by the time _he2's home, _he2's fast asleep. You set _him2 gently down on the bed and curl up behind _him2, feeling the animal warmth of _his2 body as the exhausted slave's chest rises and falls with _his2 breathing.
 		<<elseif _slave2.devotion < -20 && _slave2.trust > 20>>
 			spent the day before resting and trying to ready _himself2, and this was a necessary precaution. _He2 spends most of the day-long party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that _he2'll be bound to you as your slave _wife2 from this day onward, so _he2 must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. _slave2.slaveName spends hours with numerous cocks inside _him2, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, _he2's extracted and taken off to be bathed.
 			<br><br>
-			_He2 returns shortly, looking exhausted and annoyed. _He2's naked still, _his2 skin clean and _slave2.skin, and comes reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that _he2's had sex with more than a hundred people today is _his2 ass, which looks rather well traveled, and _his2 tiredness. _He2 does _his2 best to conceal _his2 tiredness and look stronger than _he2 is, choosing to struggle to stand instead of leaning against you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for _him2, and you place a simple steel ring <<if !hasAnyArms(_slave2)>>on a cord around _his2 neck, since _he2 lacks fingers to wear it on<<else>>on _his2 finger<</if>>. There is no ring for you, since this marriage does not bind you.
+			_He2 returns shortly, looking exhausted and annoyed. _He2's naked still, _his2 skin clean and _slave2.skin, and comes reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that _he2's had sex with more than a hundred people today is _his2 ass, which looks rather well traveled, and _his2 tiredness. _He2 does _his2 best to conceal _his2 tiredness and look stronger than _he2 is, choosing to struggle to stand instead of leaning against you. <<= capFirstChar($assistant.name)>> reads the short recitation for _him2, and you place a simple steel ring <<if !hasAnyArms(_slave2)>>on a cord around _his2 neck, since _he2 lacks fingers to wear it on<<else>>on _his2 finger<</if>>. There is no ring for you, since this marriage does not bind you.
 			<br><br>
 			Once the ceremony is complete, you scoop up your new, protesting, slave _wife2 to carry _him2 back into the master bedroom. _He2 rests _his2 head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time _he2's home, _he2's fast asleep. You set _him2 gently down on the bed and curl up behind _him2, feeling the animal warmth of _his2 body as the exhausted slave's chest rises and falls with _his2 breathing. _He2 squirms slightly in _his2 sleep to the unwelcome feeling of your arm around _him2.
 		<<elseif _slave2.devotion < -20>>
 			spent the day before resting and crying to _himself2, and this was a necessary precaution. _He2 spends most of the day-long party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that _he2'll be bound to you as your slave _wife2 from this day onward, so _he2 must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. _slave2.slaveName spends hours with numerous cocks inside _him2, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, _he2's extracted and taken off to be bathed.
 			<br><br>
-			_He2 returns shortly, looking exhausted and depressed. _He2's naked still, _his2 skin clean and _slave2.skin, and comes reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that _he2's had sex with more than a hundred people today is _his2 ass, which looks rather well traveled, and _his2 tiredness. _He2 does _his2 best to conceal _his2 tiredness out of fear of punishment, and _he2 leans against you for support despite _his2 feelings on the wedding and you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for _him2, and you place a simple steel ring <<if !hasAnyArms(_slave2)>>on a cord around _his2 neck, since _he2 lacks fingers to wear it on<<else>>on _his2 finger<</if>>. There is no ring for you, since this marriage does not bind you.
+			_He2 returns shortly, looking exhausted and depressed. _He2's naked still, _his2 skin clean and _slave2.skin, and comes reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that _he2's had sex with more than a hundred people today is _his2 ass, which looks rather well traveled, and _his2 tiredness. _He2 does _his2 best to conceal _his2 tiredness out of fear of punishment, and _he2 leans against you for support despite _his2 feelings on the wedding and you. <<= capFirstChar($assistant.name)>> reads the short recitation for _him2, and you place a simple steel ring <<if !hasAnyArms(_slave2)>>on a cord around _his2 neck, since _he2 lacks fingers to wear it on<<else>>on _his2 finger<</if>>. There is no ring for you, since this marriage does not bind you.
 			<br><br>
 			Once the ceremony is complete, you scoop up your new slave _wife2 to carry _him2 back into the master bedroom. _He2 rests _his2 head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time _he2's home, _he2's fast asleep. You set _him2 gently down on the bed and curl up behind _him2, feeling the animal warmth of _his2 body as the exhausted slave's chest rises and falls with _his2 breathing.
 		<<else>>
 			spent the day before resting and reluctantly preparing _himself2, and this was a necessary precaution. _He2 spends most of the day-long party at the center of a nonstop gangbang, moaning and wincing as _he2 takes cock after cock. The theory is that _he2'll be bound to you as your slave _wife2 from this day onward, so _he2 must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's lack of passion. Many brought their own slaves to participate, too. _slave2.slaveName spends hours with numerous cocks inside _him2, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, _he2's extracted and taken off to be bathed.
 			<br><br>
-			_He2 returns shortly, looking exhausted. _He2's naked still, _his2 skin clean and _slave2.skin, and comes to stand by you for the ceremony. The only evident signs that _he2's had sex with more than a hundred people today is _his2 ass, which looks rather well traveled, and _his2 tiredness. _He2 does _his2 best to conceal it, leaning against you despite the lack of love between you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for _him2, and you place a simple steel ring <<if !hasAnyArms(_slave2)>>on a cord around _his2 neck, since _he2 lacks fingers to wear it on<<else>>on _his2 finger<</if>>. There is no ring for you, since this marriage does not bind you.
+			_He2 returns shortly, looking exhausted. _He2's naked still, _his2 skin clean and _slave2.skin, and comes to stand by you for the ceremony. The only evident signs that _he2's had sex with more than a hundred people today is _his2 ass, which looks rather well traveled, and _his2 tiredness. _He2 does _his2 best to conceal it, leaning against you despite the lack of love between you. <<= capFirstChar($assistant.name)>> reads the short recitation for _him2, and you place a simple steel ring <<if !hasAnyArms(_slave2)>>on a cord around _his2 neck, since _he2 lacks fingers to wear it on<<else>>on _his2 finger<</if>>. There is no ring for you, since this marriage does not bind you.
 			<br><br>
 			Once the ceremony is complete, you scoop up your new slave _wife2 to carry _him2 back into the master bedroom. _He2 rests _his2 head against you, so tired that _he2's grateful for the break from standing. By the time _he2's home, _he2's fast asleep. You set _him2 gently down on the bed and curl up behind _him2, feeling the animal warmth of _his2 body as the exhausted slave's chest rises and falls with _his2 breathing.
 		<</if>>
@@ -2259,7 +2259,7 @@
 		<</if>>
 	<</if>>
 	<br><br>
-	When they are in front of you, <<if !hasAnyLegs(_slave1) && !hasAnyLegs(_slave2)>>the slaves carrying their <<if (isAmputee(_slave1)) && (isAmputee(_slave2))>>limbless<<else>>legless<</if>> torsos sets them down on the floor in front of you and prop them up so their heads are level with your crotch<<else>>they get down on their knees so their heads are level with your crotch<</if>>. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for them, and you place a simple steel ring
+	When they are in front of you, <<if !hasAnyLegs(_slave1) && !hasAnyLegs(_slave2)>>the slaves carrying their <<if (isAmputee(_slave1)) && (isAmputee(_slave2))>>limbless<<else>>legless<</if>> torsos sets them down on the floor in front of you and prop them up so their heads are level with your crotch<<else>>they get down on their knees so their heads are level with your crotch<</if>>. <<= capFirstChar($assistant.name)>> reads the short recitation for them, and you place a simple steel ring
 	<<if hasAnyArms(_slave1) && hasAnyArms(_slave2)>>
 		<<if (_slave1.devotion < -20 && _slave1.trust <= 20) && (_slave1.devotion < -20 && _slave1.trust <= 20)>>
 			on both of their trembling middle fingers.
diff --git a/src/uncategorized/seWeddingSingle.tw b/src/uncategorized/seWeddingSingle.tw
index fc64dc501adc623f6738394251a9b33b1fafa79f..c9d5d186894825ec67d4edecb55459ff0afa2e4a 100644
--- a/src/uncategorized/seWeddingSingle.tw
+++ b/src/uncategorized/seWeddingSingle.tw
@@ -398,7 +398,7 @@ In the days leading up to your wedding, $slaves[_wedS].slaveName spent $his time
 		<</if>>
 	<</if>>
 	is level with your crotch.
-	<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring
+	<<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring
 	<<if !hasAnyArms($slaves[_wedS])>>
 		on a cord around $his neck, since $he lacks fingers to wear it on.
 	<<else>>
@@ -552,31 +552,31 @@ In the days leading up to your wedding, $slaves[_wedS].slaveName spent $his time
 	<<if $slaves[_wedS].fetish == "mindbroken">>
 		$He spent the day before resting and preparing $himself, if you can call sitting around mindlessly preparing. $He spends most of the day-long party at the center of a nonstop gangbang, occasionally moaning as more of a physical reaction than anything. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter emptiness. Many brought their own slaves to participate, too. $slaves[_wedS].slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 		<br><br>
-		$He returns shortly, looking exhausted but otherwise uncaring. $He's naked still, $his skin clean and $slaves[_wedS].skin, and is led to you for the ceremony by another slave. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He can't conceal $his tiredness, and leans against you subconsciously. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+		$He returns shortly, looking exhausted but otherwise uncaring. $He's naked still, $his skin clean and $slaves[_wedS].skin, and is led to you for the ceremony by another slave. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He can't conceal $his tiredness, and leans against you subconsciously. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 		<br><br>
 		Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
 	<<elseif $slaves[_wedS].devotion+$slaves[_wedS].trust >= 175>>
 		$He spent the day before resting and preparing $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, @@.green;your guests take part with enthusiasm,@@ many having brought their own slaves to participate, too. $slaves[_wedS].slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 		<br><br>
-		$He returns shortly, looking exhausted but rather proud of $himself for getting through all that. $He's naked still, $his skin clean and $slaves[_wedS].skin, and comes confidently to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well-traveled, and $his tiredness. $He does $his best to conceal how ready to sleep $he is, but $he leans against you a little. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+		$He returns shortly, looking exhausted but rather proud of $himself for getting through all that. $He's naked still, $his skin clean and $slaves[_wedS].skin, and comes confidently to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well-traveled, and $his tiredness. $He does $his best to conceal how ready to sleep $he is, but $he leans against you a little. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 		<br><br>
 		Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
 	<<elseif $slaves[_wedS].devotion < -20 && $slaves[_wedS].trust > 20>>
 		$He spent the day before resting and trying to ready $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. $slaves[_wedS].slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 		<br><br>
-		$He returns shortly, looking exhausted and annoyed. $He's naked still, $his skin clean and $slaves[_wedS].skin, and comes reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness and look stronger than $he is, choosing to struggle to stand instead of leaning against you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+		$He returns shortly, looking exhausted and annoyed. $He's naked still, $his skin clean and $slaves[_wedS].skin, and comes reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness and look stronger than $he is, choosing to struggle to stand instead of leaning against you. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 		<br><br>
 		Once the ceremony is complete, you scoop up your new, protesting, slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing. $He squirms slightly in $his sleep to the unwelcome feeling of your arm around $him.
 	<<elseif $slaves[_wedS].devotion < -20>>
 		$He spent the day before resting and crying to $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. $slaves[_wedS].slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 		<br><br>
-		$He returns shortly, looking exhausted and depressed. $He's naked still, $his skin clean and $slaves[_wedS].skin, and comes reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness out of fear of punishment, and $he leans against you for support despite $his feelings on the wedding and you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+		$He returns shortly, looking exhausted and depressed. $He's naked still, $his skin clean and $slaves[_wedS].skin, and comes reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness out of fear of punishment, and $he leans against you for support despite $his feelings on the wedding and you. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 		<br><br>
 		Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
 	<<else>>
 		$He spent the day before resting and reluctantly preparing $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang, moaning and wincing as $he takes cock after cock. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's lack of passion. Many brought their own slaves to participate, too. $slaves[_wedS].slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 		<br><br>
-		$He returns shortly, looking exhausted. $He's naked still, $his skin clean and $slaves[_wedS].skin, and comes to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal it, leaning against you despite the lack of love between you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+		$He returns shortly, looking exhausted. $He's naked still, $his skin clean and $slaves[_wedS].skin, and comes to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal it, leaning against you despite the lack of love between you. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 		<br><br>
 		Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against you, so tired that $he's grateful for the break from standing. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
 	<</if>>
@@ -776,7 +776,7 @@ In the days leading up to your wedding, $slaves[_wedS].slaveName spent $his time
 		of $his own choice, and $he does so willingly.
 	<</if>>
 	<br><br>
-	When $he's in front of you, <<if !hasAnyLegs($slaves[_wedS])>>the slave carrying $his <<if isAmputee($slaves[_wedS])>>limbless<<else>>legless<</if>> torso sets $him down on the floor in front of you and props $him up so $his head is level with your crotch<<else>>$he gets down on $his _knees so $his head is level with your crotch<</if>>. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+	When $he's in front of you, <<if !hasAnyLegs($slaves[_wedS])>>the slave carrying $his <<if isAmputee($slaves[_wedS])>>limbless<<else>>legless<</if>> torso sets $him down on the floor in front of you and props $him up so $his head is level with your crotch<<else>>$he gets down on $his _knees so $his head is level with your crotch<</if>>. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 	<br>
 	<<if $PC.slaveSurname && $slaves[_wedS].slaveSurname != $PC.slaveSurname>>
 		<br><br><span id="surnaming">
diff --git a/src/uncategorized/seWeddingTriple.tw b/src/uncategorized/seWeddingTriple.tw
index 62a549bd117573eb464d02c167306ce21dc45c11..031ddeb504e280e4d2801925322ceb5f431d93ce 100644
--- a/src/uncategorized/seWeddingTriple.tw
+++ b/src/uncategorized/seWeddingTriple.tw
@@ -73,31 +73,31 @@ In the days leading up to your wedding, your <<if $wife == _wife2>>$wives<<else>
 	<<if $activeSlave.fetish == "mindbroken">>
 		$He spent the day before resting and preparing $himself, if you can call sitting around mindlessly preparing. $He spends most of the day-long party at the center of a nonstop gangbang, occasionally moaning as more of a physical reaction than anything. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter emptiness. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 		<br><br>
-		$He returns shortly, looking exhausted but otherwise uncaring. $He's naked still, $his skin clean and $activeSlave.skin, and is led to you for the ceremony by another slave. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He can't conceal $his tiredness, and leans against you subconsciously. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+		$He returns shortly, looking exhausted but otherwise uncaring. $He's naked still, $his skin clean and $activeSlave.skin, and is led to you for the ceremony by another slave. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He can't conceal $his tiredness, and leans against you subconsciously. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 		<br><br>
 		Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
 	<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
 		$He spent the day before resting and preparing $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, @@.green;your guests take part with enthusiasm,@@ many having brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 		<br><br>
-		$He returns shortly, looking exhausted but rather proud of $himself for getting through all that. $He's naked still, $his skin clean and $activeSlave.skin, and comes confidently to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well-traveled, and $his tiredness. $He does $his best to conceal how ready to sleep $he is, but $he leans against you a little. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+		$He returns shortly, looking exhausted but rather proud of $himself for getting through all that. $He's naked still, $his skin clean and $activeSlave.skin, and comes confidently to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well-traveled, and $his tiredness. $He does $his best to conceal how ready to sleep $he is, but $he leans against you a little. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 		<br><br>
 		Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
 	<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
 		$He spent the day before resting and trying to ready $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 		<br><br>
-		$He returns shortly, looking exhausted and annoyed. $He's naked still, $his skin clean and $activeSlave.skin, and comes reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness and look stronger than $he is, choosing to struggle to stand instead of leaning against you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+		$He returns shortly, looking exhausted and annoyed. $He's naked still, $his skin clean and $activeSlave.skin, and comes reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness and look stronger than $he is, choosing to struggle to stand instead of leaning against you. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 		<br><br>
 		Once the ceremony is complete, you scoop up your new, protesting, slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing. $He squirms slightly in $his sleep to the unwelcome feeling of your arm around $him.
 	<<elseif $activeSlave.devotion < -20>>
 		$He spent the day before resting and crying to $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 		<br><br>
-		$He returns shortly, looking exhausted and depressed. $He's naked still, $his skin clean and $activeSlave.skin, and comes reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness out of fear of punishment, and $he leans against you for support despite $his feelings on the wedding and you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+		$He returns shortly, looking exhausted and depressed. $He's naked still, $his skin clean and $activeSlave.skin, and comes reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness out of fear of punishment, and $he leans against you for support despite $his feelings on the wedding and you. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 		<br><br>
 		Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
 	<<else>>
 		$He spent the day before resting and reluctantly preparing $himself, and this was a necessary precaution. $He spends most of the day-long party at the center of a nonstop gangbang, moaning and wincing as $he takes cock after cock. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's lack of passion. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
 		<br><br>
-		$He returns shortly, looking exhausted. $He's naked still, $his skin clean and $activeSlave.skin, and comes to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal it, leaning against you despite the lack of love between you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+		$He returns shortly, looking exhausted. $He's naked still, $his skin clean and $activeSlave.skin, and comes to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal it, leaning against you despite the lack of love between you. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 		<br><br>
 		Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against you, so tired that $he's grateful for the break from standing. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
 	<</if>>
@@ -301,7 +301,7 @@ In the days leading up to your wedding, your <<if $wife == _wife2>>$wives<<else>
 		of $his own choice, and $he does so willingly.
 	<</if>>
 	<br><br>
-	When $he's in front of you, <<if !hasAnyLegs($activeSlave)>>the slave carrying $his <<if isAmputee($activeSlave)>>limbless<<else>>legless<</if>> torso sets $him down on the floor in front of you and props $him up so $his head is level with your crotch<<else>>$he gets down on $his knee<<if hasBothLegs($activeSlave)>>s<</if>> so $his head is level with your crotch<</if>>. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
+	When $he's in front of you, <<if !hasAnyLegs($activeSlave)>>the slave carrying $his <<if isAmputee($activeSlave)>>limbless<<else>>legless<</if>> torso sets $him down on the floor in front of you and props $him up so $his head is level with your crotch<<else>>$he gets down on $his knee<<if hasBothLegs($activeSlave)>>s<</if>> so $his head is level with your crotch<</if>>. <<= capFirstChar($assistant.name)>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
 	<br>
 	<<if $PC.slaveSurname && $activeSlave.slaveSurname != $PC.slaveSurname>>
 		<br><br><span id="surnaming">
diff --git a/src/uncategorized/theFutanariSisters.tw b/src/uncategorized/theFutanariSisters.tw
index d0329f3220dbbd0a9e05333149f55d74251efaab..096b4e634d9e043aa3cccbced83dfff3deda3deb 100644
--- a/src/uncategorized/theFutanariSisters.tw
+++ b/src/uncategorized/theFutanariSisters.tw
@@ -94,7 +94,7 @@ Visitors are not common: in fact, visitors are only as frequent as you feel like
 					<<= knockMeUp($PC, 80, 0, -9, 1)>>
 				<</if>>
 			<<case 7>>
-				You don't even bother to respond, and head straight for the orgy. You insert yourself into an eager mouth, bending over so the matron following you can take you from behind. The worries of your life as an arcology owner seem very far away as she slides inside you. You only leave when $assistantName repeatedly pages you over the arcology's public announcement system. On the way to your office, you notice how full of cum your stomach is, how relaxed your pussy and ass are, and how happy you feel.
+				You don't even bother to respond, and head straight for the orgy. You insert yourself into an eager mouth, bending over so the matron following you can take you from behind. The worries of your life as an arcology owner seem very far away as she slides inside you. You only leave when $assistant.name repeatedly pages you over the arcology's public announcement system. On the way to your office, you notice how full of cum your stomach is, how relaxed your pussy and ass are, and how happy you feel.
 				<<if canGetPregnant($PC)>>
 					<<= knockMeUp($PC, 100, 0, -9, 1)>>
 				<</if>>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index e6803999d8bb30cde3cae45f063456a44f1c64d4..c51580a3719bd69bf6f5e5ce0b8e9ec537ceaaad 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -8,7 +8,7 @@
 <<if $universalRulesRest == 0>>
 	Slaves will ''remain on assignment'' when unhealthy. [[Allow automatic rest when unhealthy|Universal Rules][$universalRulesRest = 1]]
 <<else>>
-	Slaves will ''automatically rest'' at $assistantName's discretion when unhealthy. [[Require all slaves to stay on assignment|Universal Rules][$universalRulesRest = 0]]
+	Slaves will ''automatically rest'' at $assistant.name's discretion when unhealthy. [[Require all slaves to stay on assignment|Universal Rules][$universalRulesRest = 0]]
 <</if>>
 
 <br>
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index 4ddd9bfd54b761f1ea6800b916cd6b78da9be41a..fe935499eba35882645aae49f9438378080f4438 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -266,7 +266,7 @@
 	<</if>>
 
 <<case "take classes">>
-	Or $he would have, had <<if $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>> allowed it. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth, not without your assistant noticing. As punishment for poor planning, $his birth will be turned into a live broadcast. Blushing strongly, $he begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, trying $his best to hide $his shame. Exhausted from the birth, $he is permitted a short break as $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> collected to clean $himself up before the lesson is continued.
+	Or $he would have, had $assistant.name allowed it. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth, not without your assistant noticing. As punishment for poor planning, $his birth will be turned into a live broadcast. Blushing strongly, $he begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, trying $his best to hide $his shame. Exhausted from the birth, $he is permitted a short break as $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> collected to clean $himself up before the lesson is continued.
 	<<set $humiliation = 1>>
 
 <<case "work in the brothel">>
@@ -564,7 +564,7 @@
 	<<set $humiliation = 1>>
 
 <<case "take classes">>
-	Or $he would have been, had <<if $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>> allowed it. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth, not without your assistant noticing. As punishment for poor planning, $he is forbidden from leaving. Additionally, $his birth will be turned into a live broadcast.
+	Or $he would have been, had $assistant.name allowed it. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth, not without your assistant noticing. As punishment for poor planning, $he is forbidden from leaving. Additionally, $his birth will be turned into a live broadcast.
 	<<set $humiliation = 1>>
 	<<ClothingBirth>>
 	Exhausted from the birth, $he is permitted a short break as $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> removed to be cleaned up before the lesson is continued.
@@ -872,22 +872,22 @@
 		<<if _birthScene > 50>>
 			While giving a slave oral service, $slaves[$i].slaveName's water breaks. $He disregards this development and continues working.
 			<<ClothingBirth>>
-			The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. Instead, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> until <<if $Stewardess != 0>>$Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<elseif $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>>shouts at $him to move $his useless ass.
+			The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. Instead, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> until <<if $Stewardess != 0>>$Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<else>>$assistant.name<</if>>shouts at $him to move $his useless ass.
 		<<else>>
 			While scrubbing the penthouse floor, $slaves[$i].slaveName's water breaks. $He turns to clean this new spill, disregarding what it means.
 			<<ClothingBirth>>
-			Instead of cleaning the fresh mess $he made, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> until <<if $Stewardess != 0>>$Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<elseif $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>>shouts at $him to move $his useless ass.
+			Instead of cleaning the fresh mess $he made, $he draws $his child<<if $slaves[$i].pregType > 1>>ren<</if>> to $his breast<<if $slaves[$i].pregType > 1>>s<</if>> until <<if $Stewardess != 0>>$Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<else>>$assistant.name<</if>>shouts at $him to move $his useless ass.
 		<</if>>
 	<<else>>
 		<<if _birthScene > 50>>
 			While giving a slave oral service, $slaves[$i].slaveName's water breaks. $He desperately tries to pull away but they grab $his head and force $him back to their crotch.
 			<<set $humiliation = 1>>
 			<<ClothingBirth>>
-			The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. $He hurriedly tries to mop up the mess and collect $his child<<if $slaves[$i].pregType > 1>>ren<</if>> before <<if $Stewardess != 0>>$Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<elseif $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>> shouts at $him.
+			The slave gets off quite strongly to the show and shoves $him out of the way, leaving $him to clean up $his mess. $He hurriedly tries to mop up the mess and collect $his child<<if $slaves[$i].pregType > 1>>ren<</if>> before <<if $Stewardess != 0>>$Stewardess.slaveName<<elseif $HeadGirl != 0>>$HeadGirl.slaveName<<else>>$assistant.name<</if>> shouts at $him.
 		<<else>>
 			While scrubbing the penthouse floor, $slaves[$i].slaveName's water breaks. $He panics at the thought of not cleaning up $his spill but $his worsening contractions force $him to find a secluded place to give birth.
 			<<ClothingBirth>>
-			Collecting $his child<<if $slaves[$i].pregType > 1>>ren<</if>>, $he exits $his hiding place before coming under the eye of <<if $Stewardess != 0>>the glaring $Stewardess.slaveName. $His child<<if $slaves[$i].pregType > 1>>ren<</if>> are promptly taken following a lecture about priorities and time management.<<elseif $HeadGirl != 0>>the glaring $HeadGirl.slaveName. $His child<<if $slaves[$i].pregType > 1>>ren<</if>> are promptly taken following a lecture about priorities and time management.<<else>><<if $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren<</if>> are promptly taken by other servants following a lecture about priorities and time management.<</if>>
+			Collecting $his child<<if $slaves[$i].pregType > 1>>ren<</if>>, $he exits $his hiding place before coming under the eye of <<if $Stewardess != 0>>the glaring $Stewardess.slaveName<<elseif $HeadGirl != 0>>the glaring $HeadGirl.slaveName<<else>>$assistant.name<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren<</if>> are promptly taken by other servants following a lecture about priorities and time management.
 		<</if>>
 	<</if>>
 
@@ -1052,12 +1052,12 @@
 
 <<case "take classes">>
 	<<if !canWalk($slaves[$i])>>
-		During a lesson under <<if $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>>, $slaves[$i].slaveName's water breaks. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth, not without your assistant noticing. As punishment for poor planning, $he is forbidden from leaving. Additionally, $his birth will be turned into a live broadcast.
+		During a lesson under $assistant.name, $slaves[$i].slaveName's water breaks. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth, not without your assistant noticing. As punishment for poor planning, $he is forbidden from leaving. Additionally, $his birth will be turned into a live broadcast.
 		<<set $humiliation = 1>>
 		<<ClothingBirth>>
 		Exhausted from the birth, $he is permitted a short break as $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> gathered to be cleaned up before the lesson is continued.
 	<<else>>
-		During a lesson under <<if $assistantName == "your personal assistant">>your personal assistant<<else>>$assistantName<</if>>, $slaves[$i].slaveName's water breaks. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth, not without your assistant noticing. As punishment for poor planning, $he is forbidden from leaving. Additionally, $his birth will be turned into a live broadcast.
+		During a lesson under $assistant.name, $slaves[$i].slaveName's water breaks. Since $he can't leave the lesson, $he tries $his best to hold back the upcoming birth, not without your assistant noticing. As punishment for poor planning, $he is forbidden from leaving. Additionally, $his birth will be turned into a live broadcast.
 		<<set $humiliation = 1>>
 		<<ClothingBirth>>
 		Exhausted from the birth, $he is permitted a short break as $his child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> gathered to clean $himself up before the lesson is continued.