diff --git a/src/pregmod/beastFuck.tw b/src/pregmod/beastFuck.tw
index 84fb95d39aaea90df3d840757fcb2ab87cffcac7..4c795ced43a455fd83d664d2ffc1879ead72a041 100644
--- a/src/pregmod/beastFuck.tw
+++ b/src/pregmod/beastFuck.tw
@@ -1,78 +1,71 @@
 :: BeastFuck [nobr]
 
-You call $him over and tell her you want to watch her get fucked by a [animal]
+<<set _animal = {species: "dog", dickSize: "large"}
 
-<<if (activeSlave.fetish != "mindbroken")>>
-    <<if (activeSlave.devotion > 50)>>
+<<if canWalk()$activeSlave)>>
+    You call $him over and tell $him you want to watch $him get fucked by a $animal.species.
+<<else>>
+    You order a servant to bring $activeSlave.slaveName over. Once $he is situated, you tell $him that you want to watch $him get fucked by a $animal.species.
+<</if>>
 
+<<if ($activeSlave.fetish != "mindbroken")>>
+    <<if ($activeSlave.devotion > 50)>>
+        <<switch $activeSlave.fetish>>
+        <<case "masochistic">>
+            $activeSlave.slaveName visibly brightens at the thought of the pain involved.
+        <<case "humiliation">>
+            $activeSlave.slaveName visibly brightens at the thought of the humiliation involved.
+        <<default>>
+            $activeSlave.slaveName looks visibly disturbed, but is so attentive to your will that $he quickly agrees.
+        <</switch>>
+    <</if>>
 
---Outline--
-You call [slave] over and tell her you want to watch her get fucked by a [animal]. (May end up just being a dog or something, I don't know yet.)
+    <<if (activeSlave.devotion > 20) && (activeSlave.devotion <= 50)>>
+        <<switch $activeSlave.fetish>>
+        <<case "masochistic">>
+            $activeSlave.slaveName isn't too keen on the idea of fucking a $animal.species, but the thought of the pain involved convinces $him to comply.
+        <<case "humiliation">>
+            $activeSlave.slaveName isn't too keen on the idea of fucking a $animal.species, but the thought of the humiliation involved convinces $him to comply.
+        <<default>>
+            $activeSlave.slaveName tries in vain to conceal $his horror, but quickly regains $his composure.
+        <</switch>>
+    <</if>>
 
-if fetish != mindbroken:
-    if devotion > devoted:
-        if fetish !=  masochistic or perverted:
-            [slave] looks visibly disturbed, but is so attentive to your will that she agrees. You have her
-            if clothing != naked:
-                take off her clothing and bend over a chair before calling in [animal].  (Possibly kneel on the floor?)
-            else:
-                bend over a chair before calling in [animal].
-        else if fetish == masochistic:
-            [slave]'s face visibly brightens at the thought of the pain soon to come.   (Not sure if this should be included - does bestiality hurt? I'd imagine a horsecock would hurt quite a bit, and a dog's knot possibly would. If not, these sections can be dropped.)
-        else if fetish == perverted:
-            [slave]'s face visibly brightens at the thought of the degradation soon to come.
+    <<if (activeSlave.devotion > -20) && (activeSlave.devotion <= 20)>>
+        <<switch $activeSlave.fetish>>
+        <<case "masochistic">>
+            $activeSlave.slaveName looks disgusted at the thought of fucking a $animal.species at first, but the thought of the pain that comes with it soon sparks a small flame of lust in $him.
+        <<case "humiliation">>
+            $activeSlave.slaveName looks disgusted at the thought of fucking a $animal.species at first, but the thought of the humiliation that comes with it soon sparks a small flame of lust in $him.
+        <<default>>
+            $activeSlave.slaveName tries in vain to conceal her horror,
+        <</switch>>
+    <</if>>
 
-    else if devotion > accepting and devotion < devoted:
-        if fetish !=  masochistic or perverted:
-            [slave] tries in vain to conceal her horror, but quickly regains her composure. You have her
-            if clothing != naked:
-                take off her clothing and bend over a chair before calling in [animal].
-            else:
-                bend over a chair before calling in [animal].
-        else if fetish == masochistic:
-            [slave] isn't too keen on the idea of being fucked by a [animal], but the thought of the pain that comes with it soon convinces her to comply.
-        else if fetish == perverted:
-            [slave] isn't too keen on the idea of being fucked by a [animal], but the thought of the degradation that comes with it soon convinces her to comply.
+    <<if (activeSlave.devotion < 20)>>
+        $activeSlave.slaveName's face contorts into a mixture of <<if (activeSlave.devotion < -50)>>hatred, anger, and disgust, <<else>>anger and disgust, <</if>>
+<<else>>
+    $activeSlave.slaveName nods $his head dumbly, $his eyes vacant.
 
-    else if devotion > ambivalent and devotion < accepting:
-        if fetish !=  masochistic or perverted:
-            [slave] tries in vain to conceal her horror, and only the threat of a far worse punishment keeps her from running out of the room. You have her
-            if clothing != naked:
-                take off her clothing and bend over a chair before calling in [animal].
-            else:
-                bend over a chair before calling in [animal].
-        else if fetish == masochistic:
-            [slave] isn't too keen on the idea of being fucked by a [animal], but the thought of the pain that comes with it soon convinces her to comply.      (This is the same as in the previous block, but I can't think of any other way to change it up. Thoughts?)
-        else if fetish == perverted:
-            [slave] isn't too keen on the idea of being fucked by a [animal], but the thought of the degradation that comes with it soon convinces her to comply.
+<<if canWalk($activeSlave)>>
+    <<if $activeSlave.devotion > -20>>
+        <<if ($activeSlave.devotion > -20) && ($activeSlave.devotion <= 20)>>and only the threat of worse punishment prevents $him from running out of the room.<</if>> You have $him <<if ($activeSlave.clothing PLACEHOLDER)>>take off $his clothing and <</if>>kneel down on the floor with $his ass in the air,
+    <<elseif (activeSlave.devotion <= -20)>>
+        and you have to physically prevent $him from running out of the room. You <<if (activeSlave.clothing PLACEHOLDER)>>force $him to take off $his clothing and <</if>>restrain $him on the floor with $his ass in the air, all the while ignoring $his screams and pleas for mercy.
+<<else>>
+    You <<if (activeSlave.clothing PLACEHOLDER)>>take off $his clothing and <</if>>place $him on the ground with a cushion under $his hips, $his ass in the air,
+<</if>>
 
-    else if devotion < ambivalent:
-        [slave]'s face contorts into a mixture of
-            if devotion < reluctant:
-                hatred, anger, and disgust, and you have to physically prevent her from running out of the room (possibly giving her a black eye in the process?). You force her to
-                    if clothing != naked:
-                        take off her clothing and restrain her over a chair before calling in [animal].
-                    else:
-                        restrain her over a chair before calling in [animal].
-            else if devotion > reluctant and devotion < ambivalent:
-                anger and disgust, and it visibly takes her all of her willpower to not run out of the room.
-        You have her
-        if clothing != naked:
-            take off her clothing and bend over a chair before calling in [animal].
-        else:
-            bend over a chair before calling in [animal].
+before calling in the $animal.species. The $animal.species slowly saunters up to the <<if ($activeSlave.devotion <= 20)>>bound <</if>>slave and takes it position <<if canWalk($activeSlave)>>behind <<else>>above <</if>>$him. You can see its $animal.dickSize slowly come to attention as its animalistic brain realizes its standing <<if canWalk($activeSlave)>>behind <<else>>above <</if>>a warm hole that needs to be filled with seed.
 
-else if fetish == mindbroken:
-    [slave] dumbly does as ordered. You have [slave]
-    if clothing != naked:
-        take off her clothing and bend over a chair before calling in [animal].
-    else:
-        bend over a chair before calling in [animal].
+<<switch>>
+    <<case "dog">>
+        <<if ($activeSlave.amp != 1)>>
+            The dog clambers up to mount $activeSlave.slaveName, eliciting a squeal from the girl as its claws dig into $his flesh.
+        <<else>>
+            The dog takes a few curious sniffs, then lines its cock up with $activeSlave.slaveName's pussy. The hound wastes no time in beginning to hammer away at her cunt, causing $activeSlave.slaveName to moan uncontrollably as its thick, veiny member probes the depths of $his pussy. A few short minutes later, $he gives a loud groan <<if ($activeSlave.fetish == "masochist") || ($activeSlave.fetish == "humiliation")>>and shakes in orgasm <</if>>as the dog's knot begins to swell and its penis begins to erupt a thick stream of jizz into $him. After almost a minute, the knot is finally sufficiently small enough that the dog is able to pull its cock out, causing a stream of cum to slide out of $his now-gaping pussy. Having finished its business, the dog runs off, presumably in search of food,
+    <<case "horse">>
+        <<if ($activeSlave.amp != 1)>>
+            The horse stands over her as another slave lines its massive phallus up with $activeSlave.slaveName's <<if ($activeSlave.fetish == "masochist") || ($activeSlave.fetish == "humiliation")>>wet <</if>>pussy. With a slight thrust, it enters $him and begins to fuck $him. $activeSlave.slaveName can't help but give a loud groan as the huge cock <<if ($activeSlave.vagina <= 2)>>stretches <<else>>enters <</if>> her $activeSlave.vagina pussy. The stallion begins to thrust faster and faster, causing $activeSlave.slaveName to moan and groan in pain as the tip rams $his cervix. Before too long, the horse's movements begin to slow, and you can see its large testicles contract slightly as it begins to fill $activeSlave.slaveName's pussy to the brim with thick horse semen. After what seems like an impossibly long time, the horse's dick finally begins to soften and it finally pulls out. You have a servant lead the horse away, with a fresh apple as a treat for its good performance,
 
-The [animal] slowly saunters up to the [bound, if devotion < reluctant] slave and takes its position behind it. You can see its [size] cock slowly come to attention as its animalistic brain realizes that it's standing in front of a hole that needs to be filled with seed.
-
-if animal == dog:
-    The dog clambers up to mount [slave], eliciting a squeal from the girl as its claws dig into her skin. It takes a couple of tries, but he (it?) finally manages to sink his cock into her [wet, if fetish == masochistic or perverted] pussy. The hound wastes no time in beginning to hammer away at her cunt, causing [slave] to moan uncontrollably as its thick, veiny member probes the depths of her pussy. A few short minutes later, [slave] gives a loud groan [and shakes in orgasm, if fetish == masochistic or perverted] as the dog's knot begins to swell and its penis begins to erupt a thick stream of jizz into her. After almost a minute, the knot is finally sufficiently small enough that the dog is able to pull its cock out, causing a stream of cum to slide out of her now-gaping pussy (this causes slave's vagina to be loosened to "loose"). Having finished its business, the dog runs off, presumably in search of food.
-
-else if animal == horse:
-    The horse stands over her as [either you or a servant / another slave] lines its massive phallus up with [slave]'s [wet, if fetish == masochistic or perverted] pussy. With a slight thrust, it enters [slave] and begins to fuck her. [slave] can't help but give a loud groan as the huge cock [stretches, if tightness < loose, else enters] her [tightness] pussy. The stallion begins to thrust faster and faster, causing [slave] to moan and groan in pain as the tip rams her cervix. Before too long, the horse's movements begin to slow, and you can see its large testicles contract slightly as it begins to fill [slave]'s pussy to the brim with thick horse semen. After what seems like an impossibly long time, the horse's dick finally begins to soften and it finally pulls out. You have [a servant / another slave] lead the horse away, with a fresh apple as a treat for its good performance.
+    while <<if canWalk($activeSlave)>>$activeSlave.slaveName uses a quick douche to clean $his pussy.<<else>>you have another slave return $activeSlave.slaveName to her duties.<</if>>