diff --git a/vitamins/pcb.scad b/vitamins/pcb.scad
index f14f3e8..ad72560 100644
--- a/vitamins/pcb.scad
+++ b/vitamins/pcb.scad
@@ -27,6 +27,7 @@ include <screws.scad>
 include <buttons.scad>
 include <green_terminals.scad>
 include <pin_headers.scad>
+include <microswitches.scad>
 
 use <../utils/rounded_cylinder.scad>
 use <../utils/dogbones.scad>
@@ -727,6 +728,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
             color(comp[7]) if(!cutouts) translate_z(comp[6] / 2) cube([comp[4], comp[5], comp[6]], center = true);
                            else if(comp[8]) translate([-50, 0, comp[6] / 2 - panel_clearance]) cube([100, comp[5] + 2 * panel_clearance, comp[6] + 2 * panel_clearance], center = true);
         if(show(comp, "button_6mm")) square_button(button_6mm);
+        if(show(comp, "microswitch")) translate_z(microswitch_thickness(comp[4])/2) microswitch(comp[4]);
         if(show(comp, "pcb")) if(!cutouts) translate_z(comp[4]) pcb(comp[5]);
         if(show(comp, "standoff")) if(!cutouts) standoff(comp[4], comp[5], comp[6], comp[7]);
         if(show(comp, "uSD")) uSD(comp[4], cutouts);
diff --git a/vitamins/pcbs.scad b/vitamins/pcbs.scad
index c0d8ec4..b2a83ba 100644
--- a/vitamins/pcbs.scad
+++ b/vitamins/pcbs.scad
@@ -17,6 +17,7 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <screws.scad>
+include <microswitches.scad>
 //
 //                                   l      w      t    r     h     l  c        b     h
 //                                   e      i      h    a     o     a  o        o     o
@@ -339,6 +340,18 @@ PERF74x51 = ["PERF74x51", "Perfboard 74 x 51mm", 74, 51, 1.0, 0, 3.0, 0, "sienna
 
 PSU12V1A = ["PSU12V1A", "PSU 12V 1A", 67, 31, 1.7, 0, 3.9, 0, "green", true, [[3.5, 3.5], [-3.5, 3.5], [-3.5, -3.5], [3.5, -3.5]], [], []];
 
-pcbs = [ExtruderPCB, PI_IO, RPI0, EnviroPlus, RPI3, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PERF80x20, PERF70x50, PERF70x30, PERF60x40, PERF74x51, PSU12V1A, DuetE, Duex2, Duex5, Melzi, ZC_A0591];
+include <microswitches.scad>
+
+RAMPSEndstop = ["RAMPSEndstop", "RAMPS Endstop Switch",
+    40.0, 16.0, 1.6, 0, 2.54, 0, "red",  false,
+    [
+        [2, 2], [2, 13.5], [17, 13.5], [36, 13.5]
+    ],
+    [
+        [ 26.5, 12.75,  0, "microswitch", small_microswitch],
+    ],
+    []];
+
+pcbs = [ExtruderPCB, PI_IO, RPI0, EnviroPlus, RPI3, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PERF80x20, PERF70x50, PERF70x30, PERF60x40, PERF74x51, PSU12V1A, DuetE, Duex2, Duex5, Melzi, ZC_A0591, RAMPSEndstop];
 
 use <pcb.scad>