diff --git a/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml b/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml
new file mode 100644
index 0000000000..b73a7f60b3
--- /dev/null
+++ b/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml
@@ -0,0 +1,39 @@
+- type: entity
+  name: spanish army knife
+  parent: BaseItem
+  id: ToolDebug
+  description: The pain of using this is almost too great to bear.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/debug.rsi
+    state: icon
+  - type: Clothing
+    sprite: Objects/Tools/debug.rsi
+    QuickEquip: false
+    Slots:
+      - Belt
+  - type: MeleeWeapon
+    damage: 10
+  - type: TilePrying
+  - type: Tool
+    qualities:
+      - Prying
+    statusShowBehavior: true
+  - type: MultiTool
+    tools:
+      - behavior: Prying
+        state: icon
+        useSound: /Audio/Items/jaws_pry.ogg
+        changeSound: /Audio/Items/change_jaws.ogg
+      - behavior: Cutting
+        state: icon
+        useSound: /Audio/Items/jaws_cut.ogg
+        changeSound: /Audio/Items/change_jaws.ogg
+      - behavior: Screwing
+        state: icon
+        useSound: /Audio/Items/drill_use.ogg
+        changeSound: /Audio/Items/change_drill.ogg
+      - behavior: Anchoring
+        state: icon
+        useSound: /Audio/Items/drill_use.ogg
+        changeSound: /Audio/Items/change_drill.ogg
diff --git a/Resources/Prototypes/EntityLists/Tools/construction.yml b/Resources/Prototypes/EntityLists/Tools/construction.yml
new file mode 100644
index 0000000000..d17395d4b1
--- /dev/null
+++ b/Resources/Prototypes/EntityLists/Tools/construction.yml
@@ -0,0 +1,6 @@
+- type: entityList
+  id: tools
+  entities:
+  - WelderExperimental
+  - ToolDebug
+  - Multitool
diff --git a/Resources/Prototypes/EntityLists/Cow/cow_tools.yml b/Resources/Prototypes/EntityLists/Tools/cow.yml
similarity index 89%
rename from Resources/Prototypes/EntityLists/Cow/cow_tools.yml
rename to Resources/Prototypes/EntityLists/Tools/cow.yml
index 7c940b52d3..8c32ff9dac 100644
--- a/Resources/Prototypes/EntityLists/Cow/cow_tools.yml
+++ b/Resources/Prototypes/EntityLists/Tools/cow.yml
@@ -1,5 +1,5 @@
 - type: entityList
-  id: CowTools
+  id: cowtools
   entities:
   - Haycutters
   - Moodriver
diff --git a/Resources/Prototypes/EntityLists/Surgery/command_tools.yml b/Resources/Prototypes/EntityLists/Tools/surgery.yml
similarity index 64%
rename from Resources/Prototypes/EntityLists/Surgery/command_tools.yml
rename to Resources/Prototypes/EntityLists/Tools/surgery.yml
index 02ecb678e0..20f689d272 100644
--- a/Resources/Prototypes/EntityLists/Surgery/command_tools.yml
+++ b/Resources/Prototypes/EntityLists/Tools/surgery.yml
@@ -1,10 +1,10 @@
 - type: entityList
-  id: SurgeryToolsBasic
+  id: surgerytools
   entities:
   - Cautery
   - Drill
-  - Scalpel
+  - ScalpelLaser
   - Retractor
   - Hemostat
-  - Saw
+  - SawAdvanced
 # - Drapes
diff --git a/Resources/Textures/Objects/Tools/debug.rsi/icon.png b/Resources/Textures/Objects/Tools/debug.rsi/icon.png
new file mode 100644
index 0000000000..3c9d723e6f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/debug.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/debug.rsi/meta.json b/Resources/Textures/Objects/Tools/debug.rsi/meta.json
new file mode 100644
index 0000000000..3a4683f28c
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/debug.rsi/meta.json
@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from baystation and modified by Swept at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177",  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}