diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
index 450db6154..7d3d82547 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
@@ -198,7 +198,7 @@ object DataGen {
 		for ((i, glass) in MRegistry.INDUSTRIAL_GLASS_PANE.blocks.withIndex()) {
 			val name = MRegistry.INDUSTRIAL_GLASS.blocks[i].registryName!!.path
 			val textureSide = ResourceLocation(MOD_ID, "block/decorative/$name")
-			val textureRailing = textureSide
+			val textureRailing = ResourceLocation(MOD_ID, "block/decorative/industrial_glass_frame")
 			pane(glass, textureSide, textureRailing)
 		}
 
diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java b/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java
index cbcdbd1f4..49da53a19 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java
@@ -48,11 +48,14 @@ public class TritaniumArmorModel {
 		PartDefinition partdefinition = meshdefinition.getRoot();
 
 		PartDefinition head = partdefinition.addOrReplaceChild("head", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, -8.3F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.51F))
-		.texOffs(32, 0).addBox(-4.0F, -8.3F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.7F))
-		.texOffs(44, 47).addBox(-4.0F, -8.6F, -5.6F, 8.0F, 2.0F, 2.0F, new CubeDeformation(0.5F))
-		.texOffs(46, 52).addBox(-3.0F, -7.6F, 4.4F, 6.0F, 2.0F, 1.0F, new CubeDeformation(0.5F)), PartPose.offset(0.0F, 0.0F, 0.0F));
+				.texOffs(0, 53).addBox(-4.0F, -0.3F, -5.0F, 8.0F, 0.0F, 1.0F, new CubeDeformation(0.52F))
+				.texOffs(32, 0).addBox(-4.0F, -8.3F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.7F))
+				.texOffs(46, 52).addBox(-3.0F, -7.6F, 4.4F, 6.0F, 2.0F, 1.0F, new CubeDeformation(0.5F))
+				.texOffs(0, 58).addBox(-4.0F, -5.4F, -4.9F, 8.0F, 5.0F, 1.0F, new CubeDeformation(0.5F))
+				.texOffs(0, 42).addBox(-5.5F, -3.7F, -4.0F, 2.0F, 4.0F, 7.0F, new CubeDeformation(0.0F))
+				.texOffs(0, 42).addBox(3.5F, -3.7F, -4.0F, 2.0F, 4.0F, 7.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F));
 
-		PartDefinition Helmet_r1 = head.addOrReplaceChild("Helmet_r1", CubeListBuilder.create().texOffs(44, 47).addBox(-4.0F, 0.5F, 0.5F, 8.0F, 1.0F, 2.0F, new CubeDeformation(0.49F)), PartPose.offsetAndRotation(0.0F, -6.1F, -6.1F, 1.1781F, 0.0F, 0.0F));
+		PartDefinition cube_r1 = head.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(0, 55).addBox(-4.0F, -1.2F, -0.04F, 8.0F, 2.0F, 1.0F, new CubeDeformation(0.5F)), PartPose.offsetAndRotation(0.0F, -7.0F, -4.5F, -0.3054F, 0.0F, 0.0F));
 
 		PartDefinition hat = partdefinition.addOrReplaceChild("hat", CubeListBuilder.create(), PartPose.offset(0.0F, 24.0F, 0.0F));
 
diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json
index ab0140a49..be31b8d37 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json
@@ -1,24 +1,325 @@
 {
-	"loader": "forge:separate-perspective",
-	"gui_light": "front",
-	"base": {
-		"parent": "minecraft:item/handheld",
-		"textures": {
-			"layer0": "overdrive_that_matters:item/swordicon"
-		}
+	"textures": {
+		"0": "overdrive_that_matters:item/energy_sword",
+		"1": "overdrive_that_matters:item/energy_sword_charge"
 	},
-	"perspectives": {
-		"third_person_right_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
+	"elements": [
+		{
+			"name": "handle",
+			"from": [7.5, 0, 10],
+			"to": [8.5, 6, 11],
+			"faces": {
+				"north": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
+				"east": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
+				"south": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
+				"west": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
+				"down": {"uv": [0, 14, 0.5, 14.5], "texture": "#0"}
+			}
 		},
-		"third_person_left_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
+		{
+			"name": "blade",
+			"from": [7.7, 11, 10.3],
+			"to": [8.2, 17, 11.2],
+			"faces": {
+				"north": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
+				"east": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
+				"south": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
+				"west": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
+				"down": {"uv": [6, 2.5, 6.5, 3], "texture": "#0"}
+			}
 		},
-		"first_person_right_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
+		{
+			"name": "handle",
+			"from": [7.6, 0, 8],
+			"to": [8.2, 1, 10],
+			"faces": {
+				"north": {"uv": [2.5, 5, 2.8, 5.5], "texture": "#0"},
+				"east": {"uv": [4, 5, 3, 5.5], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
+				"west": {"uv": [3, 5, 4, 5.5], "texture": "#0"},
+				"up": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"},
+				"down": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"}
+			}
 		},
-		"first_person_left_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
+		{
+			"name": "handle",
+			"from": [7.6, 5, 8],
+			"to": [8.2, 6, 10],
+			"faces": {
+				"north": {"uv": [2.5, 2.5, 2.8, 3], "texture": "#0"},
+				"east": {"uv": [4, 2.5, 3, 3], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
+				"west": {"uv": [3, 2.5, 4, 3], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.3, 1], "texture": "#missing"},
+				"down": {"uv": [2.5, 2.5, 2.8, 3.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "handle",
+			"from": [7.6, 1, 8],
+			"to": [8.2, 5, 9],
+			"faces": {
+				"north": {"uv": [2.5, 3, 2.8, 5], "texture": "#0"},
+				"east": {"uv": [3, 3, 3.5, 5], "texture": "#0"},
+				"south": {"uv": [3, 3, 3.3, 5], "texture": "#0"},
+				"west": {"uv": [3, 3, 3.5, 5], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "button",
+			"from": [7.7, 5, 11],
+			"to": [8.3, 6, 11.4],
+			"faces": {
+				"north": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
+				"east": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"},
+				"south": {"uv": [0.5, 11, 0.8, 11.5], "texture": "#0"},
+				"west": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.3, 0.2], "texture": "#missing"},
+				"down": {"uv": [0.5, 11, 0.8, 11.2], "texture": "#0"}
+			}
+		},
+		{
+			"name": "blade",
+			"from": [7.6, 7, 7.3],
+			"to": [8.4, 12, 11.3],
+			"faces": {
+				"north": {"uv": [0, 8.5, 0.4, 11], "texture": "#0"},
+				"east": {"uv": [15.5, 8.5, 13.5, 11], "texture": "#0"},
+				"south": {"uv": [2, 8.5, 2.4, 11], "texture": "#0"},
+				"west": {"uv": [13.5, 8.5, 15.5, 11], "texture": "#0"},
+				"up": {"uv": [0.5, 8.5, 2, 8.9], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.4, 1.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "blade",
+			"from": [7.6, 14, 7.3],
+			"to": [8.4, 29, 11.3],
+			"faces": {
+				"north": {"uv": [0, 0, 0.4, 7.5], "texture": "#0"},
+				"east": {"uv": [15.5, 0, 13.5, 7.5], "texture": "#0"},
+				"south": {"uv": [15.6, 0, 16, 7.5], "texture": "#0"},
+				"west": {"uv": [13.5, 0, 15.5, 7.5], "texture": "#0"},
+				"up": {"uv": [0.5, 0, 2, 0.4], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [2, 8.5, 2.4, 10], "texture": "#0"}
+			}
+		},
+		{
+			"name": "blade",
+			"from": [7.6, 12, 7.3],
+			"to": [8.4, 13, 10.8],
+			"faces": {
+				"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
+				"east": {"uv": [15.25, 8, 13.5, 8.5], "texture": "#0"},
+				"south": {"uv": [15.5, 8, 15.9, 8.5], "texture": "#0"},
+				"west": {"uv": [13.5, 8, 15.25, 8.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "blade",
+			"from": [7.6, 13, 7.3],
+			"to": [8.4, 13.5, 10.8],
+			"faces": {
+				"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
+				"east": {"uv": [15.25, 7.75, 13.5, 8], "texture": "#0"},
+				"south": {"uv": [15.5, 7.5, 15.9, 7.75], "texture": "#0"},
+				"west": {"uv": [13.5, 7.75, 15.25, 8], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "blade",
+			"from": [7.6, 13.5, 7.3],
+			"to": [8.4, 14, 11.3],
+			"faces": {
+				"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
+				"east": {"uv": [15.5, 7.5, 13.5, 7.75], "texture": "#0"},
+				"south": {"uv": [2, 7.5, 2.4, 7.75], "texture": "#0"},
+				"west": {"uv": [13.5, 7.5, 15.5, 7.75], "texture": "#0"},
+				"up": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"},
+				"down": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "handle",
+			"from": [7, 6, 7],
+			"to": [9, 7, 12],
+			"faces": {
+				"north": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"},
+				"east": {"uv": [3.5, 8, 4, 5.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"},
+				"west": {"uv": [3.5, 5.5, 4, 8], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [2.5, 8, 3.5, 5.5], "texture": "#0"},
+				"down": {"uv": [2.5, 5.5, 3.5, 8], "texture": "#0"}
+			}
+		},
+		{
+			"name": "battery",
+			"from": [7.3, 7, 9.8],
+			"to": [8.7, 10, 11.8],
+			"faces": {
+				"north": {"uv": [4.5, 0, 5.3, 1.5], "texture": "#0"},
+				"east": {"uv": [3.5, 0, 2.5, 1.5], "texture": "#0"},
+				"south": {"uv": [3.5, 0, 4.3, 1.5], "texture": "#0"},
+				"west": {"uv": [2.5, 0, 3.5, 1.5], "texture": "#0"},
+				"up": {"uv": [2.5, 1.5, 3.5, 2.3], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.8, 1], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [9, 7.1, 6.3],
+			"to": [9, 8.1, 12.3],
+			"faces": {
+				"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+				"east": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"},
+				"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+				"west": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"},
+				"up": {"uv": [0, 0, 0, 3], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0, 3], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [7, 7.1, 6.3],
+			"to": [7, 8.1, 12.3],
+			"faces": {
+				"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+				"east": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"},
+				"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+				"west": {"uv": [5.5, 8.5, 2.5, 9], "texture": "#0"},
+				"up": {"uv": [0, 0, 0, 3], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0, 3], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [7, 7.1, 12.3],
+			"to": [9, 8.1, 12.3],
+			"faces": {
+				"north": {"uv": [5.5, 9.5, 6.5, 10], "texture": "#0"},
+				"east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+				"south": {"uv": [5.5, 9.5, 6.5, 10], "texture": "#0"},
+				"west": {"uv": [0, 0, 0, 0.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 1, 0], "texture": "#missing"},
+				"down": {"uv": [0, 0, 1, 0], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [7, 5.1, 6.3],
+			"to": [7, 7.1, 7.3],
+			"faces": {
+				"north": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"east": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
+				"south": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"west": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [9, 5.1, 6.3],
+			"to": [9, 7.1, 7.3],
+			"faces": {
+				"north": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"east": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
+				"south": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"west": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [7, 5.1, 6.3],
+			"to": [9, 8.1, 6.3],
+			"faces": {
+				"north": {"uv": [7, 8.5, 8.5, 10], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
+				"south": {"uv": [7, 8.5, 8.5, 10], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
+				"up": {"uv": [2.5, 11, 3.5, 11.5], "texture": "#0"},
+				"down": {"uv": [2, 11, 3, 11.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "charge",
+			"from": [7.1, 7, 6.9],
+			"to": [8.8, 29.3, 12],
+			"faces": {
+				"north": {"uv": [2.45, 1, 3.45, 12], "texture": "#1"},
+				"east": {"uv": [0, 1, 2.5, 12], "texture": "#1"},
+				"south": {"uv": [6, 1, 7, 12], "texture": "#1"},
+				"west": {"uv": [3.5, 1, 6, 12], "texture": "#1"},
+				"up": {"uv": [3.5, 0, 6, 1], "rotation": 90, "texture": "#1"},
+				"down": {"uv": [0, 0, 1, 2.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "capacitor",
+			"from": [7.5, 7.4, 10.5],
+			"to": [8.5, 8.4, 13.5],
+			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 8.5, 12.5]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
+				"east": {"uv": [7.5, 0.5, 8, 2], "rotation": 270, "texture": "#0"},
+				"south": {"uv": [7.5, 0, 8, 0.5], "texture": "#0"},
+				"west": {"uv": [7.5, 0.5, 8, 2], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7.5, 0.5, 8, 2], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [7.5, 0.5, 8, 2], "texture": "#0"}
+			}
+		},
+		{
+			"name": "capacitor",
+			"from": [7.5, 8.9, 11],
+			"to": [8.5, 9.9, 14],
+			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 8.5, 12.5]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
+				"east": {"uv": [7.5, 0.5, 8, 2], "rotation": 270, "texture": "#0"},
+				"south": {"uv": [7.5, 0, 8, 0.5], "texture": "#0"},
+				"west": {"uv": [7.5, 0.5, 8, 2], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7.5, 0.5, 8, 2], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [7.5, 0.5, 8, 2], "texture": "#0"}
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 3, -1]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 3, -1]
+		},
+		"firstperson_righthand": {
+			"rotation": [20, 0, 0],
+			"translation": [0, 1.75, -4.25]
+		},
+		"firstperson_lefthand": {
+			"rotation": [20, 0, 0],
+			"translation": [0, 1.75, -4.25]
+		},
+		"ground": {
+			"rotation": [13, 0, 0],
+			"translation": [0, 5, -2.25]
+		},
+		"gui": {
+			"rotation": [90, 42, -90],
+			"translation": [-4.75, -2.25, 0],
+			"scale": [0.8, 0.8, 0.8]
+		},
+		"fixed": {
+			"rotation": [90, -45, 90],
+			"translation": [5.5, -3.5, -1]
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json
deleted file mode 100644
index 884aa4211..000000000
--- a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json
+++ /dev/null
@@ -1,205 +0,0 @@
-{
-	"textures": {
-		"0": "overdrive_that_matters:item/energy_sword"
-	},
-	"elements": [
-		{
-			"name": "handle",
-			"from": [7.4, 0, 10],
-			"to": [8.4, 6, 11],
-			"faces": {
-				"north": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"east": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"south": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"west": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
-				"down": {"uv": [0, 14, 0.5, 14.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.6, 11, 10],
-			"to": [8.1, 17, 10.9],
-			"faces": {
-				"north": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"east": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"south": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"west": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
-				"down": {"uv": [0, 14, 0.5, 14.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "handle",
-			"from": [7.6, 0, 8],
-			"to": [8.2, 1, 10],
-			"faces": {
-				"north": {"uv": [2.5, 5, 2.8, 5.5], "texture": "#0"},
-				"east": {"uv": [4, 5, 3, 5.5], "texture": "#0"},
-				"south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
-				"west": {"uv": [3, 5, 4, 5.5], "texture": "#0"},
-				"up": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"},
-				"down": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "handle",
-			"from": [7.6, 5, 8],
-			"to": [8.2, 6, 10],
-			"faces": {
-				"north": {"uv": [2.5, 2.5, 2.8, 3], "texture": "#0"},
-				"east": {"uv": [4, 2.5, 3, 3], "texture": "#0"},
-				"south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
-				"west": {"uv": [3, 2.5, 4, 3], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.3, 1], "texture": "#missing"},
-				"down": {"uv": [2.5, 2.5, 2.8, 3.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "handle",
-			"from": [7.6, 1, 8],
-			"to": [8.2, 5, 9],
-			"faces": {
-				"north": {"uv": [2.5, 3, 2.8, 5], "texture": "#0"},
-				"east": {"uv": [3, 3, 3.5, 5], "texture": "#0"},
-				"south": {"uv": [3, 3, 3.3, 5], "texture": "#0"},
-				"west": {"uv": [3, 3, 3.5, 5], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "button",
-			"from": [7.6, 5, 11],
-			"to": [8.2, 6, 11.4],
-			"faces": {
-				"north": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
-				"east": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"},
-				"south": {"uv": [0.5, 11, 0.8, 11.5], "texture": "#0"},
-				"west": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.3, 0.2], "texture": "#missing"},
-				"down": {"uv": [0.5, 11, 0.8, 11.2], "texture": "#0"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.5, 7, 8],
-			"to": [8.3, 12, 11],
-			"faces": {
-				"north": {"uv": [0, 8.5, 0.4, 11], "texture": "#0"},
-				"east": {"uv": [2, 8.5, 0.5, 11], "texture": "#0"},
-				"south": {"uv": [2, 8.5, 2.4, 11], "texture": "#0"},
-				"west": {"uv": [0.5, 8.5, 2, 11], "texture": "#0"},
-				"up": {"uv": [0.5, 8.5, 2, 8.9], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [0, 0, 0.4, 1.5], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.5, 14, 8],
-			"to": [8.3, 29, 11],
-			"faces": {
-				"north": {"uv": [0, 0, 0.4, 7.5], "texture": "#0"},
-				"east": {"uv": [2, 0, 0.5, 7.5], "texture": "#0"},
-				"south": {"uv": [2, 0, 2.4, 7.5], "texture": "#0"},
-				"west": {"uv": [0.5, 0, 2, 7.5], "texture": "#0"},
-				"up": {"uv": [0.5, 0, 2, 0.4], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [2, 8.5, 2.4, 10], "texture": "#0"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.5, 12, 8],
-			"to": [8.3, 13, 10.5],
-			"faces": {
-				"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
-				"east": {"uv": [1.75, 8, 0.5, 8.5], "texture": "#0"},
-				"south": {"uv": [2, 8, 2.4, 8.5], "texture": "#0"},
-				"west": {"uv": [0.5, 8, 1.75, 8.5], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.5, 13, 8],
-			"to": [8.3, 13.5, 10.5],
-			"faces": {
-				"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
-				"east": {"uv": [1.75, 7.75, 0.5, 8], "texture": "#0"},
-				"south": {"uv": [2, 7.5, 2.4, 7.75], "texture": "#0"},
-				"west": {"uv": [0.5, 7.75, 1.75, 8], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.5, 13.5, 8],
-			"to": [8.3, 14, 11],
-			"faces": {
-				"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
-				"east": {"uv": [2, 7.5, 0.5, 7.75], "texture": "#0"},
-				"south": {"uv": [2, 7.5, 2.4, 7.75], "texture": "#0"},
-				"west": {"uv": [0.5, 7.5, 2, 7.75], "texture": "#0"},
-				"up": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"},
-				"down": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "handle",
-			"from": [7, 6, 7],
-			"to": [9, 7, 12],
-			"faces": {
-				"north": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"},
-				"east": {"uv": [3.5, 8, 4, 5.5], "rotation": 90, "texture": "#0"},
-				"south": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"},
-				"west": {"uv": [3.5, 5.5, 4, 8], "rotation": 90, "texture": "#0"},
-				"up": {"uv": [2.5, 8, 3.5, 5.5], "texture": "#0"},
-				"down": {"uv": [2.5, 5.5, 3.5, 8], "texture": "#0"}
-			}
-		},
-		{
-			"name": "battery",
-			"from": [7.2, 7, 10],
-			"to": [8.8, 10, 12],
-			"faces": {
-				"north": {"uv": [4.5, 0, 5.3, 1.5], "texture": "#0"},
-				"east": {"uv": [3.5, 0, 2.5, 1.5], "texture": "#0"},
-				"south": {"uv": [3.5, 0, 4.3, 1.5], "texture": "#0"},
-				"west": {"uv": [2.5, 0, 3.5, 1.5], "texture": "#0"},
-				"up": {"uv": [2.5, 1.5, 3.5, 2.3], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [0, 0, 0.8, 1], "texture": "#missing"}
-			}
-		}
-	],
-	"display": {
-		"thirdperson_righthand": {
-			"translation": [0, 3, -1]
-		},
-		"thirdperson_lefthand": {
-			"translation": [0, 3, -1]
-		},
-		"firstperson_righthand": {
-			"rotation": [20, 0, 0],
-			"translation": [0, 1.75, -4.25]
-		},
-		"firstperson_lefthand": {
-			"rotation": [20, 0, 0],
-			"translation": [0, 1.75, -4.25]
-		},
-		"ground": {
-			"rotation": [13, 0, 0],
-			"translation": [0, 5, -2.25]
-		},
-		"gui": {
-			"rotation": [90, 42, -90],
-			"translation": [-4.75, -2.25, 0],
-			"scale": [0.8, 0.8, 0.8]
-		},
-		"fixed": {
-			"rotation": [90, -45, 90],
-			"translation": [5.5, -3.5, -1]
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_old.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_old.json
new file mode 100644
index 000000000..ab0140a49
--- /dev/null
+++ b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_old.json
@@ -0,0 +1,24 @@
+{
+	"loader": "forge:separate-perspective",
+	"gui_light": "front",
+	"base": {
+		"parent": "minecraft:item/handheld",
+		"textures": {
+			"layer0": "overdrive_that_matters:item/swordicon"
+		}
+	},
+	"perspectives": {
+		"third_person_right_hand": {
+			"parent": "overdrive_that_matters:item/energy_sword_3d"
+		},
+		"third_person_left_hand": {
+			"parent": "overdrive_that_matters:item/energy_sword_3d"
+		},
+		"first_person_right_hand": {
+			"parent": "overdrive_that_matters:item/energy_sword_3d"
+		},
+		"first_person_left_hand": {
+			"parent": "overdrive_that_matters:item/energy_sword_3d"
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/industrial_glass_frame.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/industrial_glass_frame.png
new file mode 100644
index 000000000..fd84aced0
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/industrial_glass_frame.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword.png b/src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword.png
index 1f59f2faa..78c499309 100644
Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_charge.png b/src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_charge.png
new file mode 100644
index 000000000..833c0f3e1
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_charge.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_charge.png.mcmeta b/src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_charge.png.mcmeta
new file mode 100644
index 000000000..b14454b15
--- /dev/null
+++ b/src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_charge.png.mcmeta
@@ -0,0 +1 @@
+{ "animation": { "frametime": 1 } }
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/models/armor/tritanium_armor.png b/src/main/resources/assets/overdrive_that_matters/textures/models/armor/tritanium_armor.png
index 259c90a3c..e5269475e 100644
Binary files a/src/main/resources/assets/overdrive_that_matters/textures/models/armor/tritanium_armor.png and b/src/main/resources/assets/overdrive_that_matters/textures/models/armor/tritanium_armor.png differ