diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll
index eb24398..d4d7bb3 100644
Binary files a/1.4/Assemblies/RJW_Menstruation.dll and b/1.4/Assemblies/RJW_Menstruation.dll differ
diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs
index 7b0ab74..2b51556 100644
--- a/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs
@@ -89,7 +89,7 @@ namespace RJW_Menstruation
                 else m.moodPowerFactor = 0.3f;
 
             }
-            if (pawn.Has(Quirk.Breeder)) pawn.needs.mood.thoughts.memories.TryGainMemoryFast(VariousDefOf.HateTookContraceptivePill);
+            if (pawn.HasQuirk(QuirkUtility.Quirks.Breeder)) pawn.needs.mood.thoughts.memories.TryGainMemoryFast(VariousDefOf.HateTookContraceptivePill);
             else pawn.needs.mood.thoughts.memories.TryGainMemoryFast(VariousDefOf.TookContraceptivePill);
         }
     }
diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
index 346a759..e86422d 100644
--- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
@@ -307,7 +307,7 @@ namespace RJW_Menstruation
                         }
                         else part.TransformValue(StatRequest.For(Pawn), ref ovulationChance);
                     }
-                    if (Pawn.Has(Quirk.Breeder)) ovulationChance *= 10.0f;
+                    if (Pawn.HasQuirk(QuirkUtility.Quirks.Breeder)) ovulationChance *= 10.0f;
                     try
                     {
                         calculatingOvulationChance = true;
@@ -872,8 +872,8 @@ namespace RJW_Menstruation
             if (!precum && fertility > 0 && IsDangerDay && pawn.relations.GetPregnancyApproachForPartner(Pawn) == PregnancyApproach.AvoidPregnancy)
             {
                 float successChance = pulloutSuccessRate;
-                if (pawn.Has(Quirk.ImpregnationFetish)) successChance *= fetishPulloutSuccessModifier;
-                if (Pawn.Has(Quirk.ImpregnationFetish)) successChance *= fetishPulloutSuccessModifier;
+                if (pawn.HasQuirk(QuirkUtility.Quirks.ImpregnationFetish)) successChance *= fetishPulloutSuccessModifier;
+                if (Pawn.HasQuirk(QuirkUtility.Quirks.ImpregnationFetish)) successChance *= fetishPulloutSuccessModifier;
                 if (Rand.Chance(successChance)) return;
             }
             if (Pawn.HasIUD()) fertility /= 100f;
@@ -1772,9 +1772,9 @@ namespace RJW_Menstruation
         {
             if (!xxx.is_human(Pawn) || !xxx.is_human(cummer)) return;
 
-            if ((cummer.Has(Quirk.Teratophile) != (Pawn.GetStatValue(StatDefOf.PawnBeauty) >= 0)) ||
-                cummer.Has(Quirk.ImpregnationFetish) ||
-                cummer.Has(Quirk.Breeder))
+            if ((cummer.HasQuirk(QuirkUtility.Quirks.Teratophile) != (Pawn.GetStatValue(StatDefOf.PawnBeauty) >= 0)) ||
+                cummer.HasQuirk(QuirkUtility.Quirks.ImpregnationFetish) ||
+                cummer.HasQuirk(QuirkUtility.Quirks.Breeder))
             {
                 if (cummer.relations.OpinionOf(Pawn) <= -25)
                 {
@@ -1788,7 +1788,7 @@ namespace RJW_Menstruation
 
             if (IsDangerDay)
             {
-                if (Pawn.Has(Quirk.Breeder) || Pawn.Has(Quirk.ImpregnationFetish))
+                if (Pawn.HasQuirk(QuirkUtility.Quirks.Breeder) || Pawn.HasQuirk(QuirkUtility.Quirks.ImpregnationFetish))
                 {
                     Pawn.needs.mood.thoughts.memories.TryGainMemory(VariousDefOf.CameInsideFFetish, cummer);
                 }
@@ -1811,7 +1811,7 @@ namespace RJW_Menstruation
             }
             else
             {
-                if (Pawn.Has(Quirk.Breeder) || Pawn.Has(Quirk.ImpregnationFetish))
+                if (Pawn.HasQuirk(QuirkUtility.Quirks.Breeder) || Pawn.HasQuirk(QuirkUtility.Quirks.ImpregnationFetish))
                 {
                     Pawn.needs.mood.thoughts.memories.TryGainMemory(VariousDefOf.CameInsideFFetishSafe, cummer);
                 }
diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs
index cab288a..b47d614 100644
--- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs
@@ -23,11 +23,11 @@ namespace RJW_Menstruation
         {
             if (is_discovered ||
                 !xxx.is_human(pawn) ||
-                pawn.Has(Quirk.Breeder) ||
+                pawn.HasQuirk(QuirkUtility.Quirks.Breeder) ||
                 (pawn.relations?.DirectRelations?.Find(x => x.def.Equals(PawnRelationDefOf.Spouse) ||
                 x.def.Equals(PawnRelationDefOf.Fiance))) != null)
                 return;
-            if (pawn.Has(Quirk.ImpregnationFetish) || pawn.relations?.DirectRelations?.Find(x => x.def.Equals(PawnRelationDefOf.Lover)) != null)
+            if (pawn.HasQuirk(QuirkUtility.Quirks.ImpregnationFetish) || pawn.relations?.DirectRelations?.Find(x => x.def.Equals(PawnRelationDefOf.Lover)) != null)
             {
                 pawn.needs.mood.thoughts.memories.TryGainMemory(VariousDefOf.UnwantedPregnancyMild);
             }
diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs
index b754557..57a6b9d 100644
--- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs
@@ -31,7 +31,7 @@ namespace RJW_Menstruation
             List<Hediff> pawnparts = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn));
 
             HediffComp_Menstruation comp;
-            if (pawn.Has(Quirk.ImpregnationFetish) || partner.Has(Quirk.ImpregnationFetish) || partner.IsInEstrus())
+            if (pawn.HasQuirk(QuirkUtility.Quirks.ImpregnationFetish) || partner.HasQuirk(QuirkUtility.Quirks.ImpregnationFetish) || partner.IsInEstrus())
                 comp = partner.GetFertileMenstruationComp();
             else comp = partner.GetRandomMenstruationComp();
             if (comp == null) return true;
@@ -102,7 +102,7 @@ namespace RJW_Menstruation
         {
             if (partner.IsAnimal() && !Configurations.EnableAnimalCycle) return true;
             HediffComp_Menstruation comp;
-            if (pawn.Has(Quirk.ImpregnationFetish) || partner.Has(Quirk.ImpregnationFetish) || partner.IsInEstrus())
+            if (pawn.HasQuirk(QuirkUtility.Quirks.ImpregnationFetish) || partner.HasQuirk(QuirkUtility.Quirks.ImpregnationFetish) || partner.IsInEstrus())
                 comp = partner.GetFertileMenstruationComp();
             else comp = partner.GetRandomMenstruationComp();
             if (comp == null)
@@ -179,7 +179,7 @@ namespace RJW_Menstruation
         {
             // Awkward, but it'll have to do
             Pawn pawn = props.pawn;
-            if (__result == 0 || !pawn.Has(Quirk.ImpregnationFetish) || !props.hasPartner()) return;
+            if (__result == 0 || !pawn.HasQuirk(QuirkUtility.Quirks.ImpregnationFetish) || !props.hasPartner()) return;
 
             // Check if the existing code would have added the count
             Pawn partner = props.partner;
diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/QuirkUtility.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/QuirkUtility.cs
new file mode 100644
index 0000000..c8c2352
--- /dev/null
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/QuirkUtility.cs
@@ -0,0 +1,33 @@
+using rjw;
+using Verse;
+
+namespace RJW_Menstruation
+{
+    public static class QuirkUtility
+    {
+        // All quirks used in Menstruation
+        public enum Quirks
+        {
+            Breeder,
+            ImpregnationFetish,
+            Messy,
+            Teratophile,
+        }
+        public static bool HasQuirk(this Pawn pawn, Quirks quirk)
+        {
+            switch (quirk)
+            {
+                case Quirks.Breeder:
+                    return pawn.Has(Quirk.Breeder);
+                case Quirks.ImpregnationFetish:
+                    return pawn.Has(Quirk.ImpregnationFetish);
+                case Quirks.Messy:
+                    return pawn.Has(Quirk.Messy);
+                case Quirks.Teratophile:
+                    return pawn.Has(Quirk.Teratophile);
+                default:
+                    return false;
+            }
+        }
+    }
+}
diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj b/1.4/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj
index 0266ab8..f2f1834 100644
--- a/1.4/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj
@@ -77,6 +77,7 @@
     <Compile Include="Patch\GC_Patch.cs" />
     <Compile Include="Patch\Gizmo_Patch.cs" />
     <Compile Include="PregnancyCommon.cs" />
+    <Compile Include="QuirkUtility.cs" />
     <Compile Include="Recipe_Surgery.cs" />
     <Compile Include="StatParts.cs" />
     <Compile Include="UI\Dialog_HybridCustom.cs" />
diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
index 4f8b62f..13aae6e 100644
--- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
@@ -86,7 +86,7 @@ namespace RJW_Menstruation
             {
                 res = 0.0f;
             }
-            if (pawn.Has(Quirk.Messy)) res *= Rand.Range(4.0f, 8.0f);
+            if (pawn.HasQuirk(QuirkUtility.Quirks.Messy)) res *= Rand.Range(4.0f, 8.0f);
 
             return res;
         }