diff --git a/src/main/java/storagecraft/proxy/ClientProxy.java b/src/main/java/storagecraft/proxy/ClientProxy.java
index c9e6aceb7..cade282cc 100644
--- a/src/main/java/storagecraft/proxy/ClientProxy.java
+++ b/src/main/java/storagecraft/proxy/ClientProxy.java
@@ -6,6 +6,7 @@ import net.minecraft.client.resources.model.ModelBakery;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.item.Item;
 import net.minecraftforge.client.MinecraftForgeClient;
+import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -97,8 +98,9 @@ public class ClientProxy extends CommonProxy
 
 		mesher.register(StorageCraftItems.WIRELESS_GRID_PLATE, 0, new ModelResourceLocation("storagecraft:wireless_grid_plate", "inventory"));
 
+		ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.GRID), 0, new ModelResourceLocation("storagecraft:grid", "inventory"));
 		// Blocks
-		mesher.register(Item.getItemFromBlock(StorageCraftBlocks.GRID), 0, new ModelResourceLocation("storagecraft:grid", "inventory"));
-		mesher.register(Item.getItemFromBlock(StorageCraftBlocks.GRID), 1, new ModelResourceLocation("storagecraft:grid", "inventory"));
+		//mesher.register(Item.getItemFromBlock(StorageCraftBlocks.GRID), 0, new ModelResourceLocation("storagecraft:grid", "inventory"));
+		//mesher.register(Item.getItemFromBlock(StorageCraftBlocks.GRID), 1, new ModelResourceLocation("storagecraft:grid", "inventory"));
 	}
 }
diff --git a/src/main/resources/assets/storagecraft/blockstates/grid.json b/src/main/resources/assets/storagecraft/blockstates/grid.json
index e9446407f..22013c460 100644
--- a/src/main/resources/assets/storagecraft/blockstates/grid.json
+++ b/src/main/resources/assets/storagecraft/blockstates/grid.json
@@ -1,5 +1,13 @@
 {
     "forge_marker": 1,
+    "defaults": {
+        "model": "orientable",
+        "transform": "forge:default-block",
+        "textures": {
+            "side": "storagecraft:blocks/side",
+            "top": "storagecraft:blocks/side"
+        }
+    },
     "variants": {
         "type": {
             "normal": {
@@ -9,10 +17,14 @@
         },
         "connected": {
             "true": {
-                "model": "storagecraft:grid_connected"
+                "textures": {
+                    "front": "storagecraft:blocks/grid_connected"
+                }
             },
             "false": {
-                "model": "storagecraft:grid_disconnected"
+                "textures": {
+                    "front": "storagecraft:blocks/grid_disconnected"
+                }
             }
         },
         "direction": {
@@ -35,5 +47,15 @@
                 "x": 90
             }
         }
-    }
+    },
+    "inventory": [
+        {
+            "textures": {
+                "side": "storagecraft:blocks/side",
+                "top": "storagecraft:blocks/side",
+                "front": "storagecraft:blocks/grid_disconnected"
+            },
+            "y": 270
+        }
+    ]
 } 
\ No newline at end of file
diff --git a/src/main/resources/assets/storagecraft/models/block/grid_connected.json b/src/main/resources/assets/storagecraft/models/block/grid_connected.json
deleted file mode 100644
index 15134560b..000000000
--- a/src/main/resources/assets/storagecraft/models/block/grid_connected.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "parent": "block/orientable",
-    "textures": {
-        "top": "storagecraft:blocks/side",
-        "front": "storagecraft:blocks/grid_connected",
-        "side": "storagecraft:blocks/side"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/storagecraft/models/block/grid_disconnected.json b/src/main/resources/assets/storagecraft/models/block/grid_disconnected.json
deleted file mode 100644
index d7b860f58..000000000
--- a/src/main/resources/assets/storagecraft/models/block/grid_disconnected.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "parent": "block/orientable",
-    "textures": {
-        "top": "storagecraft:blocks/side",
-        "front": "storagecraft:blocks/grid_disconnected",
-        "side": "storagecraft:blocks/side"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/storagecraft/models/item/grid.json b/src/main/resources/assets/storagecraft/models/item/grid.json
deleted file mode 100644
index 7677c6311..000000000
--- a/src/main/resources/assets/storagecraft/models/item/grid.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "parent": "storagecraft:block/grid_disconnected",
-    "display": {
-        "thirdperson": {
-            "rotation": [10, -45, 170],
-            "translation": [0, 1.5, -2.75],
-            "scale": [0.375, 0.375, 0.375]
-        }
-    }
-}
-