diff --git a/lib/buttons.scad b/lib/buttons.scad
index c85547b..a60054f 100644
--- a/lib/buttons.scad
+++ b/lib/buttons.scad
@@ -144,7 +144,7 @@ $fn = 90;
     if(style == "recess") {
         difference() {
             cylinder(d=8.5, h=.8);
-            translate([-1.5,-1.75,-adj]) cube([2.75,3.5,1]);
+            translate([-1.5,-1.75,-adj]) cube([2.75,3.25,1]);
             translate([-.75,-.75,-adj]) cube([5,1.25,1.25]);
         }
     }
diff --git a/sbc_case_builder.json b/sbc_case_builder.json
index 65ddb9a..a8fcf28 100644
--- a/sbc_case_builder.json
+++ b/sbc_case_builder.json
@@ -3782,6 +3782,209 @@
             "view": "model",
             "wallthick": "2"
         },
+        "m2_eyespi_shell": {
+            "$fn": "90",
+            "access_panel_location": "[0, 17]",
+            "access_panel_orientation": "portrait",
+            "access_panel_rotation": "0",
+            "access_panel_size": "[91, 50]",
+            "accessory_highlight": "false",
+            "accessory_name": "m2_eyespi_shell",
+            "adj": "0.01",
+            "bend_allowance": "1",
+            "bottom_access_panel_enable": "false",
+            "bottom_clearence": "3.5",
+            "bottom_cover_pattern": "hex_5mm",
+            "bottom_front_left_adjust": "0",
+            "bottom_front_left_enable": "true",
+            "bottom_front_left_support": "none",
+            "bottom_front_right_adjust": "0",
+            "bottom_front_right_enable": "true",
+            "bottom_front_right_support": "none",
+            "bottom_rear_left_adjust": "0",
+            "bottom_rear_left_enable": "true",
+            "bottom_rear_left_support": "none",
+            "bottom_rear_right_adjust": "0",
+            "bottom_rear_right_enable": "true",
+            "bottom_rear_right_support": "none",
+            "bottom_sidewall_support": "true",
+            "bottom_standoff_diameter": "5.75",
+            "bottom_standoff_hole_size": "3.4",
+            "bottom_standoff_insert": "true",
+            "bottom_standoff_insert_dia": "4.2",
+            "bottom_standoff_insert_height": "5.1",
+            "bottom_standoff_pillar": "hex",
+            "bottom_standoff_reverse": "false",
+            "bottom_standoff_size": "custom",
+            "bottom_standoff_support_height": "4",
+            "bottom_standoff_support_size": "10",
+            "bottom_standoff_type": "countersunk",
+            "case_design": "shell",
+            "case_offset_bz": "0",
+            "case_offset_tz": "24",
+            "case_offset_x": "0",
+            "case_offset_y": "10",
+            "cooling": "none",
+            "corner_fillet": "3",
+            "edge_fillet": "0",
+            "ext_bottom_front_left_adjust": "0",
+            "ext_bottom_front_left_enable": "true",
+            "ext_bottom_front_left_support": "front",
+            "ext_bottom_front_right_adjust": "0",
+            "ext_bottom_front_right_enable": "true",
+            "ext_bottom_front_right_support": "front",
+            "ext_bottom_rear_left_adjust": "0",
+            "ext_bottom_rear_left_enable": "true",
+            "ext_bottom_rear_left_support": "rear",
+            "ext_bottom_rear_right_adjust": "0",
+            "ext_bottom_rear_right_enable": "true",
+            "ext_bottom_rear_right_support": "rear",
+            "ext_bottom_sidewall_support": "true",
+            "ext_bottom_standoff_diameter": "5.75",
+            "ext_bottom_standoff_hole_size": "3.4",
+            "ext_bottom_standoff_insert": "false",
+            "ext_bottom_standoff_insert_dia": "4.2",
+            "ext_bottom_standoff_insert_height": "5.1",
+            "ext_bottom_standoff_pillar": "hex",
+            "ext_bottom_standoff_reverse": "false",
+            "ext_bottom_standoff_size": "custom",
+            "ext_bottom_standoff_support_height": "4",
+            "ext_bottom_standoff_support_size": "10",
+            "ext_bottom_standoff_type": "countersunk",
+            "ext_bottom_standoffs": "false",
+            "ext_top_front_left_adjust": "0",
+            "ext_top_front_left_enable": "true",
+            "ext_top_front_left_support": "front",
+            "ext_top_front_right_adjust": "0",
+            "ext_top_front_right_enable": "true",
+            "ext_top_front_right_support": "front",
+            "ext_top_rear_left_adjust": "0",
+            "ext_top_rear_left_enable": "true",
+            "ext_top_rear_left_support": "rear",
+            "ext_top_rear_right_adjust": "0",
+            "ext_top_rear_right_enable": "true",
+            "ext_top_rear_right_support": "rear",
+            "ext_top_sidewall_support": "true",
+            "ext_top_standoff_diameter": "5.75",
+            "ext_top_standoff_hole_size": "2.75",
+            "ext_top_standoff_insert": "false",
+            "ext_top_standoff_insert_dia": "4.2",
+            "ext_top_standoff_insert_height": "5.1",
+            "ext_top_standoff_pillar": "hex",
+            "ext_top_standoff_reverse": "true",
+            "ext_top_standoff_size": "custom",
+            "ext_top_standoff_support_height": "4",
+            "ext_top_standoff_support_size": "10",
+            "ext_top_standoff_type": "blind",
+            "ext_top_standoffs": "false",
+            "fan_size": "0",
+            "flat_blank_section": "false",
+            "floorthick": "1.5",
+            "gap": "2.5",
+            "gpio_opening": "default",
+            "indents": "true",
+            "individual_part": "bottom",
+            "lower_bottom": "0",
+            "material_thickness": "0.5",
+            "move_front": "0",
+            "move_leftside": "0",
+            "move_rear": "0",
+            "move_rightside": "0",
+            "multipcb_bottom_front_left_adjust": "0",
+            "multipcb_bottom_front_left_enable": "true",
+            "multipcb_bottom_front_left_support": "front",
+            "multipcb_bottom_front_right_adjust": "0",
+            "multipcb_bottom_front_right_enable": "true",
+            "multipcb_bottom_front_right_support": "front",
+            "multipcb_bottom_rear_left_adjust": "0",
+            "multipcb_bottom_rear_left_enable": "true",
+            "multipcb_bottom_rear_left_support": "rear",
+            "multipcb_bottom_rear_right_adjust": "0",
+            "multipcb_bottom_rear_right_enable": "true",
+            "multipcb_bottom_rear_right_support": "rear",
+            "multipcb_bottom_sidewall_support": "false",
+            "multipcb_bottom_standoff_diameter": "5.75",
+            "multipcb_bottom_standoff_hole_size": "3.4",
+            "multipcb_bottom_standoff_insert": "false",
+            "multipcb_bottom_standoff_insert_dia": "4.2",
+            "multipcb_bottom_standoff_insert_height": "5.1",
+            "multipcb_bottom_standoff_pillar": "hex",
+            "multipcb_bottom_standoff_reverse": "false",
+            "multipcb_bottom_standoff_size": "m2.5",
+            "multipcb_bottom_standoff_support_height": "4",
+            "multipcb_bottom_standoff_support_size": "7",
+            "multipcb_bottom_standoff_type": "countersunk",
+            "multipcb_bottom_standoffs": "false",
+            "multipcb_top_front_left_adjust": "0",
+            "multipcb_top_front_left_enable": "true",
+            "multipcb_top_front_left_support": "front",
+            "multipcb_top_front_right_adjust": "0",
+            "multipcb_top_front_right_enable": "true",
+            "multipcb_top_front_right_support": "front",
+            "multipcb_top_rear_left_adjust": "0",
+            "multipcb_top_rear_left_enable": "true",
+            "multipcb_top_rear_left_support": "rear",
+            "multipcb_top_rear_right_adjust": "0",
+            "multipcb_top_rear_right_enable": "true",
+            "multipcb_top_rear_right_support": "rear",
+            "multipcb_top_sidewall_support": "false",
+            "multipcb_top_standoff_diameter": "5.75",
+            "multipcb_top_standoff_hole_size": "2.75",
+            "multipcb_top_standoff_insert": "false",
+            "multipcb_top_standoff_insert_dia": "4.2",
+            "multipcb_top_standoff_insert_height": "5.1",
+            "multipcb_top_standoff_pillar": "hex",
+            "multipcb_top_standoff_reverse": "true",
+            "multipcb_top_standoff_size": "m2.5",
+            "multipcb_top_standoff_support_height": "4",
+            "multipcb_top_standoff_support_size": "7",
+            "multipcb_top_standoff_type": "blind",
+            "multipcb_top_standoffs": "false",
+            "pcb_loc_x": "0",
+            "pcb_loc_y": "0",
+            "pcb_loc_z": "0",
+            "raise_top": "0",
+            "rear_io_shield": "false",
+            "sbc_bottom_standoffs": "true",
+            "sbc_highlight": "false",
+            "sbc_information": "false",
+            "sbc_model": "m2",
+            "sbc_off": "false",
+            "sbc_top_standoffs": "true",
+            "sidethick": "2",
+            "standard_motherboard_thickness": "0",
+            "text_color": "Green",
+            "text_font": "Nimbus Mono PS",
+            "tol": "0.25",
+            "top_cover_pattern": "hex_5mm",
+            "top_front_left_adjust": "0",
+            "top_front_left_enable": "true",
+            "top_front_left_support": "left",
+            "top_front_right_adjust": "0",
+            "top_front_right_enable": "true",
+            "top_front_right_support": "right",
+            "top_rear_left_adjust": "0",
+            "top_rear_left_enable": "true",
+            "top_rear_left_support": "left",
+            "top_rear_right_adjust": "0",
+            "top_rear_right_enable": "true",
+            "top_rear_right_support": "none",
+            "top_sidewall_support": "true",
+            "top_standoff_diameter": "5.75",
+            "top_standoff_hole_size": "3.2",
+            "top_standoff_insert": "false",
+            "top_standoff_insert_dia": "4.2",
+            "top_standoff_insert_height": "5.1",
+            "top_standoff_pillar": "hex",
+            "top_standoff_reverse": "true",
+            "top_standoff_size": "m3+",
+            "top_standoff_support_height": "25",
+            "top_standoff_support_size": "10",
+            "top_standoff_type": "recessed",
+            "uart_opening": "open",
+            "view": "model",
+            "wallthick": "2"
+        },
         "h3_shell": {
             "$fn": "90",
             "access_panel_location": "[0, 30]",
@@ -9177,209 +9380,6 @@
             "uart_opening": "default",
             "view": "model",
             "wallthick": "2"
-        },
-        "m2_eyespi_shell": {
-            "$fn": "90",
-            "access_panel_location": "[0, 17]",
-            "access_panel_orientation": "portrait",
-            "access_panel_rotation": "0",
-            "access_panel_size": "[91, 50]",
-            "accessory_highlight": "false",
-            "accessory_name": "m2_eyespi_shell",
-            "adj": "0.01",
-            "bend_allowance": "1",
-            "bottom_access_panel_enable": "false",
-            "bottom_clearence": "3.5",
-            "bottom_cover_pattern": "hex_5mm",
-            "bottom_front_left_adjust": "0",
-            "bottom_front_left_enable": "true",
-            "bottom_front_left_support": "none",
-            "bottom_front_right_adjust": "0",
-            "bottom_front_right_enable": "true",
-            "bottom_front_right_support": "none",
-            "bottom_rear_left_adjust": "0",
-            "bottom_rear_left_enable": "true",
-            "bottom_rear_left_support": "none",
-            "bottom_rear_right_adjust": "0",
-            "bottom_rear_right_enable": "true",
-            "bottom_rear_right_support": "none",
-            "bottom_sidewall_support": "true",
-            "bottom_standoff_diameter": "5.75",
-            "bottom_standoff_hole_size": "3.4",
-            "bottom_standoff_insert": "true",
-            "bottom_standoff_insert_dia": "4.2",
-            "bottom_standoff_insert_height": "5.1",
-            "bottom_standoff_pillar": "hex",
-            "bottom_standoff_reverse": "false",
-            "bottom_standoff_size": "custom",
-            "bottom_standoff_support_height": "4",
-            "bottom_standoff_support_size": "10",
-            "bottom_standoff_type": "countersunk",
-            "case_design": "shell",
-            "case_offset_bz": "0",
-            "case_offset_tz": "23",
-            "case_offset_x": "0",
-            "case_offset_y": "10",
-            "cooling": "default",
-            "corner_fillet": "3",
-            "edge_fillet": "0",
-            "ext_bottom_front_left_adjust": "0",
-            "ext_bottom_front_left_enable": "true",
-            "ext_bottom_front_left_support": "front",
-            "ext_bottom_front_right_adjust": "0",
-            "ext_bottom_front_right_enable": "true",
-            "ext_bottom_front_right_support": "front",
-            "ext_bottom_rear_left_adjust": "0",
-            "ext_bottom_rear_left_enable": "true",
-            "ext_bottom_rear_left_support": "rear",
-            "ext_bottom_rear_right_adjust": "0",
-            "ext_bottom_rear_right_enable": "true",
-            "ext_bottom_rear_right_support": "rear",
-            "ext_bottom_sidewall_support": "true",
-            "ext_bottom_standoff_diameter": "5.75",
-            "ext_bottom_standoff_hole_size": "3.4",
-            "ext_bottom_standoff_insert": "false",
-            "ext_bottom_standoff_insert_dia": "4.2",
-            "ext_bottom_standoff_insert_height": "5.1",
-            "ext_bottom_standoff_pillar": "hex",
-            "ext_bottom_standoff_reverse": "false",
-            "ext_bottom_standoff_size": "custom",
-            "ext_bottom_standoff_support_height": "4",
-            "ext_bottom_standoff_support_size": "10",
-            "ext_bottom_standoff_type": "countersunk",
-            "ext_bottom_standoffs": "false",
-            "ext_top_front_left_adjust": "0",
-            "ext_top_front_left_enable": "true",
-            "ext_top_front_left_support": "front",
-            "ext_top_front_right_adjust": "0",
-            "ext_top_front_right_enable": "true",
-            "ext_top_front_right_support": "front",
-            "ext_top_rear_left_adjust": "0",
-            "ext_top_rear_left_enable": "true",
-            "ext_top_rear_left_support": "rear",
-            "ext_top_rear_right_adjust": "0",
-            "ext_top_rear_right_enable": "true",
-            "ext_top_rear_right_support": "rear",
-            "ext_top_sidewall_support": "true",
-            "ext_top_standoff_diameter": "5.75",
-            "ext_top_standoff_hole_size": "2.75",
-            "ext_top_standoff_insert": "false",
-            "ext_top_standoff_insert_dia": "4.2",
-            "ext_top_standoff_insert_height": "5.1",
-            "ext_top_standoff_pillar": "hex",
-            "ext_top_standoff_reverse": "true",
-            "ext_top_standoff_size": "custom",
-            "ext_top_standoff_support_height": "4",
-            "ext_top_standoff_support_size": "10",
-            "ext_top_standoff_type": "blind",
-            "ext_top_standoffs": "false",
-            "fan_size": "0",
-            "flat_blank_section": "false",
-            "floorthick": "1.5",
-            "gap": "2.5",
-            "gpio_opening": "default",
-            "indents": "true",
-            "individual_part": "bottom",
-            "lower_bottom": "0",
-            "material_thickness": "0.5",
-            "move_front": "0",
-            "move_leftside": "0",
-            "move_rear": "0",
-            "move_rightside": "0",
-            "multipcb_bottom_front_left_adjust": "0",
-            "multipcb_bottom_front_left_enable": "true",
-            "multipcb_bottom_front_left_support": "front",
-            "multipcb_bottom_front_right_adjust": "0",
-            "multipcb_bottom_front_right_enable": "true",
-            "multipcb_bottom_front_right_support": "front",
-            "multipcb_bottom_rear_left_adjust": "0",
-            "multipcb_bottom_rear_left_enable": "true",
-            "multipcb_bottom_rear_left_support": "rear",
-            "multipcb_bottom_rear_right_adjust": "0",
-            "multipcb_bottom_rear_right_enable": "true",
-            "multipcb_bottom_rear_right_support": "rear",
-            "multipcb_bottom_sidewall_support": "false",
-            "multipcb_bottom_standoff_diameter": "5.75",
-            "multipcb_bottom_standoff_hole_size": "3.4",
-            "multipcb_bottom_standoff_insert": "false",
-            "multipcb_bottom_standoff_insert_dia": "4.2",
-            "multipcb_bottom_standoff_insert_height": "5.1",
-            "multipcb_bottom_standoff_pillar": "hex",
-            "multipcb_bottom_standoff_reverse": "false",
-            "multipcb_bottom_standoff_size": "m2.5",
-            "multipcb_bottom_standoff_support_height": "4",
-            "multipcb_bottom_standoff_support_size": "7",
-            "multipcb_bottom_standoff_type": "countersunk",
-            "multipcb_bottom_standoffs": "false",
-            "multipcb_top_front_left_adjust": "0",
-            "multipcb_top_front_left_enable": "true",
-            "multipcb_top_front_left_support": "front",
-            "multipcb_top_front_right_adjust": "0",
-            "multipcb_top_front_right_enable": "true",
-            "multipcb_top_front_right_support": "front",
-            "multipcb_top_rear_left_adjust": "0",
-            "multipcb_top_rear_left_enable": "true",
-            "multipcb_top_rear_left_support": "rear",
-            "multipcb_top_rear_right_adjust": "0",
-            "multipcb_top_rear_right_enable": "true",
-            "multipcb_top_rear_right_support": "rear",
-            "multipcb_top_sidewall_support": "false",
-            "multipcb_top_standoff_diameter": "5.75",
-            "multipcb_top_standoff_hole_size": "2.75",
-            "multipcb_top_standoff_insert": "false",
-            "multipcb_top_standoff_insert_dia": "4.2",
-            "multipcb_top_standoff_insert_height": "5.1",
-            "multipcb_top_standoff_pillar": "hex",
-            "multipcb_top_standoff_reverse": "true",
-            "multipcb_top_standoff_size": "m2.5",
-            "multipcb_top_standoff_support_height": "4",
-            "multipcb_top_standoff_support_size": "7",
-            "multipcb_top_standoff_type": "blind",
-            "multipcb_top_standoffs": "false",
-            "pcb_loc_x": "0",
-            "pcb_loc_y": "0",
-            "pcb_loc_z": "0",
-            "raise_top": "0",
-            "rear_io_shield": "false",
-            "sbc_bottom_standoffs": "true",
-            "sbc_highlight": "false",
-            "sbc_information": "false",
-            "sbc_model": "m2",
-            "sbc_off": "false",
-            "sbc_top_standoffs": "true",
-            "sidethick": "2",
-            "standard_motherboard_thickness": "0",
-            "text_color": "Green",
-            "text_font": "Nimbus Mono PS",
-            "tol": "0.25",
-            "top_cover_pattern": "solid",
-            "top_front_left_adjust": "0",
-            "top_front_left_enable": "true",
-            "top_front_left_support": "left",
-            "top_front_right_adjust": "0",
-            "top_front_right_enable": "true",
-            "top_front_right_support": "right",
-            "top_rear_left_adjust": "0",
-            "top_rear_left_enable": "true",
-            "top_rear_left_support": "left",
-            "top_rear_right_adjust": "0",
-            "top_rear_right_enable": "true",
-            "top_rear_right_support": "none",
-            "top_sidewall_support": "true",
-            "top_standoff_diameter": "5.75",
-            "top_standoff_hole_size": "3.2",
-            "top_standoff_insert": "false",
-            "top_standoff_insert_dia": "4.2",
-            "top_standoff_insert_height": "5.1",
-            "top_standoff_pillar": "hex",
-            "top_standoff_reverse": "true",
-            "top_standoff_size": "m3+",
-            "top_standoff_support_height": "4",
-            "top_standoff_support_size": "12.5",
-            "top_standoff_type": "countersunk",
-            "uart_opening": "open",
-            "view": "model",
-            "wallthick": "2"
         }
     },
     "fileFormatVersion": "1"
diff --git a/sbc_case_builder_accessories.cfg b/sbc_case_builder_accessories.cfg
index 1516433..a408269 100644
--- a/sbc_case_builder_accessories.cfg
+++ b/sbc_case_builder_accessories.cfg
@@ -255,18 +255,21 @@ accessory_data = [
      ["m2_shell",
      "add2","button",5.5,56,24,"top",[0,0,180],["sbc-case_z",false,false,true],[12,8,1.5],["cutout",[2,2,2,2],2.25],[true,10,2,"default"]],
 
+     // Adafruit models available at https://github.com/adafruit/Adafruit_CAD_Parts/tree/main
      ["m2_eyespi_shell",
 //     "model","stl_model",109.62,9.8,19.25,"bottom",[0,0,180],["sbc",true,true,true],[0,0,0],[1,"stl/EYESPI-Dual_I2C.stl"],[false,10,2,"default"],
 //     "model","stl_model",50.5,99.75,3,"bottom",[90,0,180],["sbc",false,false,false],[0,0,0],[1,"adafruit/4196 1.54in eink display SSD1681.stl"],[false,10,2,"default"],
-//     "sub","round",13,99,5.5,"bottom",[270,0,0],["sbc",false,false,false],[2.5,0,6],[0],[false,10,2,"default"],
-//     "sub","round",51,99,5.5,"bottom",[270,0,0],["sbc",false,false,false],[2.5,0,6],[0],[false,10,2,"default"],
+     "add2","pcb_holder",56,99.5,49.5,"top",[180,0,180],["case",false,false,false],[47,35,2.5],[2],[false,10,2,"default"],
      "add2","standoff",13.5,104.5,5.5,"bottom",[90,0,0],["sbc",false,false,false],[0,0,0],[["m2.5+",3,3.25,3.6,6,3.25,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
      "add2","standoff",51.5,104.5,5.5,"bottom",[90,0,0],["sbc",false,false,false],[0,0,0],[["m2.5+",3,3.25,3.6,6,3.25,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
      "sub","rectangle",17,100,8.75,"top",[0,0,0],["sbc",true,true,true],[31,5,31.5],[[1,1,1,1]],[false,10,2,"default"],
      "sub","rectangle",80,83,8.75,"top",[0,0,0],["sbc",true,true,true],[5,7,15],[[1,1,1,1]],[false,10,2,"default"],
      "add1","rectangle",11,101.25,1.5,"bottom",[0,0,0],["sbc",false,false,false],[5,2,2.5],[[1,1,1,1]],[false,10,2,"default"],
      "add1","rectangle",49,101.25,1.5,"bottom",[0,0,0],["sbc",false,false,false],[5,2,2.5],[[1,1,1,1]],[false,10,2,"default"],
-     "add2","button",5.5,56,24.02,"top",[0,0,180],["sbc-case_z",true,true,true],[12,8,1.5],["cutout",[2,2,2,2],2.25],[true,10,2,"default"]],
+     "add2","button",5.5,56,25.5,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,25],["recess"],[true,10,2,"default"],
+     "model","button_assembly",5.5,56,25.5,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,26],["recess"],[false,10,2,"default"],
+     "platter","button_assembly",-20,0,0,"top",[0,0,0],["case",false,false,false],[10,0,26.5],["recess"],[false,10,2,"default"]],
+
 
      // Odroid-M1S
      ["m1s_shell_nvme",
@@ -484,6 +487,7 @@ accessory_data = [
 
 
      // N2L environmental sensors
+     // Adafruit models available at https://github.com/adafruit/Adafruit_CAD_Parts/tree/main
      ["n2l_env_sensors",
      // divider walls
      "add1","rectangle",-1,57,0,"bottom",[0,0,0],["case",false,false,false],[71,2,10.25],[[.1,.1,.1,.1]],[false,10,2,"default"],
@@ -515,6 +519,7 @@ accessory_data = [
 
 
      // avr128da48 environmental sensors
+     // Adafruit models available at https://github.com/adafruit/Adafruit_CAD_Parts/tree/main
      ["avr_env_sensors",
      // i2c radial hub holder
 //     "model","stl_model",31,24,4,"bottom",[90,0,180],["sbc",true,true,false],[0,0,0],[1,"./adafruit/5625 Stemma 5 Port Hub.stl"],[false,10,2,"default"],