diff --git a/src/main/resources/XXX.json b/src/main/resources/XXX.json
new file mode 100644
index 000000000..b494681e5
--- /dev/null
+++ b/src/main/resources/XXX.json
@@ -0,0 +1,100 @@
+{
+    "variants": {
+        "connected=true,direction=north,type=normal": {
+            "model": "storagecraft:grid_connected",
+            "y": 0
+        },
+        "connected=true,direction=north,type=crafting": {
+            "model": "storagecraft:grid_connected",
+            "y": 0
+        },
+        "connected=false,direction=north,type=normal": {
+            "model": "storagecraft:grid_disconnected",
+            "y": 0
+        },
+        "connected=false,direction=north,type=crafting": {
+            "model": "storagecraft:grid_disconnected",
+            "y": 0
+        },
+        "connected=true,direction=east,type=normal": {
+            "model": "storagecraft:grid_connected",
+            "y": 90
+        },
+        "connected=true,direction=east,type=crafting": {
+            "model": "storagecraft:grid_connected",
+            "y": 90
+        },
+        "connected=false,direction=east,type=normal": {
+            "model": "storagecraft:grid_disconnected",
+            "y": 90
+        },
+        "connected=false,direction=east,type=crafting": {
+            "model": "storagecraft:grid_disconnected",
+            "y": 90
+        },
+        "connected=true,direction=south,type=normal": {
+            "model": "storagecraft:grid_connected",
+            "y": 180
+        },
+        "connected=true,direction=south,type=crafting": {
+            "model": "storagecraft:grid_connected",
+            "y": 180
+        },
+        "connected=false,direction=south,type=normal": {
+            "model": "storagecraft:grid_disconnected",
+            "y": 180
+        },
+        "connected=false,direction=south,type=crafting": {
+            "model": "storagecraft:grid_disconnected",
+            "y": 180
+        },
+        "connected=true,direction=west,type=normal": {
+            "model": "storagecraft:grid_connected",
+            "y": 270
+        },
+        "connected=true,direction=west,type=crafting": {
+            "model": "storagecraft:grid_connected",
+            "y": 270
+        },
+        "connected=false,direction=west,type=normal": {
+            "model": "storagecraft:grid_disconnected",
+            "y": 270
+        },
+        "connected=false,direction=west,type=crafting": {
+            "model": "storagecraft:grid_disconnected",
+            "y": 270
+        },
+        "connected=true,direction=up,type=normal": {
+            "model": "storagecraft:grid_connected",
+            "x": 270
+        },
+        "connected=true,direction=up,type=crafting": {
+            "model": "storagecraft:grid_connected",
+            "x": 270
+        },
+        "connected=false,direction=up,type=normal": {
+            "model": "storagecraft:grid_disconnected",
+            "x": 270
+        },
+        "connected=false,direction=up,type=crafting": {
+            "model": "storagecraft:grid_disconnected",
+            "x": 270
+        },
+        "connected=true,direction=down,type=normal": {
+            "model": "storagecraft:grid_connected",
+            "x": 90
+        },
+        "connected=true,direction=down,type=crafting": {
+            "model": "storagecraft:grid_connected",
+            "x": 90
+        },
+        "connected=false,direction=down,type=normal": {
+            "model": "storagecraft:grid_disconnected",
+            "x": 90
+        },
+        "connected=false,direction=down,type=crafting": {
+            "model": "storagecraft:grid_disconnected",
+            "x": 90
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/storagecraft/blockstates/grid.json b/src/main/resources/assets/storagecraft/blockstates/grid.json
index b494681e5..4342c728f 100644
--- a/src/main/resources/assets/storagecraft/blockstates/grid.json
+++ b/src/main/resources/assets/storagecraft/blockstates/grid.json
@@ -1,100 +1,38 @@
 {
+    "forge_marker": 1,
+    "defaults": {
+        "model": "storagecraft:grid_disconnected"
+    },
     "variants": {
-        "connected=true,direction=north,type=normal": {
-            "model": "storagecraft:grid_connected",
-            "y": 0
+        "type": {
+            "normal": {
+            },
+            "crafing": {
+            }
         },
-        "connected=true,direction=north,type=crafting": {
-            "model": "storagecraft:grid_connected",
-            "y": 0
+        "connected": {
+            "true": {
+                "model": "storagecraft:grid_connected"
+            },
+            "false": {}
         },
-        "connected=false,direction=north,type=normal": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 0
-        },
-        "connected=false,direction=north,type=crafting": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 0
-        },
-        "connected=true,direction=east,type=normal": {
-            "model": "storagecraft:grid_connected",
-            "y": 90
-        },
-        "connected=true,direction=east,type=crafting": {
-            "model": "storagecraft:grid_connected",
-            "y": 90
-        },
-        "connected=false,direction=east,type=normal": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 90
-        },
-        "connected=false,direction=east,type=crafting": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 90
-        },
-        "connected=true,direction=south,type=normal": {
-            "model": "storagecraft:grid_connected",
-            "y": 180
-        },
-        "connected=true,direction=south,type=crafting": {
-            "model": "storagecraft:grid_connected",
-            "y": 180
-        },
-        "connected=false,direction=south,type=normal": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 180
-        },
-        "connected=false,direction=south,type=crafting": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 180
-        },
-        "connected=true,direction=west,type=normal": {
-            "model": "storagecraft:grid_connected",
-            "y": 270
-        },
-        "connected=true,direction=west,type=crafting": {
-            "model": "storagecraft:grid_connected",
-            "y": 270
-        },
-        "connected=false,direction=west,type=normal": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 270
-        },
-        "connected=false,direction=west,type=crafting": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 270
-        },
-        "connected=true,direction=up,type=normal": {
-            "model": "storagecraft:grid_connected",
-            "x": 270
-        },
-        "connected=true,direction=up,type=crafting": {
-            "model": "storagecraft:grid_connected",
-            "x": 270
-        },
-        "connected=false,direction=up,type=normal": {
-            "model": "storagecraft:grid_disconnected",
-            "x": 270
-        },
-        "connected=false,direction=up,type=crafting": {
-            "model": "storagecraft:grid_disconnected",
-            "x": 270
-        },
-        "connected=true,direction=down,type=normal": {
-            "model": "storagecraft:grid_connected",
-            "x": 90
-        },
-        "connected=true,direction=down,type=crafting": {
-            "model": "storagecraft:grid_connected",
-            "x": 90
-        },
-        "connected=false,direction=down,type=normal": {
-            "model": "storagecraft:grid_disconnected",
-            "x": 90
-        },
-        "connected=false,direction=down,type=crafting": {
-            "model": "storagecraft:grid_disconnected",
-            "x": 90
+        "direction": {
+            "north": {},
+            "east": {
+                "y": 90
+            },
+            "south": {
+                "y": 180
+            },
+            "west": {
+                "y": 270
+            },
+            "up": {
+                "x": 270
+            },
+            "down": {
+                "x": 90
+            }
         }
     }
-}
\ No newline at end of file
+} 
\ No newline at end of file