diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 7373a847eb93d57250cd3886c8f14f5ce147b8d0..31c680d7ee87c868648cf9f71726173da2951092 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -483,7 +483,7 @@ window.saServeThePublic = (function saServeThePublic() {
 				r += ` charms are only for the <span class="green">most prominent citizens.</span> When ${he}'s not `;
 				if (canDoVaginal(slave) && jsRandom(1, 4) === 1) {
 					r += `pleasing high society with ${his} `;
-					if (slave.prestige > 1 || slave.pornPrestige > 2) {
+					if (slave.prestige > 1 || slave.porn.prestige > 2) {
 						r += `prestigious`;
 					} else {
 						r += `popular`;
@@ -493,7 +493,7 @@ window.saServeThePublic = (function saServeThePublic() {
 					r += `getting gangbanged,`;
 				} else if (jsRandom(1, 2) === 1) {
 					r += `giving away one of ${his} `;
-					if (slave.prestige > 1 || slave.pornPrestige > 2) {
+					if (slave.prestige > 1 || slave.porn.prestige > 2) {
 						r += `famous`;
 					} else {
 						r += `top-tier`;
@@ -501,7 +501,7 @@ window.saServeThePublic = (function saServeThePublic() {
 					r += ` blowjobs,`;
 				} else {
 					r += `providing free access to ${his} `;
-					if (slave.prestige > 1 || slave.pornPrestige > 2) {
+					if (slave.prestige > 1 || slave.porn.prestige > 2) {
 						r += `legendary`;
 					} else {
 						r += `notorious`;
@@ -928,11 +928,11 @@ window.saServeThePublic = (function saServeThePublic() {
 			r += ` ${He} attracts more attention because it's prestigious to be seen with ${him}.`;
 		}
 
-		if (slave.pornPrestige > 2) {
+		if (slave.porn.prestige > 2) {
 			r += ` Patrons line up for the chance to spend time with the face of ${slave.porn.fameType} porn.`;
-		} else if (slave.pornPrestige > 1) {
+		} else if (slave.porn.prestige > 1) {
 			r += ` ${He} has a sizable fanbase, one that is eager to spend time with ${him}.`;
-		} else if (slave.pornPrestige > 0) {
+		} else if (slave.porn.prestige > 0) {
 			r += ` A few of ${his} fans recognize ${him} and eagerly make use of ${him}.`;
 		}
 
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 288acedf4223d66fbf9be19797a21a71a079f327..164f8473e3dc4776b48d0e9a505aed11dbb0bcbe 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -677,7 +677,7 @@ window.saWhore = (function saWhore() {
 				r += ` body commands <span class="yellowgreen">a high price.</span> When ${he}'s not `;
 				if (canDoVaginal(slave) && jsRandom(1, 4) === 1) {
 					r += `pleasing the rich with ${his} `;
-					if (slave.prestige > 1 || slave.pornPrestige > 2) {
+					if (slave.prestige > 1 || slave.porn.prestige > 2) {
 						r += `prestigious`;
 					} else {
 						r += `popular`;
@@ -687,7 +687,7 @@ window.saWhore = (function saWhore() {
 					r += `getting gangbanged,`;
 				} else if (jsRandom(1, 2) === 1) {
 					r += `performing one of ${his} `;
-					if (slave.prestige > 1 || slave.pornPrestige > 2) {
+					if (slave.prestige > 1 || slave.porn.prestige > 2) {
 						r += `famous`;
 					} else {
 						r += `top-tier`;
@@ -695,7 +695,7 @@ window.saWhore = (function saWhore() {
 					r += ` blowjobs,`;
 				} else if (canDoAnal(slave)) {
 					r += ` selling access to ${his} `;
-					if (slave.prestige > 1 || slave.pornPrestige > 2) {
+					if (slave.prestige > 1 || slave.porn.prestige > 2) {
 						r += `legendary`;
 					} else {
 						r += `notorious`;
@@ -1117,11 +1117,11 @@ window.saWhore = (function saWhore() {
 			r += ` ${He} attracts more attention because it's prestigious to fuck ${him}.`;
 		}
 
-		if (slave.pornPrestige > 2) {
+		if (slave.porn.prestige > 2) {
 			r += ` Customers line up for the chance to buy time with the face of ${slave.porn.fameType} porn.`;
-		} else if (slave.pornPrestige > 1) {
+		} else if (slave.porn.prestige > 1) {
 			r += ` ${He} has a sizable fanbase, one that is eager to buy time with ${him}.`;
-		} else if (slave.pornPrestige > 0) {
+		} else if (slave.porn.prestige > 0) {
 			r += ` A few of ${his} fans recognize ${him} and eagerly patronize ${him}.`;
 		}
 
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index 1a1246023697a1f39521d8c26426809315c2be96..93fa0c6da327bddc9ae605c4e753105ac106387a 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -289,11 +289,11 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
 		} else if (slave.prestige === 3) {
 			t += `Because ${he} is so famous, ${he} earns a lot more then ${he} would otherwise.`;
 		}
-		if (slave.pornPrestige === 1) { // TODO: are prestige and pornPrestige mutually exclusive?
+		if (slave.porn.prestige === 1) { // TODO: are prestige and pornPrestige mutually exclusive?
 			t += `${He} earns a bit more because some of your citizens already know ${him} from porn. `;
-		} else if (slave.pornPrestige === 2) {
+		} else if (slave.porn.prestige === 2) {
 			t += `${He} earns quite a bit more because a lot of your citizens already know ${him} from porn. `;
-		} else if (slave.pornPrestige === 3) {
+		} else if (slave.porn.prestige === 3) {
 			t += `${He} earns a lot more because ${he} is so famous from porn. `;
 		}
 		if (slave.health > 20) {
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index b7c9ac66c547a7ce6a1b3a2b531d8374fbba94ad..1165041f8979e6991c73a0ba1f1a3f6e24fc1e24 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -77,7 +77,7 @@ You should have received a copy of the GNU General Public License along with thi
 			<</if>>
 			<<set $slaves[_i].rivalry = 0, $slaves[_i].rivalryTarget = 0, $slaves[_i].subTarget = 0>>
 			<<set $slaves[_i].drugs = "no drugs">>
-			<<set $slaves[_i].pornFameSpending = 0>>
+			<<set $slaves[_i].porn.spending = 0>>
 			<<set $slaves[_i].rules.living = "spare">>
 			<<set $slaves[_i].diet = "healthy">>
 			<<set $slaves[_i].pregControl = "none">>
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 5a72e8f1d9a584e703db3be401553059676eeb07..66fc45cb5c8e14110b884034c9fcf0d8c1c85910 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -2862,26 +2862,26 @@ window.DefaultRules = (function() {
 	 * @param {object} rule
 	 */
 	function ProcessPornFeedEnabled(slave, rule) {
-		if (rule.pornFeed === undefined || rule.pornFeed == null) {
+		if (rule.porn.feed === undefined || rule.porn.feed == null) {
 			return;
 		}
-		if (rule.pornFeed === slave.pornFeed) {
+		if (rule.porn.feed === slave.porn.feed) {
 			return;
 		}
-		slave.pornFeed = rule.pornFeed;
-		let yesno = slave.pornFeed ? "are now" : "are no longer";
-		if (slave.pornFeed === 0) {
-			slave.pornFameSpending = 0;
+		slave.porn.feed = rule.porn.feed;
+		let yesno = slave.porn.feed ? "are now" : "are no longer";
+		if (slave.porn.feed === 0) {
+			slave.porn.spending = 0;
 		}
 		r += `<br>Highlights of ${slave.slaveName}'s sex life ${yesno} being released.`;
 	}
 
 	/** @param {App.Entity.SlaveState} slave */
 	function ProcessPorn(slave, rule) {
-		if ((rule.pornFameSpending !== undefined) && (rule.pornFameSpending !== null)) {
-			if ((slave.pornPrestige < 3)) {
-				if ((slave.pornFameSpending !== rule.pornFameSpending)) {
-					slave.pornFameSpending = rule.pornFameSpending;
+		if ((rule.porn.spending !== undefined) && (rule.porn.spending !== null)) {
+			if ((slave.porn.prestige < 3)) {
+				if ((slave.porn.spending !== rule.porn.spending)) {
+					slave.porn.spending = rule.porn.spending;
 					r += `<br>${slave.slaveName}'s porn publicity has been corrected.`;
 				}
 			}
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 33d4a461fb04a9130f13ab24321274fb3640a90a..4c06664b64eb3787be25500b29d7456915c9d89e 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -62,6 +62,25 @@
  
 App.Entity.SlavePornPerformanceState = class {
 	constructor() {
+		/** is the studio outputting porn of her?
+		 * 0: no; 1: yes */
+		this.feed = 0;
+		/** how famous her porn is? */
+		this.viewerCount = 0;
+		/** how much money is being spent on promoting her porn */
+		this.spending = 0;
+		/**
+		 * how famous she is in porn
+		 * * 0: not
+		 * * 1: some
+		 * * 2: recognized
+		 * * 3: world renowned
+		 */
+		this.prestige = 0;
+		/** description to go with @see pornPrestige
+		 * @type {string|number} */
+		this.prestigeDesc = 0;
+		
 		/** what porn she is known for */
 		this.fameType = "none";
 		/** what aspect of her the upgraded studio is focusing on for porn */
@@ -486,24 +505,6 @@ App.Entity.SlaveState = class SlaveState {
 		this.ID = 0;
 		/** slave's prestige */
 		this.prestige = 0;
-		/** is the studio outputting porn of her?
-		 * 0: no; 1: yes */
-		this.pornFeed = 0;
-		/** how famous her porn is? */
-		this.pornFame = 0;
-		/** how much money is being spent on promoting her porn */
-		this.pornFameSpending = 0;
-		/**
-		 * how famous she is in porn
-		 * * 0: not
-		 * * 1: some
-		 * * 2: recognized
-		 * * 3: world renowned
-		 */
-		this.pornPrestige = 0;
-		/** description to go with @see pornPrestige
-		 * @type {string|number} */
-		this.pornPrestigeDesc = 0;
 		/** porn fame */
 		this.porn = new App.Entity.SlavePornPerformanceState();
 		/** rules */
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index a8f8f0b07702c361b1570826a1d34d9fb32a6586..bb59b87547f0bd879c5d6cd9c77e1bce37d86cfe 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -73,6 +73,31 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function() {
 				delete slave.pornFocus;
 			}
 		}
+		
+		if (slave.hasOwnProperty("pornFeed")) {
+			slave.porn.feed = slave.pornFeed;
+			delete slave.pornFeed;
+		}
+		
+		if (slave.hasOwnProperty("pornFame")) {
+			slave.porn.viewerCount = slave.pornFame;
+			delete slave.pornFame;
+		}
+		
+		if (slave.hasOwnProperty("pornFameSpending")) {
+			slave.porn.spending = slave.pornFameSpending;
+			delete slave.pornFameSpending;
+		}
+		
+		if (slave.hasOwnProperty("pornPrestige")) {
+			slave.porn.prestige = slave.pornPrestige;
+			delete slave.pornPrestige;
+		}
+		
+		if (slave.hasOwnProperty("pornPrestigeDesc")) {
+			slave.porn.prestigeDesc = slave.pornPrestigeDesc;
+			delete slave.pornPrestigeDesc;
+		}
 	}
 
 	/**
@@ -794,12 +819,12 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
 	 * @param {App.Entity.SlaveState} slave
 	 */
 	function slavePornDatatypeCleanup(slave) {
-		slave.pornFeed = Math.clamp(+slave.pornFeed, 0, 1) || 0;
-		slave.pornFame = Math.max(+slave.pornFame, 0) || 0;
-		slave.pornFameSpending = Math.max(+slave.pornFameSpending, 0) || 0;
-		slave.pornPrestige = Math.clamp(+slave.pornPrestige, 0, 3) || 0;
-		if (typeof slave.pornPrestigeDesc !== "string") {
-			slave.pornPrestigeDesc = 0;
+		slave.porn.feed = Math.clamp(+slave.porn.feed, 0, 1) || 0;
+		slave.porn.viewerCount = Math.max(+slave.porn.viewerCount, 0) || 0;
+		slave.porn.spending = Math.max(+slave.porn.spending, 0) || 0;
+		slave.porn.prestige = Math.clamp(+slave.porn.prestige, 0, 3) || 0;
+		if (typeof slave.porn.prestigeDesc !== "string") {
+			slave.porn.prestigeDesc = 0;
 		}
 		if (typeof slave.porn.fameType !== "string") {
 			slave.porn.fameType = "none";
@@ -1380,12 +1405,12 @@ window.childDietDatatypeCleanup = function childDietDatatypeCleanup(child) {
 };
 
 window.childPornDatatypeCleanup = function childPornDatatypeCleanup(child) {
-	child.pornFeed = Math.clamp(+child.pornFeed, 0, 1) || 0;
-	child.pornFame = Math.max(+child.pornFame, 0) || 0;
-	child.pornFameSpending = Math.max(+child.pornFameSpending, 0) || 0;
-	child.pornPrestige = Math.clamp(+child.pornPrestige, 0, 3) || 0;
-	if (typeof child.pornPrestigeDesc !== "string") {
-		child.pornPrestigeDesc = 0;
+	child.porn.feed = Math.clamp(+child.porn.feed, 0, 1) || 0;
+	child.porn.viewerCount = Math.max(+child.porn.viewerCount, 0) || 0;
+	child.porn.spending = Math.max(+child.porn.spending, 0) || 0;
+	child.porn.prestige = Math.clamp(+child.porn.prestige, 0, 3) || 0;
+	if (typeof child.porn.prestigeDesc !== "string") {
+		child.porn.prestigeDesc = 0;
 	}
 	if (typeof child.porn.fameType !== "string") {
 		child.porn.fameType = "none";
@@ -2265,8 +2290,8 @@ App.Entity.Utils.RARuleDatatypeCleanup = function() {
 			set.preg = (set.preg === -1);
 		}
 
-		if (set.pornFameSpending === undefined || set.pornFameSpending === -1) {
-			set.pornFameSpending = null;
+		if (set.porn.spending === undefined || set.porn.spending === -1) {
+			set.porn.spending = null;
 		}
 
 		transformValues(set.growth,
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 793c9f709d880627accfd65e7a782d0e04d4a4d5..98140864bda775c92cac625482d61cbeb04e6ea8 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -862,8 +862,8 @@ window.getSlaveCost = function(s) {
 
 	// Promotion costs
 	if (State.variables.studio === 1) {
-		if (s.pornFameSpending > 0) {
-			cost += (s.pornFameSpending / State.variables.PCSlutContacts);
+		if (s.porn.spending > 0) {
+			cost += (s.porn.spending / State.variables.PCSlutContacts);
 		}
 	}
 
diff --git a/src/js/food.js b/src/js/food.js
index bf63c30c2d7d5437f08d279f4af37add2a23b2c8..6a79cf078fbe7408d3122c52197bb94a4cb3859a 100644
--- a/src/js/food.js
+++ b/src/js/food.js
@@ -246,11 +246,11 @@ window.farmShowsIncome = function(slave) {
 		} else if (slave.prestige === 3) { 							// slave is extremely prestigious
 			cash *= 1.3;
 		}
-		if (slave.pornPrestige === 1) { 							// slave is prestigious from porn
+		if (slave.porn.prestige === 1) { 							// slave is prestigious from porn
 			cash *= 1.1;
-		} else if (slave.pornPrestige === 2) { 						// slave is very prestigious from porn
+		} else if (slave.porn.prestige === 2) { 						// slave is very prestigious from porn
 			cash *= 1.2;
-		} else if (slave.pornPrestige === 3) { 						// slave is extremely prestigious from porn
+		} else if (slave.porn.prestige === 3) { 						// slave is extremely prestigious from porn
 			cash *= 1.3;
 		} 															// TODO: add relationship checks
 		if (slave.health > 20) { 									// slave is very healthy or more
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index ff05ba55837934cf464295fc05bde5512b60347a..95af162c1c81e3a23ca74eef075e9ce481284ea3 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -2811,15 +2811,15 @@ window.rulesAssistantOptions = (function() {
 				["enabled", 1]
 			];
 			super("Porn Broadcasting Status", pairs, true);
-			this.setValue(current_rule.set.pornFeed);
-			this.onchange = (value) => current_rule.set.pornFeed = value;
+			this.setValue(current_rule.set.porn.feed);
+			this.onchange = (value) => current_rule.set.porn.feed = value;
 		}
 	}
 
 	class PornList extends ListSelector {
 		constructor() {
 			const pairs = [
-				/* ["No broadcasting", -1], **This has changed, it would now use .pornFeed** */
+				/* ["No broadcasting", -1], **This has changed, it would now use .porn.feed** */
 				["no subsidy", 0],
 				["1000", 1000],
 				["2000", 2000],
@@ -2828,8 +2828,8 @@ window.rulesAssistantOptions = (function() {
 				["5000", 5000]
 			];
 			super("Weekly porn publicity subsidy", pairs);
-			this.setValue(current_rule.set.pornFameSpending);
-			this.onchange = (value) => current_rule.set.pornFameSpending = value;
+			this.setValue(current_rule.set.porn.spending);
+			this.onchange = (value) => current_rule.set.porn.spending = value;
 		}
 	}
 
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 467bbeabd5c44cef0745c36e79ebd5574fabc3c9..aee3276c89f4d12a55bf3a9442b5d03f649b25dd 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -274,7 +274,7 @@ window.Beauty = (function() {
 				}
 				break;
 			case "birthmark":
-				if (slave.prestige > 0 || slave.pornPrestige > 1) {
+				if (slave.prestige > 0 || slave.porn.prestige > 1) {
 					beauty += 4;
 				} else {
 					beauty -= 4;
@@ -1396,7 +1396,7 @@ window.Beauty = (function() {
 		if (slave.fuckdoll === 0 && V.seeAge === 1) {
 			calcAgeBeauty(slave);
 		}
-		if (slave.prestige + slave.pornPrestige > 0) {
+		if (slave.prestige + slave.porn.prestige > 0) {
 			calcPrestigeBeauty(slave);
 		}
 	}
@@ -1494,11 +1494,11 @@ window.Beauty = (function() {
 		} else if (slave.prestige === 1) {
 			beauty += 0.25 * beauty;
 		}
-		if (slave.pornPrestige === 3) {
+		if (slave.porn.prestige === 3) {
 			beauty += beauty;
-		} else if (slave.pornPrestige === 2) {
+		} else if (slave.porn.prestige === 2) {
 			beauty += 0.5 * beauty;
-		} else if (slave.pornPrestige === 1) {
+		} else if (slave.porn.prestige === 1) {
 			beauty += 0.1 * beauty;
 		}
 	}
@@ -1987,7 +1987,7 @@ window.slaveCost = (function() {
 		calcDevotionTrustCost(slave);
 		calcPreferencesCost(slave);
 		calcPregCost(slave);
-		if (slave.prestige + slave.pornPrestige > 0) {
+		if (slave.prestige + slave.porn.prestige > 0) {
 			calcPrestigeCost(slave);
 		}
 		calcFSCost(slave);
@@ -2149,11 +2149,11 @@ window.slaveCost = (function() {
 		if (slave.prestige > 0) {
 			multiplier += 0.7 * slave.prestige;
 		}
-		if (slave.pornPrestige === 3) {
+		if (slave.porn.prestige === 3) {
 			multiplier += 1.5;
-		} else if (slave.pornPrestige === 2) {
+		} else if (slave.porn.prestige === 2) {
 			multiplier += 0.7;
-		} else if (slave.pornPrestige === 1) {
+		} else if (slave.porn.prestige === 1) {
 			multiplier += 0.2;
 		}
 	}
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index aedb9b028607b68f25231db620a49eb3cc952702..6d9ef784f0c2ff841004cf89aabf2ad5413a169c 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -2608,13 +2608,13 @@ window.SlaveSummaryUncached = (function() {
 	 * @returns {void}
 	 */
 	function short_porn_prestige(slave, c) {
-		if (slave.pornPrestige > 0) {
+		if (slave.porn.prestige > 0) {
 			const styles = "green";
-			if (slave.pornPrestige > 2) {
+			if (slave.porn.prestige > 2) {
 				makeSpan(c, "PPrest++", styles);
-			} else if (slave.pornPrestige === 2) {
+			} else if (slave.porn.prestige === 2) {
 				makeSpan(c, "PPrest+", styles);
-			} else if (slave.pornPrestige === 1) {
+			} else if (slave.porn.prestige === 1) {
 				makeSpan(c, "PPrest", styles);
 			}
 		}
@@ -2750,13 +2750,13 @@ window.SlaveSummaryUncached = (function() {
 	 * @returns {void}
 	 */
 	function long_porn_prestige(slave, c) {
-		if (slave.pornPrestige > 0) {
+		if (slave.porn.prestige > 0) {
 			const styles = "green";
-			if (slave.pornPrestige > 2) {
+			if (slave.porn.prestige > 2) {
 				makeSpan(c, "Porn star.", styles);
-			} else if (slave.pornPrestige === 2) {
+			} else if (slave.porn.prestige === 2) {
 				makeSpan(c, "Porn slut.", styles);
-			} else if (slave.pornPrestige === 1) {
+			} else if (slave.porn.prestige === 1) {
 				makeSpan(c, "Porn amateur.", styles);
 			}
 		}
diff --git a/src/npc/uploadSlave.tw b/src/npc/uploadSlave.tw
index 8cc438ae6af9bac008f41128e8a6f8680f127573..ade6c497c5fa378e36af54c348aecafd40d2ff61 100644
--- a/src/npc/uploadSlave.tw
+++ b/src/npc/uploadSlave.tw
@@ -16,8 +16,8 @@ weekAcquired: 1,
 origin: <<if $activeSlave.origin == 0>>0<<else>>"$activeSlave.origin"<</if>>,
 career: <<if $activeSlave.career == 0>>0<<else>>"$activeSlave.career"<</if>>,
 ID: $activeSlave.ID,
-pornFame: $activeSlave.pornFame,
-pornFameSpending: $activeSlave.pornFameSpending,
+viewerCount: $activeSlave.porn.viewerCount,
+weeklySpending: $activeSlave.porn.spending,
 prestige: $activeSlave.prestige,
 prestigeDesc: "$activeSlave.prestigeDesc",
 recruiter: 0,
diff --git a/src/pregmod/birthStorm.tw b/src/pregmod/birthStorm.tw
index 077d56e490967bf7c1d745467ad2ac31d51a5f84..9c590a244b5b112f27497dc453a306bcca012690 100644
--- a/src/pregmod/birthStorm.tw
+++ b/src/pregmod/birthStorm.tw
@@ -377,7 +377,7 @@ The remote surgery allows the removal of the pregnancy generator through convent
 		<<if $Cash4Babies == 1>>
 			<br><<link "... sold at auction.">>
 				<<replace #_disposition>>
-					<<if $activeSlave.prestige > 1 || $activeSlave.pornPrestige > 2>>
+					<<if $activeSlave.prestige > 1 || $activeSlave.porn.prestige > 2>>
 						<<set _babyCost = random(-12,100)>>
 						<<if $activeSlave.prematureBirth > 0>><<set _babyCost = random(-32,40)>><</if>>
 					<<else>>
@@ -479,7 +479,7 @@ The remote surgery allows the removal of the pregnancy generator through convent
 			<</if>>
 			<<set $breederOrphanageTotal += _curBabies>>
 		<<case "the market">>
-			<<if $activeSlave.prestige > 1 || $activeSlave.pornPrestige > 2>>
+			<<if $activeSlave.prestige > 1 || $activeSlave.porn.prestige > 2>>
 				<<set _babyCost = random(-12,100)>>
 				<<if $activeSlave.prematureBirth > 0>><<set _babyCost = random(-32,40)>><</if>>
 			<<else>>
diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw
index fa42a981d8fedb15fa0d7516bd9aabe3f74e181f..8e7b06e47f9537f554ded8ec9931f028703cf3b6 100644
--- a/src/pregmod/csec.tw
+++ b/src/pregmod/csec.tw
@@ -350,7 +350,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a
 		<<if $Cash4Babies == 1>>
 			<br><<link "... sold at auction.">>
 				<<replace #_disposition>>
-					<<if $activeSlave.prestige > 1 || $activeSlave.pornPrestige > 2>>
+					<<if $activeSlave.prestige > 1 || $activeSlave.porn.prestige > 2>>
 						<<set _babyCost = random(-12,100)>>
 						<<if $activeSlave.prematureBirth > 0>><<set _babyCost = random(-32,40)>><</if>>
 					<<else>>
@@ -452,7 +452,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a
 			<</if>>
 			<<set $breederOrphanageTotal += _curBabies>>
 		<<case "the market">>
-			<<if $activeSlave.prestige > 1 || $activeSlave.pornPrestige > 2>>
+			<<if $activeSlave.prestige > 1 || $activeSlave.porn.prestige > 2>>
 				<<set _babyCost = random(-12,100)>>
 				<<if $activeSlave.prematureBirth > 0>><<set _babyCost = random(-32,40)>><</if>>
 			<<else>>
diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw
index 61281c4f61ddb5e124e6184c5abf30ddfeccabaa..bd5b6a06af276211ec5a921aa6a660f8ddb1a735 100644
--- a/src/pregmod/rePregInventor.tw
+++ b/src/pregmod/rePregInventor.tw
@@ -786,13 +786,13 @@
 	<<set $pregInventor = 3>>
 
 	The time has finally come for your slave, <<EventNameLink>>, to appear on the slave-breeding based talk show, "Husbandry with Millie."
-	<<if $activeSlave.pornPrestige > 2 || $activeSlave.prestige > 2>>
+	<<if $activeSlave.porn.prestige > 2 || $activeSlave.prestige > 2>>
 		While $he is already world-renowned, you might still improve $his chances to impress on the show with a little bit of extra investment in commercial spots or a tweaking of FCTV algorithms.
-	<<elseif $activeSlave.pornPrestige > 1 || $activeSlave.prestige > 2>>
+	<<elseif $activeSlave.porn.prestige > 1 || $activeSlave.prestige > 2>>
 		While $he is already quite famous, you could still improve $his chances to impress on the show with a little bit of extra investment in commercial spots or a tweaking of FCTV algorithms.
 	<<else>>
 		While $he has
-		<<if $activeSlave.pornPrestige > 1>>
+		<<if $activeSlave.porn.prestige > 1>>
 			managed to earn a reasonable following in slave pornography,
 		<<else>>
 			a bit of a reputation already,
@@ -866,9 +866,9 @@
 		<<EventNameDelink $activeSlave>>
 		<<replace "#result">>
 		It's a gamble, but you decide to trust in the charisma of your slave and the fame $he has already accrued to sell your vision for the world's future during the interview.
-		<<if ($activeSlave.pornPrestige > 2)>>
+		<<if ($activeSlave.porn.prestige > 2)>>
 			$He's enormously popular, so your gambit has a good chance of success.
-		<<elseif ($activeSlave.pornPrestige > 1)>>
+		<<elseif ($activeSlave.porn.prestige > 1)>>
 			$He's quite popular, so your gambit has a reasonable chance of success.
 		<<else>>
 			$He's only really well known in local pornography, but you still decide to bet on $his ability to sway the masses.
@@ -881,7 +881,7 @@
 		<<include "RE Preg Inventor Text">>
 
 		<br><br>
-		<<if $activeSlave.pornPrestige >= 3 && random(1,100) > 50>>
+		<<if $activeSlave.porn.prestige >= 3 && random(1,100) > 50>>
 			You turn your FCTV screen off satisfied that your slave has just finished a job very well done. Over the course of the next several weeks, it becomes clear that $activeSlave.slaveName's appearance on "Husbandry With Milly" has had @@.green;world changing@@ consequences.
 			<<if $activeSlave.prestige < 3>>
 				<<set $activeSlave.prestige = 3>>
@@ -898,7 +898,7 @@
 			<</for>>
 			<<set _pregmag = "a cut out magazine cover of your world renowned hyperbroodmother inventor, " + $activeSlave.slaveName + ", and " + getPronouns($activeSlave).possessive + " myriad toys">>
 			<<set $trinkets.push(_pregmag)>>
-		<<elseif $activeSlave.pornPrestige >= 3 && random(1,100) > 30>>
+		<<elseif $activeSlave.porn.prestige >= 3 && random(1,100) > 30>>
 			You turn your FCTV screen off satisfied that your slave has just completed a job well done. Over the course of the next several weeks, it becomes clear that $activeSlave.slaveName's appearance on "Husbandry With Milly" has had a @@.green;significant positive impact@@ on public opinion.
 			<<if $activeSlave.prestige < 2>>
 				<<set $activeSlave.prestige = 2>>
@@ -915,7 +915,7 @@
 			<</for>>
 			<<set _pregmag = "a cut out magazine cover of your renowned hyperbroodmother inventor, " + $activeSlave.slaveName + ", and " + getPronouns($activeSlave).possessive + " myriad toys">>
 			<<set $trinkets.push(_pregmag)>>
-		<<elseif $activeSlave.pornPrestige >= 3 && random(1,100) > 15>>
+		<<elseif $activeSlave.porn.prestige >= 3 && random(1,100) > 15>>
 			You turn your FCTV screen off satisfied that your slave has done a satisfactory job. Over the course of the next several weeks, it becomes clear that $activeSlave.slaveName's appearance on "Husbandry With Milly" has had a @@.green;significant impact@@ on public opinion, though only at a local level.
 			<<if $activeSlave.prestige < 1>>
 				<<set $activeSlave.prestige = 1>>
@@ -929,7 +929,7 @@
 					<<set $arcologies[_i].FSRestart -= 10>>
 				<</if>>
 			<</for>>
-		<<elseif $activeSlave.pornPrestige >= 3>>
+		<<elseif $activeSlave.porn.prestige >= 3>>
 			You turn your FCTV screen off disappointed that your slave has done a mediocre job. Over the course of the next several weeks, it becomes clear that @@.green;what little impact@@ $he has had is on a local scale only.
 			<<run repX(500, "event")>>
 			<<for _i = 1; _i < _l; _i++>>
@@ -939,7 +939,7 @@
 					<<set $arcologies[_i].FSRestart -= 10>>
 				<</if>>
 			<</for>>
-		<<elseif $activeSlave.pornPrestige >= 2 && random(1,100) > 75>>
+		<<elseif $activeSlave.porn.prestige >= 2 && random(1,100) > 75>>
 			You turn your FCTV screen off satisfied that your slave has just finished a job very well done. Over the course of the next several weeks, it becomes clear that $activeSlave.slaveName's appearance on "Husbandry With Milly" has had @@.green;world changing@@ consequences.
 			<<if $activeSlave.prestige < 3>>
 				<<set $activeSlave.prestige = 3>>
@@ -956,7 +956,7 @@
 			<</for>>
 			<<set _pregmag = "a cut out magazine cover of your world renowned hyperbroodmother inventor, " + $activeSlave.slaveName + ", and " + getPronouns($activeSlave).possessive + " myriad toys">>
 			<<set $trinkets.push(_pregmag)>>
-		<<elseif $activeSlave.pornPrestige >= 2 && random(1,100) > 50>>
+		<<elseif $activeSlave.porn.prestige >= 2 && random(1,100) > 50>>
 			You turn your FCTV screen off satisfied that your slave has just completed a job well done. Over the course of the next several weeks, it becomes clear that $activeSlave.slaveName's appearance on "Husbandry With Milly" has had a @@.green;significant positive impact@@ on public opinion.
 			<<if $activeSlave.prestige < 2>>
 				<<set $activeSlave.prestige = 2>>
@@ -973,7 +973,7 @@
 			<</for>>
 			<<set _pregmag = "a cut out magazine cover of your renowned hyperbroodmother inventor, " + $activeSlave.slaveName + ", and " + getPronouns($activeSlave).possessive + " myriad toys">>
 			<<set $trinkets.push(_pregmag)>>
-		<<elseif $activeSlave.pornPrestige >= 2 && random(1,100) > 30>>
+		<<elseif $activeSlave.porn.prestige >= 2 && random(1,100) > 30>>
 			You turn your FCTV screen off satisfied that your slave has done a satisfactory job. Over the course of the next several weeks, it becomes clear that $activeSlave.slaveName's appearance on "Husbandry With Milly" has had a @@.green;significant impact@@ on public opinion, though only at a local level.
 			<<if $activeSlave.prestige < 1>>
 				<<set $activeSlave.prestige = 1>>
@@ -987,7 +987,7 @@
 					<<set $arcologies[_i].FSRestart -= 10>>
 				<</if>>
 			<</for>>
-		<<elseif $activeSlave.pornPrestige >= 2>>
+		<<elseif $activeSlave.porn.prestige >= 2>>
 			You turn your FCTV screen off disappointed that your slave has done a mediocre job. Over the course of the next several weeks, it becomes clear that @@.green;what little impact@@ $he has had is on a local scale only.
 			<<run repX(500, "event")>>
 			<<for _i = 1; _i < _l; _i++>>
diff --git a/src/pregmod/saPorn.tw b/src/pregmod/saPorn.tw
index 15c074e63ef8d0f0132d9c72d9235ddb470cf065..6ce62b50b7b0768b7e11b3a91e61a019e4a0900b 100644
--- a/src/pregmod/saPorn.tw
+++ b/src/pregmod/saPorn.tw
@@ -1,9 +1,9 @@
 :: SA Porn [nobr]
 
-<<if $studio == 1 && $slaves[$i].pornFeed == 1>> /* content is being produced */
+<<if $studio == 1 && $slaves[$i].porn.feed == 1>> /* content is being produced */
 
 	/* rate of decay*/
-	<<if $slaves[$i].pornPrestige > 1>> /* 50k */
+	<<if $slaves[$i].porn.prestige > 1>> /* 50k */
 		<<set _decayRate = 5000>>
 		<<if $slaves[$i].fuckdoll > 0>>
 			<<set _face = 50>>
@@ -12,8 +12,8 @@
 		<<else>>
 			<<set _face = $slaves[$i].face*4>>
 		<</if>>
-		<<set _viewership = ((500/$HackingSkillMultiplier)+($slaves[$i].pornFameSpending)+(_face)+($slaves[$i].prestige*10)-(_decayRate))>>
-	<<elseif $slaves[$i].pornPrestige > 0>> /* 10k */
+		<<set _viewership = ((500/$HackingSkillMultiplier)+($slaves[$i].porn.spending)+(_face)+($slaves[$i].prestige*10)-(_decayRate))>>
+	<<elseif $slaves[$i].porn.prestige > 0>> /* 10k */
 		<<set _decayRate = 500>>
 		<<if $slaves[$i].fuckdoll > 0>>
 			<<set _face = 20>>
@@ -22,7 +22,7 @@
 		<<else>>
 			<<set _face = $slaves[$i].face*2>>
 		<</if>>
-		<<set _viewership = ((900/$HackingSkillMultiplier)+($slaves[$i].pornFameSpending/15)+(_face)+($slaves[$i].prestige*250)-(_decayRate))>>
+		<<set _viewership = ((900/$HackingSkillMultiplier)+($slaves[$i].porn.spending/15)+(_face)+($slaves[$i].prestige*250)-(_decayRate))>>
 	<<else>>
 		<<set _decayRate = 30>>
 		<<if $slaves[$i].fuckdoll > 0>>
@@ -32,20 +32,20 @@
 		<<else>>
 			<<set _face = $slaves[$i].face/20>>
 		<</if>>
-		<<set _viewership = ((300/$HackingSkillMultiplier)+($slaves[$i].pornFameSpending > 0 ? ($slaves[$i].pornFameSpending+($slaves[$i].pornFameSpending/100)) : 200)+(_face)+($slaves[$i].prestige*20)-(_decayRate))>>
+		<<set _viewership = ((300/$HackingSkillMultiplier)+($slaves[$i].porn.spending > 0 ? ($slaves[$i].porn.spending+($slaves[$i].porn.spending/100)) : 200)+(_face)+($slaves[$i].prestige*20)-(_decayRate))>>
 	<</if>>
 	<<set _viewerSoaking = 1>>
 	<<set _viewership = Math.trunc(_viewership)>>
 	<<set _adjustedViewership = _viewership>>
-	<<set _oldFame = $slaves[$i].pornFame>>
+	<<set _oldFame = $slaves[$i].porn.viewerCount>>
 
 	The studio regularly releases clips of $his daily affairs.
 
 	<<if $cheatMode == 1>>Decay: _decayRate Viewership: _viewership Last week's fame: _oldFame<</if>>
 
-	<<if $slaves[$i].pornPrestige > 1>>
+	<<if $slaves[$i].porn.prestige > 1>>
 		$He is widely regarded in $slaves[$i].porn.fameType porn, but with so many watchers, turn over is high.
-	<<elseif $slaves[$i].pornPrestige > 0>>
+	<<elseif $slaves[$i].porn.prestige > 0>>
 		<<if $slaves[$i].porn.fameType == "generic">>
 			$He has claimed a niche in slave porn, so there is a constant cycle of new arrivals and bored ex-watchers.
 		<<else>>
@@ -64,9 +64,9 @@
 	<<if $slaves[$i].fuckdoll > 0>>
 	<<elseif $slaves[$i].collar == "porcelain mask">>
 		$His mask adds an air of mystery to $him,
-		<<if $slaves[$i].pornPrestige > 1>>
+		<<if $slaves[$i].porn.prestige > 1>>
 			but people wonder if $he is trying to hide something.
-		<<elseif $slaves[$i].pornPrestige > 0>>
+		<<elseif $slaves[$i].porn.prestige > 0>>
 			tantalizing viewers with what it hides.
 		<<else>>
 			but viewers are more interested in $his body.
@@ -1026,25 +1026,25 @@
 		<<if $cheatMode == 1>>Size Queen: (_oldPorn) to ($slaves[$i].porn.fame.sizeQueen).<</if>>
 	<</if>>
 
-	<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.general + $slaves[$i].porn.fame.fuckdoll + $slaves[$i].porn.fame.rape + $slaves[$i].porn.fame.preggo + $slaves[$i].porn.fame.BBW + $slaves[$i].porn.fame.gainer + $slaves[$i].porn.fame.stud + $slaves[$i].porn.fame.loli + $slaves[$i].porn.fame.deepThroat + $slaves[$i].porn.fame.struggleFuck + $slaves[$i].porn.fame.painal + $slaves[$i].porn.fame.tease + $slaves[$i].porn.fame.romantic + $slaves[$i].porn.fame.pervert + $slaves[$i].porn.fame.caring + $slaves[$i].porn.fame.unflinching + $slaves[$i].porn.fame.sizeQueen + $slaves[$i].porn.fame.neglectful + $slaves[$i].porn.fame.cumAddict + $slaves[$i].porn.fame.analAddict + $slaves[$i].porn.fame.attentionWhore + $slaves[$i].porn.fame.breastGrowth + $slaves[$i].porn.fame.abusive + $slaves[$i].porn.fame.malicious + $slaves[$i].porn.fame.selfHating + $slaves[$i].porn.fame.breeder + $slaves[$i].porn.fame.sub + $slaves[$i].porn.fame.cumSlut + $slaves[$i].porn.fame.anal + $slaves[$i].porn.fame.humiliation + $slaves[$i].porn.fame.boobs + $slaves[$i].porn.fame.dom + $slaves[$i].porn.fame.sadist + $slaves[$i].porn.fame.masochist + $slaves[$i].porn.fame.pregnancy>>
-	<<set $slaves[$i].pornFame = Math.trunc($slaves[$i].pornFame)>>
+	<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.general + $slaves[$i].porn.fame.fuckdoll + $slaves[$i].porn.fame.rape + $slaves[$i].porn.fame.preggo + $slaves[$i].porn.fame.BBW + $slaves[$i].porn.fame.gainer + $slaves[$i].porn.fame.stud + $slaves[$i].porn.fame.loli + $slaves[$i].porn.fame.deepThroat + $slaves[$i].porn.fame.struggleFuck + $slaves[$i].porn.fame.painal + $slaves[$i].porn.fame.tease + $slaves[$i].porn.fame.romantic + $slaves[$i].porn.fame.pervert + $slaves[$i].porn.fame.caring + $slaves[$i].porn.fame.unflinching + $slaves[$i].porn.fame.sizeQueen + $slaves[$i].porn.fame.neglectful + $slaves[$i].porn.fame.cumAddict + $slaves[$i].porn.fame.analAddict + $slaves[$i].porn.fame.attentionWhore + $slaves[$i].porn.fame.breastGrowth + $slaves[$i].porn.fame.abusive + $slaves[$i].porn.fame.malicious + $slaves[$i].porn.fame.selfHating + $slaves[$i].porn.fame.breeder + $slaves[$i].porn.fame.sub + $slaves[$i].porn.fame.cumSlut + $slaves[$i].porn.fame.anal + $slaves[$i].porn.fame.humiliation + $slaves[$i].porn.fame.boobs + $slaves[$i].porn.fame.dom + $slaves[$i].porn.fame.sadist + $slaves[$i].porn.fame.masochist + $slaves[$i].porn.fame.pregnancy>>
+	<<set $slaves[$i].porn.viewerCount = Math.trunc($slaves[$i].porn.viewerCount)>>
 
-	<<if _oldFame > $slaves[$i].pornFame>>
+	<<if _oldFame > $slaves[$i].porn.viewerCount>>
 		Overall, $his online fame @@.red;dropped@@ this week.
-	<<elseif _oldFame < $slaves[$i].pornFame>>
+	<<elseif _oldFame < $slaves[$i].porn.viewerCount>>
 		Overall, $his online fame @@.green;rose@@ this week.
-		<<if _oldFame < 100 && $slaves[$i].pornFame >= 100 && $studioFeed == 1>>
+		<<if _oldFame < 100 && $slaves[$i].porn.viewerCount >= 100 && $studioFeed == 1>>
 			$He @@.yellow;has accrued enough views to determine prospective porn genres.@@
 		<</if>>
-	<<elseif $slaves[$i].pornFame != 0>>
+	<<elseif $slaves[$i].porn.viewerCount != 0>>
 		Surprisingly, $his online fame @@.yellow;remained consistent@@ this week despite how fickle watchers can be.
 	<<else>>
 		$he cap went @@.red;completely overlooked@@ this week and failed to gain any hits at all.
 	<</if>>
 
-	<<if $slaves[$i].pornFame > 0>>
+	<<if $slaves[$i].porn.viewerCount > 0>>
 		<<set _topFame = getHighestPorn($slaves[$i])>>
-		<<set _donations = Math.floor($slaves[$i].pornFame/(random(10,15+_viewerSoaking)))>>
+		<<set _donations = Math.floor($slaves[$i].porn.viewerCount/(random(10,15+_viewerSoaking)))>>
 		<<if _donations > 0>>
 			Fans donated a total of @@.yellowgreen;<<print cashFormat(_donations)>>@@ to $his account this week.
 			<<run cashX(_donations, "porn", $slaves[$i])>>
@@ -1053,7 +1053,7 @@
 
 	/* prestige gen */
 
-	<<if $slaves[$i].pornPrestige == 0 && $slaves[$i].pornFame >= 10000>>
+	<<if $slaves[$i].porn.prestige == 0 && $slaves[$i].porn.viewerCount >= 10000>>
 		<<set _pornFameGrabBag = []>>
 		<<if $slaves[$i].porn.fame.general >= 10000>><<set _pornFameGrabBag.push("generic")>><</if>>
 		<<if $slaves[$i].porn.fame.fuckdoll >= 10000>><<set _pornFameGrabBag.push("fuckdoll")>><</if>>
@@ -1093,137 +1093,137 @@
 
 		<<if _pornFameGrabBag.length > 0>>
 			<<set $slaves[$i].porn.fameType = _pornFameGrabBag.random()>>
-			<<set $slaves[$i].pornPrestige = 1>>
+			<<set $slaves[$i].porn.prestige = 1>>
 
 			@@.green;$He has gained a following in $slaves[$i].porn.fameType pornography!@@ Thousands have enjoyed
 
 			<<switch $slaves[$i].porn.fameType>>
 			<<case "generic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being used.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being used.">>
 				the sight of $him being used,
 			<<case "fuckdoll">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. $His fans relish the sight of $him being used.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. $His fans relish the sight of $him being used.">>
 				the sight of $him being used,
 			<<case "rape">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being raped.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being raped.">>
 				the sight of $him being raped,
 			<<case "preggo">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him swell with child.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him swell with child.">>
 				watching $him swell with child,
 			<<case "BBW">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his thick and soft body.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his thick and soft body.">>
 				the sight of $his thick and soft body,
 			<<case "underage">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his childish body.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his childish body.">>
 				the sight of $his childish body,
 			<<case "weight gain">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him eating and gaining weight.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him eating and gaining weight.">>
 				the sight of $him eating and gaining weight,
 			<<case "big dick">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his throbbing erection.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his throbbing erection.">>
 				the sight of $his throbbing erection,
 			<<case "deepthroat">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sounds $he makes when being throatfucked.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sounds $he makes when being throatfucked.">>
 				the sounds $he makes when being throatfucked,
 			<<case "unwilling">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed how $he struggles during sex.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed how $he struggles during sex.">>
 				how $he struggles during sex,
 			<<case "hardcore anal">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $his asshole pushed to its limit.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $his asshole pushed to its limit.">>
 				watching $his asshole pushed to its limit,
 			<<case "softcore">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his lewd striptease.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his lewd striptease.">>
 				$his lewd striptease,
 			<<case "romantic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the deep bond $he shares with $his partners.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the deep bond $he shares with $his partners.">>
 				the deep bond $he shares with $his partners,
 			<<case "really perverted">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his most perverted tendencies.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his most perverted tendencies.">>
 				$his most perverted tendencies,
 			<<case "voyeur">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him devote $himself to $his partners' pleasure.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him devote $himself to $his partners' pleasure.">>
 				watching $him devote $himself to $his partners' pleasure,
 			<<case "unspeakable">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his willingness to do things not repeated in polite company.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his willingness to do things not repeated in polite company.">>
 				$his willingness to do things not repeated in polite company,
 			<<case "huge insertion">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his holes filled to their limits.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his holes filled to their limits.">>
 				the sight of $his holes filled to their limits,
 			<<case "orgasm denial">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him ignoring $his own pleasure.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him ignoring $his own pleasure.">>
 				the sight of $him ignoring $his own pleasure,
 			<<case "cum addiction">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything and everything for cum.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything and everything for cum.">>
 				watching $him do anything and everything for cum,
 			<<case "anal addiction">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for a dick in $his ass.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for a dick in $his ass.">>
 				watching $him do anything for a dick in $his ass,
 			<<case "exhibition">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for attention.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for attention.">>
 				watching $him do anything for attention,
 			<<case "breast expansion">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed charting the growth of $his breasts.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed charting the growth of $his breasts.">>
 				charting the growth of $his breasts,
 			<<case "abuse">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him abuse others.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him abuse others.">>
 				watching $him abuse others,
 			<<case "sexual torture">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him getting off from the suffering $he caused.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him getting off from the suffering $he caused.">>
 				$him getting off from the suffering $he caused,
 			<<case "self hating">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him happily suffer.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him happily suffer.">>
 				watching $him happily suffer,
 			<<case "breeder">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him obsess over pumping out babies.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him obsess over pumping out babies.">>
 				watching $him obsess over pumping out babies,
 			<<case "submissive">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his submission.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his submission.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 				$his submission,
 			<<case "cum">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his taste for cum.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his taste for cum.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 				$his taste for cum,
 			<<case "buttslut">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his rear.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his rear.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 				the sight of $his rear,
 			<<case "humiliating">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him humiliating $himself.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him humiliating $himself.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 				$him humiliating $himself,
 			<<case "breast">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his breasts.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his breasts.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 				the sight of $his breasts,
 			<<case "dominant">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his dominance.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his dominance.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 				$his dominance,
 			<<case "sadistic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his sadism.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his sadism.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 				$his sadism,
 			<<case "masochistic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his masochism.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his masochism.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 				$his masochism,
 			<<case "pregnancy fetish">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his fondness for pregnancy.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his fondness for pregnancy.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 				$his fondness for pregnancy,
 			<</switch>>
 
 			but $he isn't famous enough to be called prestigious yet.
 		<</if>>
-	<<elseif $slaves[$i].pornPrestige == 1>>
+	<<elseif $slaves[$i].porn.prestige == 1>>
 		<<set _failedStar = 0, _fameSwap = 0, _swapPoint = 1.2>>
 
 		<<switch $slaves[$i].porn.fameType>>
 		<<case "generic">>
 			<<if $slaves[$i].porn.fame.general >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being used.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being used.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him being used, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.general*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1232,8 +1232,8 @@
 			<</if>>
 		<<case "fuckdoll">>
 			<<if $slaves[$i].porn.fame.fuckdoll >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being used.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being used.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him being used, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.fuckdoll*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1242,8 +1242,8 @@
 			<</if>>
 		<<case "rape">>
 			<<if $slaves[$i].porn.fame.rape >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being raped.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being raped.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him being raped, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.rape*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1252,8 +1252,8 @@
 			<</if>>
 		<<case "preggo">>
 			<<if $slaves[$i].porn.fame.preggo >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him swollen with child.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him swollen with child.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him swollen with child, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.preggo*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1262,8 +1262,8 @@
 			<</if>>
 		<<case "BBW">>
 			<<if $slaves[$i].porn.fame.BBW >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his thick, soft body.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his thick, soft body.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his thick and soft body, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.BBW*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1272,8 +1272,8 @@
 			<</if>>
 		<<case "underage">>
 			<<if $slaves[$i].porn.fame.loli >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his immature body.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his immature body.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his immature body, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.loli*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1282,8 +1282,8 @@
 			<</if>>
 		<<case "weight gain">>
 			<<if $slaves[$i].porn.fame.gainer >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish how curvy $he's gotten.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish how curvy $he's gotten.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish how curvy $he's gotten, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.gainer*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1292,8 +1292,8 @@
 			<</if>>
 		<<case "big dick">>
 			<<if $slaves[$i].porn.fame.stud >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his heavy dick.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his heavy dick.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $his heavy dick, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.stud*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1302,8 +1302,8 @@
 			<</if>>
 		<<case "deepthroat">>
 			<<if $slaves[$i].porn.fame.deepThroat >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sounds $he makes when being throatfucked.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sounds $he makes when being throatfucked.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sounds $he makes when being throatfucked, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.deepThroat*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1312,8 +1312,8 @@
 			<</if>>
 		<<case "unwilling">>
 			<<if $slaves[$i].porn.fame.struggleFuck >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish how perfectly $he struggles during sex.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish how perfectly $he struggles during sex.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish how perfectly $he struggles during sex, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.struggleFuck*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1322,8 +1322,8 @@
 			<</if>>
 		<<case "hardcore anal">>
 			<<if $slaves[$i].porn.fame.painal >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish watching $his asshole pushed to its limit.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish watching $his asshole pushed to its limit.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish watching $his asshole pushed to its limit, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.painal*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1332,8 +1332,8 @@
 			<</if>>
 		<<case "softcore">>
 			<<if $slaves[$i].porn.fame.tease >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his lewd striptease.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his lewd striptease.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his lewd striptease, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.tease*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1342,8 +1342,8 @@
 			<</if>>
 		<<case "romantic">>
 			<<if $slaves[$i].porn.fame.romantic >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the deep bond $he shares with $his partners.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the deep bond $he shares with $his partners.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the deep bond $he shares with $his partners, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.romantic*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1352,8 +1352,8 @@
 			<</if>>
 		<<case "really perverted">>
 			<<if $slaves[$i].porn.fame.pervert >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the depths of $his perversions.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the depths of $his perversions.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the depths of $his perversions, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.pervert*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1362,8 +1362,8 @@
 			<</if>>
 		<<case "voyeur">>
 			<<if $slaves[$i].porn.fame.caring >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his devotion to $his partners' pleasure.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his devotion to $his partners' pleasure.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his devotion to $his partners' pleasure, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.caring*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1372,8 +1372,8 @@
 			<</if>>
 		<<case "unspeakable">>
 			<<if $slaves[$i].porn.fame.unflinching >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his willingness to do anything and everything.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his willingness to do anything and everything.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his willingness to do anything and everything, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.unflinching*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1382,8 +1382,8 @@
 			<</if>>
 		<<case "huge insertion">>
 			<<if $slaves[$i].porn.fame.sizeQueen >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his holes filled to their limits.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his holes filled to their limits.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $his holes filled to their limits, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.sizeQueen*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1392,8 +1392,8 @@
 			<</if>>
 		<<case "orgasm denial">>
 			<<if $slaves[$i].porn.fame.neglectful >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him denying $himself pleasure.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him denying $himself pleasure.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him denying $himself pleasure, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.neglectful*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1402,8 +1402,8 @@
 			<</if>>
 		<<case "cum addiction">>
 			<<if $slaves[$i].porn.fame.cumAddict >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for cum.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for cum.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him doing anything for cum, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.cumAddict*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1412,8 +1412,8 @@
 			<</if>>
 		<<case "anal addiction">>
 			<<if $slaves[$i].porn.fame.analAddict >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for a dick up $his ass.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for a dick up $his ass.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him doing anything for a dick up $his ass, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.analAddict*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1422,8 +1422,8 @@
 			<</if>>
 		<<case "exhibition">>
 			<<if $slaves[$i].porn.fame.attentionWhore >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for attention.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for attention.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him doing anything for attention, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.attentionWhore*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1432,8 +1432,8 @@
 			<</if>>
 		<<case "breast expansion">>
 			<<if $slaves[$i].porn.fame.breastGrowth >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his expanding bust.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his expanding bust.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $his expanding bust, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.breastGrowth*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1442,8 +1442,8 @@
 			<</if>>
 		<<case "abuse">>
 			<<if $slaves[$i].porn.fame.abusive >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him abusing others.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him abusing others.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him abusing others, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.abusive*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1452,8 +1452,8 @@
 			<</if>>
 		<<case "sexual torture">>
 			<<if $slaves[$i].porn.fame.malicious >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him getting off from the suffering $he caused.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him getting off from the suffering $he caused.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $him getting off from the suffering $he caused, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.malicious*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1462,8 +1462,8 @@
 			<</if>>
 		<<case "self hating">>
 			<<if $slaves[$i].porn.fame.selfHating >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his suffering.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his suffering.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his suffering, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.selfHating*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1472,8 +1472,8 @@
 			<</if>>
 		<<case "breeder">>
 			<<if $slaves[$i].porn.fame.breeder >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his obsession with having children.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his obsession with having children.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his obsession with having children, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.breeder*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1482,8 +1482,8 @@
 			<</if>>
 		<<case "submissive">>
 			<<if $slaves[$i].porn.fame.sub >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his submissiveness.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his submissiveness.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his submissiveness, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.sub*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1492,8 +1492,8 @@
 			<</if>>
 		<<case "cum">>
 			<<if $slaves[$i].porn.fame.cumSlut >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his desire for cum.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his desire for cum.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his desire for cum, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.cumSlut*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1502,8 +1502,8 @@
 			<</if>>
 		<<case "buttslut">>
 			<<if $slaves[$i].porn.fame.anal >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his rear.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his rear.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $his rear, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.anal*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1512,8 +1512,8 @@
 			<</if>>
 		<<case "humiliating">>
 			<<if $slaves[$i].porn.fame.humiliation >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his frequent humiliation.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his frequent humiliation.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his frequent humiliation, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.humiliation*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1522,8 +1522,8 @@
 			<</if>>
 		<<case "breast">>
 			<<if $slaves[$i].porn.fame.boobs >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his breasts.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his breasts.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish the sight of $his breasts, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.boobs*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1532,8 +1532,8 @@
 			<</if>>
 		<<case "dominant">>
 			<<if $slaves[$i].porn.fame.dom >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his dominance.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his dominance.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his dominance, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.dom*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1542,8 +1542,8 @@
 			<</if>>
 		<<case "sadistic">>
 			<<if $slaves[$i].porn.fame.sadist >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his sadism.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his sadism.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his sadism, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.sadist*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1552,8 +1552,8 @@
 			<</if>>
 		<<case "masochistic">>
 			<<if $slaves[$i].porn.fame.masochist >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his masochism.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his masochism.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his masochism, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.masochist*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1562,8 +1562,8 @@
 			<</if>>
 		<<case "pregnancy fetish">>
 			<<if $slaves[$i].porn.fame.pregnancy >= 50000>>
-				<<set $slaves[$i].pornPrestige = 2>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his fondness for pregnancy.">>
+				<<set $slaves[$i].porn.prestige = 2>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his fondness for pregnancy.">>
 				@@.green;$He has gained a hold in $slaves[$i].porn.fameType pornography!@@ $His many fans relish $his fondness for pregnancy, so it is now prestigious to own $him.
 			<<elseif _topFame.value >= $slaves[$i].porn.fame.pregnancy*_swapPoint>>
 				<<set _fameSwap = 1>>
@@ -1572,11 +1572,11 @@
 			<</if>>
 		<<default>>
 			@@.red;No porn fame detected, reseting to "none".@@
-			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0, $slaves[$i].porn.fameType = "none">>
+			<<set $slaves[$i].porn.prestige = 0, $slaves[$i].porn.prestigeDesc = 0, $slaves[$i].porn.fameType = "none">>
 		<</switch>>
 
 		<<if _failedStar == 1>>
-			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0>>
+			<<set $slaves[$i].porn.prestige = 0, $slaves[$i].porn.prestigeDesc = 0>>
 			@@.red;$His popularity in $slaves[$i].porn.fameType pornography has faded.@@ $He is once again relatively unknown.
 			<<set $slaves[$i].porn.fameType = "none">>
 		<</if>>
@@ -1585,95 +1585,95 @@
 			<<set $slaves[$i].porn.fameType = _topFame.type>>
 			<<switch _topFame.type>>
 			<<case "generic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being used.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being used.">>
 			<<case "fuckdoll">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. $His fans relish the sight of $him being used.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. $His fans relish the sight of $him being used.">>
 			<<case "rape">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being raped.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being raped.">>
 			<<case "preggo">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him swell with child.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him swell with child.">>
 			<<case "BBW">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his thick and soft body.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his thick and soft body.">>
 			<<case "underage">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his childish body.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his childish body.">>
 			<<case "weight gain">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him eating and gaining weight.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him eating and gaining weight.">>
 			<<case "big dick">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his throbbing erection.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his throbbing erection.">>
 			<<case "deepthroat">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sounds $he makes when being throatfucked.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sounds $he makes when being throatfucked.">>
 			<<case "unwilling">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed how $he struggles during sex.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed how $he struggles during sex.">>
 			<<case "hardcore anal">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $his asshole pushed to its limit.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $his asshole pushed to its limit.">>
 			<<case "softcore">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his lewd striptease.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his lewd striptease.">>
 			<<case "romantic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the deep bond $he shares with $his partners.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the deep bond $he shares with $his partners.">>
 			<<case "really perverted">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his most perverted tendencies.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his most perverted tendencies.">>
 			<<case "voyeur">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him devote $himself to $his partners' pleasure.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him devote $himself to $his partners' pleasure.">>
 			<<case "unspeakable">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his willingness to do things not repeated in polite company.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his willingness to do things not repeated in polite company.">>
 			<<case "huge insertion">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his holes filled to their limits.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his holes filled to their limits.">>
 			<<case "orgasm denial">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him ignoring $his own pleasure.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him ignoring $his own pleasure.">>
 			<<case "cum addiction">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything and everything for cum.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything and everything for cum.">>
 			<<case "anal addiction">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for a dick in $his ass.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for a dick in $his ass.">>
 			<<case "exhibition">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for attention.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for attention.">>
 			<<case "breast expansion">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed charting the growth of $his breasts.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed charting the growth of $his breasts.">>
 			<<case "abuse">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him abuse others.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him abuse others.">>
 			<<case "sexual torture">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him getting off from the suffering $he caused.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him getting off from the suffering $he caused.">>
 			<<case "self hating">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him happily suffer.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him happily suffer.">>
 			<<case "breeder">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him obsess over pumping out babies.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him obsess over pumping out babies.">>
 			<<case "submissive">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his submission.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his submission.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 			<<case "cum">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his taste for cum.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his taste for cum.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 			<<case "buttslut">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his rear.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his rear.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 			<<case "humiliating">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him humiliating $himself.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him humiliating $himself.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 			<<case "breast">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his breasts.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his breasts.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 			<<case "dominant">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his dominance.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his dominance.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 			<<case "sadistic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his sadism.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his sadism.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 			<<case "masochistic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his masochism.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his masochism.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 			<<case "pregnancy fetish">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his fondness for pregnancy.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his fondness for pregnancy.">>
 				<<if $slaves[$i].fetishKnown != 1>><<set $slaves[$i].fetishKnown = 1>><</if>>
 			<</switch>>
 		<</if>>
-	<<elseif $slaves[$i].pornPrestige == 2>>
+	<<elseif $slaves[$i].porn.prestige == 2>>
 		<<set _failedStar = 0>>
 
 		<<switch $slaves[$i].porn.fameType>>
 		<<case "generic">>
 			<<if $slaves[$i].porn.fame.general >= 150000 && $pornStarID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.general = 250000, $pornStarID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.general>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him mid-coitus.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.general = 250000, $pornStarID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.general>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him mid-coitus.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him mid-coitus, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " mid-coitus">>
 				<<set $trinkets.push(_desc)>>
@@ -1682,9 +1682,9 @@
 			<</if>>
 		<<case "fuckdoll">>
 			<<if $slaves[$i].porn.fame.fuckdoll >= 150000 && $pornStarFuckdollID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.fuckdoll = 250000, $pornStarFuckdollID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.fuckdoll>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him being used.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.fuckdoll = 250000, $pornStarFuckdollID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.fuckdoll>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him being used.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him being used, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing it offering itself">>
 				<<set $trinkets.push(_desc)>>
@@ -1693,9 +1693,9 @@
 			<</if>>
 		<<case "rape">>
 			<<if $slaves[$i].porn.fame.rape >= 150000 && $pornStarRapeID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.rape = 250000, $pornStarRapeID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.rape>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him being raped.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.rape = 250000, $pornStarRapeID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.rape>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him being raped.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him being raped, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).possessive + " rape">>
 				<<set $trinkets.push(_desc)>>
@@ -1704,9 +1704,9 @@
 			<</if>>
 		<<case "preggo">>
 			<<if $slaves[$i].porn.fame.preggo >= 150000 && $pornStarPreggoID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.preggo = 250000, $pornStarPreggoID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.preggo>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him swollen with child.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.preggo = 250000, $pornStarPreggoID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.preggo>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him swollen with child.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him swollen with child, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " cradling " + getPronouns($slaves[$i]).possessive + " middle">>
 				<<set $trinkets.push(_desc)>>
@@ -1715,9 +1715,9 @@
 			<</if>>
 		<<case "BBW">>
 			<<if $slaves[$i].porn.fame.BBW >= 150000 && $pornStarBBWID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.BBW = 250000, $pornStarBBWID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.BBW>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his thick, soft body.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.BBW = 250000, $pornStarBBWID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.fame = $slaves[$i].porn.fame.BBW>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his thick, soft body.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his thick and soft body, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " giving a bellyjob">>
 				<<set $trinkets.push(_desc)>>
@@ -1726,9 +1726,9 @@
 			<</if>>
 		<<case "underage">>
 			<<if $slaves[$i].porn.fame.loli >= 150000 && $pornStarLoliID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.loli = 250000, $pornStarLoliID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.loli>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his immature body.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.loli = 250000, $pornStarLoliID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.loli>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his immature body.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his immature body, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).possessive + " 'innocence'">>
 				<<set $trinkets.push(_desc)>>
@@ -1737,9 +1737,9 @@
 			<</if>>
 		<<case "weight gain">>
 			<<if $slaves[$i].porn.fame.gainer >= 150000 && $pornStarGainerID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.gainer = 250000, $pornStarGainerID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.gainer>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with how with how much weight $he has gained.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.gainer = 250000, $pornStarGainerID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.fame = $slaves[$i].porn.fame.gainer>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with how with how much weight $he has gained.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with how much weight<<print $he>>'s put on, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " trying on " + getPronouns($slaves[$i]).possessive + " old clothes">>
 				<<set $trinkets.push(_desc)>>
@@ -1748,9 +1748,9 @@
 			<</if>>
 		<<case "big dick">>
 			<<if $slaves[$i].porn.fame.stud >= 150000 && $pornStarStudID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.stud = 250000, $pornStarStudID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.stud>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his erect dick.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.stud = 250000, $pornStarStudID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.stud>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his erect dick.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $his erect dick, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).possessive + " money shot">>
 				<<set $trinkets.push(_desc)>>
@@ -1759,9 +1759,9 @@
 			<</if>>
 		<<case "deepthroat">>
 			<<if $slaves[$i].porn.fame.deepThroat >= 150000 && $pornStarDeepThroatID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.deepThroat = 250000, $pornStarDeepThroatID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.deepThroat>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sounds $he makes when being throatfucked.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.deepThroat = 250000, $pornStarDeepThroatID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.deepThroat>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sounds $he makes when being throatfucked.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sounds $he makes when being throatfucked, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " getting facefucked">>
 				<<set $trinkets.push(_desc)>>
@@ -1770,9 +1770,9 @@
 			<</if>>
 		<<case "unwilling">>
 			<<if $slaves[$i].porn.fame.struggleFuck >= 150000 && $pornStarStruggleFuckID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.struggleFuck = 250000, $pornStarStruggleFuckID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.struggleFuck>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with how perfectly $he struggles during sex.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.struggleFuck = 250000, $pornStarStruggleFuckID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.fame = $slaves[$i].porn.fame.struggleFuck>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with how perfectly $he struggles during sex.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with how perfectly $he struggles during sex, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " struggling">>
 				<<set $trinkets.push(_desc)>>
@@ -1781,9 +1781,9 @@
 			<</if>>
 		<<case "hardcore anal">>
 			<<if $slaves[$i].porn.fame.painal >= 150000 && $pornStarPainalID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.painal = 250000, $pornStarPainalID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.painal>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with seeing $his asshole pushed to its limit.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.painal = 250000, $pornStarPainalID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.painal>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with seeing $his asshole pushed to its limit.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with seeing $his asshole pushed to its limit, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " taking an enormous dick up " + getPronouns($slaves[$i]).possessive + " ass">>
 				<<set $trinkets.push(_desc)>>
@@ -1792,9 +1792,9 @@
 			<</if>>
 		<<case "softcore">>
 			<<if $slaves[$i].porn.fame.tease >= 150000 && $pornStarTeaseID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.tease = 250000, $pornStarTeaseID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.tease>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his lewd striptease.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.tease = 250000, $pornStarTeaseID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.fame = $slaves[$i].porn.fame.tease>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his lewd striptease.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his lewd striptease, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " stripping">>
 				<<set $trinkets.push(_desc)>>
@@ -1803,9 +1803,9 @@
 			<</if>>
 		<<case "romantic">>
 			<<if $slaves[$i].porn.fame.romantic >= 150000 && $pornStarRomanticID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.romantic = 250000, $pornStarRomanticID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.romantic>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the deep bond $he shares with $his partners.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.romantic = 250000, $pornStarRomanticID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.fame = $slaves[$i].porn.fame.romantic>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the deep bond $he shares with $his partners.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the deep bond $he shares with $his partners, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " sharing an orgasm with " + getPronouns($slaves[$i]).possessive + " partner">>
 				<<set $trinkets.push(_desc)>>
@@ -1814,9 +1814,9 @@
 			<</if>>
 		<<case "really perverted">>
 			<<if $slaves[$i].porn.fame.pervert >= 150000 && $pornStarPervertID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.pervert = 250000, $pornStarPervertID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.pervert>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the depths of $his perversions.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.pervert = 250000, $pornStarPervertID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.pervert>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the depths of $his perversions.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the depths of $his perversions, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " doing something perverted">>
 				<<set $trinkets.push(_desc)>>
@@ -1825,9 +1825,9 @@
 			<</if>>
 		<<case "voyeur">>
 			<<if $slaves[$i].porn.fame.caring >= 150000 && $pornStarCaringID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.caring = 250000, $pornStarCaringID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.caring>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his devotion to $his partners' pleasure.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.caring = 250000, $pornStarCaringID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.caring>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his devotion to $his partners' pleasure.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his devotion to $his partners' pleasure, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " bringing " + getPronouns($slaves[$i]).possessive + " partner to orgasm">>
 				<<set $trinkets.push(_desc)>>
@@ -1836,9 +1836,9 @@
 			<</if>>
 		<<case "unspeakable">>
 			<<if $slaves[$i].porn.fame.unflinching >= 150000 && $pornStarUnflinchingID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.unflinching = 250000, $pornStarUnflinchingID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.unflinching>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his willingness to do things not repeated in polite company.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.unflinching = 250000, $pornStarUnflinchingID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.unflinching>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his willingness to do things not repeated in polite company.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his willingness to do things not repeated in polite company, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " doing something unmentionable">>
 				<<set $trinkets.push(_desc)>>
@@ -1847,9 +1847,9 @@
 			<</if>>
 		<<case "huge insertion">>
 			<<if $slaves[$i].porn.fame.sizeQueen >= 150000 && $pornStarSizeQueenID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.sizeQueen = 250000, $pornStarSizeQueenID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.sizeQueen>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his holes filled to their limits.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.sizeQueen = 250000, $pornStarSizeQueenID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.sizeQueen>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his holes filled to their limits.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $his holes filled to their limits, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).possessive + " belly bulging from within">>
 				<<set $trinkets.push(_desc)>>
@@ -1858,9 +1858,9 @@
 			<</if>>
 		<<case "orgasm denial">>
 			<<if $slaves[$i].porn.fame.neglectful >= 150000 && $pornStarNeglectfulID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.neglectful = 250000, $pornStarNeglectfulID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.neglectful>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him denying $himself pleasure.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.neglectful = 250000, $pornStarNeglectfulID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.neglectful>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him denying $himself pleasure.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him denying $himself pleasure, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " pleasing a line of partners without cumming once">>
 				<<set $trinkets.push(_desc)>>
@@ -1869,9 +1869,9 @@
 			<</if>>
 		<<case "cum addiction">>
 			<<if $slaves[$i].porn.fame.cumAddict >= 150000 && $pornStarCumAddictID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.cumAddict = 250000, $pornStarCumAddictID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.cumAddict>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him doing anything for cum.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.cumAddict = 250000, $pornStarCumAddictID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.cumAddict>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him doing anything for cum.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him doing anything for cum, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " bathing in a tub of cum">>
 				<<set $trinkets.push(_desc)>>
@@ -1880,9 +1880,9 @@
 			<</if>>
 		<<case "anal addiction">>
 			<<if $slaves[$i].porn.fame.analAddict >= 150000 && $pornStarAnalAddictID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.analAddict = 250000, $pornStarAnalAddictID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.analAddict>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his well-versed anus.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.analAddict = 250000, $pornStarAnalAddictID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.analAddict>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his well-versed anus.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him doing anything for a dick up $his ass, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " taking a series of huge cocks up " + getPronouns($slaves[$i]).possessive + " ass">>
 				<<set $trinkets.push(_desc)>>
@@ -1891,9 +1891,9 @@
 			<</if>>
 		<<case "exhibition">>
 			<<if $slaves[$i].porn.fame.attentionWhore >= 150000 && $pornStarAttentionWhoreID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.attentionWhore = 250000, $pornStarAttentionWhoreID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.attentionWhore>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him doing anything for attention.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.attentionWhore = 250000, $pornStarAttentionWhoreID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.attentionWhore>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him doing anything for attention.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him going to any length for attention, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " flashing strangers">>
 				<<set $trinkets.push(_desc)>>
@@ -1902,9 +1902,9 @@
 			<</if>>
 		<<case "breast expansion">>
 			<<if $slaves[$i].porn.fame.breastGrowth >= 150000 && $pornStarBreastGrowthID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.breastGrowth = 250000, $pornStarBreastGrowthID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.breastGrowth>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the history of $his growing bust.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.breastGrowth = 250000, $pornStarBreastGrowthID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.breastGrowth>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the history of $his growing bust.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with history of $his growing bust, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " having " + getPronouns($slaves[$i]).possessive + " tits measured">>
 				<<set $trinkets.push(_desc)>>
@@ -1913,9 +1913,9 @@
 			<</if>>
 		<<case "abuse">>
 			<<if $slaves[$i].porn.fame.abusive >= 150000 && $pornStarAbusiveID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.abusive = 250000, $pornStarAbusiveID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.abusive>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his abusive tendencies.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.abusive = 250000, $pornStarAbusiveID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.abusive>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his abusive tendencies.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his abusive tendencies, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " taking what " + getPronouns($slaves[$i]).pronoun + " wants by force">>
 				<<set $trinkets.push(_desc)>>
@@ -1924,9 +1924,9 @@
 			<</if>>
 		<<case "sexual torture">>
 			<<if $slaves[$i].porn.fame.malicious >= 150000 && $pornStarMaliciousID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.malicious = 250000, $pornStarMaliciousID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.malicious>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his hunger for making others suffer.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.malicious = 250000, $pornStarMaliciousID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.malicious>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his hunger for making others suffer.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him torturing others, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " tormenting " + getPronouns($slaves[$i]).possessive + " prey">>
 				<<set $trinkets.push(_desc)>>
@@ -1935,9 +1935,9 @@
 			<</if>>
 		<<case "self hating">>
 			<<if $slaves[$i].porn.fame.selfHating >= 150000 && $pornStarSelfHatingID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.selfHating = 250000, $pornStarSelfHatingID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.selfHating>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him suffering.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.selfHating = 250000, $pornStarSelfHatingID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.selfHating>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him suffering.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $him suffering, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " orgasming from pain">>
 				<<set $trinkets.push(_desc)>>
@@ -1946,9 +1946,9 @@
 			<</if>>
 		<<case "breeder">>
 			<<if $slaves[$i].porn.fame.breeder >= 150000 && $pornStarBreederID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.breeder = 250000, $pornStarBreederID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.breeder>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his obsession with being pregnant.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.breeder = 250000, $pornStarBreederID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.breeder>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his obsession with being pregnant.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his obsession with having children, so it is now extremely prestigious to own $him.
 				<<if $slaves[$i].counter.births > 0>>
 					<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " having an orgasmic birth">>
@@ -1961,9 +1961,9 @@
 			<</if>>
 		<<case "submissive">>
 			<<if $slaves[$i].porn.fame.sub >= 150000 && $pornStarSubID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.sub = 250000, $pornStarSubID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.sub>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his submissiveness.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.sub = 250000, $pornStarSubID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.sub>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his submissiveness.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his submissiveness, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).possessive + " submission">>
 				<<set $trinkets.push(_desc)>>
@@ -1972,9 +1972,9 @@
 			<</if>>
 		<<case "cum">>
 			<<if $slaves[$i].porn.fame.cumSlut >= 150000 && $pornStarCumSlutID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.cumSlut = 250000, $pornStarCumSlutID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.cumSlut>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his taste for cum.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.cumSlut = 250000, $pornStarCumSlutID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.cumSlut>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his taste for cum.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his taste for cum, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " drinking a glass of cum">>
 				<<set $trinkets.push(_desc)>>
@@ -1983,9 +1983,9 @@
 			<</if>>
 		<<case "buttslut">>
 			<<if $slaves[$i].porn.fame.anal >= 150000 && $pornStarAnalID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.anal = 250000, $pornStarAnalID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.anal>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his rear.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.anal = 250000, $pornStarAnalID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.anal>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his rear.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with the sight of $his rear, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " shaking " + getPronouns($slaves[$i]).possessive + " booty">>
 				<<set $trinkets.push(_desc)>>
@@ -1994,9 +1994,9 @@
 			<</if>>
 		<<case "humiliating">>
 			<<if $slaves[$i].porn.fame.humiliation >= 150000 && $pornStarHumiliationID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.humiliation = 250000, $pornStarHumiliationID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.humiliation>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his frequent humiliation.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.humiliation = 250000, $pornStarHumiliationID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.humiliation>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his frequent humiliation.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his frequent humiliation, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " humiliated in public">>
 				<<set $trinkets.push(_desc)>>
@@ -2005,9 +2005,9 @@
 			<</if>>
 		<<case "breast">>
 			<<if $slaves[$i].porn.fame.boobs >= 150000 && $pornStarBoobsID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.boobs = 250000, $pornStarBoobsID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.boobs>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his breasts.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.boobs = 250000, $pornStarBoobsID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.boobs>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his breasts.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his breasts, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).possessive + " bare chest">>
 				<<set $trinkets.push(_desc)>>
@@ -2016,9 +2016,9 @@
 			<</if>>
 		<<case "dominant">>
 			<<if $slaves[$i].porn.fame.dom >= 150000 && $pornStarDomID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.dom = 250000, $pornStarDomID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.dom>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his dominant streak.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.dom = 250000, $pornStarDomID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.dom>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his dominant streak.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his dominant streak, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " seated upon " + getPronouns($slaves[$i]).possessive + " obedient toy">>
 				<<set $trinkets.push(_desc)>>
@@ -2027,9 +2027,9 @@
 			<</if>>
 		<<case "sadistic">>
 			<<if $slaves[$i].porn.fame.sadist >= 150000 && $pornStarSadistID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.sadist = 250000, $pornStarSadistID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.sadist>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his sadistic streak.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.sadist = 250000, $pornStarSadistID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.sadist>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his sadistic streak.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his sadistic streak, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " whipping " + getPronouns($slaves[$i]).possessive + " lover">>
 				<<set $trinkets.push(_desc)>>
@@ -2038,9 +2038,9 @@
 			<</if>>
 		<<case "masochistic">>
 			<<if $slaves[$i].porn.fame.masochist >= 150000 && $pornStarMasochistID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.masochist = 250000, $pornStarMasochistID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.masochist>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his masochistic streak.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.masochist = 250000, $pornStarMasochistID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.masochist>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his masochistic streak.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his masochistic streak, so it is now extremely prestigious to own $him.
 				<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " being whipped">>
 				<<set $trinkets.push(_desc)>>
@@ -2049,9 +2049,9 @@
 			<</if>>
 		<<case "pregnancy fetish">>
 			<<if $slaves[$i].porn.fame.pregnancy >= 150000 && $pornStarPregnancyID == 0>>
-				<<set $slaves[$i].pornPrestige = 3, $slaves[$i].porn.fame.pregnancy = 250000, $pornStarPregnancyID = $slaves[$i].ID>>
-				<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.pregnancy>>
-				<<set $slaves[$i].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his pregnancy kink.">>
+				<<set $slaves[$i].porn.prestige = 3, $slaves[$i].porn.fame.pregnancy = 250000, $pornStarPregnancyID = $slaves[$i].ID>>
+				<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.pregnancy>>
+				<<set $slaves[$i].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his pregnancy kink.">>
 				@@.green;$He has become world famous for $his career in $slaves[$i].porn.fameType pornography!@@ Millions are now intimately familiar with $his pregnancy kink, so it is now extremely prestigious to own $him.
 				<<if $slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1>>
 					<<set _desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing " + getPronouns($slaves[$i]).object + " getting knocked up">>
@@ -2066,97 +2066,97 @@
 			<</if>>
 		<<default>>
 			@@.red;No porn fame detected, reseting to "none".@@
-			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0, $slaves[$i].porn.fameType = "none">>
+			<<set $slaves[$i].porn.prestige = 0, $slaves[$i].porn.prestigeDesc = 0, $slaves[$i].porn.fameType = "none">>
 		<</switch>>
 
 		<<if _failedStar == 1>>
-			<<set $slaves[$i].pornPrestige = 1>>
+			<<set $slaves[$i].porn.prestige = 1>>
 			@@.red;$His popularity in $slaves[$i].porn.fameType pornography has dropped considerably,@@ though $he still retains a core fanbase.
 			<<switch $slaves[$i].porn.fameType>>
 			<<case "generic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being used.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being used.">>
 			<<case "fuckdoll">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. $His fans relish the sight of $him being used.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. $His fans relish the sight of $him being used.">>
 			<<case "rape">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being raped.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being raped.">>
 			<<case "preggo">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him swell with child.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him swell with child.">>
 			<<case "BBW">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his thick and soft body.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his thick and soft body.">>
 			<<case "underage">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his childish body.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his childish body.">>
 			<<case "weight gain">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him eating and gaining weight.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him eating and gaining weight.">>
 			<<case "big dick">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his throbbing erection.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his throbbing erection.">>
 			<<case "deepthroat">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sounds $he makes when being throatfucked.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sounds $he makes when being throatfucked.">>
 			<<case "unwilling">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed how $he struggles during sex.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed how $he struggles during sex.">>
 			<<case "hardcore anal">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $his asshole pushed to its limit.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $his asshole pushed to its limit.">>
 			<<case "softcore">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his lewd striptease.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his lewd striptease.">>
 			<<case "romantic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the deep bond $he shares with $his partners.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the deep bond $he shares with $his partners.">>
 			<<case "really perverted">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his most perverted tendencies.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his most perverted tendencies.">>
 			<<case "voyeur">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him devote $himself to $his partners' pleasure.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him devote $himself to $his partners' pleasure.">>
 			<<case "unspeakable">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his willingness to do things not repeated in polite company.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his willingness to do things not repeated in polite company.">>
 			<<case "huge insertion">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his holes filled to their limits.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his holes filled to their limits.">>
 			<<case "orgasm denial">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him ignoring $his own pleasure.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him ignoring $his own pleasure.">>
 			<<case "cum addiction">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything and everything for cum.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything and everything for cum.">>
 			<<case "anal addiction">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for a dick in $his ass.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for a dick in $his ass.">>
 			<<case "exhibition">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for attention.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for attention.">>
 			<<case "breast expansion">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed charting the growth of $his breasts.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed charting the growth of $his breasts.">>
 			<<case "abuse">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him abuse others.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him abuse others.">>
 			<<case "sexual torture">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him getting off from the suffering $he caused.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him getting off from the suffering $he caused.">>
 			<<case "self hating">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him happily suffer.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him happily suffer.">>
 			<<case "breeder">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him obsess over pumping out babies.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him obsess over pumping out babies.">>
 			<<case "submissive">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his submission.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his submission.">>
 			<<case "cum">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his taste for cum.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his taste for cum.">>
 			<<case "buttslut">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his rear.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his rear.">>
 			<<case "humiliating">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him humiliating $himself.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him humiliating $himself.">>
 			<<case "breast">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his breasts.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his breasts.">>
 			<<case "dominant">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his dominance.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his dominance.">>
 			<<case "sadistic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his sadism.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his sadism.">>
 			<<case "masochistic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his masochism.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his masochism.">>
 			<<case "pregnancy fetish">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his fondness for pregnancy.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his fondness for pregnancy.">>
 			<</switch>>
 		<</if>>
 
-		<<if $slaves[$i].pornPrestige > 2>>
+		<<if $slaves[$i].porn.prestige > 2>>
 			Further paid publicity cannot increase $his fame, so subsidy of porn featuring $him has stopped.
-			<<set $slaves[$i].pornFameSpending = 0>>
+			<<set $slaves[$i].porn.spending = 0>>
 		<</if>>
 	<</if>>
 
 <<else>> /* popularity decay from lack of new content */
 
-	<<if $slaves[$i].pornPrestige > 1>> /* 500k */
+	<<if $slaves[$i].porn.prestige > 1>> /* 500k */
 		<<set _decayRate = 5000>>
-	<<elseif $slaves[$i].pornPrestige > 0>> /* 10k */
+	<<elseif $slaves[$i].porn.prestige > 0>> /* 10k */
 		<<set _decayRate = 500>>
 	<<else>>
 		<<set _decayRate = 30>>
@@ -2341,306 +2341,306 @@
 		<<if $cheatMode == 1>>Size Queen: (_oldPorn) to ($slaves[$i].porn.fame.sizeQueen).<</if>>
 	<</if>>
 
-	<<set $slaves[$i].pornFame = $slaves[$i].porn.fame.general + $slaves[$i].porn.fame.fuckdoll + $slaves[$i].porn.fame.rape + $slaves[$i].porn.fame.preggo + $slaves[$i].porn.fame.BBW + $slaves[$i].porn.fame.gainer + $slaves[$i].porn.fame.stud + $slaves[$i].porn.fame.loli + $slaves[$i].porn.fame.deepThroat + $slaves[$i].porn.fame.struggleFuck + $slaves[$i].porn.fame.painal + $slaves[$i].porn.fame.tease + $slaves[$i].porn.fame.romantic + $slaves[$i].porn.fame.pervert + $slaves[$i].porn.fame.caring + $slaves[$i].porn.fame.unflinching + $slaves[$i].porn.fame.sizeQueen + $slaves[$i].porn.fame.neglectful + $slaves[$i].porn.fame.cumAddict + $slaves[$i].porn.fame.analAddict + $slaves[$i].porn.fame.attentionWhore + $slaves[$i].porn.fame.breastGrowth + $slaves[$i].porn.fame.abusive + $slaves[$i].porn.fame.malicious + $slaves[$i].porn.fame.selfHating + $slaves[$i].porn.fame.breeder + $slaves[$i].porn.fame.sub + $slaves[$i].porn.fame.cumSlut + $slaves[$i].porn.fame.anal + $slaves[$i].porn.fame.humiliation + $slaves[$i].porn.fame.boobs + $slaves[$i].porn.fame.dom + $slaves[$i].porn.fame.sadist + $slaves[$i].porn.fame.masochist + $slaves[$i].porn.fame.pregnancy>>
-	<<set $slaves[$i].pornFame = Math.trunc($slaves[$i].pornFame)>>
+	<<set $slaves[$i].porn.viewerCount = $slaves[$i].porn.fame.general + $slaves[$i].porn.fame.fuckdoll + $slaves[$i].porn.fame.rape + $slaves[$i].porn.fame.preggo + $slaves[$i].porn.fame.BBW + $slaves[$i].porn.fame.gainer + $slaves[$i].porn.fame.stud + $slaves[$i].porn.fame.loli + $slaves[$i].porn.fame.deepThroat + $slaves[$i].porn.fame.struggleFuck + $slaves[$i].porn.fame.painal + $slaves[$i].porn.fame.tease + $slaves[$i].porn.fame.romantic + $slaves[$i].porn.fame.pervert + $slaves[$i].porn.fame.caring + $slaves[$i].porn.fame.unflinching + $slaves[$i].porn.fame.sizeQueen + $slaves[$i].porn.fame.neglectful + $slaves[$i].porn.fame.cumAddict + $slaves[$i].porn.fame.analAddict + $slaves[$i].porn.fame.attentionWhore + $slaves[$i].porn.fame.breastGrowth + $slaves[$i].porn.fame.abusive + $slaves[$i].porn.fame.malicious + $slaves[$i].porn.fame.selfHating + $slaves[$i].porn.fame.breeder + $slaves[$i].porn.fame.sub + $slaves[$i].porn.fame.cumSlut + $slaves[$i].porn.fame.anal + $slaves[$i].porn.fame.humiliation + $slaves[$i].porn.fame.boobs + $slaves[$i].porn.fame.dom + $slaves[$i].porn.fame.sadist + $slaves[$i].porn.fame.masochist + $slaves[$i].porn.fame.pregnancy>>
+	<<set $slaves[$i].porn.viewerCount = Math.trunc($slaves[$i].porn.viewerCount)>>
 
-	<<if $slaves[$i].pornPrestige > 0>>
+	<<if $slaves[$i].porn.prestige > 0>>
 		<<set _failedStar = 0>>
 
 		<<switch $slaves[$i].porn.fameType>>
 		<<case "generic">>
-			<<if $slaves[$i].porn.fame.general < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.general < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.general < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "fuckdoll">>
-			<<if $slaves[$i].porn.fame.fuckdoll < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.fuckdoll < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.fuckdoll < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "rape">>
-			<<if $slaves[$i].porn.fame.rape < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.rape < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.rape < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "preggo">>
-			<<if $slaves[$i].porn.fame.preggo < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.preggo < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.preggo < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "BBW">>
-			<<if $slaves[$i].porn.fame.preggo < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.preggo < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.preggo < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "underage">>
-			<<if $slaves[$i].porn.fame.loli < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.loli < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.loli < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "weight gain">>
-			<<if $slaves[$i].porn.fame.gainer < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.gainer < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.gainer < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "big dick">>
-			<<if $slaves[$i].porn.fame.stud < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.stud < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.stud < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "deepthroat">>
-			<<if $slaves[$i].porn.fame.deepThroat < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.deepThroat < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.deepThroat < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "unwilling">>
-			<<if $slaves[$i].porn.fame.struggleFuck < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.struggleFuck < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.struggleFuck < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "hardcore anal">>
-			<<if $slaves[$i].porn.fame.painal < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.painal < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.painal < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "softcore">>
-			<<if $slaves[$i].porn.fame.tease < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.tease < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.tease < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "romantic">>
-			<<if $slaves[$i].porn.fame.romantic < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.romantic < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.romantic < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "really perverted">>
-			<<if $slaves[$i].porn.fame.pervert < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.pervert < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.pervert < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "voyeur">>
-			<<if $slaves[$i].porn.fame.caring < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.caring < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.caring < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "unspeakable">>
-			<<if $slaves[$i].porn.fame.unflinching < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.unflinching < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.unflinching < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "huge insertion">>
-			<<if $slaves[$i].porn.fame.sizeQueen < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.sizeQueen < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.sizeQueen < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "orgasm denial">>
-			<<if $slaves[$i].porn.fame.neglectful < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.neglectful < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.neglectful < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "cum addiction">>
-			<<if $slaves[$i].porn.fame.cumAddict < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.cumAddict < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.cumAddict < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "anal addiction">>
-			<<if $slaves[$i].porn.fame.analAddict < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.analAddict < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.analAddict < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "exhibition">>
-			<<if $slaves[$i].porn.fame.attentionWhore < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.attentionWhore < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.attentionWhore < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breast expansion">>
-			<<if $slaves[$i].porn.fame.breastGrowth < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.breastGrowth < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.breastGrowth < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "abuse">>
-			<<if $slaves[$i].porn.fame.abusive < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.abusive < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.abusive < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "sexual torture">>
-			<<if $slaves[$i].porn.fame.malicious < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.malicious < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.malicious < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "self hating">>
-			<<if $slaves[$i].porn.fame.selfHating < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.selfHating < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.selfHating < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breeder">>
-			<<if $slaves[$i].porn.fame.breeder < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.breeder < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.breeder < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "submissive">>
-			<<if $slaves[$i].porn.fame.sub < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.sub < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.sub < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "cum">>
-			<<if $slaves[$i].porn.fame.cumSlut < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.cumSlut < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.cumSlut < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "buttslut">>
-			<<if $slaves[$i].porn.fame.anal < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.anal < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.anal < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "humiliating">>
-			<<if $slaves[$i].porn.fame.humiliation < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.humiliation < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.humiliation < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "breast">>
-			<<if $slaves[$i].porn.fame.boobs < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.boobs < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.boobs < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "dominant">>
-			<<if $slaves[$i].porn.fame.dom < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.dom < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.dom < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "sadistic">>
-			<<if $slaves[$i].porn.fame.sadist < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.sadist < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.sadist < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "masochistic">>
-			<<if $slaves[$i].porn.fame.masochist < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.masochist < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.masochist < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<case "pregnancy fetish">>
-			<<if $slaves[$i].porn.fame.pregnancy < 40000 && $slaves[$i].pornPrestige == 2>>
+			<<if $slaves[$i].porn.fame.pregnancy < 40000 && $slaves[$i].porn.prestige == 2>>
 				<<set _failedStar = 2>>
 			<<elseif $slaves[$i].porn.fame.pregnancy < 5000>>
 				<<set _failedStar = 1>>
 			<</if>>
 		<<default>>
 			@@.red;No porn fame detected, reseting to "none".@@
-			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0, $slaves[$i].porn.fameType = "none">>
+			<<set $slaves[$i].porn.prestige = 0, $slaves[$i].porn.prestigeDesc = 0, $slaves[$i].porn.fameType = "none">>
 		<</switch>>
 
 		<<if _failedStar == 1>>
-			<<set $slaves[$i].pornPrestige = 0, $slaves[$i].pornPrestigeDesc = 0>>
+			<<set $slaves[$i].porn.prestige = 0, $slaves[$i].porn.prestigeDesc = 0>>
 			With no new $slaves[$i].porn.fameType content coming out, @@.red;$his popularity has faded away.@@
 			<<set $slaves[$i].porn.fameType = "none">>
 		<<elseif _failedStar == 2>>
-			<<set $slaves[$i].pornPrestige = 1>>
+			<<set $slaves[$i].porn.prestige = 1>>
 			With the lack of any new content, @@.red;$his popularity in $slaves[$i].porn.fameType pornography has dropped considerably,@@ though some viewers still cling to the hope that <<print $he>>'ll come back.
 			<<switch $slaves[$i].porn.fameType>>
 			<<case "generic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being used.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being used.">>
 			<<case "fuckdoll">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. $His fans relish the sight of $him being used.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. $His fans relish the sight of $him being used.">>
 			<<case "rape">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being raped.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being raped.">>
 			<<case "preggo">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him swell with child.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him swell with child.">>
 			<<case "BBW">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his thick and soft body.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his thick and soft body.">>
 			<<case "underage">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his childish body.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his childish body.">>
 			<<case "weight gain">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him eating and gaining weight.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him eating and gaining weight.">>
 			<<case "big dick">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his throbbing erection.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his throbbing erection.">>
 			<<case "deepthroat">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sounds $he makes when being throatfucked.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sounds $he makes when being throatfucked.">>
 			<<case "unwilling">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed how $he struggles during sex.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed how $he struggles during sex.">>
 			<<case "hardcore anal">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $his asshole pushed to its limit.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $his asshole pushed to its limit.">>
 			<<case "softcore">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his lewd striptease.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his lewd striptease.">>
 			<<case "romantic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the deep bond $he shares with $his partners.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the deep bond $he shares with $his partners.">>
 			<<case "really perverted">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his most perverted tendencies.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his most perverted tendencies.">>
 			<<case "voyeur">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him devote $himself to $his partners' pleasure.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him devote $himself to $his partners' pleasure.">>
 			<<case "unspeakable">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his willingness to do things not repeated in polite company.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his willingness to do things not repeated in polite company.">>
 			<<case "huge insertion">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his holes filled to their limits.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his holes filled to their limits.">>
 			<<case "orgasm denial">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him ignoring $his own pleasure.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him ignoring $his own pleasure.">>
 			<<case "cum addiction">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything and everything for cum.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything and everything for cum.">>
 			<<case "anal addiction">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for a dick in $his ass.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for a dick in $his ass.">>
 			<<case "exhibition">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for attention.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for attention.">>
 			<<case "breast expansion">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed charting the growth of $his breasts.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed charting the growth of $his breasts.">>
 			<<case "abuse">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him abuse others.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him abuse others.">>
 			<<case "sexual torture">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him getting off from the suffering $he caused.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him getting off from the suffering $he caused.">>
 			<<case "self hating">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him happily suffer.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him happily suffer.">>
 			<<case "breeder">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him obsess over pumping out babies.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him obsess over pumping out babies.">>
 			<<case "submissive">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his submission.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his submission.">>
 			<<case "cum">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his taste for cum.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his taste for cum.">>
 			<<case "buttslut">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his rear.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his rear.">>
 			<<case "humiliating">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him humiliating $himself.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him humiliating $himself.">>
 			<<case "breast">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his breasts.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his breasts.">>
 			<<case "dominant">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his dominance.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his dominance.">>
 			<<case "sadistic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his sadism.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his sadism.">>
 			<<case "masochistic">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his masochism.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his masochism.">>
 			<<case "pregnancy fetish">>
-				<<set $slaves[$i].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his fondness for pregnancy.">>
+				<<set $slaves[$i].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his fondness for pregnancy.">>
 			<</switch>>
 		<</if>>
 	<</if>>
diff --git a/src/pregmod/seBurst.tw b/src/pregmod/seBurst.tw
index 229a65e612bd83c24a1ba706857bf907aeadc1a1..46c1efee37c91dc9a3c2daf396c11b0ed4c4910a 100644
--- a/src/pregmod/seBurst.tw
+++ b/src/pregmod/seBurst.tw
@@ -254,7 +254,7 @@
 				<<if $Cash4Babies == 1>>
 					<br><<link "Send them to auction">>
 						<<replace `"#" + $dispositionId`>>
-							<<if $activeSlave.prestige > 1 || $activeSlave.pornPrestige > 2>>
+							<<if $activeSlave.prestige > 1 || $activeSlave.porn.prestige > 2>>
 								<<set _babyCost = random(-12,100)>>
 								<<if $activeSlave.prematureBirth > 0>><<set _babyCost = random(-32,40)>><</if>>
 							<<else>>
@@ -283,7 +283,7 @@
 					The child<<if _curBabies > 1>>ren are<<else>> is<</if>> sent to one of $arcologies[0].name's future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. Hopefully there they will be trained to not suffer the same fate.
 					<<set $breederOrphanageTotal += _curBabies, $slaveOrphanageTotal -= _curBabies>>
 				<<case "the market">>
-					<<if $slaves[$_b].prestige > 1 || $slaves[$_b].pornPrestige > 2>>
+					<<if $slaves[$_b].prestige > 1 || $slaves[$_b].porn.prestige > 2>>
 						<<set _babyCost = random(-12,100)>>
 						<<if $slaves[$_b].prematureBirth > 0>><<set _babyCost = random(-32,40)>><</if>>
 					<<else>>
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index 5bf63cf84e12aa0ad91db24afc02f83eca889bd5..21fbb7f7aa655203880be27a8d0d5aef05ff7347 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -167,9 +167,9 @@
 	<<set $args[0].curatives = $args[1].curatives>>
 	<<set $args[0].drugs = $args[1].drugs>>
 	<<set $args[0].prestige = $args[1].prestige>>
-	<<set $args[0].pornFame = $args[1].pornFame>>
-	<<set $args[0].pornPrestige = $args[1].pornPrestige>>
-	<<set $args[0].pornPrestigeDesc = $args[1].pornPrestigeDesc>>
+	<<set $args[0].porn.viewerCount = $args[1].porn.viewerCount>>
+	<<set $args[0].porn.prestige = $args[1].porn.prestige>>
+	<<set $args[0].porn.prestigeDesc = $args[1].porn.prestigeDesc>>
 	<<set $args[0].prestigeDesc = $args[1].prestigeDesc>>
 	<<set $args[0].minorInjury = $args[1].minorInjury>>
 	<<set $args[0].eyeWear = $args[1].eyeWear>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index ccc3c737f0d5452fcabfddb06d470275a9b05b05..c260217bcb58469146423d71c9d0f36275a1bbc2 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -157,364 +157,364 @@
 <<if (def $args[0].prestigeDesc) && ($args[0].prestigeDesc != 0)>>
 	<<set $args[0].prestigeDesc = pronounReplacer($args[0].prestigeDesc)>>
 <</if>>
-<<if (def $args[0].pornPrestigeDesc) && ($args[0].pornPrestigeDesc != 0)>>
+<<if (def $args[0].porn.prestigeDesc) && ($args[0].porn.prestigeDesc != 0)>>
 	<<if $releaseID < 1050 && (def $args[0].prestigeDesc) && ($args[0].prestigeDesc != 0)>> /* BC absolutely FUCKED this */
 		<<switch $args[0].porn.fameType>>
 		<<case "generic">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being used.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being used.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him mid-coitus.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being used.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being used.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him mid-coitus.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "fuckdoll">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. $His fans relish the sight of $him being used.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being used.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him being used.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. $His fans relish the sight of $him being used.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being used.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him being used.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "rape">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being raped.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being raped.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him being raped.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him being raped.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him being raped.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him being raped.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "preggo">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him swell with child.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him swollen with child.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him swollen with child.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him swell with child.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him swollen with child.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him swollen with child.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "BBW">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his thick and soft body.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his thick, soft body.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his thick, soft body.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his thick and soft body.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his thick, soft body.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his thick, soft body.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "underage">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his childish body.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his immature body.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his immature body.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his childish body.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his immature body.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his immature body.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "weight gain">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him eating and gaining weight.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish how curvy $he's gotten.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with how with how much weight $he has gained.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him eating and gaining weight.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish how curvy $he's gotten.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with how with how much weight $he has gained.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "big dick">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his throbbing erection.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his heavy dick.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his erect dick.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his throbbing erection.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his heavy dick.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his erect dick.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "deepthroat">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sounds $he makes when being throatfucked.">>
-			<<elseif $args[0].pornPrestige == 2>>
-					<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sounds $he makes when being throatfucked.">>
-			<<elseif $args[0].pornPrestige == 3>>
-					<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sounds $he makes when being throatfucked.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sounds $he makes when being throatfucked.">>
+			<<elseif $args[0].porn.prestige == 2>>
+					<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sounds $he makes when being throatfucked.">>
+			<<elseif $args[0].porn.prestige == 3>>
+					<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sounds $he makes when being throatfucked.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "unwilling">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed how $he struggles during sex.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish how perfectly $he struggles during sex.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with how perfectly $he struggles during sex.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed how $he struggles during sex.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish how perfectly $he struggles during sex.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with how perfectly $he struggles during sex.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "hardcore anal">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $his asshole pushed to its limit.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish watching $his asshole pushed to its limit.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with seeing $his asshole pushed to its limit.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $his asshole pushed to its limit.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish watching $his asshole pushed to its limit.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with seeing $his asshole pushed to its limit.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "softcore">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his lewd striptease.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his lewd striptease.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his lewd striptease.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his lewd striptease.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his lewd striptease.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his lewd striptease.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "romantic">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the deep bond $he shares with $his partners.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the deep bond $he shares with $his partners.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the deep bond $he shares with $his partners.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the deep bond $he shares with $his partners.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the deep bond $he shares with $his partners.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the deep bond $he shares with $his partners.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "really perverted">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his most perverted tendencies.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the depths of $his perversions.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the depths of $his perversions.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his most perverted tendencies.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the depths of $his perversions.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the depths of $his perversions.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "voyeur">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him devote $himself to $his partners' pleasure.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his devotion to $his partners' pleasure.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his devotion to $his partners' pleasure.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him devote $himself to $his partners' pleasure.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his devotion to $his partners' pleasure.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his devotion to $his partners' pleasure.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "unspeakable">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his willingness to do things not repeated in polite company.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his willingness to do anything and everything.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his willingness to do things not repeated in polite company.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his willingness to do things not repeated in polite company.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his willingness to do anything and everything.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his willingness to do things not repeated in polite company.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "huge insertion">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his holes filled to their limits.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his holes filled to their limits.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his holes filled to their limits.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his holes filled to their limits.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his holes filled to their limits.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his holes filled to their limits.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "orgasm denial">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him ignoring $his own pleasure.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him denying $himself pleasure.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him denying $himself pleasure.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $him ignoring $his own pleasure.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him denying $himself pleasure.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him denying $himself pleasure.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "cum addiction">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything and everything for cum.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for cum.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him doing anything for cum.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything and everything for cum.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for cum.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him doing anything for cum.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "anal addiction">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for a dick in $his ass.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for a dick up $his ass.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his well-versed anus.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for a dick in $his ass.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for a dick up $his ass.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his well-versed anus.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "exhibition">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for attention.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for attention.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him doing anything for attention.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him do anything for attention.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him doing anything for attention.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him doing anything for attention.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "breast expansion">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed charting the growth of $his breasts.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his expanding bust.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the history of $his growing bust.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed charting the growth of $his breasts.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his expanding bust.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the history of $his growing bust.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "abuse">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him abuse others.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him abusing others.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his abusive tendencies.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him abuse others.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him abusing others.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his abusive tendencies.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "sexual torture">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him getting off from the suffering $he caused.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him getting off from the suffering $he caused.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his hunger for making others suffer.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him getting off from the suffering $he caused.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $him getting off from the suffering $he caused.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his hunger for making others suffer.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "self hating">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him happily suffer.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his suffering.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him suffering.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him happily suffer.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his suffering.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $him suffering.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "breeder">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him obsess over pumping out babies.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his obsession with having children.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his obsession with being pregnant.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed watching $him obsess over pumping out babies.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his obsession with having children.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his obsession with being pregnant.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "submissive">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his submission.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his submissiveness.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his submissiveness.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his submission.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his submissiveness.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his submissiveness.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "cum">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his taste for cum.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his desire for cum.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his taste for cum.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his taste for cum.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his desire for cum.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his taste for cum.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "buttslut">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his rear.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his rear.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his rear.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his rear.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his rear.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with the sight of $his rear.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "humiliating">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him humiliating $himself.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his frequent humiliation.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his frequent humiliation.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $him humiliating $himself.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his frequent humiliation.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his frequent humiliation.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "breast">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his breasts.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his breasts.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his breasts.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed the sight of $his breasts.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish the sight of $his breasts.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his breasts.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "dominant">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his dominance.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his dominance.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his dominant streak.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his dominance.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his dominance.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his dominant streak.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "sadistic">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his sadism.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his sadism.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his sadistic streak.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his sadism.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his sadism.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his sadistic streak.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "masochistic">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his masochism.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his masochism.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his masochistic streak.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his masochism.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his masochism.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his masochistic streak.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<case "pregnancy fetish">>
-			<<if $args[0].pornPrestige == 1>>
-				<<set $args[0].pornPrestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his fondness for pregnancy.">>
-			<<elseif $args[0].pornPrestige == 2>>
-				<<set $args[0].pornPrestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his fondness for pregnancy.">>
-			<<elseif $args[0].pornPrestige == 3>>
-				<<set $args[0].pornPrestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his pregnancy kink.">>
+			<<if $args[0].porn.prestige == 1>>
+				<<set $args[0].porn.prestigeDesc = "$He has a following in slave pornography. Thousands have enjoyed $his fondness for pregnancy.">>
+			<<elseif $args[0].porn.prestige == 2>>
+				<<set $args[0].porn.prestigeDesc = "$He is well known from $his career in slave pornography. $His many fans relish $his fondness for pregnancy.">>
+			<<elseif $args[0].porn.prestige == 3>>
+				<<set $args[0].porn.prestigeDesc = "$He is world famous for $his career in slave pornography. Millions are intimately familiar with $his pregnancy kink.">>
 			<<else>>
-				<<set $args[0].pornPrestigeDesc = 0>>
+				<<set $args[0].porn.prestigeDesc = 0>>
 			<</if>>
 		<<default>>
-			<<set $args[0].pornPrestigeDesc = 0>>
+			<<set $args[0].porn.prestigeDesc = 0>>
 		<</switch>>
 	<<else>>
-		<<set $args[0].pornPrestigeDesc = pronounReplacer($args[0].pornPrestigeDesc)>>
+		<<set $args[0].porn.prestigeDesc = pronounReplacer($args[0].porn.prestigeDesc)>>
 	<</if>>
 <</if>>
 
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index e1ccd8ab4d5b75cda4715768eaf0af674753f4fe..550234fbcb94a953068c617ed6adc85b194d2509 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -999,7 +999,7 @@ All in all,
 		<</link>>
 		//Will cost <<print cashFormat(500)>> weekly//
 		<<if $Cash4Babies == 1>>
-			<<if $slaves[$i].prestige > 1 || $slaves[$i].pornPrestige > 2>>
+			<<if $slaves[$i].prestige > 1 || $slaves[$i].porn.prestige > 2>>
 				<br><<link "Send them to auction">>
 					<<replace `"#" + $dispositionId`>>
 						<<set _babyCost = random(-12,100)>>
@@ -1125,7 +1125,7 @@ All in all,
 				<</if>>
 				<<set $breederOrphanageTotal += _curBabies>>
 			<<case "the market">>
-				<<if $slaves[$i].prestige > 1 || $slaves[$i].pornPrestige > 2>>
+				<<if $slaves[$i].prestige > 1 || $slaves[$i].porn.prestige > 2>>
 					<<set _babyCost = random(-12,100)>>
 					<<if $slaves[$i].prematureBirth > 0>><<set _babyCost = random(-32,40)>><</if>>
 				<<else>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index b9c78665947c6c2366b636dbb22c1fd081ace168..27e5e66774f999115fb6d03ec54e1857d806eb76 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -862,10 +862,10 @@ $researchLab.level > 0>>
 		<<set _individualCosts += Math.trunc($drugsCost*0.5)>>
 	<</if>>
 	<<if ($studio == 1)>>
-		<<if ($slaves[$i].pornFameSpending > 0)>>
+		<<if ($slaves[$i].porn.spending > 0)>>
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;<i>Publicity:</i>
-			@@.yellowgreen;<<print cashFormat($slaves[$i].pornFameSpending/$PCSlutContacts)>>@@
-			<<set _individualCosts += ($slaves[$i].pornFameSpending/$PCSlutContacts)>>
+			@@.yellowgreen;<<print cashFormat($slaves[$i].porn.spending/$PCSlutContacts)>>@@
+			<<set _individualCosts += ($slaves[$i].porn.spending/$PCSlutContacts)>>
 		<</if>>
 	<</if>>
 	<<if (($slaves[$i].assignment == "be your Concubine" ||$slaves[$i].relationship == -3) && $arcologies[0].FSPetiteAdmirationLaw == 1)>>
diff --git a/src/uncategorized/costsWidgets.tw b/src/uncategorized/costsWidgets.tw
index 3eb56f2a992263f7215b896ace78f7c2d027f665..8294ebf8ef4ed74bf707977f1c03f6315aaff89e 100644
--- a/src/uncategorized/costsWidgets.tw
+++ b/src/uncategorized/costsWidgets.tw
@@ -399,10 +399,10 @@
 		<<set _individualCosts += Math.trunc($drugsCost*0.5)>>
 	<</if>>
 	<<if ($studio == 1)>>
-		<<if ($args[0].pornFameSpending > 0)>>
+		<<if ($args[0].porn.spending > 0)>>
 			<br>&nbsp;&nbsp;&nbsp;&nbsp;<i>Publicity:</i>
-			@@.yellowgreen;<<print cashFormat($args[0].pornFameSpending/$PCSlutContacts)>>@@
-			<<set _individualCosts += ($args[0].pornFameSpending/$PCSlutContacts)>>
+			@@.yellowgreen;<<print cashFormat($args[0].porn.spending/$PCSlutContacts)>>@@
+			<<set _individualCosts += ($args[0].porn.spending/$PCSlutContacts)>>
 		<</if>>
 	<</if>>
 	<<if (($args[0].assignment == "be your Concubine" ||$args[0].relationship == -3) && $arcologies[0].FSPetiteAdmirationLaw == 1)>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index b4cb1bb862c18ce12bb19e13efc30008c9829f11..d21f6e7bf2129cd3c13144cb61eeefa25e23e604 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1586,18 +1586,18 @@ is
 	<</if>>
 <</if>>
 
-<<if $activeSlave.pornPrestige > 0>>
-	<<if $activeSlave.pornPrestigeDesc>>$activeSlave.pornPrestigeDesc<</if>>
-	<<if $activeSlave.pornPrestige > 2>>
+<<if $activeSlave.porn.prestige > 0>>
+	<<if $activeSlave.porn.prestigeDesc>>$activeSlave.porn.prestigeDesc<</if>>
+	<<if $activeSlave.porn.prestige > 2>>
 		As such, $he tends to gain a following wherever $he goes.
-	<<elseif $activeSlave.pornPrestige > 1>>
+	<<elseif $activeSlave.porn.prestige > 1>>
 		As such, $he is recognized often.
 	<<else>>
 		As such, $he is recognized occasionally.
 	<</if>>
 <</if>>
 
-<<if $activeSlave.prestige > 0 || $activeSlave.pornPrestige > 1>>
+<<if $activeSlave.prestige > 0 || $activeSlave.porn.prestige > 1>>
 	<<if $activeSlave.fuckdoll == 0 && $activeSlave.markings == "birthmark">>
 		$He has a large, liver-colored birthmark, but since $he's well known, this uniqueness adds to $his beauty rather than detracting from it.
 	<</if>>
@@ -2024,7 +2024,7 @@ $He is
 <</for>>
 
 <<if $activeSlave.fuckdoll == 0>>
-	<<if $activeSlave.markings == "birthmark" && $activeSlave.prestige == 0 && $activeSlave.pornPrestige < 2>>
+	<<if $activeSlave.markings == "birthmark" && $activeSlave.prestige == 0 && $activeSlave.porn.prestige < 2>>
 		$He has a large, liver-colored birthmark, detracting from $his beauty.
 	<</if>>
 	<<if ($activeSlave.skin == "sun tanned")>>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 9a8afa72428f6784eb590cf2b3085345a256c73b..efe2babd177501fa533409d0c8f342b1c97f8b39 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -152,10 +152,10 @@
 					<</if>>
 				<</if>>
 			<</if>>
-			<<if $Concubine.pornPrestige > 2>>
+			<<if $Concubine.porn.prestige > 2>>
 				<<run repX(800, "concubine", $Concubine)>>
 				Having a porn star as your personal bed warmer @@.green;reflects on your standing.@@ Your citizens can only wonder at what kinky things happen behind closed doors.
-			<<elseif $Concubine.pornPrestige > 1>>
+			<<elseif $Concubine.porn.prestige > 1>>
 				<<run repX(300, "concubine", $Concubine)>>
 				Having a rising porn star as your personal bed warmer @@.green;reflects on your standing.@@
 			<</if>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index d117d28df009ff3f672fa1ac8e31bd7ae2e5dcc0..6565ff97e30d75e6cd77be126196364f66aae75c 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -106,7 +106,7 @@
 				<<if ($eventSlave.bellyPreg >= 1000000)>>
 					<<if $eventSlave.fetish != "mindbroken" && $eventSlave.fuckdoll == 0>>
 						<<if ($eventSlave.devotion > 50)>>
-							<<if $eventSlave.pornPrestige >= 1 || $eventSlave.prestige >= 1>>
+							<<if $eventSlave.porn.prestige >= 1 || $eventSlave.prestige >= 1>>
 								<<set $events.push("RE preg inventor")>>
 							<</if>>
 						<</if>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 414552b5d502b2853c4b49f072dadae6115655f1..239aa809df5c1e976ee5c7bad5a796eae8241b18 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -395,11 +395,11 @@
 <<set $activeSlave.hormones = 0>>
 <<set $activeSlave.waist = 0>>
 <<set $activeSlave.prestige = 0>>
-<<set $activeSlave.pornFame = 0>>
-<<set $activeSlave.pornFameSpending = 0>>
-<<set $activeSlave.pornFeed = 0>>
-<<set $activeSlave.pornPrestige = 0>>
-<<set $activeSlave.pornPrestigeDesc = 0>>
+<<set $activeSlave.porn.viewerCount = 0>>
+<<set $activeSlave.porn.spending = 0>>
+<<set $activeSlave.porn.feed = 0>>
+<<set $activeSlave.porn.prestige = 0>>
+<<set $activeSlave.porn.prestigeDesc = 0>>
 <<set $activeSlave.porn.fameType = "none">>
 <<set $activeSlave.porn.focus = "none">>
 <<set $activeSlave.porn.fame.general = 0>>
@@ -1029,11 +1029,11 @@ You look up the _relationType. _He2 costs <<print cashFormat($slaveCost)>>, a ba
 	<<set $activeSlave.nipples = either("cute", "inverted", "partially inverted", "puffy")>>
 <</if>>
 <<set $activeSlave.prestige = 0>>
-<<set $activeSlave.pornFame = 0>>
-<<set $activeSlave.pornFameSpending = 0>>
-<<set $activeSlave.pornFeed = 0>>
-<<set $activeSlave.pornPrestige = 0>>
-<<set $activeSlave.pornPrestigeDesc = 0>>
+<<set $activeSlave.porn.viewerCount = 0>>
+<<set $activeSlave.porn.spending = 0>>
+<<set $activeSlave.porn.feed = 0>>
+<<set $activeSlave.porn.prestige = 0>>
+<<set $activeSlave.porn.prestigeDesc = 0>>
 <<set $activeSlave.porn.fameType = "none">>
 <<set $activeSlave.porn.focus = "none">>
 <<set $activeSlave.porn.fame.general = 0>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index bd25fa8b3bd36b7476e2d4f00276ecf2d15940a3..61d39d0705d245138301ee34aec13a7eadeba498 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -1140,7 +1140,7 @@
 						<<set $slaves[$i].devotion -= 3>>
 					<</if>>
 				<</if>>
-				<<if $slaves[$i].pornFeed == 1 && $slaves[$i].pornFame >= 10000>>
+				<<if $slaves[$i].porn.feed == 1 && $slaves[$i].porn.viewerCount >= 10000>>
 					$His paraphilia is satisfied by the viewcounts on $his porn and the many viewers no doubt enjoying themselves to $his day to day life.
 					<<set _para = 1>>
 				<<elseif ["whore", "serve the public", "work in the brothel", "serve in the club", "be the DJ"].includes($slaves[$i].assignment)>>
@@ -5190,11 +5190,11 @@
 
 	<<set $pornFameBonus = 1>>
 	<<if $studio == 1>>
-		<<if $slaves[$i].pornFame > 0>>
-			<<set $pornFameBonus += (Math.ceil($slaves[$i].pornFame/100000))>>
-			<<if ($slaves[$i].pornFame >= 100000)>>
+		<<if $slaves[$i].porn.viewerCount > 0>>
+			<<set $pornFameBonus += (Math.ceil($slaves[$i].porn.viewerCount/100000))>>
+			<<if ($slaves[$i].porn.viewerCount >= 100000)>>
 				$His near-ubiquitous presence in arcology pornography greatly increases $his impact on society.
-			<<elseif ($slaves[$i].pornFame >= 10000)>>
+			<<elseif ($slaves[$i].porn.viewerCount >= 10000)>>
 				$His presence in arcology pornography increases $his impact on society.
 			<<else>>
 				$His occasional presence in arcology pornography slightly increases $his impact on society.
@@ -8337,15 +8337,15 @@
 <</if>>
 
 /* saPorn */
-<<if $slaves[$i].pornPrestige == 3>>
+<<if $slaves[$i].porn.prestige == 3>>
 	$He is the whore people envision when they think of $slaves[$i].porn.fameType porn. $His omnipresence on the internet @@.green;boosts $his owner's reputation.@@
-	<<run repX((750*$slaves[$i].pornPrestige), "porn", $slaves[$i])>>
-	<<set _donations = Math.floor($slaves[$i].pornFame/(random(13,20)))+(random(-5000,5000))>>
+	<<run repX((750*$slaves[$i].porn.prestige), "porn", $slaves[$i])>>
+	<<set _donations = Math.floor($slaves[$i].porn.viewerCount/(random(13,20)))+(random(-5000,5000))>>
 	<<if _donations > 0>>
 		A number of gifts and donations totaling @@.yellowgreen;<<print cashFormat(_donations)>>@@ were also sent to $him, among other things.
 		<<run cashX(_donations, "porn", $slaves[$i])>>
 	<</if>>
-<<elseif $slaves[$i].pornFeed > 0>>
+<<elseif $slaves[$i].porn.feed > 0>>
 	<<include "SA Porn">>
 <</if>>
 
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index 0768bbaa442521f6236d2825b947dbea201201f0..458a7b3a3062524a8cc27cd69dab12bd7d766339 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -1245,9 +1245,9 @@ serves you this week.
 <<elseif ($slaves[$i].ID == $HeadGirl.ID) && ($arcologies[0].FSEgyptianRevivalistLaw == 1)>>
 	<<set _multiplier += 0.05>>
 <</if>>
-<<if $slaves[$i].pornPrestige > 2>>
+<<if $slaves[$i].porn.prestige > 2>>
 	<<set _multiplier += 0.1>>
-<<elseif $slaves[$i].pornPrestige > 1>>
+<<elseif $slaves[$i].porn.prestige > 1>>
 	<<set _multiplier += 0.03>>
 <</if>>
 
@@ -1275,9 +1275,9 @@ Keeping $him as nothing but your personal
 	@@.green;adds slightly to your reputation@@ as a prosperous citizen.
 <</if>>
 
-<<if $slaves[$i].pornPrestige > 2>>
+<<if $slaves[$i].porn.prestige > 2>>
 	Having your every urge attended to by a famous porn star @@.green;is not lost on the citizenry.@@
-<<elseif $slaves[$i].pornPrestige > 1>>
+<<elseif $slaves[$i].porn.prestige > 1>>
 	Having a rising porn star to sate your urges with @@.green;demonstrates how well off you are.@@
 <</if>>
 
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index c9d14c71afe4917f4d380603446827f531c8b27c..6c8246c9be47c6a91e87902829912bddfb7b4dc2 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -476,8 +476,8 @@
 	<<if $slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 15>>
 		<<set _seed += _FSIntMod>>
 	<</if>>
-	<<if $studio && $slaves[$i].pornFame >= 10000 && $slaves[$i].pornPrestige > 0>>
-		<<set _seed += $slaves[$i].pornPrestige*3>>
+	<<if $studio && $slaves[$i].porn.viewerCount >= 10000 && $slaves[$i].porn.prestige > 0>>
+		<<set _seed += $slaves[$i].porn.prestige*3>>
 	<</if>>
 
 	<<if $arcologies[0].FSSupremacist != "unset">>
@@ -781,7 +781,7 @@
 		<<else>>
 			$He lacks the intelligence to compose thoughtful remarks; a lot the time $he merely +1s what others have said.
 		<</if>>
-		<<if $studio && $slaves[$i].pornFame >= 1000 && $slaves[$i].pornPrestige > 0>>
+		<<if $studio && $slaves[$i].porn.viewerCount >= 1000 && $slaves[$i].porn.prestige > 0>>
 			$His fan base from arcology porn significantly drives up $his followers count.
 		<</if>>
 	<</if>> /*temp close EWM so next two lines always show */
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index 75e2f5a1c4a336f7b58329ed37bba0f4d88ddbc5..c460b2846a383a5f297231e8394dfdffc008bb09 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -750,7 +750,7 @@ Dye or paint:
 <<if ($activeSlave.markings == "birthmark")>>
 	<br><br>
 	$He has a large birthmark, which
-	<<if $activeSlave.prestige > 0 || $activeSlave.pornPrestige > 1>>
+	<<if $activeSlave.prestige > 0 || $activeSlave.porn.prestige > 1>>
 		enhances $his attractiveness due to $his prestige.
 	<<else>>
 		detracts from $his attractiveness.
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index d192d37eeae8b258aee6c199c9e3495688c5e578..6a2bd29a2da6a805d73904bd0346d4b5d0b60ec2 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -86,10 +86,10 @@ $He's certainly going to have some adjustments to make.
 <<else>>
 	<<set $toSearch = $activeSlave.prestigeDesc>>
 <</if>>
-<<if $activeSlave.pornPrestigeDesc == 0>>
+<<if $activeSlave.porn.prestigeDesc == 0>>
 	<<set $toSearchAlt = "">>
 <<else>>
-	<<set $toSearchAlt = $activeSlave.pornPrestigeDesc>>
+	<<set $toSearchAlt = $activeSlave.porn.prestigeDesc>>
 <</if>>
 <<if ($toSearch.indexOf("Head Girl") != -1) || ($HeadGirl.ID == $activeSlave.ID)>>
 	<br><br>
@@ -103,7 +103,7 @@ $He's certainly going to have some adjustments to make.
 	<</if>>
 <<elseif ($toSearchAlt.indexOf("is world famous for") != -1)>>
 	<br><br>
-	<<set _pornFame = $activeSlave.pornPrestigeDesc>>
+	<<set _pornFame = $activeSlave.porn.prestigeDesc>>
 	<<set _pornFame = _pornFame.replace("$He is world famous for $his career in slave pornography. Millions are intimately familiar with", "enjoy")>>
 	<<set _pornFame = _pornFame.replace(".", ",")>>
 	In addition to $his annuity, you've laid the groundwork for $him to become wealthy by the way you publicized pornography of $him. Many thousands of people across the world are willing to pay to _pornFame and they enjoy it in part because $he doesn't mind it, either. $He's in a position to make great money for doing on camera what $he would probably do anyway.
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index 7e74990ea0b67e37d1146770d46f5eaef5ea1943..cae5087bfe47a5bba74430b98ca2e79a6c8287c8 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -529,11 +529,11 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
 	I see notes on $his notoriety in $his file. That will drive up $his price.
 <</if>>
 
-<<if $activeSlave.pornPrestige == 3>>
+<<if $activeSlave.porn.prestige == 3>>
 	$He's pretty popular in $activeSlave.porn.fameType smut, isn't $he? Buyers will be lining up for $him.
-<<elseif $activeSlave.pornPrestige == 2>>
+<<elseif $activeSlave.porn.prestige == 2>>
 	$He's gained quite the following in $activeSlave.porn.fameType smut. In fact, I've even seen some of $his smut; buyers will flock to $him.
-<<elseif $activeSlave.pornPrestige == 1>>
+<<elseif $activeSlave.porn.prestige == 1>>
 	$He's got a small fanbase in $activeSlave.porn.fameType smut. Who knows? Maybe one of them will want $him all to themselves?
 <</if>>
 
@@ -1320,7 +1320,7 @@ __Bids Received__
 	<</if>>
 <</if>>
 
-<<if $activeSlave.pornPrestige == 1>>
+<<if $activeSlave.porn.prestige == 1>>
 	<<if random(1,100) == 69>>
 		<br>''<<print cashFormat(200*Math.trunc(($slaveCost*2)/200))>>'' from an obsessive fan who absolutely must have $him for himself.
 		<<link "Accept bid" "Slave Sold">>
@@ -1329,7 +1329,7 @@ __Bids Received__
 			<<set $buyer = "obsessed fan">>
 		<</link>>
 	<</if>>
-<<elseif $activeSlave.pornPrestige == 3>>
+<<elseif $activeSlave.porn.prestige == 3>>
 	<<if random(1,100) > 90>>
 		<br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.3)/500))>>'' from a studio interested in continued production of $his porn.
 		<<link "Accept bid" "Slave Sold">>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index fefcf47c7514b81c387cedceefaccac345156770..3774827d47378981cd1ed496bd829b4cd69e9817 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1629,26 +1629,26 @@ Relationship rules: ''<span id="relationshipRules">$activeSlave.rules.relationsh
 <<if $studio == 1>>
 
 	<br><br>__Media__:<br>
-	<<if $activeSlave.pornPrestige == 3>>
+	<<if $activeSlave.porn.prestige == 3>>
 		//$He is so prestigious in the realm of $activeSlave.porn.fameType porn that $his fame is self-sustaining.//
-	<<elseif $activeSlave.pornFeed == 0>>
-		The media hub is not releasing highlights of $his sex life. [[Release|Slave Interact][$activeSlave.pornFeed = 1]]
+	<<elseif $activeSlave.porn.feed == 0>>
+		The media hub is not releasing highlights of $his sex life. [[Release|Slave Interact][$activeSlave.porn.feed = 1]]
 	<<else>>
-		The media hub is releasing highlights of $his sex life <<if $activeSlave.pornFameSpending < 500>>to those who can find it<<elseif $activeSlave.pornFameSpending < 2500>>on several websites<<elseif $activeSlave.pornFameSpending > 5000>>through your old distributor<<else>>on many websites<</if>>.
-		<<if $activeSlave.pornFameSpending == 0>>
-			[[Halt|Slave Interact][$activeSlave.pornFeed = 0, $activeSlave.porn.focus = "none"]] |
-			[[Publicize|Slave Interact][$activeSlave.pornFameSpending += 1000]]
+		The media hub is releasing highlights of $his sex life <<if $activeSlave.porn.spending < 500>>to those who can find it<<elseif $activeSlave.porn.spending < 2500>>on several websites<<elseif $activeSlave.porn.spending > 5000>>through your old distributor<<else>>on many websites<</if>>.
+		<<if $activeSlave.porn.spending == 0>>
+			[[Halt|Slave Interact][$activeSlave.porn.feed = 0, $activeSlave.porn.focus = "none"]] |
+			[[Publicize|Slave Interact][$activeSlave.porn.spending += 1000]]
 			//Will cost <<print cashFormat(1000)>> weekly.//
 		<<else>>
-			<<textbox "_newPornSpending" $activeSlave.pornFameSpending>> weekly is spent to publicize them. [[Save changes|Slave Interact][$activeSlave.pornFameSpending = Number(_newPornSpending) || 0]] |
-			[[Halt|Slave Interact][$activeSlave.pornFeed = 0, $activeSlave.pornFameSpending = 0, $activeSlave.porn.focus = "none", $PCSlutContacts = 1]] |
-			<<if $activeSlave.pornFameSpending < 5000>>
-				[[Increase|Slave Interact][$activeSlave.pornFameSpending += 1000]] |
+			<<textbox "_newPornSpending" $activeSlave.porn.spending>> weekly is spent to publicize them. [[Save changes|Slave Interact][$activeSlave.porn.spending = Number(_newPornSpending) || 0]] |
+			[[Halt|Slave Interact][$activeSlave.porn.feed = 0, $activeSlave.porn.spending = 0, $activeSlave.porn.focus = "none", $PCSlutContacts = 1]] |
+			<<if $activeSlave.porn.spending < 5000>>
+				[[Increase|Slave Interact][$activeSlave.porn.spending += 1000]] |
 			<</if>>
-			[[Decrease|Slave Interact][$activeSlave.pornFameSpending -= 1000]]
-			<<if $activeSlave.pornFameSpending > 5000>><<set _warn = 1>><</if>>
-			<<set $activeSlave.pornFameSpending = Number($activeSlave.pornFameSpending) || 0>>
-			<<set $activeSlave.pornFameSpending = Math.clamp(Math.ceil($activeSlave.pornFameSpending/1000)*1000, 0, 5000)>>
+			[[Decrease|Slave Interact][$activeSlave.porn.spending -= 1000]]
+			<<if $activeSlave.porn.spending > 5000>><<set _warn = 1>><</if>>
+			<<set $activeSlave.porn.spending = Number($activeSlave.porn.spending) || 0>>
+			<<set $activeSlave.porn.spending = Math.clamp(Math.ceil($activeSlave.porn.spending/1000)*1000, 0, 5000)>>
 			<<if _warn>><br>//Spending more than <<print cashFormat(5000)>> weekly will have no effect.//<</if>>
 			<<if $PC.career == "escort">>
 				<br>
@@ -1665,11 +1665,11 @@ Relationship rules: ''<span id="relationshipRules">$activeSlave.rules.relationsh
 
 		<<if $studioFeed == 1>>
 			<br>
-			<<if $activeSlave.pornFame < 100>>
+			<<if $activeSlave.porn.viewerCount < 100>>
 				$He lacks the fame in porn needed to discern what $his feed is getting tagged as.
 			<<else>>
-				<<if $activeSlave.pornPrestige > 0>>
-					$He is known for $activeSlave.porn.fameType porn<<if $activeSlave.pornPrestige > 1>> and viewers have grown to expect it from $him<</if>>.
+				<<if $activeSlave.porn.prestige > 0>>
+					$He is known for $activeSlave.porn.fameType porn<<if $activeSlave.porn.prestige > 1>> and viewers have grown to expect it from $him<</if>>.
 				<</if>>
 				<<if $activeSlave.porn.focus == "none">>
 					You are allowing $his viewers to guide the direction of $his content.
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index b3dfc160af4bac29daaa9fb2de9bf6ad3e10d108..94e6c2b3510aee07d8d4602d1b35257c88734303 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -1068,7 +1068,7 @@
 	$activeSlave.slaveName becomes a frequent sight in $activeSlave.porn.fameType smut and attracts huge crowds with each public appearance.
 	<<run clearSummaryCache()>>
 	<<for _ss = 0; _ss < $slaves.length; _ss++>>
-		<<if $slaves[_ss].pornPrestige > 0 && $slaves[_ss].pornPrestige < 3>>
+		<<if $slaves[_ss].porn.prestige > 0 && $slaves[_ss].porn.prestige < 3>>
 			<<if ($slaves[_ss].devotion > 20)>>
 				<<run clearSummaryCache($slaves[_ss])>>
 				<<set $slaves[_ss].trust += 2>>
@@ -1084,7 +1084,7 @@
 	$activeSlave.slaveName is rarely seen after $his buyer takes charge of $him, since he prefers to keep his prize safe and sound at home.
 	<<run clearSummaryCache()>>
 	<<for _ss = 0; _ss < $slaves.length; _ss++>>
-		<<if $slaves[_ss].pornPrestige == 1>>
+		<<if $slaves[_ss].porn.prestige == 1>>
 			<<if ($slaves[_ss].devotion > 20)>>
 				<<run clearSummaryCache($slaves[_ss])>>
 				<<set $slaves[_ss].trust += 1>>
diff --git a/src/uncategorized/slaveStats.tw b/src/uncategorized/slaveStats.tw
index f49783350c5212be17ade0f99bdfbd7323da309f..94bcf449df526a8dad9fc690c4670bca1399358e 100644
--- a/src/uncategorized/slaveStats.tw
+++ b/src/uncategorized/slaveStats.tw
@@ -341,12 +341,12 @@ Income: <<= num($activeSlave.lastWeeksRepIncome)>>
 <div id="Porn" class="tabcontent">
 	<div class="content">
 		Focus: $activeSlave.porn.focus,
-		Feed: $activeSlave.pornFeed
-		<br>Fame: $activeSlave.pornFame
+		Feed: $activeSlave.porn.feed
+		<br>ViewerCount: $activeSlave.porn.viewerCount
 		FameType: $activeSlave.porn.fameType
-		<br>FameSpending: $activeSlave.pornFameSpending
-		<br>Prestige: $activeSlave.pornPrestige
-		PrestigeDesc: $activeSlave.pornPrestigeDesc
+		<br>WeeklySpending: $activeSlave.porn.spending
+		<br>Prestige: $activeSlave.porn.prestige
+		PrestigeDesc: $activeSlave.porn.prestigeDesc
  
 		<br><br>
 		<h2>Type</h2>