diff --git a/features.js b/features.js
index 3e37e9f..368df7c 100644
--- a/features.js
+++ b/features.js
@@ -867,6 +867,7 @@ options = [
     "name": "Tail",
     "id": "hasTail",
     "optional": true,
+    "parts": ["tail"],
     "panels": ["tails"],
     "buttons": ["tail_slap"],
     "entries":
@@ -957,6 +958,7 @@ options = [
     "id": "maleParts",
     "optional": true,
     "stats": ["cum"],
+    "parts": ["dick", "balls"],
     "panels": ["dick"],
     "buttons": ["cockslap", "ball_smother"],
     "entries":
@@ -1103,6 +1105,7 @@ options = [
     "id": "femaleParts",
     "optional": true,
     "stats": ["femcum"],
+    "parts": ["slit", "womb"],
     "panels": ["vagina"],
     "buttons": ["slit_toy"],
     "entries":
@@ -1212,6 +1215,7 @@ options = [
     "id": "hasBreasts",
     "optional": true,
     "panels": ["breasts"],
+    "parts": ["breasts"],
     "buttons": ["breast_crush", "breast_toy", "cleavage_stuff", "cleavage_crush", "cleavage_drop", "cleavage_absorb"],
     "entries":
     [
diff --git a/game.js b/game.js
index 5dd3dca..afd9ecc 100644
--- a/game.js
+++ b/game.js
@@ -4272,7 +4272,7 @@ function loadPreset() {
   loadSettings(presets[select.selectedIndex]);
 }
 
-function grabFormData(form, warnings, panels, buttons, stats) {
+function grabFormData(form, warnings, panels, buttons, stats, parts) {
 
   // verify that this input box is in something we enabled
 
@@ -4329,6 +4329,14 @@ function grabFormData(form, warnings, panels, buttons, stats) {
       stats.push(token);
     })
   }
+
+  if (form.hasAttribute("data-parts")) {
+    let text = form.getAttribute("data-parts");
+
+    text.split(",").forEach(function(token) {
+      parts.push(token);
+    })
+  }
 }
 
 function generateSettings() {
@@ -4339,6 +4347,7 @@ function generateSettings() {
   let panels = [];
   let buttons = [];
   let stats = [];
+  let parts = [];
 
   for (let i=0; i<form.length; i++) {
     let value = form[i].value == "" ? form[i].placeholder : form[i].value;
@@ -4350,7 +4359,7 @@ function generateSettings() {
       settings[form[i].name] = form[i].checked;
 
       if (form[i].checked) {
-        grabFormData(form[i], warnings, panels, buttons, stats);
+        grabFormData(form[i], warnings, panels, buttons, stats, parts);
       }
 
 
@@ -4358,12 +4367,12 @@ function generateSettings() {
       let name = form[i].name;
       if (form[i].checked) {
         settings[name] = form[i].value;
-        grabFormData(form[i], warnings, panels, buttons, stats);
+        grabFormData(form[i], warnings, panels, buttons, stats, parts);
       }
 
     } else if (form[i].type == "select-one") {
       settings[form[i].name] = form[i][form[i].selectedIndex].value;
-      grabFormData(form[i][form[i].selectedIndex], warnings, panels, buttons, stats);
+      grabFormData(form[i][form[i].selectedIndex], warnings, panels, buttons, stats, parts);
     }
   }
 
@@ -4372,7 +4381,8 @@ function generateSettings() {
     "warnings": warnings,
     "panels": panels,
     "buttons": buttons,
-    "stats": stats
+    "stats": stats,
+    "parts": parts
   };
 }
 
@@ -4570,6 +4580,10 @@ function startGame(e) {
     enable_stat(stat);
   });
 
+  info["parts"].forEach(function(part) {
+    enable_growth_part(part);
+  });
+
   for (var key in settings) {
     if (settings.hasOwnProperty(key)) {
       macro[key] = settings[key];
@@ -4630,7 +4644,6 @@ function startGame(e) {
 
   if (macro.tailCount > 0) {
     enable_panel("tails");
-    enable_growth_part("tail");
 
     if (macro.tailMaw) {
       if (macro.tailCount > 1) {
@@ -4645,22 +4658,6 @@ function startGame(e) {
     }
   }
 
-  if (macro.maleParts) {
-    enable_growth_part("dick");
-    enable_growth_part("balls");
-  }
-
-  if (macro.femaleParts) {
-
-    enable_growth_part("slit");
-    enable_growth_part("womb");
-
-  }
-
-  if (macro.hasBreasts) {
-    enable_growth_part("breasts");
-  }
-
   if (macro.hasPouch) {
     if (macro.oralVore) {
       enable_button("pouch_eat");
@@ -5208,6 +5205,10 @@ function attach_form_data(element, data) {
   if (data.stats != undefined) {
     element.setAttribute("data-stats", data.stats.join(","));
   }
+
+  if (data.parts != undefined) {
+    element.setAttribute("data-parts", data.parts.join(","));
+  }
 }
 
 function construct_panels() {