diff --git a/openscad/Back.scad b/openscad/Back.scad
index 425743b..7a5f0fa 100644
--- a/openscad/Back.scad
+++ b/openscad/Back.scad
@@ -1,11 +1,15 @@
 x_size = 75;
 y_size = 40;
-z_size = 6;
+z_size = 9;
+pcb_x = 70;
+pcb_y = 35;
 wall_size = 1;
-hole_rad = 2;
-filament_x = 10;
+hole_rad = 1.5;
+filament_x = 57.5 - pcb_x/2 - 13 - 1;
 filament_size = 2;
 
+difference()
+{
 union()
 {
 	difference()
@@ -18,18 +22,13 @@ union()
 		{
 			cube([x_size - 2 * wall_size, y_size - 2 * wall_size, z_size], center = true);
 		}
-
-		// Fillament Hole
-		translate([filament_x, 0, wall_size])
-		{
-			cube([filament_size, y_size + 1, z_size], center = true);
-		}
+		
 	}
 
-	// Hole Mounts
-	for (i = [-1:1:1])
+	// Bottom Hole Mounts
+	for (i = [-1:2:1])
 	{
-		translate([i * 32, ((i == 0) ? 1 : 0) * 29 - 14.5, 0])
+		translate([i * (pcb_x/2 - 3) - 1, -(pcb_y/2 - 3) - 1, -0.5])
 		{
 			difference()
 			{
@@ -42,22 +41,62 @@ union()
 		}
 	}
 
-	// Bearing Mount
-	translate([3, 0, 0])
-	{
-		cylinder(z_size, 2, 2, $fn = 360, center = true);
-	}
-
-	// Left Walls for fillament
-	for (i = [-1:2:1])
-	{
-		translate([filament_x + i * ((filament_size + wall_size) / 2), 0, 0])
+	// Top Hole Mount
+	translate([(41 - pcb_x/2) - 1, pcb_y/2 - 3 - 1, -0.5])
+		difference()
 		{
-			difference()
+			cylinder(z_size - 1, hole_rad + 1, hole_rad + 1, $fn = 360, center = true);
+			translate([0, 0, wall_size])
 			{
-				cube([wall_size, y_size, z_size - 1], center = true);
-				cube([wall_size + 1, 5.625 + i * 0.875, z_size], center = true);
+				cylinder(z_size - 1, hole_rad, hole_rad, $fn = 360, center = true);
+			}
+		}
+
+	// Fillament Block
+	translate([filament_x, 0, -0.5])
+	{
+		difference()
+		{
+			cube([filament_size + wall_size * 2, y_size, z_size - 1], center = true);
+			translate([13, pcb_y/2 - 12.5 - 1, 0])
+			{
+				cylinder(z_size, 13.5, 13.5, $fn = 360, center = true);
 			}
 		}
 	}
+}
+
+	// Bottom Holes
+	for (i = [-1:2:1])
+	{
+		translate([i * (pcb_x/2 - 3) - 1, -(pcb_y/2 - 3) - 1, -z_size/2 + 1])
+		{
+			cylinder(2, 2.8, hole_rad, $fn = 360, center = true);
+		}
+	}
+
+	// Top Hole
+	translate([(41 - pcb_x/2) - 1, pcb_y / 2 - 3 - 1, -z_size/2 + 1])
+	{
+		cylinder(2, 2.8, hole_rad, $fn = 360, center = true);
+	}
+
+	// Filament Hole
+	translate([filament_x, 0, -0.5])
+	{
+		rotate([90, 0, 0])
+		{
+			cylinder(y_size + 1, filament_size/2, filament_size/2, $fn = 360, center = true);
+		}
+	}
+
+	// Temp
+	*translate([-x_size/2, y_size/5, 0])
+	{
+		cube([x_size, y_size, z_size], center = true);
+	}
+	*translate([x_size/1.5, y_size/5, 0])
+	{
+		cube([x_size, y_size, z_size], center = true);
+	}
 }
\ No newline at end of file
diff --git a/openscad/Front.scad b/openscad/Front.scad
new file mode 100644
index 0000000..f63f0e2
--- /dev/null
+++ b/openscad/Front.scad
@@ -0,0 +1,69 @@
+x_size = 75;
+y_size = 40;
+z_size = 13;
+pcb_x = 70;
+pcb_y = 35;
+wall_size = 1;
+hole_rad = 2;
+screen_x = 30;
+screen_y = 12;
+
+union()
+{
+	difference()
+	{
+		// Main
+		cube([x_size, y_size, z_size], center = true);
+
+		// Hollow
+		translate([0, 0, wall_size])
+		{
+			cube([x_size - 2 * wall_size, y_size - 2 * wall_size, z_size], center = true);
+		}
+
+		// Display Cutout
+		translate([pcb_x/2 - screen_x/2 + 1 - 5, pcb_y/2 - screen_y/2 - 1, 0])
+		{
+			cube([screen_x, screen_y, z_size + 1], center = true);
+		}
+
+		// Button Cutout
+		translate([-16 + 1, -12.5 - 1, 0])
+		{
+			cube([8, 8, z_size + 1], center = true);
+		}
+
+		// Switch Cutout
+		translate([0 + 1, -y_size/2 + wall_size/2, z_size/2 - 6/2])
+		{
+			cube([5, wall_size * 2, 6], center = true);
+		}
+	}
+
+	// Bottom Hole Mounts
+	for (i = [-1:2:1])
+	{
+		translate([i * (pcb_x/2 - 3) + 1, -(pcb_y/2 - 3) - 1, 0])
+		{
+			difference()
+			{
+				cylinder(z_size, hole_rad + 1, hole_rad + 1, $fn = 360, center = true);
+				translate([0, 0, wall_size])
+				{
+					cylinder(z_size, hole_rad, hole_rad, $fn = 360, center = true);
+				}
+			}
+		}
+	}
+
+	// Top Hole Mount
+	translate([-((41 - pcb_x/2)) + 1, pcb_y/2 - 3 - 1, 0])
+		difference()
+		{
+			cylinder(z_size, hole_rad + 1, hole_rad + 1, $fn = 360, center = true);
+			translate([0, 0, wall_size])
+			{
+				cylinder(z_size, hole_rad, hole_rad, $fn = 360, center = true);
+			}
+		}
+}
diff --git a/openscad/zippy_cover2.scad b/openscad/zippy_cover2.scad
index 912b733..b784c08 100644
--- a/openscad/zippy_cover2.scad
+++ b/openscad/zippy_cover2.scad
@@ -1,26 +1,21 @@
-seg = 360;
-seg2 = 60;
-outer = 12;
-height = 5;
-rad = 1;
-dist = 1.5;
-
-rotate_extrude($fn = seg)
-difference()
-{
-	square([outer, height]);
-	translate([0, 1.5, 0])
-	{
-		square([10.5, height]);
-	}
-
-	translate([12, height/2 + dist, 0])
-	{
-		circle(rad, $fn = seg);
-	}
-
-	translate([12, height/2 - dist, 0])
-	{
-		circle(rad, $fn = seg);
-	}
-}
+seg = 360;
+seg2 = 60;
+outer = 12;
+height = 6;
+rad = 1;
+dist = 4;
+
+rotate_extrude($fn = seg)
+difference()
+{
+	square([outer, height]);
+	translate([0, height - 3.5, 0])
+	{
+		square([10.5, 3.5]);
+	}
+
+	translate([outer, height - dist, 0])
+	{
+		circle(rad, $fn = seg);
+	}
+}