diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 37ba14c59a9251bb1977513e0e8b9e9d37e6c5b0..4f6155cb7bfba0db57020f5b3076d8a1dcc534db 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -54,66 +54,6 @@ $encyclopedia
 /**********
 OBTAINING SLAVES
 **********/
-<<case "Obtaining Slaves">>
-	//Future room for lore text//
-
-	<br><br>
-	Choose a more particular entry below:
-	<br>
-
-<<case "Kidnapped Slaves">>
-	//Slavers, from disreputable to noble, visit the Free Cities in droves. Their merchandise is, as a rule, offered as-is and no questions asked. This usually means that their charges have been forcibly kidnapped. These slaves are generally rebellious, often unhealthy, and always cheap.
-
-	<br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition////
-
-
-<<case "Slave Schools">>
-	<<if $minimumSlaveAge < 16>>The Free Cities host what are referred to as 'orphanages,' but are in fact slave schools. <<else>>It is not legal to own children in the Free Cities. It is however legal to hold an interest in future ownership of a child once they reach their 16th birthday. The Free Cities host what are referred to as 'orphanages,' but are in fact slave schools. Of course, instruction cannot include sexual training, so it instead focuses on obedience and fitness.<</if>>
-
-	<br><br>The standard slave school produces merchandise to a strict mold. Their stock is guaranteed to be robustly healthy, at a sleek weight, body modification free, 16 to 19 years of age, very obedient, and 100% virgin. A few schools specialize in slaves with non-standard organs or in modified slaves, but most protect brand identity by confining themselves to natural females.
-
-	<br><br>It has recently become common practice to begin treating such trainees with drugs years before sale. Not all orphanages engage in this questionable practice, usually justified as 'seeing to orphans' medical welfare,' but you will occasionally see fresh slaves sold with breasts and asses unusually well-developed for their age. These are very rare, as the newness of slavery means that few slaves have been so from a young age. Presumably, slaves treated in this way will become more common as the Free Cities mature.
-
-	<br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition////
-
-
-<<case "Stables">>
-	//At any given time, many hundreds of new slaves are listed for sale in the Free City. Since these slaves have come through a training stable, they will tend to be fairly obedient, reasonably healthy, and have basic sexual skill, but will never be virgins.
-
-	<br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition////
-
-
-<<case "Household Liquidations">>
-	//It is natural that where there is a demand for slaves who are related to one another, supply should arise.
-
-	<br><br>Suppliers of slaves from the outside world are well aware that paired slaves, whether mothers and daughters or sisters, command a premium. This special merchandise is best found at dealers that specialize in it. After all, the demand is strong enough that only experienced dealers have the skill and equipment to defeat all the tricks suppliers are willing to use to pass slaves off as relatives.
-
-	<br><br>Nature has contrived that the demand for twin slaves should far outstrip the supply. Since slavery is new, a majority of those now enslaved were born free, so this is difficult for slave trainers to address. However, the coming decades should see a great increase in the number of slave twins as breeders improve fertility treatments.
-
-	<br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition////
-
-
-<<case "Direct Sales">>
-	//On occasion, an established slaveowner will sell a trained and modified slave due to financial need, because he is bored of her, or because he trains unique slaves as a hobby.
-
-	<br><br>Some of the most powerful persons in the Free Cities also maneuver their enemies into selling a favorite slave as a way of bloodlessly showing dominance. The truly powerful occasionally feel the need to show that they can obtain any slave, at any time, regardless of her owners' wishes.
-
-	<br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition////
-
-
-<<case "Pre-Owned Slaves">>
-	The slaves left behind by the previous owner of your arcology are from a catalog of slaves that can also be accessed through the pre-owned slave vendor.
-
-	<br><br>Most of these slaves were submitted to the game by anons on /d/. If you'd like to submit a slave for addition to the game, you can do so at http://freecitiesblog.blogspot.com/2015/08/slave-submissions.html.
-
-<<case "Discarded Slaves">>
-	//Slaves don't last forever in the Free Cities. Many don't even last until retirement, with broken minds and abused or over-used bodies.
-
-	<br><br>These slaves which have lost their value are often simply culled from the owners' herds, but may also be sold through <<= App.Encyclopedia.Dialog.linkSC("the Flesh Heap", "The Flesh Heap")>> as discount merchandise for new or cash-strapped slaveowners who can wring some final use out of them. Their new owners may end up using them as discount whores, <<= App.Encyclopedia.Dialog.linkSC("living sex toys", "Fuckdolls")>>, or for medical testing.
-
-	<br><br>Some discarded slaves are also "rescued" by the so-called Slave Shelters. These charities place the discarded slaves with well-off slaveowners who are willing to invest the time and effort into caring for them, whether to restore them to serviceable condition or simply for humanitarian reasons. Abuse and resale of placed shelter slaves is generally prohibited, and most shelters attempt to enforce these terms with regular inspections.
-
-	<br><br>— Lawrence, W. G., //Guide to Modern Slavery, 2037 Edition////
 
 /**********
 SLAVE ASSIGNMENTS:
@@ -2316,12 +2256,6 @@ MODS
 <<case "Youth Preferentialism Research">>
 	Specialized creams built off of stem cells and several ingredients known for reducing the ravages of age. Steady use leaves a slave looking younger, though the effects are literally skin deep; several gossip pieces have run about celebrities bedding youthful slaves just to accidentally find their efforts resulting in a broken hip.
 
-<<case "The Flesh Heap">>
-	More of a trash heap than a slave market, the "Flesh Heap" is a dumping ground for thoroughly broken slaves. Relatively healthy bodies are usually scooped up for medical testing or other purposes; several that one wouldn't want to waste a valuable slave on. Anything with some sort of life in it is up for sale, usually at extremely low prices, though one gets what they pay for; most slaves are nothing more than vegetables. One would have to place a reserve should they want a mindless, healthy slave for whatever they seek.
-
-<<case "The Job Fulfillment Center">>
-	If you are looking for a slave qualified for a specific role, look no further than the Traders Union that makes up the Job Fulfillment Center. Leave the job description and a list of desired traits and before long a suitable slave will be delivered to your doorstep and ready to serve you. Due to the nature of the business, these slaves are not @@.yellowgreen;<<= App.Encyclopedia.Dialog.linkSC("cheap", "Money")>>@@ and usually not perfect, but they always fulfill their job adequately and obediently.
-
 <<case "Gestation Drugs and Labor Suppressants">>
 	Not all drugs are applied directly to your slavegirl. In this case, gestation accelerants and retardants are passed through the mother into her unborn children to control the rate of fetal growth. While slightly unhealthy for the mother, gestation slowing drugs are relatively harmless, though an unwilling mother may become more distraught when she realizes her pregnancy will last even longer. Due to the extended duration of the pregnancy, the mother's body may become accustomed to being so round, leading towards a sagging middle once birth occurs. On the other hand, gestation hastening drugs are extremely dangerous to the mother. It is strongly recommended to keep her under the observation and care of an experienced doctor or nurse. Failure to do so will cause her body to struggle to keep up with the rate of growth of her children, harming her physical and mental health, as well as potentially bursting her uterus later in her pregnancy. Labor suppressants are exactly that; they prevent the mother from entering labor, thus allowing the child to grow longer than a normal pregnancy. Excessive use may lead to health complications, especially during childbirth, though going even further may result in the slave's body suddenly entering labor and rapidly birthing her children, often without giving the slave time to prepare or even get undressed.
 
@@ -2411,9 +2345,6 @@ MODS
 		</dd>
 	</dl>
 
-<<case "Wetware CPUs">>
-	Slaves stripped of all unneeded parts, attached to a VR world, and honed to near perfection. Their minds are peerless, but their bodies are broken; if one is able to overcome such an obstacle, a valuable slave awaits.
-
 <<case "Contraband and Illegal Goods">>
 	While there is little to no issue with possessing nearly anything, getting your hands on it may not always be feasible. Be it local policy or overreaching business deals, certain goods may not be found for sale in the Free City. This does not stop some of the shadier dealers from risking the sale of them, of course; this is where smugglers come in. There is always a market for contraband and illicit goods and never a shortage of people looking to buy them. Not all smugglers are successful, and those that aren't soon find themselves up for sale in the slave markets.
 
diff --git a/src/gui/Encyclopedia/encyclopediaObtainingSlaves.js b/src/gui/Encyclopedia/encyclopediaObtainingSlaves.js
new file mode 100644
index 0000000000000000000000000000000000000000..19a88d5f78c6bd50795a4cf712a8f49d85aa7b84
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaObtainingSlaves.js
@@ -0,0 +1,165 @@
+App.Encyclopedia.addArticle("Obtaining Slaves", function() {
+	const f = new DocumentFragment();
+	App.UI.DOM.appendNewElement("p", f, "Future room for lore text", "note");
+	App.UI.DOM.appendNewElement("p", f, "Choose a more particular entry below:");
+	return f;
+}, "obtainingSlaves");
+
+App.Encyclopedia.addArticle("Kidnapped Slaves", function() {
+	const f = new DocumentFragment();
+
+	App.Events.addParagraph(f, ["Slavers, from disreputable to noble, visit the Free Cities in droves. Their merchandise is, as a rule, offered as-is and no questions asked. This usually means that their charges have been forcibly kidnapped. These slaves are generally rebellious, often unhealthy, and always cheap."]);
+
+	App.Encyclopedia.addArticleSource(f, "Guide to Modern Slavery, 2037 Edition", "Lawrence, W. G.");
+
+	return f;
+}, "obtainingSlaves");
+
+App.Encyclopedia.addArticle("Slave Schools", function() {
+	const f = new DocumentFragment();
+	let r;
+
+	r = [];
+	if (V.minimumSlaveAge < 16) {
+		r.push("The Free Cities host what are referred to as 'orphanages,' but are in fact slave schools.");
+	} else {
+		r.push("It is not legal to own children in the Free Cities. It is however legal to hold an interest in future ownership of a child once they reach their 16th birthday. The Free Cities host what are referred to as 'orphanages,' but are in fact slave schools. Of course, instruction cannot include sexual training, so it instead focuses on obedience and fitness.");
+	}
+	App.Events.addParagraph(f, r);
+
+	App.Events.addParagraph(f, ["The standard slave school produces merchandise to a strict mold. Their stock is guaranteed to be robustly healthy, at a sleek weight, body modification free, 16 to 19 years of age, very obedient, and 100% virgin. A few schools specialize in slaves with non-standard organs or in modified slaves, but most protect brand identity by confining themselves to natural females."]);
+
+	App.Events.addParagraph(f, ["It has recently become common practice to begin treating such trainees with drugs years before sale. Not all orphanages engage in this questionable practice, usually justified as 'seeing to orphans' medical welfare,' but you will occasionally see fresh slaves sold with breasts and asses unusually well-developed for their age. These are very rare, as the newness of slavery means that few slaves have been so from a young age. Presumably, slaves treated in this way will become more common as the Free Cities mature."]);
+
+	App.Encyclopedia.addArticleSource(f, "Guide to Modern Slavery, 2037 Edition", "Lawrence, W. G.");
+
+	return f;
+}, "obtainingSlaves");
+
+App.Encyclopedia.addArticle("Stables", function() {
+	const f = new DocumentFragment();
+
+	App.Events.addParagraph(f, ["At any given time, many hundreds of new slaves are listed for sale in the Free City. Since these slaves have come through a training stable, they will tend to be fairly obedient, reasonably healthy, and have basic sexual skill, but will never be virgins."]);
+
+	App.Encyclopedia.addArticleSource(f, "Guide to Modern Slavery, 2037 Edition", "Lawrence, W. G.");
+
+	return f;
+}, "obtainingSlaves");
+
+App.Encyclopedia.addArticle("Household Liquidations", function() {
+	const f = new DocumentFragment();
+
+
+	App.Events.addParagraph(f, ["It is natural that where there is a demand for slaves who are related to one another, supply should arise."]);
+
+	App.Events.addParagraph(f, ["Suppliers of slaves from the outside world are well aware that paired slaves, whether mothers and daughters or sisters, command a premium. This special merchandise is best found at dealers that specialize in it. After all, the demand is strong enough that only experienced dealers have the skill and equipment to defeat all the tricks suppliers are willing to use to pass slaves off as relatives."]);
+
+	App.Events.addParagraph(f, ["Nature has contrived that the demand for twin slaves should far outstrip the supply. Since slavery is new, a majority of those now enslaved were born free, so this is difficult for slave trainers to address. However, the coming decades should see a great increase in the number of slave twins as breeders improve fertility treatments."]);
+
+	App.Encyclopedia.addArticleSource(f, "Guide to Modern Slavery, 2037 Edition", "Lawrence, W. G.");
+
+	return f;
+}, "obtainingSlaves");
+
+App.Encyclopedia.addArticle("Direct Sales", function() {
+	const f = new DocumentFragment();
+
+	App.Events.addParagraph(f, ["On occasion, an established slaveowner will sell a trained and modified slave due to financial need, because he is bored of her, or because he trains unique slaves as a hobby."]);
+
+	App.Events.addParagraph(f, ["Some of the most powerful persons in the Free Cities also maneuver their enemies into selling a favorite slave as a way of bloodlessly showing dominance. The truly powerful occasionally feel the need to show that they can obtain any slave, at any time, regardless of her owners' wishes."]);
+
+	App.Encyclopedia.addArticleSource(f, "Guide to Modern Slavery, 2037 Edition", "Lawrence, W. G.");
+
+	return f;
+}, "obtainingSlaves");
+
+App.Encyclopedia.addArticle("Pre-Owned Slaves", function() {
+	const f = new DocumentFragment();
+
+	App.Events.addParagraph(f, ["The slaves left behind by the previous owner of your arcology are from a catalog of slaves that can also be accessed through the pre-owned slave vendor."]);
+
+	// TODO update link
+	App.Events.addParagraph(f, ["Most of these slaves were submitted to the game by anons on /d/. If you'd like to submit a slave for addition to the game, you can do so at the GitGud development site."]);
+
+	return f;
+}, "obtainingSlaves");
+
+
+App.Encyclopedia.addArticle("Discarded Slaves", function() {
+	const f = new DocumentFragment();
+	let r;
+
+	App.Events.addParagraph(f, ["Slaves don't last forever in the Free Cities. Many don't even last until retirement, with broken minds and abused or over-used bodies."]);
+
+	r = [];
+	r.push("These slaves which have lost their value are often simply culled from the owners' herds, but may also be sold through");
+	r.push(App.Encyclopedia.Dialog.linkDOM("the Flesh Heap", "The Flesh Heap"));
+	r.push("as discount merchandise for new or cash-strapped slaveowners who can wring some final use out of them. Their new owners may end up using them as discount whores,");
+	r.push(App.UI.DOM.combineNodes(App.Encyclopedia.Dialog.linkDOM("living sex toys", "Fuckdolls"), ","));
+	r.push("or for medical testing.");
+	App.Events.addParagraph(f, r);
+
+	r = [];
+	r.push("Some discarded slaves are also");
+	r.push(App.Encyclopedia.topic("rescued"));
+	r.push("by the so-called Slave Shelters. These charities place the discarded slaves with well-off slaveowners who are willing to invest the time and effort into caring for them, whether to restore them to serviceable condition or simply for humanitarian reasons. Abuse and resale of placed shelter slaves is generally prohibited, and most shelters attempt to enforce these terms with regular inspections.");
+	App.Events.addParagraph(f, r);
+
+	App.Encyclopedia.addArticleSource(f, "Guide to Modern Slavery, 2037 Edition", "Lawrence, W. G.");
+
+	return f;
+}, "obtainingSlaves");
+
+
+App.Encyclopedia.addArticle("The Flesh Heap", function() {
+	const f = new DocumentFragment();
+	let r;
+
+	r = [];
+	r.push("More of a trash heap than a slave market, the");
+	r.push(App.Encyclopedia.topic("Flesh Heap"));
+	r.push("is a dumping ground for thoroughly broken slaves. Relatively healthy bodies are usually scooped up for medical testing or other purposes; several that one wouldn't want to waste a valuable slave on. Anything with some sort of life in it is up for sale, usually at extremely low prices, though one gets what they pay for; most slaves are nothing more than vegetables. One would have to place a reserve should they want a mindless, healthy slave for whatever they seek.");
+	App.Events.addParagraph(f, r);
+
+	return f;
+}, "obtainingSlaves");
+
+
+App.Encyclopedia.addArticle("The Job Fulfillment Center", function() {
+	const f = new DocumentFragment();
+	let r;
+
+	r = [];
+	r.push("If you are looking for a slave qualified for a specific role, look no further than the Traders Union that makes up the Job Fulfillment Center. Leave the job description and a list of desired traits and before long a suitable slave will be delivered to your doorstep and ready to serve you. Due to the nature of the business, these slaves are not");
+	r.push(App.Encyclopedia.Dialog.linkDOM("cheap", "Money", "cash"));
+	r.push("and usually not perfect, but they always fulfill their job adequately and obediently.");
+	App.Events.addParagraph(f, r);
+
+	return f;
+}, "obtainingSlaves");
+
+
+App.Encyclopedia.addArticle("Wetware CPUs", function() {
+	const f = new DocumentFragment();
+
+	App.Events.addParagraph(f, ["Slaves stripped of all unneeded parts, attached to a VR world, and honed to near perfection. Their minds are peerless, but their bodies are broken; if one is able to overcome such an obstacle, a valuable slave awaits."]);
+
+	return f;
+}, "obtainingSlaves");
+
+App.Encyclopedia.addCategory("obtainingSlaves", function() {
+	const r = [];
+	r.push(App.Encyclopedia.Dialog.linkDOM("Kidnapped Slaves", "Kidnapped Slaves"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Slave Schools", "Slave Schools"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Stables", "Stables"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Household Liquidations", "Household Liquidations"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Direct Sales", "Direct Sales"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Pre-Owned Slaves", "Pre-Owned Slaves"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Random Events", "Random Events"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Discarded Slaves", "Discarded Slaves"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("The Flesh Heap", "The Flesh Heap"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("The Job Fulfillment Center", "The Job Fulfillment Center"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Wetware CPUs", "Wetware CPUs"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("The Corporation", "The Corporation"));
+	return App.UI.DOM.generateLinksStrip(r);
+});
diff --git a/src/gui/Encyclopedia/encyclopediaRelatedLinks.tw b/src/gui/Encyclopedia/encyclopediaRelatedLinks.tw
index 00af23c6c116fa60b4ca5dc623281985098c0439..c978fa01c796bd566d216a5540dcde3d80c2d784 100644
--- a/src/gui/Encyclopedia/encyclopediaRelatedLinks.tw
+++ b/src/gui/Encyclopedia/encyclopediaRelatedLinks.tw
@@ -13,27 +13,6 @@
 
 <<switch $encyclopedia>>
 
-/**********
-SLAVES
-**********/
-
-/**********
-OBTAINING SLAVES
-**********/
-<<case "Direct Sales" "Discarded Slaves" "Household Liquidations" "Kidnapped Slaves" "Obtaining Slaves" "Pre-Owned Slaves" "Slave Schools" "Stables" "The Flesh Heap" "The Job Fulfillment Center" "Wetware CPUs">>
-	<<= App.Encyclopedia.Dialog.linkSC("Kidnapped Slaves", "Kidnapped Slaves")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Slave Schools", "Slave Schools")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Stables", "Stables")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Household Liquidations", "Household Liquidations")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Direct Sales", "Direct Sales")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Pre-Owned Slaves", "Pre-Owned Slaves")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Random Events", "Random Events")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Discarded Slaves", "Discarded Slaves")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("The Flesh Heap", "The Flesh Heap")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("The Job Fulfillment Center", "The Job Fulfillment Center")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Wetware CPUs", "Wetware CPUs")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("The Corporation", "The Corporation")>>
-
 /**********
 SLAVE LEADERS:
 **********/