diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 22ced2dc78b1ad6f4d89734e179900082c5891bc..289362e0151a3c185c472e1fe015c971d974aeab 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -564,28 +564,31 @@ App.Update.globalVariables = function() {
 	}
 
 	// Facilities
-	if (typeof V.spaSpots === "undefined") {
-		V.spaSpots = 0;
-	}
-	if (typeof V.killChoice === "undefined") {
-		V.killChoice = -1;
-	}
-	if (typeof V.schoolroomRemodelBimbo === "undefined") {
-		V.schoolroomRemodelBimbo = 0;
-	}
-	if (V.clubAdsSpending > 0 && V.club === 0) {
-		V.clubAdsSpending = 0;
-	}
-	if (V.brothelAdsSpending > 0 && V.brothel === 0) {
-		V.brothelAdsSpending = 0;
-	}
-	if (typeof V.milkPipeline === "undefined") {
-		V.milkPipeline = 0;
-	}
-	if (typeof V.cumPipeline === "undefined") {
-		V.cumPipeline = 0;
+	{
+		if (typeof V.spaSpots === "undefined") {
+			V.spaSpots = 0;
+		}
+		if (typeof V.killChoice === "undefined") {
+			V.killChoice = -1;
+		}
+		if (typeof V.schoolroomRemodelBimbo === "undefined") {
+			V.schoolroomRemodelBimbo = 0;
+		}
+		if (V.clubAdsSpending > 0 && V.club === 0) {
+			V.clubAdsSpending = 0;
+		}
+		if (V.brothelAdsSpending > 0 && V.brothel === 0) {
+			V.brothelAdsSpending = 0;
+		}
+		if (typeof V.milkPipeline === "undefined") {
+			V.milkPipeline = 0;
+		}
+		if (typeof V.cumPipeline === "undefined") {
+			V.cumPipeline = 0;
+		}
 	}
 
+
 	// Slave mods/surgery
 	{
 		if (typeof V.brandTarget === "string") {
@@ -770,22 +773,39 @@ App.Update.globalVariables = function() {
 		}
 	}
 
-	// Content
+	// Content / Policies
 	{
-		if (typeof V.universalRulesBirthing === "undefined") {
-			V.universalRulesBirthing = 0;
-		}
-		if (typeof V.universalRulesImmobileSlavesMaintainMuscles === "undefined") {
-			V.universalRulesImmobileSlavesMaintainMuscles = 0;
-		}
-		if (typeof V.universalRulesChildrenBecomeBreeders === "undefined") {
-			V.universalRulesChildrenBecomeBreeders = 0;
-		}
-		if (typeof V.fixedNationality === "undefined") {
-			V.fixedNationality = 0;
-		}
-		if (typeof V.fixedRace === "undefined") {
-			V.fixedRace = 0;
+		// See content
+		{
+			if (((V.ver.startsWith("0.6") && !V.ver.startsWith("10.6")) || (V.ver.startsWith("0.7")) || (V.ver.startsWith("0.8")) || (V.ver === "0.9"))) {
+				if (V.seeDicks === 2) {
+					V.seeDicks = 100;
+				} else if (V.seeDicks === 1) {
+					V.seeDicks = 25;
+				}
+			}
+			V.seeDicks = Math.clamp(V.seeDicks, 0, 100);
+			if (typeof V.seeBestiality === "undefined") {
+				V.seeBestiality = 0;
+			}
+			if (typeof V.seePee === "undefined") {
+				V.seePee = 1;
+			}
+			if (typeof V.menstruation === "undefined") {
+				V.menstruation = 0; // TODO: possibly unused
+			}
+			if (typeof V.seeIncest === "undefined") {
+				V.seeIncest = 1;
+			}
+			if (typeof V.seeHyperPreg === "undefined") {
+				V.seeHyperPreg = 0;
+			}
+			if (typeof V.seePreg === "undefined") {
+				V.seePreg = 1;
+			}
+			if (typeof V.seeDicksAffectsPregnancy === "undefined") {
+				V.seeDicksAffectsPregnancy = 1;
+			}
 		}
 		if (typeof V.surnamesForbidden === "undefined") {
 			V.surnamesForbidden = 0;
@@ -793,45 +813,18 @@ App.Update.globalVariables = function() {
 		if (typeof V.FSNamePref === "undefined") {
 			V.FSNamePref = 0;
 		}
-		if (typeof V.loliGrow === "undefined") {
-			V.loliGrow = 0;
-		}
 		if (typeof V.ageMode === "undefined") {
 			V.ageMode = 0;
 		}
-		if (typeof V.seeBestiality === "undefined") {
-			V.seeBestiality = 0;
-		}
-		if (typeof V.seePee === "undefined") {
-			V.seePee = 1;
-		}
-		if (typeof V.menstruation === "undefined") {
-			V.menstruation = 0;
-		}
-		if (typeof V.seeIncest === "undefined") {
-			V.seeIncest = 1;
-		}
-		if (typeof V.extremeUnderage === "undefined") {
-			V.extremeUnderage = 0;
-		}
 		if (typeof V.inbreeding === "undefined") {
 			V.inbreeding = 1;
 		}
 		if (typeof V.bodyswapAnnounced === "undefined") {
 			V.bodyswapAnnounced = 0;
 		}
-		if (typeof V.seeHyperPreg === "undefined") {
-			V.seeHyperPreg = 0;
-		}
-		if (typeof V.seePreg === "undefined") {
-			V.seePreg = 1;
-		}
 		if (typeof V.adamPrinciple === "undefined") {
 			V.adamPrinciple = 0;
 		}
-		if (typeof V.seeDicksAffectsPregnancy === "undefined") {
-			V.seeDicksAffectsPregnancy = 1;
-		}
 		if (typeof V.dangerousPregnancy === "undefined") {
 			V.dangerousPregnancy = 1;
 		}
@@ -842,10 +835,6 @@ App.Update.globalVariables = function() {
 			// eslint-disable-next-line camelcase
 			V.pedo_mode = 0;
 		}
-		if (typeof V.one_time_age_overrides_pedo_mode === "undefined") {
-			// eslint-disable-next-line camelcase
-			V.one_time_age_overrides_pedo_mode = 0;
-		}
 		if (typeof V.minimumSlaveAge === "undefined") {
 			V.minimumSlaveAge = 16;
 		}
@@ -855,21 +844,9 @@ App.Update.globalVariables = function() {
 		if (typeof V.potencyAge === "undefined") {
 			V.potencyAge = 13;
 		}
-		if (typeof slaveOneTimeMinAge === "undefined") {
-			V.slaveOneTimeMinAge = 0;
-		}
-		if (typeof slaveOneTimeMaxAge === "undefined") {
-			V.slaveOneTimeMaxAge = 999;
-		}
-		if (typeof V.oneTimeDisableDisability === "undefined") {
-			V.oneTimeDisableDisability = 0;
-		}
 		if (typeof V.AgePenalty === "undefined") {
 			V.AgePenalty = 1;
 		}
-		if (typeof V.precociousPuberty === "undefined") {
-			V.precociousPuberty = 0;
-		}
 		if (typeof V.targetAge === "undefined") {
 			V.targetAge = V.minimumSlaveAge;
 		}
@@ -879,6 +856,287 @@ App.Update.globalVariables = function() {
 		if (typeof V.postSexCleanUp === "undefined") {
 			V.postSexCleanUp = 1;
 		}
+		if (typeof V.hormoneUpgradeMood === "undefined") {
+			V.hormoneUpgradeMood = 0;
+		}
+		if (typeof V.hormoneUpgradeShrinkage === "undefined") {
+			V.hormoneUpgradeShrinkage = 0;
+		}
+		if (typeof V.hormoneUpgradePower === "undefined") {
+			V.hormoneUpgradePower = 0;
+		}
+		if (typeof V.displayAssignments === "undefined") {
+			V.displayAssignments = 1;
+		}
+		if (typeof V.abbreviateNationality === "undefined") {
+			V.abbreviateNationality = 0;
+		}
+		// Universal Rules
+		{
+			if (typeof V.universalRulesBirthing === "undefined") {
+				V.universalRulesBirthing = 0;
+			}
+			if (typeof V.universalRulesImmobileSlavesMaintainMuscles === "undefined") {
+				V.universalRulesImmobileSlavesMaintainMuscles = 0;
+			}
+			if (typeof V.universalRulesChildrenBecomeBreeders === "undefined") {
+				V.universalRulesChildrenBecomeBreeders = 0;
+			}
+			if (typeof V.universalHGImpregnateMasterSuiteToggle === "undefined") {
+				V.universalHGImpregnateMasterSuiteToggle = 0;
+			}
+			if (typeof V.universalRulesRest === "undefined") {
+				V.universalRulesRest = 0;
+			}
+			if (typeof V.universalRulesNewSlavesRA === "undefined") {
+				V.universalRulesNewSlavesRA = 1;
+			}
+			if (typeof V.universalRulesImpregnation === "undefined") {
+				V.universalRulesImpregnation = "none";
+			}
+		}
+
+		// Outside of lore
+		{
+			if (typeof V.extremeUnderage === "undefined") {
+				V.extremeUnderage = 0; // TODO: Possibly unused
+			}
+			if (typeof V.loliGrow === "undefined") {
+				V.loliGrow = 0;
+			}
+			if (typeof V.precociousPuberty === "undefined") {
+				V.precociousPuberty = 0;
+			}
+			if (typeof V.pubertyLength === "undefined") {
+				V.pubertyLength = 5;
+			}
+			if (typeof V.maxGrowthAge === "undefined") {
+				V.maxGrowthAge = 24;
+			}
+		}
+
+		// Policies
+		{
+			if (typeof V.goodImageCampaign === "undefined") {
+				V.goodImageCampaign = 0;
+			}
+			if (typeof V.sexualOpeness === "undefined") {
+				V.sexualOpeness = 0;
+			}
+			if (typeof V.CulturalOpenness === "undefined") {
+				V.CulturalOpenness = 0;
+			}
+			if (typeof V.alwaysSubsidizeRep === "undefined") {
+				V.alwaysSubsidizeRep = 0;
+			}
+			if (typeof V.alwaysSubsidizeGrowth === "undefined") {
+				V.alwaysSubsidizeGrowth = 0;
+			}
+			if (typeof V.ProImmigrationCash === "undefined") {
+				V.ProImmigrationCash = 0;
+			}
+			if (typeof V.ProImmigrationRep === "undefined") {
+				V.ProImmigrationRep = 0;
+			}
+			if (typeof V.AntiImmigrationCash === "undefined") {
+				V.AntiImmigrationCash = 0;
+			}
+			if (typeof V.AntiImmigrationRep === "undefined") {
+				V.AntiImmigrationRep = 0;
+			}
+			if (typeof V.ProEnslavementCash === "undefined") {
+				V.ProEnslavementCash = 0;
+			}
+			if (typeof V.ProEnslavementRep === "undefined") {
+				V.ProEnslavementRep = 0;
+			}
+			if (typeof V.AntiEnslavementCash === "undefined") {
+				V.AntiEnslavementCash = 0;
+			}
+			if (typeof V.AntiEnslavementRep === "undefined") {
+				V.AntiEnslavementRep = 0;
+			}
+			if (typeof V.BasicSMR === "undefined") {
+				V.BasicSMR = 1;
+			}
+			if (typeof V.HealthInspectionSMR === "undefined") {
+				V.HealthInspectionSMR = 0;
+			}
+			if (typeof V.EducationSMR === "undefined") {
+				V.EducationSMR = 0;
+			}
+			if (typeof V.FrigiditySMR === "undefined") {
+				V.FrigiditySMR = 0;
+			}
+			if (typeof V.BasicBeautySMR === "undefined") {
+				V.BasicBeautySMR = 0;
+			}
+			if (typeof V.QualityBeautySMR === "undefined") {
+				V.QualityBeautySMR = 0;
+			}
+			if (typeof V.BasicWeightSMR === "undefined") {
+				V.BasicWeightSMR = 0;
+			}
+			if (typeof V.BasicIntelligenceSMR === "undefined") {
+				V.BasicIntelligenceSMR = 0;
+			}
+			if (typeof V.QualityIntelligenceSMR === "undefined") {
+				V.QualityIntelligenceSMR = 0;
+			}
+			if (typeof V.BasicHeightSMR === "undefined") {
+				V.BasicHeightSMR = 0;
+			}
+			if (typeof V.AdvancedHeightSMR === "undefined") {
+				V.AdvancedHeightSMR = 0;
+			}
+			if (typeof V.BasicTallSMR !== "undefined") {
+				V.BasicHeightSMR = 1;
+			}
+			if (typeof V.BasicShortSMR !== "undefined") {
+				V.BasicHeightSMR = -1;
+			}
+			if (typeof V.IntelligenceEugenicsSMR === "undefined") {
+				V.IntelligenceEugenicsSMR = 0;
+			}
+			if (typeof V.HeightEugenicsSMR === "undefined") {
+				V.HeightEugenicsSMR = 0;
+			}
+			if (typeof V.FaceEugenicsSMR === "undefined") {
+				V.FaceEugenicsSMR = 0;
+			}
+			if (typeof V.HonestySMR === "undefined") {
+				V.HonestySMR = 0;
+			}
+			if (typeof V.ProRefugees === "undefined") {
+				V.ProRefugees = 0;
+			}
+			if (typeof V.ProRecruitment === "undefined") {
+				V.ProRecruitment = 0;
+			}
+			if (typeof V.OralEncouragement === "undefined") {
+				V.OralEncouragement = 0;
+			}
+			if (typeof V.VaginalEncouragement === "undefined") {
+				V.VaginalEncouragement = 0;
+			}
+			if (typeof V.AnalEncouragement === "undefined") {
+				V.AnalEncouragement = 0;
+			}
+			if (typeof V.OralDiscouragement === "undefined") {
+				V.OralDiscouragement = 0;
+			}
+			if (typeof V.VaginalDiscouragement === "undefined") {
+				V.VaginalDiscouragement = 0;
+			}
+			if (typeof V.AnalDiscouragement === "undefined") {
+				V.AnalDiscouragement = 0;
+			}
+			if (typeof V.CashForRep === "undefined") {
+				V.CashForRep = 0;
+			}
+			if (typeof V.RepForCash === "undefined") {
+				V.RepForCash = 0;
+			}
+			if (typeof V.Cash4Babies === "undefined") {
+				V.Cash4Babies = 0;
+			}
+			if (typeof V.PAPublic === "undefined") {
+				V.PAPublic = 0;
+			}
+			if (typeof V.CoursingAssociation === "undefined") {
+				V.CoursingAssociation = 0;
+			}
+			if (typeof V.Lurcher === "undefined") {
+				V.Lurcher = 0;
+			}
+			if (typeof V.coursed === "undefined") {
+				V.coursed = 0;
+			}
+			if (typeof V.MixedMarriage === "undefined") {
+				V.MixedMarriage = 0;
+			}
+			if (typeof V.retirementAge === "undefined") {
+				V.retirementAge = 45;
+			}
+			if (typeof V.customRetirementAge === "undefined") {
+				V.customRetirementAge = 45;
+			}
+			if (typeof V.customMenialRetirementAge === "undefined") {
+				V.customMenialRetirementAge = 65;
+			}
+			if (typeof V.retirementCum === "undefined") {
+				V.retirementCum = 500000;
+			}
+			if (typeof V.CustomRetirementAgePolicy === "undefined") {
+				V.CustomRetirementAgePolicy = 0;
+			}
+			if (typeof V.PhysicalRetirementAgePolicy === "undefined") {
+				V.PhysicalRetirementAgePolicy = 0;
+			}
+			if (typeof V.CumMilestoneRetirement === "undefined") {
+				V.CumMilestoneRetirement = 0;
+			}
+			if (typeof V.BioreactorRetirement === "undefined") {
+				V.BioreactorRetirement = 0;
+			}
+			if (typeof V.ArcadeRetirement === "undefined") {
+				V.ArcadeRetirement = 0;
+			}
+			if (typeof V.CitizenRetirement === "undefined") {
+				V.CitizenRetirement = 0;
+			}
+			if (typeof V.citizenRetirementMenials === "undefined") {
+				V.citizenRetirementMenials = 0;
+			}
+			if (typeof V.FSSupLawTrigger === "undefined") {
+				V.FSSupLawTrigger = 0;
+			}
+			if (typeof V.FSSubLawTrigger === "undefined") {
+				V.FSSubLawTrigger = 0;
+			}
+			if (typeof V.FSSlaveProfLawTrigger === "undefined") {
+				V.FSSlaveProfLawTrigger = 0;
+			}
+		}
+
+		// Art
+		{
+			if (typeof V.seeVectorArtHighlights === "undefined") {
+				V.seeVectorArtHighlights = 1;
+			}
+			if (typeof V.seeFaces === "undefined") {
+				V.seeFaces = 1;
+			}
+			if (typeof V.seeAvatar === "undefined") {
+				V.seeAvatar = 1;
+			}
+			if (typeof V.seeHeight === "undefined") {
+				V.seeHeight = 0;
+			}
+		}
+	}
+
+	// Slave Generation
+	{
+		if (typeof V.one_time_age_overrides_pedo_mode === "undefined") {
+			// eslint-disable-next-line camelcase
+			V.one_time_age_overrides_pedo_mode = 0;
+		}
+		if (typeof V.fixedNationality === "undefined") {
+			V.fixedNationality = 0;
+		}
+		if (typeof V.fixedRace === "undefined") {
+			V.fixedRace = 0;
+		}
+		if (typeof slaveOneTimeMinAge === "undefined") {
+			V.slaveOneTimeMinAge = 0;
+		}
+		if (typeof slaveOneTimeMaxAge === "undefined") {
+			V.slaveOneTimeMaxAge = 999;
+		}
+		if (typeof V.oneTimeDisableDisability === "undefined") {
+			V.oneTimeDisableDisability = 0;
+		}
 	}
 
 	// Event
@@ -895,8 +1153,98 @@ App.Update.globalVariables = function() {
 		if (typeof V.traitorType === "undefined") {
 			V.traitorType = "standard";
 		}
+		if (typeof V.REFeminizationCheckinIDs === "undefined") {
+			V.REFeminizationCheckinIDs = [];
+		}
+		if (typeof V.REMILFCheckinIDs === "undefined") {
+			V.REMILFCheckinIDs = [];
+		}
+		if (typeof V.REOrientationCheckinIDs === "undefined") {
+			V.REOrientationCheckinIDs = [];
+		}
+		if (typeof V.REUglyCheckinIDs === "undefined") {
+			V.REUglyCheckinIDs = [];
+		}
+		if (typeof V.REButtholeCheckinIDs === "undefined") {
+			V.REButtholeCheckinIDs = [];
+		}
+		if (typeof V.REFutaSisterCheckinIDs === "undefined") {
+			V.REFutaSisterCheckinIDs = [];
+		}
+		if (typeof V.REReductionCheckinIDs === "undefined") {
+			V.REReductionCheckinIDs = [];
+		}
+		if (typeof V.schoolSuggestion === "undefined") {
+			V.schoolSuggestion = 0;
+		}
+		// Nicea
+		{
+			if (typeof V.nicaeaAnnounceable === "undefined") {
+				V.nicaeaAnnounceable = 0;
+			}
+			if (typeof V.nicaeaAnnounced === "undefined") {
+				V.nicaeaAnnounced = 0;
+			}
+			if (typeof V.nicaeaPreparation === "undefined") {
+				V.nicaeaPreparation = 0;
+			}
+			if (typeof V.nicaeaInvolvement === "undefined") {
+				V.nicaeaInvolvement = -1;
+			}
+			if (typeof V.nicaeaPower === "undefined") {
+				V.nicaeaPower = 0;
+			}
+			if (typeof V.nicaeaHeld === "undefined") {
+				V.nicaeaHeld = 0;
+			}
+		}
+		if (typeof V.shelterSlaveGeneratedWeek || V.shelterSlaveGeneratedWeek > V.week === "undefined") {
+			V.shelterSlaveGeneratedWeek = 0;
+		}
+		if (typeof V.pregInventor === "undefined") {
+			V.pregInventor = 0;
+		}
+		if (typeof V.pregInventorID === "undefined") {
+			V.pregInventorID = 0;
+		}
+		if (typeof V.pregInventions === "undefined") {
+			V.pregInventions = 0;
+		}
+		if (typeof V.traitorWeeks === "undefined") {
+			V.traitorWeeks = 0;
+		}
+		if (typeof V.taitorWeeks !== "undefined") {
+			V.traitorWeeks = V.taitorWeeks;
+		}
+		if (typeof V.rivalGender === "undefined") {
+			if ((V.rivalOwner > 0)) {
+				if (random(0, 99) <= V.seeDicks) {
+					V.rivalGender = 2;
+				} else {
+					V.rivalGender = 1;
+				}
+			} else {
+				V.rivalGender = 0;
+			}
+		}
+		if (typeof V.realRoyalties === "undefined") {
+			V.realRoyalties = 0;
+		}
+		if (typeof V.birthee === "undefined") {
+			V.birthee = 0;
+		}
+		if (typeof V.expiree === "undefined") {
+			V.expiree = 0;
+		}
+		if (typeof V.retiree === "undefined") {
+			V.retiree = 0;
+		}
+		if (typeof V.justiceEvents === "undefined") {
+			V.justiceEvents = ["indenture deal", "majority deal", "slave deal", "slave training", "virginity deal"];
+		}
 	}
 
+
 	// FCTV
 	{
 		if (typeof V.FCTVenable === "undefined") {
@@ -1242,32 +1590,6 @@ App.Update.globalVariables = function() {
 		}
 	}
 
-	// Penthouse upgrades
-	{
-		if (typeof V.pregAccessibility === "undefined") {
-			V.pregAccessibility = 0;
-		}
-		if (typeof V.dickAccessibility === "undefined") {
-			V.dickAccessibility = 0;
-		}
-		if (typeof V.ballsAccessibility === "undefined") {
-			V.ballsAccessibility = 0;
-		}
-		if (typeof V.buttAccessibility === "undefined") {
-			V.buttAccessibility = 0;
-		}
-		if (typeof V.dairyPiping === "undefined") {
-			V.dairyPiping = 0;
-		}
-
-		if (typeof V.wcPiping === "undefined") {
-			V.wcPiping = 0;
-		}
-		if (typeof V.pregSpeedControl === "undefined") {
-			V.pregSpeedControl = 0;
-		}
-	}
-
 	// Shopping for slaves
 	{
 		if (typeof V.specialSlavesPriceOverride === "undefined") {
@@ -1564,6 +1886,107 @@ App.Update.globalVariables = function() {
 	// Corp
 	{
 		App.Corporate.Backcompat();
+		/* Corporation variables added*/
+		if (typeof V.vanillaShareSplit === "undefined") {
+			V.vanillaShareSplit = 1;
+		}
+		if (typeof V.corpCashDividend === "undefined") {
+			V.corpCashDividend = 0;
+		}
+		if (typeof V.corpDiv === "undefined") {
+			V.corpDiv = 0;
+		}
+		if (typeof V.corpExpandToken === "undefined") {
+			V.corpExpandToken = 0;
+		}
+		if (V.corpExpandToken > 1) {
+			V.corpExpandToken = 1;
+		}
+		if (typeof V.corpSpec === "undefined") {
+			V.corpSpec = 0;
+		}
+		if (typeof V.corpSpecToken === "undefined") {
+			V.corpSpecToken = 0;
+		}
+		if (typeof V.corpDivExtra === "undefined") {
+			V.corpDivExtra = 0;
+		}
+		if (typeof V.corpDivLegal === "undefined") {
+			V.corpDivLegal = 0;
+		}
+		if (typeof V.corpDivBreak === "undefined") {
+			V.corpDivBreak = 0;
+		}
+		if (typeof V.corpDivSurgery === "undefined") {
+			V.corpDivSurgery = 0;
+		}
+		if (typeof V.corpDivTrain === "undefined") {
+			V.corpDivTrain = 0;
+		}
+		if (typeof V.corpDivArcade === "undefined") {
+			V.corpDivArcade = 0;
+		}
+		if (typeof V.corpDivMenial === "undefined") {
+			V.corpDivMenial = 0;
+		}
+		if (typeof V.corpDivDairy === "undefined") {
+			V.corpDivDairy = 0;
+		}
+		if (typeof V.corpDivWhore === "undefined") {
+			V.corpDivWhore = 0;
+		}
+		if (typeof V.corpDivExtraDev === "undefined") {
+			V.corpDivExtraDev = 0;
+		}
+		if (typeof V.corpDivLegalDev === "undefined") {
+			V.corpDivLegalDev = 0;
+		}
+		if (typeof V.corpDivBreakDev === "undefined") {
+			V.corpDivBreakDev = 0;
+		}
+		if (typeof V.corpDivSurgeryDev === "undefined") {
+			V.corpDivSurgeryDev = 0;
+		}
+		if (typeof V.corpDivTrainDev === "undefined") {
+			V.corpDivTrainDev = 0;
+		}
+		if (typeof V.corpDivArcadeDev === "undefined") {
+			V.corpDivArcadeDev = 0;
+		}
+		if (typeof V.corpDivMenialDev === "undefined") {
+			V.corpDivMenialDev = 0;
+		}
+		if (typeof V.corpDivDairyDev === "undefined") {
+			V.corpDivDairyDev = 0;
+		}
+		if (typeof V.corpDivWhoreDev === "undefined") {
+			V.corpDivWhoreDev = 0;
+		}
+		if (typeof V.corpSpecRaces === "undefined") {
+			V.corpSpecRaces = [];
+		}
+		V.dividendTimer = V.dividendTimer || 13;
+		if (typeof V.corpEcon === "undefined") {
+			V.corpEcon = 0;
+		}
+
+		/* Removing the old Corp from save*/
+		if (typeof V.newCorp === "undefined") {
+			V.newCorp = 1;
+			V.corpIncorporated = 0;
+			cashX(Math.min(Math.trunc((V.corpValue / (V.publicShares + V.personalShares)) * V.personalShares), 1000000), "stocksTraded");
+			/* Paying the player for his old corporation, so they can get the new one started with haste. It should perhaps have a message going with it*/
+			V.mercenariesHelpCorp = 0;
+			V.corpMarket = 0;
+			if (typeof V.sectors !== "undefined") {
+				for (let _i = 0; _i < V.sectors.length; _i++) {
+					if (V.sectors[_i].type === "CorporateMarket") {
+						V.sectors[_i].type = "Markets";
+						break;
+					}
+				}
+			}
+		}
 		// TODO: Corp, should captureUpgradeRace be removed? -LCD
 		if (V.captureUpgradeRace === "") {
 			V.generalUpgradeBreaking = "unselected";
@@ -1680,52 +2103,6 @@ App.Update.globalVariables = function() {
 
 	// Arcologies
 	{
-		if (typeof V.FSPromenade === "undefined") {
-			V.FSPromenade = {
-				Subjugationist: 0,
-				Supremacist: 0,
-				GenderRadicalist: 0,
-				GenderFundamentalist: 0,
-				Paternalist: 0,
-				Degradationist: 0,
-				BodyPurist: 0,
-				TransformationFetishist: 0,
-				YouthPreferentialist: 0,
-				MaturityPreferentialist: 0,
-				SlimnessEnthusiast: 0,
-				AssetExpansionist: 0,
-				Pastoralist: 0,
-				PhysicalIdealist: 0,
-				ChattelReligionist: 0,
-				RomanRevivalist: 0,
-				AztecRevivalist: 0,
-				EgyptianRevivalist: 0,
-				EdoRevivalist: 0,
-				ArabianRevivalist: 0,
-				ChineseRevivalist: 0,
-				Repopulationist: 0,
-				Eugenics: 0,
-				Hedonism: 0,
-				IntellectualDependency: 0,
-				SlaveProfessionalism: 0,
-				PetiteAdmiration: 0,
-				StatuesqueGlorification: 0
-			};
-		}
-		if (typeof V.arcologyUpgrade === "undefined") {
-			V.arcologyUpgrade = {
-				drones: 0,
-				hydro: 0,
-				apron: 0,
-				grid: 0,
-				spire: 0
-			};
-			V.arcologyUpgrade.drones = (V.AProsperityCap > 60) ? 1 : 0;
-			V.arcologyUpgrade.hydro = (V.AProsperityCap > 80) ? 1 : 0;
-			V.arcologyUpgrade.apron = (V.AProsperityCap > 100) ? 1 : 0;
-			V.arcologyUpgrade.grid = (V.AProsperityCap > 120) ? 1 : 0;
-			V.arcologyUpgrade.spire = (V.AProsperityCap > 240) ? 1 : 0;
-		}
 		if (typeof V.arcologies === "undefined") {
 			V.arcologies = [];
 			V.arcologies[0] = {
@@ -1771,6 +2148,10 @@ App.Update.globalVariables = function() {
 				rival: 0
 			};
 		}
+	}
+
+	// Player Arcology: object
+	{
 		if (typeof V.arcologyName !== "undefined") {
 			V.arcologies[0].name = V.arcologyName;
 		} else if (typeof V.arcologies[0].name === "undefined") {
@@ -1857,367 +2238,589 @@ App.Update.globalVariables = function() {
 		if (typeof V.arcologies[0].leaderID === "undefined") {
 			V.arcologies[0].leaderID = 0;
 		}
-		if (typeof V.building === "undefined") {
-			if (typeof V.sectors !== "undefined") {
-				App.Update.sectorsToBuilding();
-			} else {
-				V.building = App.Arcology.defaultBuilding();
+		// FS
+		{
+			if ((typeof V.FSSupremacist !== "undefined") && V.FSSupremacist !== "unset") {
+				V.arcologies[0].FSSupremacist = V.FSSupremacist;
+				V.arcologies[0].FSSupremacistRace = V.FSSupremacistRace;
+			} else if (typeof V.arcologies[0].FSSupremacist === "undefined") {
+				V.arcologies[0].FSSupremacist = "unset";
+			}
+			if ((typeof V.FSSupremacistLawME !== "undefined") && V.FSSupremacistLawME !== 0) {
+				V.arcologies[0].FSSupremacistLawME = V.FSSupremacistLawME;
+			} else if (typeof V.arcologies[0].FSSupremacistLawME === "undefined") {
+				V.arcologies[0].FSSupremacistLawME = 0;
+			}
+			if (V.arcologies[0].FSSupremacistRace === "middle") {
+				V.arcologies[0].FSSupremacistRace = "middle eastern";
+			} else if (V.arcologies[0].FSSupremacistRace === "pacific") {
+				V.arcologies[0].FSSupremacistRace = "pacific islander";
+			} else if (V.arcologies[0].FSSupremacistRace === "southern") {
+				V.arcologies[0].FSSupremacistRace = "southern european";
+			} else if (V.arcologies[0].FSSupremacistRace === "mixed") {
+				V.arcologies[0].FSSupremacistRace = "mixed race";
+			}
+			if ((typeof V.FSSubjugationist !== "undefined") && V.FSSubjugationist !== "unset") {
+				V.arcologies[0].FSSubjugationist = V.FSSubjugationist;
+				V.arcologies[0].FSSubjugationistRace = V.FSSubjugationistRace;
+			} else if (typeof V.arcologies[0].FSSubjugationist === "undefined") {
+				V.arcologies[0].FSSubjugationist = "unset";
+			}
+			if ((typeof V.FSSubjugationistLawME !== "undefined") && V.FSSubjugationistLawME !== 0) {
+				V.arcologies[0].FSSubjugationistLawME = V.FSSubjugationistLawME;
+			} else if (typeof V.arcologies[0].FSSubjugationistLawME === "undefined") {
+				V.arcologies[0].FSSubjugationistLawME = 0;
+			}
+			if (V.arcologies[0].FSSubjugationistRace === "middle") {
+				V.arcologies[0].FSSubjugationistRace = "middle eastern";
+			} else if (V.arcologies[0].FSSubjugationistRace === "pacific") {
+				V.arcologies[0].FSSubjugationistRace = "pacific islander";
+			} else if (V.arcologies[0].FSSubjugationistRace === "southern") {
+				V.arcologies[0].FSSubjugationistRace = "southern european";
+			} else if (V.arcologies[0].FSSubjugationistRace === "mixed") {
+				V.arcologies[0].FSSubjugationistRace = "mixed race";
+			}
+			if ((typeof V.FSDegradationist !== "undefined") && V.FSDegradationist !== "unset") {
+				V.arcologies[0].FSDegradationist = V.FSDegradationist;
+			} else if (typeof V.arcologies[0].FSDegradationist === "undefined") {
+				V.arcologies[0].FSDegradationist = "unset";
+			}
+			if ((typeof V.FSDegradationistLaw !== "undefined") && V.FSDegradationistLaw !== 0) {
+				V.arcologies[0].FSDegradationistLaw = V.FSDegradationistLaw;
+			} else if (typeof V.arcologies[0].FSDegradationistLaw === "undefined") {
+				V.arcologies[0].FSDegradationistLaw = 0;
+			}
+			if ((typeof V.FSPaternalist !== "undefined") && V.FSPaternalist !== "unset") {
+				V.arcologies[0].FSPaternalist = V.FSPaternalist;
+			} else if (typeof V.arcologies[0].FSPaternalist === "undefined") {
+				V.arcologies[0].FSPaternalist = "unset";
+			}
+			if ((typeof V.FSPaternalistLaw !== "undefined") && V.FSPaternalistLaw !== 0) {
+				V.arcologies[0].FSPaternalistLaw = V.FSPaternalistLaw;
+			} else if (typeof V.arcologies[0].FSPaternalistLaw === "undefined") {
+				V.arcologies[0].FSPaternalistLaw = 0;
+			}
+			if ((typeof V.FSGenderFundamentalist !== "undefined") && V.FSGenderFundamentalist !== "unset") {
+				V.arcologies[0].FSGenderFundamentalist = V.FSGenderFundamentalist;
+			} else if (typeof V.arcologies[0].FSGenderFundamentalist === "undefined") {
+				V.arcologies[0].FSGenderFundamentalist = "unset";
+			}
+			if ((typeof V.FSGenderFundamentalistSMR !== "undefined") && V.FSGenderFundamentalistSMR !== 0) {
+				V.arcologies[0].FSGenderFundamentalistSMR = V.FSGenderFundamentalistSMR;
+			} else if (typeof V.arcologies[0].FSGenderFundamentalistSMR === "undefined") {
+				V.arcologies[0].FSGenderFundamentalistSMR = 0;
+			}
+			delete V.arcologies[0].FSGenderFundamentalistLaw;
+			if ((typeof V.FSGenderRadicalist !== "undefined") && V.FSGenderRadicalist !== "unset") {
+				V.arcologies[0].FSGenderRadicalist = V.FSGenderRadicalist;
+			} else if (typeof V.arcologies[0].FSGenderRadicalist === "undefined") {
+				V.arcologies[0].FSGenderRadicalist = "unset";
+			}
+			if (typeof V.arcologies[0].FSGenderRadicalistLawBeauty === "undefined") {
+				V.arcologies[0].FSGenderRadicalistLawBeauty = 0;
+			}
+			if (typeof V.arcologies[0].FSGenderRadicalistLawFuta === "undefined") {
+				V.arcologies[0].FSGenderRadicalistLawFuta = 0;
+			}
+			delete V.arcologies[0].FSGenderRadicalistLawDicks;
+			delete V.arcologies[0].FSGenderRadicalistSMR;
+			if ((typeof V.FSBodyPurist !== "undefined") && V.FSBodyPurist !== "unset") {
+				V.arcologies[0].FSBodyPurist = V.FSBodyPurist;
+			} else if (typeof V.arcologies[0].FSBodyPurist === "undefined") {
+				V.arcologies[0].FSBodyPurist = "unset";
 			}
+			if ((typeof V.FSBodyPuristLaw !== "undefined") && V.FSBodyPuristLaw !== 0) {
+				V.arcologies[0].FSBodyPuristLaw = V.FSBodyPuristLaw;
+			} else if (typeof V.arcologies[0].FSBodyPuristLaw === "undefined") {
+				V.arcologies[0].FSBodyPuristLaw = 0;
+			}
+			if ((typeof V.FSPhysicalIdealist !== "undefined") && V.FSPhysicalIdealist !== "unset") {
+				V.arcologies[0].FSPhysicalIdealist = V.FSPhysicalIdealist;
+			} else if (typeof V.arcologies[0].FSPhysicalIdealist === "undefined") {
+				V.arcologies[0].FSPhysicalIdealist = "unset";
+			}
+			if ((typeof V.FSPhysicalIdealistSMR !== "undefined") && V.FSPhysicalIdealistSMR !== 0) {
+				V.arcologies[0].FSPhysicalIdealistSMR = V.FSPhysicalIdealistSMR;
+			} else if (typeof V.arcologies[0].FSPhysicalIdealistSMR === "undefined") {
+				V.arcologies[0].FSPhysicalIdealistSMR = 0;
+			}
+			if ((typeof V.FSTransformationFetishist !== "undefined") && V.FSTransformationFetishist !== "unset") {
+				V.arcologies[0].FSTransformationFetishist = V.FSTransformationFetishist;
+			} else if (typeof V.arcologies[0].FSTransformationFetishist === "undefined") {
+				V.arcologies[0].FSTransformationFetishist = "unset";
+			}
+			if ((typeof V.FSTransformationFetishistSMR !== "undefined") && V.FSTransformationFetishistSMR !== 0) {
+				V.arcologies[0].FSTransformationFetishistSMR = V.FSTransformationFetishistSMR;
+			} else if (typeof V.arcologies[0].FSTransformationFetishistSMR === "undefined") {
+				V.arcologies[0].FSTransformationFetishistSMR = 0;
+			}
+			delete V.arcologies[0].FSTransformationFetishistLaw;
+			if ((typeof V.FSAssetExpansionist !== "undefined") && V.FSAssetExpansionist !== "unset") {
+				V.arcologies[0].FSAssetExpansionist = V.FSAssetExpansionist;
+			} else if (typeof V.arcologies[0].FSAssetExpansionist === "undefined") {
+				V.arcologies[0].FSAssetExpansionist = "unset";
+			}
+			if ((typeof V.FSAssetExpansionistSMR !== "undefined") && V.FSAssetExpansionistSMR !== 0) {
+				V.arcologies[0].FSAssetExpansionistSMR = V.FSAssetExpansionistSMR;
+			} else if (typeof V.arcologies[0].FSAssetExpansionistSMR === "undefined") {
+				V.arcologies[0].FSAssetExpansionistSMR = 0;
+			}
+			delete V.arcologies[0].FSAssetExpansionistLaw;
+			if ((typeof V.FSSlimnessEnthusiast !== "undefined") && V.FSSlimnessEnthusiast !== "unset") {
+				V.arcologies[0].FSSlimnessEnthusiast = V.FSSlimnessEnthusiast;
+			} else if (typeof V.arcologies[0].FSSlimnessEnthusiast === "undefined") {
+				V.arcologies[0].FSSlimnessEnthusiast = "unset";
+			}
+			if ((typeof V.FSSlimnessEnthusiastSMR !== "undefined") && V.FSSlimnessEnthusiastSMR !== 0) {
+				V.arcologies[0].FSSlimnessEnthusiastSMR = V.FSSlimnessEnthusiastSMR;
+			} else if (typeof V.arcologies[0].FSSlimnessEnthusiastSMR === "undefined") {
+				V.arcologies[0].FSSlimnessEnthusiastSMR = 0;
+			}
+			if ((typeof V.FSMaturityPreferentialist !== "undefined") && V.FSMaturityPreferentialist !== "unset") {
+				V.arcologies[0].FSMaturityPreferentialist = V.FSMaturityPreferentialist;
+			} else if (typeof V.arcologies[0].FSMaturityPreferentialist === "undefined") {
+				V.arcologies[0].FSMaturityPreferentialist = "unset";
+			}
+			if ((typeof V.FSMaturityPreferentialistLaw !== "undefined") && V.FSMaturityPreferentialistLaw !== 0) {
+				V.arcologies[0].FSMaturityPreferentialistLaw = V.FSMaturityPreferentialistLaw;
+			} else if (typeof V.arcologies[0].FSMaturityPreferentialistLaw === "undefined") {
+				V.arcologies[0].FSMaturityPreferentialistLaw = 0;
+			}
+			if ((typeof V.FSYouthPreferentialist !== "undefined") && V.FSYouthPreferentialist !== "unset") {
+				V.arcologies[0].FSYouthPreferentialist = V.FSYouthPreferentialist;
+			} else if (typeof V.arcologies[0].FSYouthPreferentialist === "undefined") {
+				V.arcologies[0].FSYouthPreferentialist = "unset";
+			}
+			if ((typeof V.FSYouthPreferentialistLaw !== "undefined") && V.FSYouthPreferentialistLaw !== 0) {
+				V.arcologies[0].FSYouthPreferentialistLaw = V.FSYouthPreferentialistLaw;
+			} else if (typeof V.arcologies[0].FSYouthPreferentialistLaw === "undefined") {
+				V.arcologies[0].FSYouthPreferentialistLaw = 0;
+			}
+			if ((typeof V.FSPastoralist !== "undefined") && V.FSPastoralist !== "unset") {
+				V.arcologies[0].FSPastoralist = V.FSPastoralist;
+			} else if (typeof V.arcologies[0].FSPastoralist === "undefined") {
+				V.arcologies[0].FSPastoralist = "unset";
+			}
+			if ((typeof V.FSPastoralistLaw !== "undefined") && V.FSPastoralistLaw !== 0) {
+				V.arcologies[0].FSPastoralistLaw = V.FSPastoralistLaw;
+			} else if (typeof V.arcologies[0].FSPastoralistLaw === "undefined") {
+				V.arcologies[0].FSPastoralistLaw = 0;
+			}
+			if ((typeof V.FSChattelReligionist !== "undefined") && V.FSChattelReligionist !== "unset") {
+				V.arcologies[0].FSChattelReligionist = V.FSChattelReligionist;
+			} else if (typeof V.arcologies[0].FSChattelReligionist === "undefined") {
+				V.arcologies[0].FSChattelReligionist = "unset";
+			}
+			if ((typeof V.FSChattelReligionistLaw !== "undefined") && V.FSChattelReligionistLaw !== 0) {
+				V.arcologies[0].FSChattelReligionistLaw = V.FSChattelReligionistLaw;
+			} else if (typeof V.arcologies[0].FSChattelReligionistLaw === "undefined") {
+				V.arcologies[0].FSChattelReligionistLaw = 0;
+			}
+			if ((typeof V.FSRomanRevivalist !== "undefined") && V.FSRomanRevivalist !== "unset") {
+				V.arcologies[0].FSRomanRevivalist = V.FSRomanRevivalist;
+			} else if (typeof V.arcologies[0].FSRomanRevivalist === "undefined") {
+				V.arcologies[0].FSRomanRevivalist = "unset";
+			}
+			if ((typeof V.FSRomanRevivalistLaw !== "undefined") && V.FSRomanRevivalistLaw !== 0) {
+				V.arcologies[0].FSRomanRevivalistLaw = V.FSRomanRevivalistLaw;
+			} else if (typeof V.arcologies[0].FSRomanRevivalistLaw === "undefined") {
+				V.arcologies[0].FSRomanRevivalistLaw = 0;
+			}
+			if ((typeof V.FSEgyptianRevivalist !== "undefined") && V.FSEgyptianRevivalist !== "unset") {
+				V.arcologies[0].FSEgyptianRevivalist = V.FSEgyptianRevivalist;
+			} else if (typeof V.arcologies[0].FSEgyptianRevivalist === "undefined") {
+				V.arcologies[0].FSEgyptianRevivalist = "unset";
+			}
+			if ((typeof V.FSEgyptianRevivalistLaw !== "undefined") && V.FSEgyptianRevivalistLaw !== 0) {
+				V.arcologies[0].FSEgyptianRevivalistLaw = V.FSEgyptianRevivalistLaw;
+			} else if (typeof V.arcologies[0].FSEgyptianRevivalistLaw === "undefined") {
+				V.arcologies[0].FSEgyptianRevivalistLaw = 0;
+			}
+			if (typeof V.arcologies[0].FSEgyptianRevivalistIncestPolicy === "undefined") {
+				V.arcologies[0].FSEgyptianRevivalistIncestPolicy = 0;
+			}
+			if (typeof V.arcologies[0].FSEgyptianRevivalistInterest === "undefined") {
+				V.arcologies[0].FSEgyptianRevivalistInterest = 0;
+			}
+			if ((typeof V.FSEdoRevivalist !== "undefined") && V.FSEdoRevivalist !== "unset") {
+				V.arcologies[0].FSEdoRevivalist = V.FSEdoRevivalist;
+			} else if (typeof V.arcologies[0].FSEdoRevivalist === "undefined") {
+				V.arcologies[0].FSEdoRevivalist = "unset";
+			}
+			if ((typeof V.FSEdoRevivalistLaw !== "undefined") && V.FSEdoRevivalistLaw !== 0) {
+				V.arcologies[0].FSEdoRevivalistLaw = V.FSEdoRevivalistLaw;
+			} else if (typeof V.arcologies[0].FSEdoRevivalistLaw === "undefined") {
+				V.arcologies[0].FSEdoRevivalistLaw = 0;
+			}
+			if ((typeof V.FSArabianRevivalist !== "undefined") && V.FSArabianRevivalist !== "unset") {
+				V.arcologies[0].FSArabianRevivalist = V.FSArabianRevivalist;
+			} else if (typeof V.arcologies[0].FSArabianRevivalist === "undefined") {
+				V.arcologies[0].FSArabianRevivalist = "unset";
+			}
+			if ((typeof V.FSArabianRevivalistLaw !== "undefined") && V.FSArabianRevivalistLaw !== 0) {
+				V.arcologies[0].FSArabianRevivalistLaw = V.FSArabianRevivalistLaw;
+			} else if (typeof V.arcologies[0].FSArabianRevivalistLaw === "undefined") {
+				V.arcologies[0].FSArabianRevivalistLaw = 0;
+			}
+			if ((typeof V.FSChineseRevivalist !== "undefined") && V.FSChineseRevivalist !== "unset") {
+				V.arcologies[0].FSChineseRevivalist = V.FSChineseRevivalist;
+			} else if (typeof V.arcologies[0].FSChineseRevivalist === "undefined") {
+				V.arcologies[0].FSChineseRevivalist = "unset";
+			}
+			if ((typeof V.FSChineseRevivalistLaw !== "undefined") && V.FSChineseRevivalistLaw !== 0) {
+				V.arcologies[0].FSChineseRevivalistLaw = V.FSChineseRevivalistLaw;
+			} else if (typeof V.arcologies[0].FSChineseRevivalistLaw === "undefined") {
+				V.arcologies[0].FSChineseRevivalistLaw = 0;
+			}
+			delete V.arcologies[0].FSNullLaw;
+
+			if (V.arcologies[0].FSSubjugationist !== "unset" && !Number.isFinite(V.arcologies[0].FSSubjugationist)) {
+				V.arcologies[0].FSSubjugationist = 10;
+				r += `<br>Fixed NaN FS value for FSSubjugationist`;
+			}
+			if (V.arcologies[0].FSGenderRadicalist !== "unset" && !Number.isFinite(V.arcologies[0].FSGenderRadicalist)) {
+				V.arcologies[0].FSGenderRadicalist = 10;
+				r += `<br>Fixed NaN FS value for FSGenderRadicalist`;
+			}
+			if (V.arcologies[0].FSRestart !== "unset" && !Number.isFinite(V.arcologies[0].FSRestart)) {
+				V.arcologies[0].FSRestart = 10;
+				r += `<br>Fixed NaN FS value for FSRestart`;
+			}
+			if (V.arcologies[0].FSRepopulationFocus !== "unset" && !Number.isFinite(V.arcologies[0].FSRepopulationFocus)) {
+				V.arcologies[0].FSRepopulationFocus = 10;
+				r += `<br>Fixed NaN FS value for FSRepopulationFocus`;
+			}
+			if (V.arcologies[0].FSSupremacist !== "unset" && !Number.isFinite(V.arcologies[0].FSSupremacist)) {
+				V.arcologies[0].FSSupremacist = 10;
+				r += `<br>Fixed NaN FS value for FSSupremacist`;
+			}
+			if (V.arcologies[0].FSBodyPurist !== "unset" && !Number.isFinite(V.arcologies[0].FSBodyPurist)) {
+				V.arcologies[0].FSBodyPurist = 10;
+				r += `<br>Fixed NaN FS value for FSBodyPurist`;
+			}
+			if (V.arcologies[0].FSPaternalist !== "unset" && !Number.isFinite(V.arcologies[0].FSPaternalist)) {
+				V.arcologies[0].FSPaternalist = 10;
+				r += `<br>Fixed NaN FS value for FSPaternalist`;
+			}
+			if (V.arcologies[0].FSSlimnessEnthusiast !== "unset" && !Number.isFinite(V.arcologies[0].FSSlimnessEnthusiast)) {
+				V.arcologies[0].FSSlimnessEnthusiast = 10;
+				r += `<br>Fixed NaN FS value for FSSlimnessEnthusiast`;
+			}
+			if (V.arcologies[0].FSGenderFundamentalist !== "unset" && !Number.isFinite(V.arcologies[0].FSGenderFundamentalist)) {
+				V.arcologies[0].FSGenderFundamentalist = 10;
+				r += `<br>Fixed NaN FS value for FSGenderFundamentalist`;
+			}
+			if (V.arcologies[0].FSMaturityPreferentialist !== "unset" && !Number.isFinite(V.arcologies[0].FSMaturityPreferentialist)) {
+				V.arcologies[0].FSMaturityPreferentialist = 10;
+				r += `<br>Fixed NaN FS value for FSMaturityPreferentialist`;
+			}
+			if (V.arcologies[0].FSYouthPreferentialist !== "unset" && !Number.isFinite(V.arcologies[0].FSYouthPreferentialist)) {
+				V.arcologies[0].FSYouthPreferentialist = 10;
+				r += `<br>Fixed NaN FS value for FSYouthPreferentialist`;
+			}
+			if (V.arcologies[0].FSTransformationFetishist !== "unset" && !Number.isFinite(V.arcologies[0].FSTransformationFetishist)) {
+				V.arcologies[0].FSTransformationFetishist = 10;
+				r += `<br>Fixed NaN FS value for FSTransformationFetishist`;
+			}
+			if (V.arcologies[0].FSHedonisticDecadence !== "unset" && !Number.isFinite(V.arcologies[0].FSHedonisticDecadence)) {
+				V.arcologies[0].FSHedonisticDecadence = 10;
+				r += `<br>Fixed NaN FS value for FSHedonisticDecadence`;
+			}
+			if (V.arcologies[0].FSPhysicalIdealist !== "unset" && !Number.isFinite(V.arcologies[0].FSPhysicalIdealist)) {
+				V.arcologies[0].FSPhysicalIdealist = 10;
+				r += `<br>Fixed NaN FS value for FSPhysicalIdealist`;
+			}
+			if (V.arcologies[0].FSPastoralist !== "unset" && !Number.isFinite(V.arcologies[0].FSPastoralist)) {
+				V.arcologies[0].FSPastoralist = 10;
+				r += `<br>Fixed NaN FS value for FSPastoralist`;
+			}
+			if (V.arcologies[0].FSAssetExpansionist !== "unset" && !Number.isFinite(V.arcologies[0].FSAssetExpansionist)) {
+				V.arcologies[0].FSAssetExpansionist = 10;
+				r += `<br>Fixed NaN FS value for FSAssetExpansionist`;
+			}
+			if (V.arcologies[0].FSDegradationist !== "unset" && !Number.isFinite(V.arcologies[0].FSDegradationist)) {
+				V.arcologies[0].FSDegradationist = 10;
+				r += `<br>Fixed NaN FS value for FSDegradationist`;
+			}
+			if (V.arcologies[0].FSRomanRevivalist !== "unset" && !Number.isFinite(V.arcologies[0].FSRomanRevivalist)) {
+				V.arcologies[0].FSRomanRevivalist = 10;
+				r += `<br>Fixed NaN FS value for FSRomanRevivalist`;
+			}
+			if (V.arcologies[0].FSChattelReligionist !== "unset" && !Number.isFinite(V.arcologies[0].FSChattelReligionist)) {
+				V.arcologies[0].FSChattelReligionist = 10;
+				r += `<br>Fixed NaN FS value for FSChattelReligionist`;
+			}
+			if (V.arcologies[0].FSChineseRevivalist !== "unset" && !Number.isFinite(V.arcologies[0].FSChineseRevivalist)) {
+				V.arcologies[0].FSChineseRevivalist = 10;
+				r += `<br>Fixed NaN FS value for FSChineseRevivalist`;
+			}
+			if (V.arcologies[0].FSArabianRevivalist !== "unset" && !Number.isFinite(V.arcologies[0].FSArabianRevivalist)) {
+				V.arcologies[0].FSArabianRevivalist = 10;
+				r += `<br>Fixed NaN FS value for FSArabianRevivalist`;
+			}
+			if (V.arcologies[0].FSEdoRevivalist !== "unset" && !Number.isFinite(V.arcologies[0].FSEdoRevivalist)) {
+				V.arcologies[0].FSEdoRevivalist = 10;
+				r += `<br>Fixed NaN FS value for FSEdoRevivalist`;
+			}
+			if (V.arcologies[0].FSEgyptianRevivalist !== "unset" && !Number.isFinite(V.arcologies[0].FSEgyptianRevivalist)) {
+				V.arcologies[0].FSEgyptianRevivalist = 10;
+				r += `<br>Fixed NaN FS value for FSEgyptianRevivalist`;
+			}
+			if (V.arcologies[0].FSAztecRevivalist !== "unset" && !Number.isFinite(V.arcologies[0].FSAztecRevivalist)) {
+				V.arcologies[0].FSAztecRevivalist = 10;
+				r += `<br>Fixed NaN FS value for FSAztecRevivalist`;
+			}
+			if (V.arcologies[0].FSIntellectualDependency !== "unset" && !Number.isFinite(V.arcologies[0].FSIntellectualDependency)) {
+				V.arcologies[0].FSIntellectualDependency = 10;
+				r += `<br>Fixed NaN FS value for FSIntellectualDependency`;
+			}
+			if (V.arcologies[0].FSSlaveProfessionalism !== "unset" && !Number.isFinite(V.arcologies[0].FSSlaveProfessionalism)) {
+				V.arcologies[0].FSSlaveProfessionalism = 10;
+				r += `<br>Fixed NaN FS value for FSSlaveProfessionalism`;
+			}
+			if (V.arcologies[0].FSPetiteAdmiration !== "unset" && !Number.isFinite(V.arcologies[0].FSPetiteAdmiration)) {
+				V.arcologies[0].FSPetiteAdmiration = 10;
+				r += `<br>Fixed NaN FS value for FSPetiteAdmiration`;
+			}
+			if (V.arcologies[0].FSStatuesqueGlorification !== "unset" && !Number.isFinite(V.arcologies[0].FSStatuesqueGlorification)) {
+				V.arcologies[0].FSStatuesqueGlorification = 10;
+				r += `<br>Fixed NaN FS value for FSStatuesqueGlorification`;
+			}
+			// Clean up FS in player arcology
+			App.Update.FScheatDatatypeCleanup();
 		}
 	}
 
-	// Arcologies FS
+	// Player Arcology
 	{
-		if ((typeof V.FSSupremacist !== "undefined") && V.FSSupremacist !== "unset") {
-			V.arcologies[0].FSSupremacist = V.FSSupremacist;
-			V.arcologies[0].FSSupremacistRace = V.FSSupremacistRace;
-		} else if (typeof V.arcologies[0].FSSupremacist === "undefined") {
-			V.arcologies[0].FSSupremacist = "unset";
-		}
-		if ((typeof V.FSSupremacistLawME !== "undefined") && V.FSSupremacistLawME !== 0) {
-			V.arcologies[0].FSSupremacistLawME = V.FSSupremacistLawME;
-		} else if (typeof V.arcologies[0].FSSupremacistLawME === "undefined") {
-			V.arcologies[0].FSSupremacistLawME = 0;
-		}
-		if (V.arcologies[0].FSSupremacistRace === "middle") {
-			V.arcologies[0].FSSupremacistRace = "middle eastern";
-		} else if (V.arcologies[0].FSSupremacistRace === "pacific") {
-			V.arcologies[0].FSSupremacistRace = "pacific islander";
-		} else if (V.arcologies[0].FSSupremacistRace === "southern") {
-			V.arcologies[0].FSSupremacistRace = "southern european";
-		} else if (V.arcologies[0].FSSupremacistRace === "mixed") {
-			V.arcologies[0].FSSupremacistRace = "mixed race";
-		}
-		if ((typeof V.FSSubjugationist !== "undefined") && V.FSSubjugationist !== "unset") {
-			V.arcologies[0].FSSubjugationist = V.FSSubjugationist;
-			V.arcologies[0].FSSubjugationistRace = V.FSSubjugationistRace;
-		} else if (typeof V.arcologies[0].FSSubjugationist === "undefined") {
-			V.arcologies[0].FSSubjugationist = "unset";
-		}
-		if ((typeof V.FSSubjugationistLawME !== "undefined") && V.FSSubjugationistLawME !== 0) {
-			V.arcologies[0].FSSubjugationistLawME = V.FSSubjugationistLawME;
-		} else if (typeof V.arcologies[0].FSSubjugationistLawME === "undefined") {
-			V.arcologies[0].FSSubjugationistLawME = 0;
-		}
-		if (V.arcologies[0].FSSubjugationistRace === "middle") {
-			V.arcologies[0].FSSubjugationistRace = "middle eastern";
-		} else if (V.arcologies[0].FSSubjugationistRace === "pacific") {
-			V.arcologies[0].FSSubjugationistRace = "pacific islander";
-		} else if (V.arcologies[0].FSSubjugationistRace === "southern") {
-			V.arcologies[0].FSSubjugationistRace = "southern european";
-		} else if (V.arcologies[0].FSSubjugationistRace === "mixed") {
-			V.arcologies[0].FSSubjugationistRace = "mixed race";
-		}
-		if ((typeof V.FSDegradationist !== "undefined") && V.FSDegradationist !== "unset") {
-			V.arcologies[0].FSDegradationist = V.FSDegradationist;
-		} else if (typeof V.arcologies[0].FSDegradationist === "undefined") {
-			V.arcologies[0].FSDegradationist = "unset";
-		}
-		if ((typeof V.FSDegradationistLaw !== "undefined") && V.FSDegradationistLaw !== 0) {
-			V.arcologies[0].FSDegradationistLaw = V.FSDegradationistLaw;
-		} else if (typeof V.arcologies[0].FSDegradationistLaw === "undefined") {
-			V.arcologies[0].FSDegradationistLaw = 0;
-		}
-		if ((typeof V.FSPaternalist !== "undefined") && V.FSPaternalist !== "unset") {
-			V.arcologies[0].FSPaternalist = V.FSPaternalist;
-		} else if (typeof V.arcologies[0].FSPaternalist === "undefined") {
-			V.arcologies[0].FSPaternalist = "unset";
-		}
-		if ((typeof V.FSPaternalistLaw !== "undefined") && V.FSPaternalistLaw !== 0) {
-			V.arcologies[0].FSPaternalistLaw = V.FSPaternalistLaw;
-		} else if (typeof V.arcologies[0].FSPaternalistLaw === "undefined") {
-			V.arcologies[0].FSPaternalistLaw = 0;
-		}
-		if ((typeof V.FSGenderFundamentalist !== "undefined") && V.FSGenderFundamentalist !== "unset") {
-			V.arcologies[0].FSGenderFundamentalist = V.FSGenderFundamentalist;
-		} else if (typeof V.arcologies[0].FSGenderFundamentalist === "undefined") {
-			V.arcologies[0].FSGenderFundamentalist = "unset";
-		}
-		if ((typeof V.FSGenderFundamentalistSMR !== "undefined") && V.FSGenderFundamentalistSMR !== 0) {
-			V.arcologies[0].FSGenderFundamentalistSMR = V.FSGenderFundamentalistSMR;
-		} else if (typeof V.arcologies[0].FSGenderFundamentalistSMR === "undefined") {
-			V.arcologies[0].FSGenderFundamentalistSMR = 0;
-		}
-		delete V.arcologies[0].FSGenderFundamentalistLaw;
-		if ((typeof V.FSGenderRadicalist !== "undefined") && V.FSGenderRadicalist !== "unset") {
-			V.arcologies[0].FSGenderRadicalist = V.FSGenderRadicalist;
-		} else if (typeof V.arcologies[0].FSGenderRadicalist === "undefined") {
-			V.arcologies[0].FSGenderRadicalist = "unset";
-		}
-		if (typeof V.arcologies[0].FSGenderRadicalistLawBeauty === "undefined") {
-			V.arcologies[0].FSGenderRadicalistLawBeauty = 0;
-		}
-		if (typeof V.arcologies[0].FSGenderRadicalistLawFuta === "undefined") {
-			V.arcologies[0].FSGenderRadicalistLawFuta = 0;
-		}
-		delete V.arcologies[0].FSGenderRadicalistLawDicks;
-		delete V.arcologies[0].FSGenderRadicalistSMR;
-		if ((typeof V.FSBodyPurist !== "undefined") && V.FSBodyPurist !== "unset") {
-			V.arcologies[0].FSBodyPurist = V.FSBodyPurist;
-		} else if (typeof V.arcologies[0].FSBodyPurist === "undefined") {
-			V.arcologies[0].FSBodyPurist = "unset";
-		}
-		if ((typeof V.FSBodyPuristLaw !== "undefined") && V.FSBodyPuristLaw !== 0) {
-			V.arcologies[0].FSBodyPuristLaw = V.FSBodyPuristLaw;
-		} else if (typeof V.arcologies[0].FSBodyPuristLaw === "undefined") {
-			V.arcologies[0].FSBodyPuristLaw = 0;
-		}
-		if ((typeof V.FSPhysicalIdealist !== "undefined") && V.FSPhysicalIdealist !== "unset") {
-			V.arcologies[0].FSPhysicalIdealist = V.FSPhysicalIdealist;
-		} else if (typeof V.arcologies[0].FSPhysicalIdealist === "undefined") {
-			V.arcologies[0].FSPhysicalIdealist = "unset";
-		}
-		if ((typeof V.FSPhysicalIdealistSMR !== "undefined") && V.FSPhysicalIdealistSMR !== 0) {
-			V.arcologies[0].FSPhysicalIdealistSMR = V.FSPhysicalIdealistSMR;
-		} else if (typeof V.arcologies[0].FSPhysicalIdealistSMR === "undefined") {
-			V.arcologies[0].FSPhysicalIdealistSMR = 0;
-		}
-		if ((typeof V.FSTransformationFetishist !== "undefined") && V.FSTransformationFetishist !== "unset") {
-			V.arcologies[0].FSTransformationFetishist = V.FSTransformationFetishist;
-		} else if (typeof V.arcologies[0].FSTransformationFetishist === "undefined") {
-			V.arcologies[0].FSTransformationFetishist = "unset";
-		}
-		if ((typeof V.FSTransformationFetishistSMR !== "undefined") && V.FSTransformationFetishistSMR !== 0) {
-			V.arcologies[0].FSTransformationFetishistSMR = V.FSTransformationFetishistSMR;
-		} else if (typeof V.arcologies[0].FSTransformationFetishistSMR === "undefined") {
-			V.arcologies[0].FSTransformationFetishistSMR = 0;
-		}
-		delete V.arcologies[0].FSTransformationFetishistLaw;
-		if ((typeof V.FSAssetExpansionist !== "undefined") && V.FSAssetExpansionist !== "unset") {
-			V.arcologies[0].FSAssetExpansionist = V.FSAssetExpansionist;
-		} else if (typeof V.arcologies[0].FSAssetExpansionist === "undefined") {
-			V.arcologies[0].FSAssetExpansionist = "unset";
-		}
-		if ((typeof V.FSAssetExpansionistSMR !== "undefined") && V.FSAssetExpansionistSMR !== 0) {
-			V.arcologies[0].FSAssetExpansionistSMR = V.FSAssetExpansionistSMR;
-		} else if (typeof V.arcologies[0].FSAssetExpansionistSMR === "undefined") {
-			V.arcologies[0].FSAssetExpansionistSMR = 0;
-		}
-		delete V.arcologies[0].FSAssetExpansionistLaw;
-		if ((typeof V.FSSlimnessEnthusiast !== "undefined") && V.FSSlimnessEnthusiast !== "unset") {
-			V.arcologies[0].FSSlimnessEnthusiast = V.FSSlimnessEnthusiast;
-		} else if (typeof V.arcologies[0].FSSlimnessEnthusiast === "undefined") {
-			V.arcologies[0].FSSlimnessEnthusiast = "unset";
-		}
-		if ((typeof V.FSSlimnessEnthusiastSMR !== "undefined") && V.FSSlimnessEnthusiastSMR !== 0) {
-			V.arcologies[0].FSSlimnessEnthusiastSMR = V.FSSlimnessEnthusiastSMR;
-		} else if (typeof V.arcologies[0].FSSlimnessEnthusiastSMR === "undefined") {
-			V.arcologies[0].FSSlimnessEnthusiastSMR = 0;
-		}
-		if ((typeof V.FSMaturityPreferentialist !== "undefined") && V.FSMaturityPreferentialist !== "unset") {
-			V.arcologies[0].FSMaturityPreferentialist = V.FSMaturityPreferentialist;
-		} else if (typeof V.arcologies[0].FSMaturityPreferentialist === "undefined") {
-			V.arcologies[0].FSMaturityPreferentialist = "unset";
-		}
-		if ((typeof V.FSMaturityPreferentialistLaw !== "undefined") && V.FSMaturityPreferentialistLaw !== 0) {
-			V.arcologies[0].FSMaturityPreferentialistLaw = V.FSMaturityPreferentialistLaw;
-		} else if (typeof V.arcologies[0].FSMaturityPreferentialistLaw === "undefined") {
-			V.arcologies[0].FSMaturityPreferentialistLaw = 0;
-		}
-		if ((typeof V.FSYouthPreferentialist !== "undefined") && V.FSYouthPreferentialist !== "unset") {
-			V.arcologies[0].FSYouthPreferentialist = V.FSYouthPreferentialist;
-		} else if (typeof V.arcologies[0].FSYouthPreferentialist === "undefined") {
-			V.arcologies[0].FSYouthPreferentialist = "unset";
-		}
-		if ((typeof V.FSYouthPreferentialistLaw !== "undefined") && V.FSYouthPreferentialistLaw !== 0) {
-			V.arcologies[0].FSYouthPreferentialistLaw = V.FSYouthPreferentialistLaw;
-		} else if (typeof V.arcologies[0].FSYouthPreferentialistLaw === "undefined") {
-			V.arcologies[0].FSYouthPreferentialistLaw = 0;
-		}
-		if ((typeof V.FSPastoralist !== "undefined") && V.FSPastoralist !== "unset") {
-			V.arcologies[0].FSPastoralist = V.FSPastoralist;
-		} else if (typeof V.arcologies[0].FSPastoralist === "undefined") {
-			V.arcologies[0].FSPastoralist = "unset";
-		}
-		if ((typeof V.FSPastoralistLaw !== "undefined") && V.FSPastoralistLaw !== 0) {
-			V.arcologies[0].FSPastoralistLaw = V.FSPastoralistLaw;
-		} else if (typeof V.arcologies[0].FSPastoralistLaw === "undefined") {
-			V.arcologies[0].FSPastoralistLaw = 0;
-		}
-		if ((typeof V.FSChattelReligionist !== "undefined") && V.FSChattelReligionist !== "unset") {
-			V.arcologies[0].FSChattelReligionist = V.FSChattelReligionist;
-		} else if (typeof V.arcologies[0].FSChattelReligionist === "undefined") {
-			V.arcologies[0].FSChattelReligionist = "unset";
-		}
-		if ((typeof V.FSChattelReligionistLaw !== "undefined") && V.FSChattelReligionistLaw !== 0) {
-			V.arcologies[0].FSChattelReligionistLaw = V.FSChattelReligionistLaw;
-		} else if (typeof V.arcologies[0].FSChattelReligionistLaw === "undefined") {
-			V.arcologies[0].FSChattelReligionistLaw = 0;
-		}
-		if ((typeof V.FSRomanRevivalist !== "undefined") && V.FSRomanRevivalist !== "unset") {
-			V.arcologies[0].FSRomanRevivalist = V.FSRomanRevivalist;
-		} else if (typeof V.arcologies[0].FSRomanRevivalist === "undefined") {
-			V.arcologies[0].FSRomanRevivalist = "unset";
-		}
-		if ((typeof V.FSRomanRevivalistLaw !== "undefined") && V.FSRomanRevivalistLaw !== 0) {
-			V.arcologies[0].FSRomanRevivalistLaw = V.FSRomanRevivalistLaw;
-		} else if (typeof V.arcologies[0].FSRomanRevivalistLaw === "undefined") {
-			V.arcologies[0].FSRomanRevivalistLaw = 0;
-		}
-		if ((typeof V.FSEgyptianRevivalist !== "undefined") && V.FSEgyptianRevivalist !== "unset") {
-			V.arcologies[0].FSEgyptianRevivalist = V.FSEgyptianRevivalist;
-		} else if (typeof V.arcologies[0].FSEgyptianRevivalist === "undefined") {
-			V.arcologies[0].FSEgyptianRevivalist = "unset";
-		}
-		if ((typeof V.FSEgyptianRevivalistLaw !== "undefined") && V.FSEgyptianRevivalistLaw !== 0) {
-			V.arcologies[0].FSEgyptianRevivalistLaw = V.FSEgyptianRevivalistLaw;
-		} else if (typeof V.arcologies[0].FSEgyptianRevivalistLaw === "undefined") {
-			V.arcologies[0].FSEgyptianRevivalistLaw = 0;
-		}
-		if (typeof V.arcologies[0].FSEgyptianRevivalistIncestPolicy === "undefined") {
-			V.arcologies[0].FSEgyptianRevivalistIncestPolicy = 0;
-		}
-		if (typeof V.arcologies[0].FSEgyptianRevivalistInterest === "undefined") {
-			V.arcologies[0].FSEgyptianRevivalistInterest = 0;
-		}
-		if ((typeof V.FSEdoRevivalist !== "undefined") && V.FSEdoRevivalist !== "unset") {
-			V.arcologies[0].FSEdoRevivalist = V.FSEdoRevivalist;
-		} else if (typeof V.arcologies[0].FSEdoRevivalist === "undefined") {
-			V.arcologies[0].FSEdoRevivalist = "unset";
-		}
-		if ((typeof V.FSEdoRevivalistLaw !== "undefined") && V.FSEdoRevivalistLaw !== 0) {
-			V.arcologies[0].FSEdoRevivalistLaw = V.FSEdoRevivalistLaw;
-		} else if (typeof V.arcologies[0].FSEdoRevivalistLaw === "undefined") {
-			V.arcologies[0].FSEdoRevivalistLaw = 0;
-		}
-		if ((typeof V.FSArabianRevivalist !== "undefined") && V.FSArabianRevivalist !== "unset") {
-			V.arcologies[0].FSArabianRevivalist = V.FSArabianRevivalist;
-		} else if (typeof V.arcologies[0].FSArabianRevivalist === "undefined") {
-			V.arcologies[0].FSArabianRevivalist = "unset";
-		}
-		if ((typeof V.FSArabianRevivalistLaw !== "undefined") && V.FSArabianRevivalistLaw !== 0) {
-			V.arcologies[0].FSArabianRevivalistLaw = V.FSArabianRevivalistLaw;
-		} else if (typeof V.arcologies[0].FSArabianRevivalistLaw === "undefined") {
-			V.arcologies[0].FSArabianRevivalistLaw = 0;
-		}
-		if ((typeof V.FSChineseRevivalist !== "undefined") && V.FSChineseRevivalist !== "unset") {
-			V.arcologies[0].FSChineseRevivalist = V.FSChineseRevivalist;
-		} else if (typeof V.arcologies[0].FSChineseRevivalist === "undefined") {
-			V.arcologies[0].FSChineseRevivalist = "unset";
-		}
-		if ((typeof V.FSChineseRevivalistLaw !== "undefined") && V.FSChineseRevivalistLaw !== 0) {
-			V.arcologies[0].FSChineseRevivalistLaw = V.FSChineseRevivalistLaw;
-		} else if (typeof V.arcologies[0].FSChineseRevivalistLaw === "undefined") {
-			V.arcologies[0].FSChineseRevivalistLaw = 0;
-		}
-		delete V.arcologies[0].FSNullLaw;
-
-		if (V.arcologies[0].FSSubjugationist !== "unset" && !Number.isFinite(V.arcologies[0].FSSubjugationist)) {
-			V.arcologies[0].FSSubjugationist = 10;
-			r += `<br>Fixed NaN FS value for FSSubjugationist`;
-		}
-		if (V.arcologies[0].FSGenderRadicalist !== "unset" && !Number.isFinite(V.arcologies[0].FSGenderRadicalist)) {
-			V.arcologies[0].FSGenderRadicalist = 10;
-			r += `<br>Fixed NaN FS value for FSGenderRadicalist`;
-		}
-		if (V.arcologies[0].FSRestart !== "unset" && !Number.isFinite(V.arcologies[0].FSRestart)) {
-			V.arcologies[0].FSRestart = 10;
-			r += `<br>Fixed NaN FS value for FSRestart`;
-		}
-		if (V.arcologies[0].FSRepopulationFocus !== "unset" && !Number.isFinite(V.arcologies[0].FSRepopulationFocus)) {
-			V.arcologies[0].FSRepopulationFocus = 10;
-			r += `<br>Fixed NaN FS value for FSRepopulationFocus`;
-		}
-		if (V.arcologies[0].FSSupremacist !== "unset" && !Number.isFinite(V.arcologies[0].FSSupremacist)) {
-			V.arcologies[0].FSSupremacist = 10;
-			r += `<br>Fixed NaN FS value for FSSupremacist`;
-		}
-		if (V.arcologies[0].FSBodyPurist !== "unset" && !Number.isFinite(V.arcologies[0].FSBodyPurist)) {
-			V.arcologies[0].FSBodyPurist = 10;
-			r += `<br>Fixed NaN FS value for FSBodyPurist`;
-		}
-		if (V.arcologies[0].FSPaternalist !== "unset" && !Number.isFinite(V.arcologies[0].FSPaternalist)) {
-			V.arcologies[0].FSPaternalist = 10;
-			r += `<br>Fixed NaN FS value for FSPaternalist`;
-		}
-		if (V.arcologies[0].FSSlimnessEnthusiast !== "unset" && !Number.isFinite(V.arcologies[0].FSSlimnessEnthusiast)) {
-			V.arcologies[0].FSSlimnessEnthusiast = 10;
-			r += `<br>Fixed NaN FS value for FSSlimnessEnthusiast`;
-		}
-		if (V.arcologies[0].FSGenderFundamentalist !== "unset" && !Number.isFinite(V.arcologies[0].FSGenderFundamentalist)) {
-			V.arcologies[0].FSGenderFundamentalist = 10;
-			r += `<br>Fixed NaN FS value for FSGenderFundamentalist`;
-		}
-		if (V.arcologies[0].FSMaturityPreferentialist !== "unset" && !Number.isFinite(V.arcologies[0].FSMaturityPreferentialist)) {
-			V.arcologies[0].FSMaturityPreferentialist = 10;
-			r += `<br>Fixed NaN FS value for FSMaturityPreferentialist`;
+		if (typeof V.assistant === "number") {
+			assistant.BC();
+		} else {
+			assistant.object();
 		}
-		if (V.arcologies[0].FSYouthPreferentialist !== "unset" && !Number.isFinite(V.arcologies[0].FSYouthPreferentialist)) {
-			V.arcologies[0].FSYouthPreferentialist = 10;
-			r += `<br>Fixed NaN FS value for FSYouthPreferentialist`;
+		if (typeof V.FSPromenade === "undefined") {
+			V.FSPromenade = {
+				Subjugationist: 0,
+				Supremacist: 0,
+				GenderRadicalist: 0,
+				GenderFundamentalist: 0,
+				Paternalist: 0,
+				Degradationist: 0,
+				BodyPurist: 0,
+				TransformationFetishist: 0,
+				YouthPreferentialist: 0,
+				MaturityPreferentialist: 0,
+				SlimnessEnthusiast: 0,
+				AssetExpansionist: 0,
+				Pastoralist: 0,
+				PhysicalIdealist: 0,
+				ChattelReligionist: 0,
+				RomanRevivalist: 0,
+				AztecRevivalist: 0,
+				EgyptianRevivalist: 0,
+				EdoRevivalist: 0,
+				ArabianRevivalist: 0,
+				ChineseRevivalist: 0,
+				Repopulationist: 0,
+				Eugenics: 0,
+				Hedonism: 0,
+				IntellectualDependency: 0,
+				SlaveProfessionalism: 0,
+				PetiteAdmiration: 0,
+				StatuesqueGlorification: 0
+			};
 		}
-		if (V.arcologies[0].FSTransformationFetishist !== "unset" && !Number.isFinite(V.arcologies[0].FSTransformationFetishist)) {
-			V.arcologies[0].FSTransformationFetishist = 10;
-			r += `<br>Fixed NaN FS value for FSTransformationFetishist`;
+		if (typeof V.arcologyUpgrade === "undefined") {
+			V.arcologyUpgrade = {
+				drones: 0,
+				hydro: 0,
+				apron: 0,
+				grid: 0,
+				spire: 0
+			};
+			V.arcologyUpgrade.drones = (V.AProsperityCap > 60) ? 1 : 0;
+			V.arcologyUpgrade.hydro = (V.AProsperityCap > 80) ? 1 : 0;
+			V.arcologyUpgrade.apron = (V.AProsperityCap > 100) ? 1 : 0;
+			V.arcologyUpgrade.grid = (V.AProsperityCap > 120) ? 1 : 0;
+			V.arcologyUpgrade.spire = (V.AProsperityCap > 240) ? 1 : 0;
 		}
-		if (V.arcologies[0].FSHedonisticDecadence !== "unset" && !Number.isFinite(V.arcologies[0].FSHedonisticDecadence)) {
-			V.arcologies[0].FSHedonisticDecadence = 10;
-			r += `<br>Fixed NaN FS value for FSHedonisticDecadence`;
+		if (typeof V.building === "undefined") {
+			if (typeof V.sectors !== "undefined") {
+				App.Update.sectorsToBuilding();
+			} else {
+				V.building = App.Arcology.defaultBuilding();
+			}
 		}
-		if (V.arcologies[0].FSPhysicalIdealist !== "unset" && !Number.isFinite(V.arcologies[0].FSPhysicalIdealist)) {
-			V.arcologies[0].FSPhysicalIdealist = 10;
-			r += `<br>Fixed NaN FS value for FSPhysicalIdealist`;
+		if (typeof V.dormitory === "undefined") {
+			V.dormitory = 20;
 		}
-		if (V.arcologies[0].FSPastoralist !== "unset" && !Number.isFinite(V.arcologies[0].FSPastoralist)) {
-			V.arcologies[0].FSPastoralist = 10;
-			r += `<br>Fixed NaN FS value for FSPastoralist`;
+		if (typeof V.dormitoryPopulation === "undefined") {
+			V.dormitoryPopulation = 0;
 		}
-		if (V.arcologies[0].FSAssetExpansionist !== "unset" && !Number.isFinite(V.arcologies[0].FSAssetExpansionist)) {
-			V.arcologies[0].FSAssetExpansionist = 10;
-			r += `<br>Fixed NaN FS value for FSAssetExpansionist`;
+		if (typeof V.rooms === "undefined") {
+			V.rooms = 5;
 		}
-		if (V.arcologies[0].FSDegradationist !== "unset" && !Number.isFinite(V.arcologies[0].FSDegradationist)) {
-			V.arcologies[0].FSDegradationist = 10;
-			r += `<br>Fixed NaN FS value for FSDegradationist`;
+		if (typeof V.roomsPopulation === "undefined") {
+			V.roomsPopulation = 0;
 		}
-		if (V.arcologies[0].FSRomanRevivalist !== "unset" && !Number.isFinite(V.arcologies[0].FSRomanRevivalist)) {
-			V.arcologies[0].FSRomanRevivalist = 10;
-			r += `<br>Fixed NaN FS value for FSRomanRevivalist`;
+		if (typeof V.prostheticsUpgrade === "undefined") {
+			V.prostheticsUpgrade = 0;
 		}
-		if (V.arcologies[0].FSChattelReligionist !== "unset" && !Number.isFinite(V.arcologies[0].FSChattelReligionist)) {
-			V.arcologies[0].FSChattelReligionist = 10;
-			r += `<br>Fixed NaN FS value for FSChattelReligionist`;
+		if (typeof V.dispensaryUpgrade === "undefined") {
+			V.dispensaryUpgrade = 0;
 		}
-		if (V.arcologies[0].FSChineseRevivalist !== "unset" && !Number.isFinite(V.arcologies[0].FSChineseRevivalist)) {
-			V.arcologies[0].FSChineseRevivalist = 10;
-			r += `<br>Fixed NaN FS value for FSChineseRevivalist`;
+		if (typeof V.growthStim === "undefined") {
+			V.growthStim = 0;
 		}
-		if (V.arcologies[0].FSArabianRevivalist !== "unset" && !Number.isFinite(V.arcologies[0].FSArabianRevivalist)) {
-			V.arcologies[0].FSArabianRevivalist = 10;
-			r += `<br>Fixed NaN FS value for FSArabianRevivalist`;
+		if (typeof V.ImplantProductionUpgrade === "undefined") {
+			V.ImplantProductionUpgrade = 0;
 		}
-		if (V.arcologies[0].FSEdoRevivalist !== "unset" && !Number.isFinite(V.arcologies[0].FSEdoRevivalist)) {
-			V.arcologies[0].FSEdoRevivalist = 10;
-			r += `<br>Fixed NaN FS value for FSEdoRevivalist`;
+		if (typeof V.geneticMappingUpgrade === "undefined") {
+			V.geneticMappingUpgrade = 0;
 		}
-		if (V.arcologies[0].FSEgyptianRevivalist !== "unset" && !Number.isFinite(V.arcologies[0].FSEgyptianRevivalist)) {
-			V.arcologies[0].FSEgyptianRevivalist = 10;
-			r += `<br>Fixed NaN FS value for FSEgyptianRevivalist`;
+		if (typeof V.pregnancyMonitoringUpgrade === "undefined") {
+			V.pregnancyMonitoringUpgrade = 0;
 		}
-		if (V.arcologies[0].FSAztecRevivalist !== "unset" && !Number.isFinite(V.arcologies[0].FSAztecRevivalist)) {
-			V.arcologies[0].FSAztecRevivalist = 10;
-			r += `<br>Fixed NaN FS value for FSAztecRevivalist`;
+
+		// Implant Manufactory
+		{
+			if (typeof V.permaPregImplant === "undefined") {
+				V.permaPregImplant = 0;
+			}
+			if (typeof V.bellyImplants === "undefined") {
+				V.bellyImplants = 0;
+			}
+			if (typeof V.cervixImplants === "undefined") {
+				V.cervixImplants = 0;
+			}
+			if (typeof V.prostateImplants === "undefined") {
+				V.prostateImplants = 0;
+			}
+			if (typeof V.sympatheticOvaries === "undefined") {
+				V.sympatheticOvaries = 0;
+			}
+			if (typeof V.fertilityImplant === "undefined") {
+				V.fertilityImplant = 0;
+			}
+			if (typeof V.asexualReproduction === "undefined") {
+				V.asexualReproduction = 0;
+			}
 		}
-		if (V.arcologies[0].FSIntellectualDependency !== "unset" && !Number.isFinite(V.arcologies[0].FSIntellectualDependency)) {
-			V.arcologies[0].FSIntellectualDependency = 10;
-			r += `<br>Fixed NaN FS value for FSIntellectualDependency`;
+
+		// Dispensery
+		{
+			if (typeof V.pubertyHormones === "undefined") {
+				V.pubertyHormones = 0;
+			}
+			if (typeof V.dietXXY === "undefined") {
+				V.dietXXY = 0;
+			}
+			if (typeof V.dietCleanse === "undefined") {
+				V.dietCleanse = 0;
+			}
+			if (typeof V.dietFertility === "undefined") {
+				V.dietFertility = 0;
+			}
+			if (typeof V.cumProDiet === "undefined") {
+				V.cumProDiet = 0;
+			}
+			if (typeof V.aphrodisiacUpgradeRefine === "undefined") {
+				V.aphrodisiacUpgradeRefine = 0;
+			}
+			if (typeof V.healthyDrugsUpgrade === "undefined") {
+				V.healthyDrugsUpgrade = 0;
+			}
+			if (typeof V.reproductionFormula === "undefined") {
+				V.reproductionFormula = 0;
+			}
+			if (typeof V.superFertilityDrugs === "undefined") {
+				V.superFertilityDrugs = 0;
+			}
 		}
-		if (V.arcologies[0].FSSlaveProfessionalism !== "unset" && !Number.isFinite(V.arcologies[0].FSSlaveProfessionalism)) {
-			V.arcologies[0].FSSlaveProfessionalism = 10;
-			r += `<br>Fixed NaN FS value for FSSlaveProfessionalism`;
+
+		// Penthouse upgrades
+		{
+			if (typeof V.pregAccessibility === "undefined") {
+				V.pregAccessibility = 0;
+			}
+			if (typeof V.dickAccessibility === "undefined") {
+				V.dickAccessibility = 0;
+			}
+			if (typeof V.ballsAccessibility === "undefined") {
+				V.ballsAccessibility = 0;
+			}
+			if (typeof V.buttAccessibility === "undefined") {
+				V.buttAccessibility = 0;
+			}
+			if (typeof V.dairyPiping === "undefined") {
+				V.dairyPiping = 0;
+			}
+			if (typeof V.wcPiping === "undefined") {
+				V.wcPiping = 0;
+			}
+			if (typeof V.pregSpeedControl === "undefined") {
+				V.pregSpeedControl = 0;
+			}
 		}
-		if (V.arcologies[0].FSPetiteAdmiration !== "unset" && !Number.isFinite(V.arcologies[0].FSPetiteAdmiration)) {
-			V.arcologies[0].FSPetiteAdmiration = 10;
-			r += `<br>Fixed NaN FS value for FSPetiteAdmiration`;
+		if (typeof V.youngerOvaries === "undefined") {
+			V.youngerOvaries = 0;
+		}
+		if (typeof V.animalOvaries === "undefined") {
+			V.animalOvaries = 0;
+		}
+		if (typeof V.animalTesticles === "undefined") {
+			V.animalTesticles = 0;
+		}
+		if (typeof V.animalMpreg === "undefined") {
+			V.animalMpreg = 0;
+		}
+		if (typeof V.cloningSystem === "undefined") {
+			V.cloningSystem = 0;
+		}
+		if (typeof V.geneticFlawLibrary === "undefined") {
+			V.geneticFlawLibrary = 0;
+		}
+		if (typeof V.language === "undefined") {
+			V.language = "English";
+		}
+		if (typeof V.terrain === "undefined") {
+			V.terrain = "rural";
+		}
+		if (typeof V.trinkets === "undefined") {
+			V.trinkets = [];
+			if (V.PC.career === "wealth") {
+				V.trinkets.push("a collection of diplomas from expensive schools");
+			} else if (V.PC.career === "capitalist") {
+				V.trinkets.push("a framed low denomination piece of paper money from your native country");
+			} else if (V.PC.career === "mercenary") {
+				V.trinkets.push("a battered old assault rifle");
+			} else if (V.PC.career === "slaver") {
+				V.trinkets.push("a framed picture of a slave with her sale price scrawled across the bottom");
+			} else if (V.PC.career === "engineer") {
+				V.trinkets.push("an artist's impression of an early arcology design");
+			} else if (V.PC.career === "medicine") {
+				V.trinkets.push("a framed postsurgical x-ray");
+			} else if (V.PC.career === "celebrity") {
+				V.trinkets.push("a framed copy of the first news story featuring yourself");
+			} else if (V.PC.career === "arcology owner") {
+				V.trinkets.push("a miniature model of your first arcology");
+			} else if (V.PC.career === "escort") {
+				V.trinkets.push("a copy of the first porno you starred in");
+			} else if (V.PC.career === "servant") {
+				V.trinkets.push("a framed picture of your late Master");
+			} else if (V.PC.career === "gang") {
+				V.trinkets.push("your favorite handgun, whose sight has instilled fear in many");
+			} else if (V.PC.career === "BlackHat") {
+				V.trinkets.push("a news clipping of your first successful live hack");
+			}
 		}
-		if (V.arcologies[0].FSStatuesqueGlorification !== "unset" && !Number.isFinite(V.arcologies[0].FSStatuesqueGlorification)) {
-			V.arcologies[0].FSStatuesqueGlorification = 10;
-			r += `<br>Fixed NaN FS value for FSStatuesqueGlorification`;
+		if (typeof V.NPCSlaves === "undefined") {
+			V.NPCSlaves = V.ASlaves;
+			V.ASlaves += V.menials + V.fuckdolls + V.menialBioreactors;
 		}
-		// Clean up FS in player arcology
-		App.Update.FScheatDatatypeCleanup();
 	}
 
+
 	// Clean up neighbor's arcologies
 	App.Update.neighborArcologyCheatDatatypeCleanup();
 
@@ -2246,864 +2849,307 @@ App.Update.globalVariables = function() {
 		V.completedOrgans = _newOrgans;
 	}
 
-	if (typeof V.assistant === "number") {
-		assistant.BC();
-	} else {
-		assistant.object();
-	}
-	if (typeof V.CulturalOpenness === "undefined") {
-		V.CulturalOpenness = 0;
-	}
-	if (typeof V.displayAssignments === "undefined") {
-		V.displayAssignments = 1;
-	}
-	if (typeof V.universalRulesImpregnation === "undefined") {
-		V.universalRulesImpregnation = "none";
-	}
-	if (typeof V.abbreviateNationality === "undefined") {
-		V.abbreviateNationality = 0;
-	}
-	if (typeof V.language === "undefined") {
-		V.language = "English";
-	}
-	if (typeof V.terrain === "undefined") {
-		V.terrain = "rural";
-	}
-
-	// Nicea
-	if (typeof V.nicaeaAnnounceable === "undefined") {
-		V.nicaeaAnnounceable = 0;
-	}
-	if (typeof V.nicaeaAnnounced === "undefined") {
-		V.nicaeaAnnounced = 0;
-	}
-	if (typeof V.nicaeaPreparation === "undefined") {
-		V.nicaeaPreparation = 0;
-	}
-	if (typeof V.nicaeaInvolvement === "undefined") {
-		V.nicaeaInvolvement = -1;
-	}
-	if (typeof V.nicaeaPower === "undefined") {
-		V.nicaeaPower = 0;
-	}
-	if (typeof V.nicaeaHeld === "undefined") {
-		V.nicaeaHeld = 0;
-	}
-
-	// Events
-	if (typeof V.REFeminizationCheckinIDs === "undefined") {
-		V.REFeminizationCheckinIDs = [];
-	}
-	if (typeof V.REMILFCheckinIDs === "undefined") {
-		V.REMILFCheckinIDs = [];
-	}
-	if (typeof V.REOrientationCheckinIDs === "undefined") {
-		V.REOrientationCheckinIDs = [];
-	}
-	if (typeof V.REUglyCheckinIDs === "undefined") {
-		V.REUglyCheckinIDs = [];
-	}
-	if (typeof V.REButtholeCheckinIDs === "undefined") {
-		V.REButtholeCheckinIDs = [];
-	}
-	if (typeof V.REFutaSisterCheckinIDs === "undefined") {
-		V.REFutaSisterCheckinIDs = [];
-	}
-	if (typeof V.REReductionCheckinIDs === "undefined") {
-		V.REReductionCheckinIDs = [];
-	}
-
-	// Arcology
-	if (typeof V.dormitory === "undefined") {
-		V.dormitory = 20;
-	}
-	if (typeof V.dormitoryPopulation === "undefined") {
-		V.dormitoryPopulation = 0;
-	}
-	if (typeof V.rooms === "undefined") {
-		V.rooms = 5;
-	}
-	if (typeof V.roomsPopulation === "undefined") {
-		V.roomsPopulation = 0;
-	}
-
-	// Content
-	if (typeof V.universalHGImpregnateMasterSuiteToggle === "undefined") {
-		V.universalHGImpregnateMasterSuiteToggle = 0;
-	}
-
 	FacilityDatatypeCleanup();
 
 	// Pit
-	if (typeof V.fighterIDs === "undefined") {
-		V.fighterIDs = [];
-	}
-	if (typeof V.pitVirginities === "undefined") {
-		V.pitVirginities = 0;
-	}
-	if (typeof V.pitBG === "undefined") {
-		V.pitBG = 0;
-	}
-	if (typeof V.slaveFightingBG === "undefined") {
-		V.slaveFightingBG = 0;
-	}
-	if (typeof V.pitAnimal === "undefined") {
-		V.pitAnimal = 0;
-	}
-	if (typeof V.pitAnimalType === "undefined") {
-		V.pitAnimalType = 0;
-	}
-	if (typeof V.verboseDescriptions === "undefined") {
-		V.verboseDescriptions = 0;
+	{
+		if (typeof V.fighterIDs === "undefined") {
+			V.fighterIDs = [];
+		}
+		if (typeof V.pitVirginities === "undefined") {
+			V.pitVirginities = 0;
+		}
+		if (typeof V.pitBG === "undefined") {
+			V.pitBG = 0;
+		}
+		if (typeof V.slaveFightingBG === "undefined") {
+			V.slaveFightingBG = 0;
+		}
+		if (typeof V.pitAnimal === "undefined") {
+			V.pitAnimal = 0;
+		}
+		if (typeof V.pitAnimalType === "undefined") {
+			V.pitAnimalType = 0;
+		}
+		if (typeof V.verboseDescriptions === "undefined") {
+			V.verboseDescriptions = 0;
+		}
 	}
 
-
-	if (typeof V.universalRulesRest === "undefined") {
-		V.universalRulesRest = 0;
-	}
-	if (typeof V.universalRulesNewSlavesRA === "undefined") {
-		V.universalRulesNewSlavesRA = 1;
-	}
-	if (typeof V.hormoneUpgradeMood === "undefined") {
-		V.hormoneUpgradeMood = 0;
-	}
-	if (typeof V.hormoneUpgradeShrinkage === "undefined") {
-		V.hormoneUpgradeShrinkage = 0;
-	}
-	if (typeof V.hormoneUpgradePower === "undefined") {
-		V.hormoneUpgradePower = 0;
-	}
-	if (typeof V.schoolSuggestion === "undefined") {
-		V.schoolSuggestion = 0;
-	}
-	if (typeof V.prostheticsUpgrade === "undefined") {
-		V.prostheticsUpgrade = 0;
-	}
-	if (typeof V.dispensaryUpgrade === "undefined") {
-		V.dispensaryUpgrade = 0;
-	}
-	if (typeof V.growthStim === "undefined") {
-		V.growthStim = 0;
-	}
-	if (typeof V.pubertyLength === "undefined") {
-		V.pubertyLength = 5;
-	}
-	if (typeof V.maxGrowthAge === "undefined") {
-		V.maxGrowthAge = 24;
-	}
-	if (typeof V.ImplantProductionUpgrade === "undefined") {
-		V.ImplantProductionUpgrade = 0;
-	}
-	if (typeof V.geneticMappingUpgrade === "undefined") {
-		V.geneticMappingUpgrade = 0;
-	}
-	if (typeof V.pregnancyMonitoringUpgrade === "undefined") {
-		V.pregnancyMonitoringUpgrade = 0;
-	}
-	if (typeof V.permaPregImplant === "undefined") {
-		V.permaPregImplant = 0;
-	}
-	if (typeof V.pubertyHormones === "undefined") {
-		V.pubertyHormones = 0;
-	}
-	if (typeof V.dietXXY === "undefined") {
-		V.dietXXY = 0;
-	}
-	if (typeof V.dietCleanse === "undefined") {
-		V.dietCleanse = 0;
-	}
-	if (typeof V.dietFertility === "undefined") {
-		V.dietFertility = 0;
-	}
-	if (typeof V.cumProDiet === "undefined") {
-		V.cumProDiet = 0;
-	}
-	if (typeof V.aphrodisiacUpgradeRefine === "undefined") {
-		V.aphrodisiacUpgradeRefine = 0;
-	}
-	if (typeof V.healthyDrugsUpgrade === "undefined") {
-		V.healthyDrugsUpgrade = 0;
-	}
-	if (typeof V.reproductionFormula === "undefined") {
-		V.reproductionFormula = 0;
-	}
-	if (typeof V.superFertilityDrugs === "undefined") {
-		V.superFertilityDrugs = 0;
-	}
-	if (typeof V.bellyImplants === "undefined") {
-		V.bellyImplants = 0;
-	}
-	if (typeof V.cervixImplants === "undefined") {
-		V.cervixImplants = 0;
-	}
-	if (typeof V.prostateImplants === "undefined") {
-		V.prostateImplants = 0;
-	}
-	if (typeof V.sympatheticOvaries === "undefined") {
-		V.sympatheticOvaries = 0;
-	}
-	if (typeof V.fertilityImplant === "undefined") {
-		V.fertilityImplant = 0;
-	}
-	if (typeof V.asexualReproduction === "undefined") {
-		V.asexualReproduction = 0;
-	}
-	if (typeof V.shelterSlaveGeneratedWeek || V.shelterSlaveGeneratedWeek > V.week === "undefined") {
-		V.shelterSlaveGeneratedWeek = 0;
-	}
-	if (typeof V.goodImageCampaign === "undefined") {
-		V.goodImageCampaign = 0;
-	}
-	if (typeof V.sexualOpeness === "undefined") {
-		V.sexualOpeness = 0;
-	}
-	if (typeof V.youngerOvaries === "undefined") {
-		V.youngerOvaries = 0;
-	}
-	if (typeof V.animalOvaries === "undefined") {
-		V.animalOvaries = 0;
-	}
-	if (typeof V.animalTesticles === "undefined") {
-		V.animalTesticles = 0;
-	}
-	if (typeof V.animalMpreg === "undefined") {
-		V.animalMpreg = 0;
-	}
-	if (typeof V.cloningSystem === "undefined") {
-		V.cloningSystem = 0;
-	}
-	if (typeof V.geneticFlawLibrary === "undefined") {
-		V.geneticFlawLibrary = 0;
-	}
-	if (typeof V.pregInventor === "undefined") {
-		V.pregInventor = 0;
-	}
-	if (typeof V.pregInventorID === "undefined") {
-		V.pregInventorID = 0;
-	}
-	if (typeof V.pregInventions === "undefined") {
-		V.pregInventions = 0;
-	}
-	if (typeof V.traitorWeeks === "undefined") {
-		V.traitorWeeks = 0;
-	}
-	if (typeof V.taitorWeeks !== "undefined") {
-		V.traitorWeeks = V.taitorWeeks;
-	}
-	if (typeof V.rivalGender === "undefined") {
-		if ((V.rivalOwner > 0)) {
-			if (random(0, 99) <= V.seeDicks) {
-				V.rivalGender = 2;
-			} else {
-				V.rivalGender = 1;
-			}
-		} else {
-			V.rivalGender = 0;
+	// Job Fulfillment Center
+	{
+		if (typeof V.JFCOrder === "undefined") {
+			V.JFCOrder = 0;
+		}
+		if (typeof V.Role === "undefined") {
+			V.Role = "";
 		}
-	}
-	if (typeof V.realRoyalties === "undefined") {
-		V.realRoyalties = 0;
 	}
 
-	/* Job Fulfillment Center */
-	if (typeof V.JFCOrder === "undefined") {
-		V.JFCOrder = 0;
-	}
-	if (typeof V.Role === "undefined") {
-		V.Role = "";
-	}
-	if (typeof V.trinkets === "undefined") {
-		V.trinkets = [];
-		if (V.PC.career === "wealth") {
-			V.trinkets.push("a collection of diplomas from expensive schools");
-		} else if (V.PC.career === "capitalist") {
-			V.trinkets.push("a framed low denomination piece of paper money from your native country");
-		} else if (V.PC.career === "mercenary") {
-			V.trinkets.push("a battered old assault rifle");
-		} else if (V.PC.career === "slaver") {
-			V.trinkets.push("a framed picture of a slave with her sale price scrawled across the bottom");
-		} else if (V.PC.career === "engineer") {
-			V.trinkets.push("an artist's impression of an early arcology design");
-		} else if (V.PC.career === "medicine") {
-			V.trinkets.push("a framed postsurgical x-ray");
-		} else if (V.PC.career === "celebrity") {
-			V.trinkets.push("a framed copy of the first news story featuring yourself");
-		} else if (V.PC.career === "arcology owner") {
-			V.trinkets.push("a miniature model of your first arcology");
-		} else if (V.PC.career === "escort") {
-			V.trinkets.push("a copy of the first porno you starred in");
-		} else if (V.PC.career === "servant") {
-			V.trinkets.push("a framed picture of your late Master");
-		} else if (V.PC.career === "gang") {
-			V.trinkets.push("your favorite handgun, whose sight has instilled fear in many");
-		} else if (V.PC.career === "BlackHat") {
-			V.trinkets.push("a news clipping of your first successful live hack");
+	// Schools
+	{
+		if (typeof V.TSS === "undefined") {
+			V.TSS = {
+				schoolUpgrade: 0,
+				schoolPresent: 0,
+				schoolProsperity: 0,
+				subsidize: 0,
+				schoolAnnexed: 0,
+				studentsBought: 0,
+				schoolSale: 0
+			};
 		}
-	}
-	if (typeof V.TSS === "undefined") {
-		V.TSS = {
-			schoolUpgrade: 0,
-			schoolPresent: 0,
-			schoolProsperity: 0,
-			subsidize: 0,
-			schoolAnnexed: 0,
-			studentsBought: 0,
-			schoolSale: 0
-		};
-	}
-	if (typeof V.GRI === "undefined") {
-		V.GRI = {
-			schoolUpgrade: 0,
-			schoolPresent: 0,
-			schoolProsperity: 0,
-			subsidize: 0,
-			schoolAnnexed: 0,
-			studentsBought: 0,
-			schoolSale: 0
-		};
-	}
-	if (typeof V.SCP === "undefined") {
-		V.SCP = {
-			schoolUpgrade: 0,
-			schoolPresent: 0,
-			schoolProsperity: 0,
-			subsidize: 0,
-			schoolAnnexed: 0,
-			studentsBought: 0,
-			schoolSale: 0
-		};
-	}
-	if (typeof V.LDE === "undefined") {
-		V.LDE = {
-			schoolUpgrade: 0,
-			schoolPresent: 0,
-			schoolProsperity: 0,
-			subsidize: 0,
-			schoolAnnexed: 0,
-			studentsBought: 0,
-			schoolSale: 0
-		};
-	}
-	if (typeof V.TGA === "undefined") {
-		V.TGA = {
-			schoolUpgrade: 0,
-			schoolPresent: 0,
-			schoolProsperity: 0,
-			subsidize: 0,
-			schoolAnnexed: 0,
-			studentsBought: 0,
-			schoolSale: 0
-		};
-	}
-	if (typeof V.TCR === "undefined") {
-		V.TCR = {
-			schoolUpgrade: 0,
-			schoolPresent: 0,
-			schoolProsperity: 0,
-			subsidize: 0,
-			schoolAnnexed: 0,
-			studentsBought: 0,
-			schoolSale: 0
-		};
-	}
-	if (typeof V.TFS === "undefined") {
-		V.TFS = {
-			schoolUpgrade: 0,
-			schoolPresent: 0,
-			schoolProsperity: 0,
-			subsidize: 0,
-			schoolAnnexed: 0,
-			studentsBought: 0,
-			schoolSale: 0,
-			compromiseWeek: 0,
-			farmUpgrade: 0
-		};
-	}
-	if (typeof V.TFS.compromiseWeek === "undefined") {
-		V.TFS.compromiseWeek = 0;
-	}
-	if (typeof V.HA === "undefined") {
-		V.HA = {
-			schoolUpgrade: 0,
-			schoolPresent: 0,
-			schoolProsperity: 0,
-			subsidize: 0,
-			schoolAnnexed: 0,
-			studentsBought: 0,
-			schoolSale: 0
-		};
-	}
-	if (typeof V.NUL === "undefined") {
-		V.NUL = {
-			schoolUpgrade: 0,
-			schoolPresent: 0,
-			schoolProsperity: 0,
-			subsidize: 0,
-			schoolAnnexed: 0,
-			studentsBought: 0,
-			schoolSale: 0
-		};
-	}
-	if (typeof V.birthee === "undefined") {
-		V.birthee = 0;
-	}
-	if (typeof V.alwaysSubsidizeRep === "undefined") {
-		V.alwaysSubsidizeRep = 0;
-	}
-	if (typeof V.alwaysSubsidizeGrowth === "undefined") {
-		V.alwaysSubsidizeGrowth = 0;
-	}
-	if (typeof V.ProImmigrationCash === "undefined") {
-		V.ProImmigrationCash = 0;
-	}
-	if (typeof V.ProImmigrationRep === "undefined") {
-		V.ProImmigrationRep = 0;
-	}
-	if (typeof V.AntiImmigrationCash === "undefined") {
-		V.AntiImmigrationCash = 0;
-	}
-	if (typeof V.AntiImmigrationRep === "undefined") {
-		V.AntiImmigrationRep = 0;
-	}
-	if (typeof V.ProEnslavementCash === "undefined") {
-		V.ProEnslavementCash = 0;
-	}
-	if (typeof V.ProEnslavementRep === "undefined") {
-		V.ProEnslavementRep = 0;
-	}
-	if (typeof V.AntiEnslavementCash === "undefined") {
-		V.AntiEnslavementCash = 0;
-	}
-	if (typeof V.AntiEnslavementRep === "undefined") {
-		V.AntiEnslavementRep = 0;
-	}
-	if (typeof V.BasicSMR === "undefined") {
-		V.BasicSMR = 1;
-	}
-	if (typeof V.HealthInspectionSMR === "undefined") {
-		V.HealthInspectionSMR = 0;
-	}
-	if (typeof V.EducationSMR === "undefined") {
-		V.EducationSMR = 0;
-	}
-	if (typeof V.FrigiditySMR === "undefined") {
-		V.FrigiditySMR = 0;
-	}
-	if (typeof V.BasicBeautySMR === "undefined") {
-		V.BasicBeautySMR = 0;
-	}
-	if (typeof V.QualityBeautySMR === "undefined") {
-		V.QualityBeautySMR = 0;
-	}
-	if (typeof V.BasicWeightSMR === "undefined") {
-		V.BasicWeightSMR = 0;
-	}
-	if (typeof V.BasicIntelligenceSMR === "undefined") {
-		V.BasicIntelligenceSMR = 0;
-	}
-	if (typeof V.QualityIntelligenceSMR === "undefined") {
-		V.QualityIntelligenceSMR = 0;
-	}
-	if (typeof V.BasicHeightSMR === "undefined") {
-		V.BasicHeightSMR = 0;
-	}
-	if (typeof V.AdvancedHeightSMR === "undefined") {
-		V.AdvancedHeightSMR = 0;
-	}
-	if (typeof V.BasicTallSMR !== "undefined") {
-		V.BasicHeightSMR = 1;
-	}
-	if (typeof V.BasicShortSMR !== "undefined") {
-		V.BasicHeightSMR = -1;
-	}
-	if (typeof V.IntelligenceEugenicsSMR === "undefined") {
-		V.IntelligenceEugenicsSMR = 0;
-	}
-	if (typeof V.HeightEugenicsSMR === "undefined") {
-		V.HeightEugenicsSMR = 0;
-	}
-	if (typeof V.FaceEugenicsSMR === "undefined") {
-		V.FaceEugenicsSMR = 0;
-	}
-	if (typeof V.HonestySMR === "undefined") {
-		V.HonestySMR = 0;
-	}
-	if (typeof V.ProRefugees === "undefined") {
-		V.ProRefugees = 0;
-	}
-	if (typeof V.ProRecruitment === "undefined") {
-		V.ProRecruitment = 0;
-	}
-	if (typeof V.OralEncouragement === "undefined") {
-		V.OralEncouragement = 0;
-	}
-	if (typeof V.VaginalEncouragement === "undefined") {
-		V.VaginalEncouragement = 0;
-	}
-	if (typeof V.AnalEncouragement === "undefined") {
-		V.AnalEncouragement = 0;
-	}
-	if (typeof V.OralDiscouragement === "undefined") {
-		V.OralDiscouragement = 0;
-	}
-	if (typeof V.VaginalDiscouragement === "undefined") {
-		V.VaginalDiscouragement = 0;
-	}
-	if (typeof V.AnalDiscouragement === "undefined") {
-		V.AnalDiscouragement = 0;
-	}
-	if (typeof V.CashForRep === "undefined") {
-		V.CashForRep = 0;
-	}
-	if (typeof V.RepForCash === "undefined") {
-		V.RepForCash = 0;
-	}
-	if (typeof V.Cash4Babies === "undefined") {
-		V.Cash4Babies = 0;
-	}
-	if (typeof V.PAPublic === "undefined") {
-		V.PAPublic = 0;
-	}
-	if (typeof V.CoursingAssociation === "undefined") {
-		V.CoursingAssociation = 0;
-	}
-	if (typeof V.Lurcher === "undefined") {
-		V.Lurcher = 0;
-	}
-	if (typeof V.coursed === "undefined") {
-		V.coursed = 0;
-	}
-	if (typeof V.MixedMarriage === "undefined") {
-		V.MixedMarriage = 0;
-	}
-	if (typeof V.expiree === "undefined") {
-		V.expiree = 0;
-	}
-	if (typeof V.retiree === "undefined") {
-		V.retiree = 0;
-	}
-	if (typeof V.retirementAge === "undefined") {
-		V.retirementAge = 45;
-	}
-	if (typeof V.customRetirementAge === "undefined") {
-		V.customRetirementAge = 45;
-	}
-	if (typeof V.customMenialRetirementAge === "undefined") {
-		V.customMenialRetirementAge = 65;
-	}
-	if (typeof V.retirementCum === "undefined") {
-		V.retirementCum = 500000;
-	}
-	if (typeof V.CustomRetirementAgePolicy === "undefined") {
-		V.CustomRetirementAgePolicy = 0;
-	}
-	if (typeof V.PhysicalRetirementAgePolicy === "undefined") {
-		V.PhysicalRetirementAgePolicy = 0;
-	}
-	if (typeof V.CumMilestoneRetirement === "undefined") {
-		V.CumMilestoneRetirement = 0;
-	}
-	if (typeof V.BioreactorRetirement === "undefined") {
-		V.BioreactorRetirement = 0;
-	}
-	if (typeof V.ArcadeRetirement === "undefined") {
-		V.ArcadeRetirement = 0;
-	}
-	if (typeof V.CitizenRetirement === "undefined") {
-		V.CitizenRetirement = 0;
-	}
-	if (typeof V.citizenRetirementMenials === "undefined") {
-		V.citizenRetirementMenials = 0;
-	}
-	if (typeof V.FSSupLawTrigger === "undefined") {
-		V.FSSupLawTrigger = 0;
-	}
-	if (typeof V.FSSubLawTrigger === "undefined") {
-		V.FSSubLawTrigger = 0;
-	}
-	if (typeof V.FSSlaveProfLawTrigger === "undefined") {
-		V.FSSlaveProfLawTrigger = 0;
-	}
-	if (typeof V.justiceEvents === "undefined") {
-		V.justiceEvents = ["indenture deal", "majority deal", "slave deal", "slave training", "virginity deal"];
-	}
-	if (((V.ver.startsWith("0.6") && !V.ver.startsWith("10.6")) || (V.ver.startsWith("0.7")) || (V.ver.startsWith("0.8")) || (V.ver === "0.9"))) {
-		if (V.seeDicks === 2) {
-			V.seeDicks = 100;
-		} else if (V.seeDicks === 1) {
-			V.seeDicks = 25;
+		if (typeof V.GRI === "undefined") {
+			V.GRI = {
+				schoolUpgrade: 0,
+				schoolPresent: 0,
+				schoolProsperity: 0,
+				subsidize: 0,
+				schoolAnnexed: 0,
+				studentsBought: 0,
+				schoolSale: 0
+			};
+		}
+		if (typeof V.SCP === "undefined") {
+			V.SCP = {
+				schoolUpgrade: 0,
+				schoolPresent: 0,
+				schoolProsperity: 0,
+				subsidize: 0,
+				schoolAnnexed: 0,
+				studentsBought: 0,
+				schoolSale: 0
+			};
+		}
+		if (typeof V.LDE === "undefined") {
+			V.LDE = {
+				schoolUpgrade: 0,
+				schoolPresent: 0,
+				schoolProsperity: 0,
+				subsidize: 0,
+				schoolAnnexed: 0,
+				studentsBought: 0,
+				schoolSale: 0
+			};
+		}
+		if (typeof V.TGA === "undefined") {
+			V.TGA = {
+				schoolUpgrade: 0,
+				schoolPresent: 0,
+				schoolProsperity: 0,
+				subsidize: 0,
+				schoolAnnexed: 0,
+				studentsBought: 0,
+				schoolSale: 0
+			};
+		}
+		if (typeof V.TCR === "undefined") {
+			V.TCR = {
+				schoolUpgrade: 0,
+				schoolPresent: 0,
+				schoolProsperity: 0,
+				subsidize: 0,
+				schoolAnnexed: 0,
+				studentsBought: 0,
+				schoolSale: 0
+			};
+		}
+		if (typeof V.TFS === "undefined") {
+			V.TFS = {
+				schoolUpgrade: 0,
+				schoolPresent: 0,
+				schoolProsperity: 0,
+				subsidize: 0,
+				schoolAnnexed: 0,
+				studentsBought: 0,
+				schoolSale: 0,
+				compromiseWeek: 0,
+				farmUpgrade: 0
+			};
+		}
+		if (typeof V.TFS.compromiseWeek === "undefined") {
+			V.TFS.compromiseWeek = 0;
+		}
+		if (typeof V.HA === "undefined") {
+			V.HA = {
+				schoolUpgrade: 0,
+				schoolPresent: 0,
+				schoolProsperity: 0,
+				subsidize: 0,
+				schoolAnnexed: 0,
+				studentsBought: 0,
+				schoolSale: 0
+			};
+		}
+		if (typeof V.NUL === "undefined") {
+			V.NUL = {
+				schoolUpgrade: 0,
+				schoolPresent: 0,
+				schoolProsperity: 0,
+				subsidize: 0,
+				schoolAnnexed: 0,
+				studentsBought: 0,
+				schoolSale: 0
+			};
 		}
 	}
-	V.seeDicks = Math.clamp(V.seeDicks, 0, 100);
-
 
-	if (typeof V.pornStars === "undefined") {
-		V.studioFeed = 0;
-		V.PCSlutContacts = 1;
-
-		/* create but don't populate (that happens later) */
-		V.pornStars = {};
-	}
+	// Pornstars
+	{
+		if (typeof V.pornStars === "undefined") {
+			V.studioFeed = 0;
+			V.PCSlutContacts = 1;
 
-	/* migrate to new genre-driven pornstar object */
-	if (typeof V.pornStars === "number") {
-		let _oldPornStars = V.pornStars;
+			/* create but don't populate (that happens later) */
+			V.pornStars = {};
+		}
 
-		V.pornStars = {};
-		V.pornStars.general = {p1count: _oldPornStars, p3ID: V.pornStarID};
-		V.pornStars.fuckdoll = {p1count: V.pornStarFuckdolls, p3ID: V.pornStarFuckdollID};
-		V.pornStars.rape = {p1count: V.pornStarRapees, p3ID: V.pornStarRapeID};
-		V.pornStars.preggo = {p1count: V.pornStarPreggos, p3ID: V.pornStarPreggoID};
-		V.pornStars.BBW = {p1count: V.pornStarBBWs, p3ID: V.pornStarBBWID};
-		V.pornStars.gainer = {p1count: V.pornStarGainers, p3ID: V.pornStarGainerID};
-		V.pornStars.stud = {p1count: V.pornStarStuds, p3ID: V.pornStarStudID};
-		V.pornStars.loli = {p1count: V.pornStarLolis, p3ID: V.pornStarLoliID};
-		V.pornStars.deepThroat = {p1count: V.pornStarDeepThroats, p3ID: V.pornStarDeepThroatID};
-		V.pornStars.struggleFuck = {p1count: V.pornStarStruggleFucks, p3ID: V.pornStarStruggleFuckID};
-		V.pornStars.painal = {p1count: V.pornStarPainals, p3ID: V.pornStarPainalID};
-		V.pornStars.tease = {p1count: V.pornStarTeases, p3ID: V.pornStarTeaseID};
-		V.pornStars.romantic = {p1count: V.pornStarRomantics, p3ID: V.pornStarRomanticID};
-		V.pornStars.pervert = {p1count: V.pornStarPerverts, p3ID: V.pornStarPervertID};
-		V.pornStars.caring = {p1count: V.pornStarCarings, p3ID: V.pornStarCaringID};
-		V.pornStars.unflinching = {p1count: V.pornStarUnflinchings, p3ID: V.pornStarUnflinchingID};
-		V.pornStars.sizeQueen = {p1count: V.pornStarSizeQueens, p3ID: V.pornStarSizeQueenID};
-		V.pornStars.neglectful = {p1count: V.pornStarNeglectfuls, p3ID: V.pornStarNeglectfulID};
-		V.pornStars.cumAddict = {p1count: V.pornStarCumAddicts, p3ID: V.pornStarCumAddictID};
-		V.pornStars.analAddict = {p1count: V.pornStarAnalAddicts, p3ID: V.pornStarAnalAddictID};
-		V.pornStars.attentionWhore = {p1count: V.pornStarAttentionWhores, p3ID: V.pornStarAttentionWhoreID};
-		V.pornStars.breastGrowth = {p1count: V.pornStarBreastGrowths, p3ID: V.pornStarBreastGrowthID};
-		V.pornStars.abusive = {p1count: V.pornStarAbusives, p3ID: V.pornStarAbusiveID};
-		V.pornStars.malicious = {p1count: V.pornStarMalicious, p3ID: V.pornStarMaliciousID};
-		V.pornStars.selfHating = {p1count: V.pornStarSelfHatings, p3ID: V.pornStarSelfHatingID};
-		V.pornStars.breeder = {p1count: V.pornStarBreeders, p3ID: V.pornStarBreederID};
-		V.pornStars.sub = {p1count: V.pornStarSubs, p3ID: V.pornStarSubID};
-		V.pornStars.cumSlut = {p1count: V.pornStarCumSluts, p3ID: V.pornStarCumSlutID};
-		V.pornStars.anal = {p1count: V.pornStarAnals, p3ID: V.pornStarAnalID};
-		V.pornStars.humiliation = {p1count: V.pornStarHumiliations, p3ID: V.pornStarHumiliationID};
-		V.pornStars.boobs = {p1count: V.pornStarBoobs, p3ID: V.pornStarBoobsID};
-		V.pornStars.dom = {p1count: V.pornStarDoms, p3ID: V.pornStarDomID};
-		V.pornStars.sadist = {p1count: V.pornStarSadists, p3ID: V.pornStarSadistID};
-		V.pornStars.masochist = {p1count: V.pornStarMasochists, p3ID: V.pornStarMasochistID};
-		V.pornStars.pregnancy = {p1count: V.pornStarPregnancySluts, p3ID: V.pornStarPregnancyID};
-	}
+		/* migrate to new genre-driven pornstar object */
+		if (typeof V.pornStars === "number") {
+			let _oldPornStars = V.pornStars;
 
-	/* make sure that any new genres get added correctly (and populate V.pornStars for very old games) */
-	for (let genre in App.Porn.getAllGenres()) {
-		if (typeof V.pornStars[genre.fameVar] === "undefined") {
-			V.pornStars[genre.fameVar] = {p1count: 0, p3ID: 0};
+			V.pornStars = {};
+			V.pornStars.general = {p1count: _oldPornStars, p3ID: V.pornStarID};
+			V.pornStars.fuckdoll = {p1count: V.pornStarFuckdolls, p3ID: V.pornStarFuckdollID};
+			V.pornStars.rape = {p1count: V.pornStarRapees, p3ID: V.pornStarRapeID};
+			V.pornStars.preggo = {p1count: V.pornStarPreggos, p3ID: V.pornStarPreggoID};
+			V.pornStars.BBW = {p1count: V.pornStarBBWs, p3ID: V.pornStarBBWID};
+			V.pornStars.gainer = {p1count: V.pornStarGainers, p3ID: V.pornStarGainerID};
+			V.pornStars.stud = {p1count: V.pornStarStuds, p3ID: V.pornStarStudID};
+			V.pornStars.loli = {p1count: V.pornStarLolis, p3ID: V.pornStarLoliID};
+			V.pornStars.deepThroat = {p1count: V.pornStarDeepThroats, p3ID: V.pornStarDeepThroatID};
+			V.pornStars.struggleFuck = {p1count: V.pornStarStruggleFucks, p3ID: V.pornStarStruggleFuckID};
+			V.pornStars.painal = {p1count: V.pornStarPainals, p3ID: V.pornStarPainalID};
+			V.pornStars.tease = {p1count: V.pornStarTeases, p3ID: V.pornStarTeaseID};
+			V.pornStars.romantic = {p1count: V.pornStarRomantics, p3ID: V.pornStarRomanticID};
+			V.pornStars.pervert = {p1count: V.pornStarPerverts, p3ID: V.pornStarPervertID};
+			V.pornStars.caring = {p1count: V.pornStarCarings, p3ID: V.pornStarCaringID};
+			V.pornStars.unflinching = {p1count: V.pornStarUnflinchings, p3ID: V.pornStarUnflinchingID};
+			V.pornStars.sizeQueen = {p1count: V.pornStarSizeQueens, p3ID: V.pornStarSizeQueenID};
+			V.pornStars.neglectful = {p1count: V.pornStarNeglectfuls, p3ID: V.pornStarNeglectfulID};
+			V.pornStars.cumAddict = {p1count: V.pornStarCumAddicts, p3ID: V.pornStarCumAddictID};
+			V.pornStars.analAddict = {p1count: V.pornStarAnalAddicts, p3ID: V.pornStarAnalAddictID};
+			V.pornStars.attentionWhore = {p1count: V.pornStarAttentionWhores, p3ID: V.pornStarAttentionWhoreID};
+			V.pornStars.breastGrowth = {p1count: V.pornStarBreastGrowths, p3ID: V.pornStarBreastGrowthID};
+			V.pornStars.abusive = {p1count: V.pornStarAbusives, p3ID: V.pornStarAbusiveID};
+			V.pornStars.malicious = {p1count: V.pornStarMalicious, p3ID: V.pornStarMaliciousID};
+			V.pornStars.selfHating = {p1count: V.pornStarSelfHatings, p3ID: V.pornStarSelfHatingID};
+			V.pornStars.breeder = {p1count: V.pornStarBreeders, p3ID: V.pornStarBreederID};
+			V.pornStars.sub = {p1count: V.pornStarSubs, p3ID: V.pornStarSubID};
+			V.pornStars.cumSlut = {p1count: V.pornStarCumSluts, p3ID: V.pornStarCumSlutID};
+			V.pornStars.anal = {p1count: V.pornStarAnals, p3ID: V.pornStarAnalID};
+			V.pornStars.humiliation = {p1count: V.pornStarHumiliations, p3ID: V.pornStarHumiliationID};
+			V.pornStars.boobs = {p1count: V.pornStarBoobs, p3ID: V.pornStarBoobsID};
+			V.pornStars.dom = {p1count: V.pornStarDoms, p3ID: V.pornStarDomID};
+			V.pornStars.sadist = {p1count: V.pornStarSadists, p3ID: V.pornStarSadistID};
+			V.pornStars.masochist = {p1count: V.pornStarMasochists, p3ID: V.pornStarMasochistID};
+			V.pornStars.pregnancy = {p1count: V.pornStarPregnancySluts, p3ID: V.pornStarPregnancyID};
 		}
-	}
-	if (V.PCSlutContacts === 0) {
-		V.PCSlutContacts = 1;
-	}
-	if (typeof V.seeVectorArtHighlights === "undefined") {
-		V.seeVectorArtHighlights = 1;
-	}
-	if (typeof V.seeFaces === "undefined") {
-		V.seeFaces = 1;
-	}
-	if (typeof V.seeAvatar === "undefined") {
-		V.seeAvatar = 1;
-	}
-	if (typeof V.seeHeight === "undefined") {
-		V.seeHeight = 0;
-	}
 
-	/* Economy Mod */
-	if (V.economy === 0.5) {
-		V.economy = 200;
-	} else if (V.economy === 1) {
-		V.economy = 100;
-	} else if (V.economy === 1.5) {
-		V.economy = 67;
-	}
-	/* if (typeof V.baseDifficulty === "undefined") {
-		if (V.economy > 125) {
-			V.baseDifficulty = 1;
-		} else if (V.economy > 100) {
-			V.baseDifficulty = 2;
-		} else if (V.economy > 80) {
-			V.baseDifficulty = 3;
-		} else if (V.economy > 67) {
-			V.baseDifficulty = 4;
-		} else {
-			V.baseDifficulty = 5;
+		/* make sure that any new genres get added correctly (and populate V.pornStars for very old games) */
+		for (let genre in App.Porn.getAllGenres()) {
+			if (typeof V.pornStars[genre.fameVar] === "undefined") {
+				V.pornStars[genre.fameVar] = {p1count: 0, p3ID: 0};
+			}
+		}
+		if (V.PCSlutContacts === 0) {
+			V.PCSlutContacts = 1;
 		}
-	}
-	*/
-	if (typeof V.NPCSlaves === "undefined") {
-		V.NPCSlaves = V.ASlaves;
-		V.ASlaves += V.menials + V.fuckdolls + V.menialBioreactors;
-	}
-
-	/* Corporation variables added*/
-	if (typeof V.vanillaShareSplit === "undefined") {
-		V.vanillaShareSplit = 1;
-	}
-	if (typeof V.corpCashDividend === "undefined") {
-		V.corpCashDividend = 0;
-	}
-	if (typeof V.corpDiv === "undefined") {
-		V.corpDiv = 0;
-	}
-	if (typeof V.corpExpandToken === "undefined") {
-		V.corpExpandToken = 0;
-	}
-	if (V.corpExpandToken > 1) {
-		V.corpExpandToken = 1;
-	}
-	if (typeof V.corpSpec === "undefined") {
-		V.corpSpec = 0;
-	}
-	if (typeof V.corpSpecToken === "undefined") {
-		V.corpSpecToken = 0;
-	}
-	if (typeof V.corpDivExtra === "undefined") {
-		V.corpDivExtra = 0;
-	}
-	if (typeof V.corpDivLegal === "undefined") {
-		V.corpDivLegal = 0;
-	}
-	if (typeof V.corpDivBreak === "undefined") {
-		V.corpDivBreak = 0;
-	}
-	if (typeof V.corpDivSurgery === "undefined") {
-		V.corpDivSurgery = 0;
-	}
-	if (typeof V.corpDivTrain === "undefined") {
-		V.corpDivTrain = 0;
-	}
-	if (typeof V.corpDivArcade === "undefined") {
-		V.corpDivArcade = 0;
-	}
-	if (typeof V.corpDivMenial === "undefined") {
-		V.corpDivMenial = 0;
-	}
-	if (typeof V.corpDivDairy === "undefined") {
-		V.corpDivDairy = 0;
-	}
-	if (typeof V.corpDivWhore === "undefined") {
-		V.corpDivWhore = 0;
-	}
-	if (typeof V.corpDivExtraDev === "undefined") {
-		V.corpDivExtraDev = 0;
-	}
-	if (typeof V.corpDivLegalDev === "undefined") {
-		V.corpDivLegalDev = 0;
-	}
-	if (typeof V.corpDivBreakDev === "undefined") {
-		V.corpDivBreakDev = 0;
-	}
-	if (typeof V.corpDivSurgeryDev === "undefined") {
-		V.corpDivSurgeryDev = 0;
-	}
-	if (typeof V.corpDivTrainDev === "undefined") {
-		V.corpDivTrainDev = 0;
-	}
-	if (typeof V.corpDivArcadeDev === "undefined") {
-		V.corpDivArcadeDev = 0;
-	}
-	if (typeof V.corpDivMenialDev === "undefined") {
-		V.corpDivMenialDev = 0;
-	}
-	if (typeof V.corpDivDairyDev === "undefined") {
-		V.corpDivDairyDev = 0;
-	}
-	if (typeof V.corpDivWhoreDev === "undefined") {
-		V.corpDivWhoreDev = 0;
-	}
-	if (typeof V.corpSpecRaces === "undefined") {
-		V.corpSpecRaces = [];
-	}
-	V.dividendTimer = V.dividendTimer || 13;
-	if (typeof V.corpEcon === "undefined") {
-		V.corpEcon = 0;
 	}
 
-	/* Removing the old Corp from save*/
-	if (typeof V.newCorp === "undefined") {
-		V.newCorp = 1;
-		V.corpIncorporated = 0;
-		cashX(Math.min(Math.trunc((V.corpValue / (V.publicShares + V.personalShares)) * V.personalShares), 1000000), "stocksTraded");
-		/* Paying the player for his old corporation, so they can get the new one started with haste. It should perhaps have a message going with it*/
-		V.mercenariesHelpCorp = 0;
-		V.corpMarket = 0;
-		if (typeof V.sectors !== "undefined") {
-			for (let _i = 0; _i < V.sectors.length; _i++) {
-				if (V.sectors[_i].type === "CorporateMarket") {
-					V.sectors[_i].type = "Markets";
-					break;
-				}
+	// Economy Mod
+	{
+		if (V.economy === 0.5) {
+			V.economy = 200;
+		} else if (V.economy === 1) {
+			V.economy = 100;
+		} else if (V.economy === 1.5) {
+			V.economy = 67;
+		}
+		/* if (typeof V.baseDifficulty === "undefined") {
+			if (V.economy > 125) {
+				V.baseDifficulty = 1;
+			} else if (V.economy > 100) {
+				V.baseDifficulty = 2;
+			} else if (V.economy > 80) {
+				V.baseDifficulty = 3;
+			} else if (V.economy > 67) {
+				V.baseDifficulty = 4;
+			} else {
+				V.baseDifficulty = 5;
 			}
 		}
+		*/
 	}
 
-	/* Slave services and goods variables*/
-	if (typeof V.publicFuckdolls === "undefined") {
-		V.publicFuckdolls = 0;
-	}
-	if (typeof V.classSatisfied === "undefined") {
-		V.classSatisfied = {};
-	}
-	if (typeof V.lowerClassSatisfied !== "undefined") {
-		V.classSatisfied.lowerClass = V.lowerClassSatisfied;
-	}
-	if (typeof V.sexSubsidies === "undefined") {
-		V.sexSubsidies = {};
-	}
-	if (typeof V.sexSubsidiesLC !== "undefined") {
-		V.sexSubsidies.lowerClass = V.sexSubsidiesLC;
-	}
-	if (typeof V.sexSupplyBarriers === "undefined") {
-		V.sexSupplyBarriers = {};
-	}
-	if (typeof V.sexSupplyBarriersLC !== "undefined") {
-		V.sexSupplyBarriers.lowerClass = V.sexSupplyBarriersLC;
-	}
-	if (typeof V.arcadePrice === "undefined") {
-		V.arcadePrice = 2;
-	}
-	if (typeof V.clubSlaveSexAmount === "undefined") {
-		V.clubSlaveSexAmount = 0;
-	}
-	if (typeof V.food === "undefined") {
-		V.food = 50000;
-	}
-	if (typeof V.foodLastWeek === "undefined") {
-		V.foodLastWeek = 0;
-	}
-	if (typeof V.foodTotal === "undefined") {
-		V.foodTotal = 0;
-	}
-	if (typeof V.foodProduced === "undefined") {
-		V.foodProduced = 0;
-	}
-	if (typeof V.foodStored === "undefined") {
-		V.foodStored = 0;
-	}
-	if (typeof V.foodCost === "undefined") {
-		V.foodCost = 25;
-	}
-	if (typeof V.foodMarket === "undefined") {
-		V.foodMarket = 0;
-	}
-	if (typeof V.foodRate === "undefined") {
-		V.foodRate = {
-			slave: 2,
-			lower: 1.8,
-			middle: 2,
-			upper: 2.2,
-			top: 2.4
-		};
-	}
-	if (typeof V.foodConsumption === "undefined") {
-		V.foodConsumption = ((V.lowerClass * V.foodRate.lower) + (V.middleClass * V.foodRate.middle) + (V.upperClass * V.foodRate.upper) + (V.topClass * V.foodRate.top)); /* total amount food consumed per week */
-	}
-	if (typeof V.revealFoodEffects === "undefined") {
-		V.revealFoodEffects = 0;
-	}
-	if (typeof V.rations === "undefined") {
-		V.rations = 0;
+	// Slave services and goods variables
+	{
+		if (typeof V.publicFuckdolls === "undefined") {
+			V.publicFuckdolls = 0;
+		}
+		if (typeof V.classSatisfied === "undefined") {
+			V.classSatisfied = {};
+		}
+		if (typeof V.lowerClassSatisfied !== "undefined") {
+			V.classSatisfied.lowerClass = V.lowerClassSatisfied;
+		}
+		if (typeof V.sexSubsidies === "undefined") {
+			V.sexSubsidies = {};
+		}
+		if (typeof V.sexSubsidiesLC !== "undefined") {
+			V.sexSubsidies.lowerClass = V.sexSubsidiesLC;
+		}
+		if (typeof V.sexSupplyBarriers === "undefined") {
+			V.sexSupplyBarriers = {};
+		}
+		if (typeof V.sexSupplyBarriersLC !== "undefined") {
+			V.sexSupplyBarriers.lowerClass = V.sexSupplyBarriersLC;
+		}
+		if (typeof V.arcadePrice === "undefined") {
+			V.arcadePrice = 2;
+		}
+		if (typeof V.clubSlaveSexAmount === "undefined") {
+			V.clubSlaveSexAmount = 0;
+		}
+		if (typeof V.food === "undefined") {
+			V.food = 50000;
+		}
+		if (typeof V.foodLastWeek === "undefined") {
+			V.foodLastWeek = 0;
+		}
+		if (typeof V.foodTotal === "undefined") {
+			V.foodTotal = 0;
+		}
+		if (typeof V.foodProduced === "undefined") {
+			V.foodProduced = 0;
+		}
+		if (typeof V.foodStored === "undefined") {
+			V.foodStored = 0;
+		}
+		if (typeof V.foodCost === "undefined") {
+			V.foodCost = 25;
+		}
+		if (typeof V.foodMarket === "undefined") {
+			V.foodMarket = 0;
+		}
+		if (typeof V.foodRate === "undefined") {
+			V.foodRate = {
+				slave: 2,
+				lower: 1.8,
+				middle: 2,
+				upper: 2.2,
+				top: 2.4
+			};
+		}
+		if (typeof V.foodConsumption === "undefined") {
+			V.foodConsumption = ((V.lowerClass * V.foodRate.lower) + (V.middleClass * V.foodRate.middle) + (V.upperClass * V.foodRate.upper) + (V.topClass * V.foodRate.top)); /* total amount food consumed per week */
+		}
+		if (typeof V.revealFoodEffects === "undefined") {
+			V.revealFoodEffects = 0;
+		}
+		if (typeof V.rations === "undefined") {
+			V.rations = 0;
+		}
 	}
 
 	EconomyDatatypeCleanup();