diff --git a/CHANGELOG.md b/CHANGELOG.md
index d523292..754eb0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release Notes
 
+### Version 2.16.2
+Added Organ Grinder!
+
+---
+
 ### Version 2.16.1
 Updated character night order to be consistent with script tool
 
diff --git a/src/assets/icons/organgrinder.png b/src/assets/icons/organgrinder.png
new file mode 100644
index 0000000..81394a5
Binary files /dev/null and b/src/assets/icons/organgrinder.png differ
diff --git a/src/hatred.json b/src/hatred.json
index a30bb1c..86ac4ce 100644
--- a/src/hatred.json
+++ b/src/hatred.json
@@ -372,5 +372,30 @@
         "reason": "If the Lleech has poisoned the Heretic then the Lleech dies, the Heretic remains poisoned."
       }
     ]
+  },
+  {
+    "id": "Organ Grinder",
+    "hatred": [
+      {
+        "id": "Butler",
+        "reason": "If the Organ Grinder is causing eyes closed voting, the Butler may raise their hand to vote but their vote is only counted if their master voted too."
+      },
+      {
+        "id": "Flowergirl",
+        "reason":  "If players' eyes were closed during the nominations, the Flowergirl learns how many times the Demon voted."
+      },
+      {
+        "id": "Lil' Monsta",
+        "reason": "Votes for the Organ Grinder count if the Organ Grinder is babysitting Lil' Monsta."
+      },
+      {
+        "id": "Minstrel",
+        "reason": "Only 1 jinxed character can be in play. Evil players start knowing which player and character it is."
+      },
+      {
+        "id": "Preacher",
+        "reason": "Only 1 jinxed character can be in play. Evil players start knowing which player and character it is."
+      }
+    ]
   }
 ]
diff --git a/src/roles.json b/src/roles.json
index 42c6a78..5e3e4f1 100644
--- a/src/roles.json
+++ b/src/roles.json
@@ -1637,6 +1637,19 @@
     "setup": false,
     "ability": "If you are executed, all but 3 players die. 1 minute later, the player with the most players pointing at them dies."
   },
+  {
+    "id": "organgrinder",
+    "name": "Organ Grinder",
+    "edition": "",
+    "team": "minion",
+    "firstNight": 0,
+    "firstNightReminder": "",
+    "otherNight": 0,
+    "otherNightReminder": "",
+    "reminders": ["About to die"],
+    "setup": false,
+    "ability": "All players keep their eyes closed when voting & the vote tally is secret. Votes for you only count if you vote."
+  },
   {
     "id": "lilmonsta",
     "name": "Lil' Monsta",