diff --git a/src/frame-right.scad b/src/frame-right.scad
index 4a2f166..49de451 100644
--- a/src/frame-right.scad
+++ b/src/frame-right.scad
@@ -17,10 +17,36 @@
  */
 
 include <components.scad>
-use <frame-left.scad>
+
+module base_right_frame() {
+	difference() {
+		frame();
+		// chop the left edge off
+		mirror([1, 0, 0]) side_chopper();
+	}
+}
 
 module right_frame() {
-	mirror([1, 0, 0]) left_frame();
+	difference() {
+		base_right_frame();
+		// connection holes to other frames
+		mirror([1, 0, 0]) translate([0, 0, -top_plate_z/2]) frame_connection_holes();
+
+		// cable routing hole
+		mirror([1, 0, 0]) translate([0, 0, -top_plate_z/2]) frame_cable_routing_hole();
+
+		// aux button holes
+		translate([30, 101.5, 0]) rotate([270, 0, 0]) button_24mm_hole();
+		translate([30, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([70, 101.5, 0]) rotate([270, 0, 0]) button_24mm_hole();
+		translate([70, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([-10, 101.5, 0]) rotate([270, 0, 0]) button_24mm_hole();
+		translate([-10, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+
+		// neutrix button hole
+		translate([-70, (frame_y/2)-neutrik_panel_thickness, 0]) rotate([90, 0, 0]) neutrik_d_mount();
+		translate([-70, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+	}
 }
 
 right_frame();