diff --git a/bike-lights/case/battery_enclosure.scad b/bike-lights/case/battery_enclosure.scad
index ad5f14b..9e9131d 100644
--- a/bike-lights/case/battery_enclosure.scad
+++ b/bike-lights/case/battery_enclosure.scad
@@ -111,40 +111,31 @@ module contact_box() {
                   wall_thickness * 2,
                   battery_contact_length + threshold],
                  center = true);
+
+        color("red", 1) translate([0,
+                   -(wall_thickness + contact_thickness + threshold) / 2,
+                   cell_holder_height / 2])
+                   cube([5, wall_thickness + threshold * 2, cell_holder_height], center = true);
+
+        translate([0,
+                   -(wall_thickness + contact_thickness + threshold) / 2 - wire_radius,
+                   0])
+            rotate([0, 90, 0])
+            cylinder(h = cell_holder_width, r = wire_radius / 2, center = true);
     }
-
-
-/*
-    union() {
-        translate([box_width / 2 - (contact_width * .8) / 2,
-                   wall_thickness,
-                   box_height - contact_height])
-            cube([contact_width * .8,
-                  wall_thickness + contact_thickness_ + cutout_threshold,
-                  contact_height + cutout_threshold]);
-
-        translate([width / 2 + wall_thickness,
-                   0,
-                   width + wire_radius * 2])
-                   rotate([-90, 0, 0])
-                   cylinder(h=wall_thickness * 4, r=wire_radius, center = true);
-
-        rotate([0, 180, 0])
-            translate([-cutout_threshold / 2,
-                       box_thickness,
-                       width + wire_radius * 2])
-            cylinder(h = width + wall_thickness * 2 + cutout_threshold, r = 1, center = true);
-    }
-*/
 }
 
 module battery_slot() {
-    union() {
-        translate([0, -cell_holder_length / 2, 0]) contact_box();
-        translate([0, wall_thickness, 0]) cell_box();
-        translate([0, cell_holder_length / 2 + wall_thickness * 2, 0])
-            rotate([0, 0, 180])
-            contact_box();
+    difference() {
+        union() {
+            translate([0, -cell_holder_length / 2, 0]) contact_box();
+            translate([0, wall_thickness, 0]) cell_box();
+            translate([0, cell_holder_length / 2 + wall_thickness * 2, 0])
+                rotate([0, 0, 180])
+                contact_box();
+        }
+        translate([cell_holder_width / 2, 1, 0]) rotate([90, 0, 0]) cylinder(h = cell_holder_length + wall_thickness * 4 + battery_contact_flange_height * 2, r = wire_radius / 2, center = true);
+        translate([-cell_holder_width / 2, 1, 0]) rotate([90, 0, 0]) cylinder(h = cell_holder_length + wall_thickness * 4 + battery_contact_flange_height * 2, r = wire_radius / 2, center = true);
     }
 }