diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/blocks/fabricator.block.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/blocks/fabricator.block.json
index 29fa48e..47665a3 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/blocks/fabricator.block.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/blocks/fabricator.block.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "1.21.50",
+  "format_version": "1.21.60",
   "minecraft:block": {
     "description": {
       "identifier": "mikeamm_gwve:fabricator",
@@ -31,10 +31,28 @@
         "catch_chance_modifier": 5
       },
       "minecraft:geometry": "geometry.mikeamm_gwve_fabricator",
+      "minecraft:liquid_detection": {
+        "detection_rules": [
+          {
+            "liquid_type": "water",
+            "on_liquid_touches": "broken"
+          }
+        ]
+      },
+      "minecraft:item_visual": {
+        "geometry": "geometry.mikeamm_gwve_fabricator_in_hand",
+        "material_instances": {
+          "*": {
+            "texture": "mikeamm_gwve_fabricator_in_hand",
+            "render_method": "alpha_test"
+          }
+        }
+      },
       "minecraft:material_instances": {
         "*": {
           "texture": "mikeamm_gwve_fabricator",
-          "render_method": "alpha_test"
+          "render_method": "alpha_test",
+          "ambient_occlusion": 1
         }
       },
       "minecraft:light_emission": 7,
diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/axe_turret_kit.item.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/axe_turret_kit.item.json
index 0a9c848..b936813 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/axe_turret_kit.item.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/axe_turret_kit.item.json
@@ -4,7 +4,7 @@
     "description": {
       "identifier": "mikeamm_gwve:axe_turret_kit",
       "menu_category": {
-        "category": "items"
+        "category": "equipment"
       }
     },
     "components": {
diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/bow_turret_kit.item.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/bow_turret_kit.item.json
index b85aae0..00fafef 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/bow_turret_kit.item.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/bow_turret_kit.item.json
@@ -4,7 +4,7 @@
     "description": {
       "identifier": "mikeamm_gwve:bow_turret_kit",
       "menu_category": {
-        "category": "items"
+        "category": "equipment"
       }
     },
     "components": {
diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/crossbow_turret_kit.item.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/crossbow_turret_kit.item.json
index 174eaa9..cf3aeb7 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/crossbow_turret_kit.item.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/crossbow_turret_kit.item.json
@@ -4,7 +4,7 @@
     "description": {
       "identifier": "mikeamm_gwve:crossbow_turret_kit",
       "menu_category": {
-        "category": "items"
+        "category": "equipment"
       }
     },
     "components": {
diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/depleted_gray_shard.item.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/depleted_gray_shard.item.json
index b925d64..d6fcb42 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/depleted_gray_shard.item.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/depleted_gray_shard.item.json
@@ -4,7 +4,7 @@
     "description": {
       "identifier": "mikeamm_gwve:depleted_gray_shard",
       "menu_category": {
-        "category": "items"
+        "category": "equipment"
       }
     },
     "components": {
diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/gray_wave_generator_kit.item.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/gray_wave_generator_kit.item.json
index 37302f5..8ff20cc 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/gray_wave_generator_kit.item.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/gray_wave_generator_kit.item.json
@@ -4,7 +4,7 @@
     "description": {
       "identifier": "mikeamm_gwve:gray_wave_generator_kit",
       "menu_category": {
-        "category": "items"
+        "category": "equipment"
       }
     },
     "components": {
diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/shbullet_turret_kit.item.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/shbullet_turret_kit.item.json
index 176f1ec..dccf855 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/shbullet_turret_kit.item.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/shbullet_turret_kit.item.json
@@ -4,7 +4,7 @@
     "description": {
       "identifier": "mikeamm_gwve:shbullet_turret_kit",
       "menu_category": {
-        "category": "items"
+        "category": "equipment"
       }
     },
     "components": {
diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/smfireball_turret_kit.item.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/smfireball_turret_kit.item.json
index 6b4010f..4955ec8 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/smfireball_turret_kit.item.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/smfireball_turret_kit.item.json
@@ -4,7 +4,7 @@
     "description": {
       "identifier": "mikeamm_gwve:smfireball_turret_kit",
       "menu_category": {
-        "category": "items"
+        "category": "equipment"
       }
     },
     "components": {
diff --git a/casual_creator/gray_wave/resource_packs/mikeamm_gwve/models/blocks/fabricator_in_hand.geo.json b/casual_creator/gray_wave/resource_packs/mikeamm_gwve/models/blocks/fabricator_in_hand.geo.json
new file mode 100644
index 0000000..df4f7ac
--- /dev/null
+++ b/casual_creator/gray_wave/resource_packs/mikeamm_gwve/models/blocks/fabricator_in_hand.geo.json
@@ -0,0 +1,51 @@
+{
+	"format_version": "1.19.0",
+	"minecraft:geometry": [
+		{
+			"description": {
+				"identifier": "geometry.mikeamm_gwve_fabricator_in_hand",
+				"texture_width": 64,
+				"texture_height": 64,
+				"visible_bounds_width": 4,
+				"visible_bounds_height": 2.5,
+				"visible_bounds_offset": [0, 0.75, 0]
+			},
+			"bones": [
+				{
+					"name": "bone",
+					"pivot": [8, 0, -8],
+					"cubes": [
+						{
+							"origin": [-8, 0, -8],
+							"size": [16, 2, 16],
+							"uv": {
+								"north": {"uv": [0, 32], "uv_size": [16, 2]},
+								"east": {"uv": [0, 34], "uv_size": [16, 2]},
+								"south": {"uv": [0, 36], "uv_size": [16, 2]},
+								"west": {"uv": [0, 38], "uv_size": [16, 2]},
+								"up": {"uv": [0, 0], "uv_size": [16, 16]},
+								"down": {"uv": [0, 32], "uv_size": [16, -16]}
+							}
+						},
+						{"origin": [5, 2, -7], "size": [2, 13, 2], "uv": [0, 0]},
+						{"origin": [-7, 2, -7], "size": [2, 13, 2], "uv": [0, 0]},
+						{"origin": [-7, 2, 5], "size": [2, 13, 2], "uv": [0, 0]},
+						{"origin": [5, 2, 5], "size": [2, 13, 2], "uv": [2, 9]},
+						{
+							"origin": [-8, 15, -8],
+							"size": [16, 2, 16],
+							"uv": {
+								"north": {"uv": [0, 32], "uv_size": [16, 2]},
+								"east": {"uv": [0, 34], "uv_size": [16, 2]},
+								"south": {"uv": [0, 36], "uv_size": [16, 2]},
+								"west": {"uv": [0, 38], "uv_size": [16, 2]},
+								"up": {"uv": [0, 0], "uv_size": [16, 16]},
+								"down": {"uv": [0, 32], "uv_size": [16, -16]}
+							}
+						}
+					]
+				}
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/casual_creator/gray_wave/resource_packs/mikeamm_gwve/textures/mikeamm/gray_wave/blocks/fabricator_in_hand.png b/casual_creator/gray_wave/resource_packs/mikeamm_gwve/textures/mikeamm/gray_wave/blocks/fabricator_in_hand.png
new file mode 100644
index 0000000..2bc6754
Binary files /dev/null and b/casual_creator/gray_wave/resource_packs/mikeamm_gwve/textures/mikeamm/gray_wave/blocks/fabricator_in_hand.png differ
diff --git a/casual_creator/gray_wave/resource_packs/mikeamm_gwve/textures/terrain_texture.json b/casual_creator/gray_wave/resource_packs/mikeamm_gwve/textures/terrain_texture.json
index 0eb3d73..72d4cb3 100644
--- a/casual_creator/gray_wave/resource_packs/mikeamm_gwve/textures/terrain_texture.json
+++ b/casual_creator/gray_wave/resource_packs/mikeamm_gwve/textures/terrain_texture.json
@@ -7,6 +7,9 @@
     "mikeamm_gwve_fabricator": {
       "textures": "textures/mikeamm/gray_wave/blocks/fabricator.png"
     },
+    "mikeamm_gwve_fabricator_in_hand": {
+      "textures": "textures/mikeamm/gray_wave/blocks/fabricator_in_hand.png"
+    },
     "mikeamm_gwve_gray_ore": {
       "textures": "textures/mikeamm/gray_wave/blocks/gray_ore.png"
     }
diff --git a/custom_blocks/.vscode/launch.json b/custom_blocks/.vscode/launch.json
index 7805a7d..929d7ea 100644
--- a/custom_blocks/.vscode/launch.json
+++ b/custom_blocks/.vscode/launch.json
@@ -1,15 +1,14 @@
 {
-    "version": "0.2.0",
+    "version": "0.3.0",
     "configurations": [
       {
         "type": "minecraft-js",
-        "request": "attach",
-        "name": "Debug with Minecraft",
+        "port": 19144,
         "mode": "listen",
-        "preLaunchTask": "build",
+        "name": "Debug with Minecraft",
+        "preLaunchTask": "buildandeploy",
         "sourceMapRoot": "${workspaceFolder}/dist/debug/",
-        "generatedSourceRoot": "${workspaceFolder}/dist/scripts/",
-        "port": 19144
+        "generatedSourceRoot": "${workspaceFolder}/dist/scripts/"
       }
     ]
   }
\ No newline at end of file
diff --git a/custom_blocks/.vscode/tasks.json b/custom_blocks/.vscode/tasks.json
index a75ea4e..6e7a14c 100644
--- a/custom_blocks/.vscode/tasks.json
+++ b/custom_blocks/.vscode/tasks.json
@@ -1,12 +1,12 @@
 {
   "version": "2.0.0",
-  "tasks": [     
-      {
-        "label": "build",
-        "dependsOrder": "sequence",
-        "dependsOn": [
-            "gulp: default"
-        ]
+  "tasks": [
+    {
+      "type": "npm",
+      "label": "buildandeploy",
+      "group": "build",
+      "script": "local-deploy",
+      "dependsOrder": "sequence"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/custom_blocks/behavior_packs/custom_blocks/blocks/blue_bubble_fish.json b/custom_blocks/behavior_packs/custom_blocks/blocks/blue_bubble_fish.json
index 97cd91b..1c04947 100644
--- a/custom_blocks/behavior_packs/custom_blocks/blocks/blue_bubble_fish.json
+++ b/custom_blocks/behavior_packs/custom_blocks/blocks/blue_bubble_fish.json
@@ -90,7 +90,8 @@
         "*": {
           "texture": "bubble_fish_blue",
           "render_method": "blend",
-          "face_dimming": true
+          "face_dimming": true,
+          "ambient_occlusion": 1
         }
       }
     }
diff --git a/custom_blocks/resource_packs/custom_blocks/blocks.json b/custom_blocks/resource_packs/custom_blocks/blocks.json
index 1b4a7fc..67fb816 100644
--- a/custom_blocks/resource_packs/custom_blocks/blocks.json
+++ b/custom_blocks/resource_packs/custom_blocks/blocks.json
@@ -11,7 +11,7 @@
     },
     "carried_textures": "die_red",
     "isotropic": true,
-    "brightness_gamma": 1,
+    "ambient_occlusion_exponent": 1,
     "sound": "stone"
   },
   "demo:tuna_roll": {