diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js
index 3179d7fd04af28ad9a68c0492f63f046a5687940..ada51e1ce6e2d14040062bc50c8ddeee2aee3913 100644
--- a/src/js/walkPastJS.js
+++ b/src/js/walkPastJS.js
@@ -2912,3 +2912,96 @@ window.anusWatch = function(slave) {
 
 	return t;
 };
+
+
+window.lipWatch = function(slave) {
+
+	/* will be moved up once this becomes a single, contained function. */
+	let t = "";
+	let V = State.variables;
+
+	let pronouns = getPronouns(slave);
+	let he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun;
+	let He = capFirstChar(he), His = capFirstChar(his);
+
+	t += `<<faceDescription>>`;
+	t += `<<mouthDescription>>`;
+	switch (slave.collar) {
+		case "a Fuckdoll suit":
+			t += `${His} suit is expressly designed to encourage use of ${his} face hole.`;
+			break;
+		case "uncomfortable leather":
+			t += `${His} uncomfortable leather collar makes ${him} swallow and lick ${his} lips periodically, making it look like ${he}'s offering oral even though ${he}'s just trying to relieve the discomfort.`;
+			break;
+		case "tight steel":
+		case "cruel retirement counter":
+			t += `${His} tight steel collar makes ${him} swallow and lick ${his} lips periodically, making it look like ${he}'s offering oral even though ${he}'s just trying to relieve the discomfort.`;
+			break;
+		case "preg biometrics":
+			t += `${His} collar reveals everything about ${his} womb, bringing eyes straight to ${his} belly before drawing them back to ${his} neck.`;
+			break;
+		case "dildo gag":
+			t += `${His} ring gag would make ${him} ready for oral service, as soon as the formidable dildo it secures down ${his} throat is removed.`;
+			break;
+		case "massive dildo gag":
+			t += `Your eyes are drawn to the distinct bulge in ${his} throat caused by the enormous dildo in it, though ${his} mouth would only be suitable for the largest of cocks right now.`;
+			break;
+		case "shock punishment":
+			t += `${His} shock collar rests threateningly at ${his} throat, ready to compel ${him} to do anything you wish.`;
+			break;
+		case "neck corset":
+			t += `${His} fitted neck corset keeps ${his} breaths shallow, and ${his} head posture rigidly upright.`;
+			break;
+		case "stylish leather":
+			t += `${His} stylish leather collar is at once a fashion statement, and a subtle indication of ${his} enslavement.`;
+			break;
+		case "satin choker":
+			t += `${His} elegant satin choker is at once a fashion statement, and a subtle indication of ${his} enslavement.`;
+			break;
+		case "silk ribbon":
+			t += `${His} delicate, fitted silken ribbon is at once a fashion statement, and a subtle indication of ${his} enslavement.`;
+			break;
+		case "heavy gold":
+			t += `${His} heavy gold collar draws attention to the sexual decadence of ${his} mouth.`;
+			break;
+		case "pretty jewelry":
+		case "nice retirement counter":
+			t += `${His} pretty necklace can hardly be called a collar, but it's just slavish enough to hint that the throat it rests on is available.`;
+			break;
+		case "bell collar":
+			t += `${His} little bell tinkles merrily whenever ${he} moves, dispelling any grace or gravity.`;
+			break;
+		case "leather with cowbell":
+			t += `${His} cowbell tinkles merrily whenever ${he} moves, instantly dispelling any grace or gravity.`;
+			break;
+		case "bowtie":
+			t += `${His} black bowtie contrasts with ${his} white collar, drawing the eye towards ${his} neck and face.`;
+			break;
+		case "ancient Egyptian":
+			t += `${His} wesekh glints richly as ${he} moves, sparkling with opulence and sensuality.`;
+			break;
+		case "ball gag":
+			t += `${His} ball gag uncomfortably holds ${his} jaw apart as it fills ${his} mouth.`;
+			break;
+		case "bit gag":
+			t += `${His} bit gag uncomfortably keeps ${him} from closing ${his} jaw; drool visibly pools along the corners of ${his} mouth, where the rod forces back ${his} cheeks.`;
+			break;
+		case "porcelain mask":
+			t += `${His} beautiful porcelain mask hides ${his} face and any unsightly facial features.`;
+			break;
+		default:
+			t += `${His} unadorned `;
+			if (V.PC.dick == 1) {
+				t += `throat is just waiting to be wrapped around a thick shaft.`;
+			} else {
+				t += `lips are just begging for a cunt to lavish attention on.`;
+			}
+	}
+	if (jsRandom(1,3) === 1) {
+		V.target = "FKiss";
+	} else {
+		V.target = "FLips";
+	}
+
+	return t;
+};
\ No newline at end of file
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index da15e298a074507d564995966d35f8179c470ec5..7530e37a8e7b3f6606f96db0400ded4d22988442 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -555,5 +555,5 @@ Filter by assignment: |
 
 <<set $activeSlave = $slaves.random()>>
 <<if $activeSlave && ($activeSlave.assignment != "please you") && ($activeSlave.assignment != "guard you")>>
-	<br><<include "Walk Past">>
+	<br>//<span id="walk"><<include "Walk Past">></span>//
 <</if>>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 2c2cb1e2f651feb10343f1be83ce892ade791c54..742e7b44de5f73285bb442b1f2e3bc07760eda97 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -1,6 +1,5 @@
 :: Walk Past [nobr]
 
-//
 <<set $target = "">>
 <<set _seed = random(1,100)>>
 <<if $familyTesting == 1 && totalRelatives($activeSlave) > 0 && random(1,100) > 80>>
@@ -34,8 +33,6 @@
 
 <<setLocalPronouns $activeSlave>>
 
-<span id="walk">
-
 <<= primeSlave($activeSlave, _seed)>>
 
 <<if ($partner == "rivalry")>>
@@ -2997,57 +2994,9 @@
 	<<= anusWatch($activeSlave)>>
 
 <<elseif (_flag > 0)>>
-	<<faceDescription>>
-	<<mouthDescription>>
-	<<switch $activeSlave.collar>>
-	<<case "a Fuckdoll suit">>
-		$His suit is expressly designed to encourage use of $his face hole.
-	<<case "uncomfortable leather">>
-		$His uncomfortable leather collar makes $him swallow and lick $his lips periodically, making it look like $he's offering oral even though $he's just trying to relieve the discomfort.
-	<<case "tight steel" "cruel retirement counter">>
-		$His tight steel collar makes $him swallow and lick $his lips periodically, making it look like $he's offering oral even though $he's just trying to relieve the discomfort.
-	<<case "preg biometrics">>
-		$His collar reveals everything about $his womb, bringing eyes straight to $his belly before drawing them back to $his neck.
-	<<case "dildo gag">>
-		$His ring gag would make $him ready for oral service, as soon as the formidable dildo it secures down $his throat is removed.
-	<<case "massive dildo gag">>
-		Your eyes are drawn to the distinct bulge in $his throat caused by the enormous dildo in it, though $his mouth would only be suitable for the largest of cocks right now.
-	<<case "shock punishment">>
-		$His shock collar rests threateningly at $his throat, ready to compel $him to do anything you wish.
-	<<case "neck corset">>
-		$His fitted neck corset keeps $his breaths shallow, and $his head posture rigidly upright.
-	<<case "stylish leather">>
-		$His stylish leather collar is at once a fashion statement, and a subtle indication of $his enslavement.
-	<<case "satin choker">>
-		$His elegant satin choker is at once a fashion statement, and a subtle indication of $his enslavement.
-	<<case "silk ribbon">>
-		$His delicate, fitted silken ribbon is at once a fashion statement, and a subtle indication of $his enslavement.
-	<<case "heavy gold">>
-		$His heavy gold collar draws attention to the sexual decadence of $his mouth.
-	<<case "pretty jewelry" "nice retirement counter">>
-		$His pretty necklace can hardly be called a collar, but it's just slavish enough to hint that the throat it rests on is available.
-	<<case "bell collar">>
-		$His little bell tinkles merrily whenever $he moves, dispelling any grace or gravity.
-	<<case "leather with cowbell">>
-		$His cowbell tinkles merrily whenever $he moves, instantly dispelling any grace or gravity.
-	<<case "bowtie">>
-		$His black bowtie contrasts with $his white collar, drawing the eye towards $his neck and face.
-	<<case "ancient Egyptian">>
-		$His wesekh glints richly as $he moves, sparkling with opulence and sensuality.
-	<<case "ball gag">>
-		$His ball gag uncomfortably holds $his jaw apart as it fills $his mouth.
-	<<case "bit gag">>
-		$His bit gag uncomfortably keeps $him from closing $his jaw; drool visibly pools along the corners of $his mouth, where the rod forces back $his cheeks.
-	<<case "porcelain mask">>
-		$His beautiful porcelain mask hides $his unsightly facial features.
-	<<default>>
-		$His unadorned <<if $PC.dick == 1>>throat is just waiting to be wrapped around a thick shaft<<else>>lips are just begging for a cunt to lavish attention on<</if>>.
-	<</switch>>
-	<<if random(1,3) == 1>>
-		<<set $target = "FKiss">>
-	<<else>>
-		<<set $target = "FLips">>
-	<</if>>
+
+	<<= lipWatch($activeSlave)>>
+
 <</if>>
 
 <<if $activeSlave.fuckdoll == 0>>
@@ -3079,6 +3028,4 @@
 	<<default>>
 		<span id="walkpast"><<link "Fuck $him">><<replace "#walk">><<FFuckdollOral>><</replace>><</link>></span>
 	<</switch>>
-<</if>>
-</span>
-//
+<</if>>
\ No newline at end of file