diff --git a/template/1593K_Enclosure/1593K_Enclosure.kicad_pcb b/template/1593K_Enclosure/1593K_Enclosure.kicad_pcb
index e5441419..527af1ff 100644
--- a/template/1593K_Enclosure/1593K_Enclosure.kicad_pcb
+++ b/template/1593K_Enclosure/1593K_Enclosure.kicad_pcb
@@ -1,14 +1,14 @@
-(kicad_pcb (version 20160815) (host pcbnew no-vcs-found-undefined)
+(kicad_pcb (version 20160815) (host pcbnew no-vcs-found-7409~56~ubuntu16.10.1)
 
   (general
     (links 0)
     (no_connects 0)
     (area 69.845 81.766999 134.395 145.67)
     (thickness 1.6)
-    (drawings 19)
+    (drawings 15)
     (tracks 0)
     (zones 0)
-    (modules 1)
+    (modules 5)
     (nets 1)
   )
 
@@ -68,8 +68,8 @@
     (mod_edge_width 0.15)
     (mod_text_size 1 1)
     (mod_text_width 0.15)
-    (pad_size 1.524 1.524)
-    (pad_drill 0.762)
+    (pad_size 3.2 3.2)
+    (pad_drill 3.2)
     (pad_to_mask_clearance 0.0762)
     (aux_axis_origin 130 100)
     (grid_origin 130 100)
@@ -114,15 +114,75 @@
     (diff_pair_width 0.2)
   )
 
+  (module Mounting_Holes:MountingHole_3.2mm_M3_ISO14580 locked (layer F.Cu) (tedit 586721DC) (tstamp 58672070)
+    (at 115.695 124.647)
+    (descr "Mounting Hole 3.2mm, no annular, M3, ISO14580")
+    (tags "mounting hole 3.2mm no annular m3 iso14580")
+    (fp_text reference MK4 (at 0 -3.75) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MountingHole_3.2mm_M3_ISO14580 (at 0 3.75) (layer F.Fab) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 3 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 2.75 0) (layer Cmts.User) (width 0.15))
+    (pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask))
+  )
+
+  (module Mounting_Holes:MountingHole_3.2mm_M3_ISO14580 locked (layer F.Cu) (tedit 586721DF) (tstamp 5867206A)
+    (at 87.695 124.647)
+    (descr "Mounting Hole 3.2mm, no annular, M3, ISO14580")
+    (tags "mounting hole 3.2mm no annular m3 iso14580")
+    (fp_text reference MK3 (at 0 -3.75) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MountingHole_3.2mm_M3_ISO14580 (at 0 3.75) (layer F.Fab) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 3 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 2.75 0) (layer Cmts.User) (width 0.15))
+    (pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask))
+  )
+
+  (module Mounting_Holes:MountingHole_3.2mm_M3_ISO14580 locked (layer F.Cu) (tedit 586721D5) (tstamp 58672064)
+    (at 115.695 96.647)
+    (descr "Mounting Hole 3.2mm, no annular, M3, ISO14580")
+    (tags "mounting hole 3.2mm no annular m3 iso14580")
+    (fp_text reference MK2 (at 0 -3.75) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MountingHole_3.2mm_M3_ISO14580 (at 0 3.75) (layer F.Fab) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 3 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 2.75 0) (layer Cmts.User) (width 0.15))
+    (pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask))
+  )
+
+  (module Mounting_Holes:MountingHole_3.2mm_M3_ISO14580 locked (layer F.Cu) (tedit 586721D8) (tstamp 58671FE4)
+    (at 87.695 96.647)
+    (descr "Mounting Hole 3.2mm, no annular, M3, ISO14580")
+    (tags "mounting hole 3.2mm no annular m3 iso14580")
+    (fp_text reference MK1 (at 0 -3.75) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MountingHole_3.2mm_M3_ISO14580 (at 0 3.75) (layer F.Fab) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 2.75 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 3 0) (layer F.CrtYd) (width 0.05))
+    (pad 1 np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask))
+  )
+
   (module Symbols:KiCad-Logo2_6mm_SilkScreen (layer F.Cu) (tedit 581164A0) (tstamp 581165B4)
     (at 80 136)
     (descr "KiCad Logo")
     (tags "Logo KiCad")
     (attr virtual)
-    (fp_text reference REF*** (at 0 -4) (layer F.SilkS) hide
+    (fp_text reference REF*** (at -3.95 -3.37) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value KiCad-Logo2_6mm_SilkScreen (at 5 -4) (layer F.Fab) hide
+    (fp_text value KiCad-Logo2_6mm_SilkScreen (at -7.34 4.17) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_poly (pts (xy -6.121371 2.269066) (xy -6.081889 2.269467) (xy -5.9662 2.272259) (xy -5.869311 2.28055)
@@ -609,9 +669,6 @@
   )
   (gr_arc (start 126.695 103.315) (end 126.695 106.63) (angle 180) (layer Edge.Cuts) (width 0.1))
   (gr_arc (start 76.695 103.315) (end 76.695 100) (angle 180) (layer Edge.Cuts) (width 0.1))
-  (gr_circle (center 87.695 96.647) (end 89.295 96.647) (layer Edge.Cuts) (width 0.1))
-  (gr_circle (center 115.695 124.647) (end 117.295 124.647) (layer Edge.Cuts) (width 0.1))
-  (gr_circle (center 115.695 96.647) (end 117.295 96.647) (layer Edge.Cuts) (width 0.1))
   (gr_line (start 73.39 81.817) (end 73.39 100) (layer Edge.Cuts) (width 0.1))
   (gr_line (start 130 81.817) (end 73.39 81.817) (layer Edge.Cuts) (width 0.1))
   (gr_line (start 73.39 139.477) (end 130 139.477) (layer Edge.Cuts) (width 0.1))
@@ -620,7 +677,6 @@
   (gr_line (start 130 139.477) (end 130 106.63) (layer Edge.Cuts) (width 0.1))
   (gr_line (start 76.695 106.63) (end 73.39 106.63) (layer Edge.Cuts) (width 0.1))
   (gr_line (start 130 106.63) (end 126.695 106.63) (layer Edge.Cuts) (width 0.1))
-  (gr_circle (center 87.695 124.647) (end 89.295 124.647) (layer Edge.Cuts) (width 0.1))
   (gr_line (start 73.39 100) (end 76.695 100) (layer Edge.Cuts) (width 0.1))
   (gr_line (start 130 100) (end 130 81.817) (layer Edge.Cuts) (width 0.1))
 
diff --git a/template/1593K_Enclosure/1593K_Enclosure.net b/template/1593K_Enclosure/1593K_Enclosure.net
new file mode 100644
index 00000000..1832d9b7
--- /dev/null
+++ b/template/1593K_Enclosure/1593K_Enclosure.net
@@ -0,0 +1,54 @@
+(export (version D)
+  (design
+    (source /home/ashton/kicad/kicad-library/template/1593K_Enclosure/1593K_Enclosure.sch)
+    (date "Fri 30 Dec 2016 09:10:05 PM CST")
+    (tool "Eeschema no-vcs-found-7409~56~ubuntu16.10.1")
+    (sheet (number 1) (name /) (tstamps /)
+      (title_block
+        (title)
+        (company)
+        (rev)
+        (date)
+        (source 1593K_Enclosure.sch)
+        (comment (number 1) (value ""))
+        (comment (number 2) (value ""))
+        (comment (number 3) (value ""))
+        (comment (number 4) (value "")))))
+  (components
+    (comp (ref MK1)
+      (value Mounting_Hole)
+      (footprint Mounting_Holes:MountingHole_3.2mm_M3_ISO7380)
+      (libsource (lib mechanical) (part Mounting_Hole))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5867217E))
+    (comp (ref MK3)
+      (value Mounting_Hole)
+      (footprint Mounting_Holes:MountingHole_3.2mm_M3_ISO7380)
+      (libsource (lib mechanical) (part Mounting_Hole))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 58672295))
+    (comp (ref MK2)
+      (value Mounting_Hole)
+      (footprint Mounting_Holes:MountingHole_3.2mm_M3_ISO7380)
+      (libsource (lib mechanical) (part Mounting_Hole))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 586722B5))
+    (comp (ref MK4)
+      (value Mounting_Hole)
+      (footprint Mounting_Holes:MountingHole_3.2mm_M3_ISO7380)
+      (libsource (lib mechanical) (part Mounting_Hole))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5867236D)))
+  (libparts
+    (libpart (lib mechanical) (part Mounting_Hole)
+      (description "Mounting Hole without connection")
+      (footprints
+        (fp Mounting?Hole*)
+        (fp Hole*))
+      (fields
+        (field (name Reference) MK)
+        (field (name Value) Mounting_Hole))))
+  (libraries
+    (library (logical mechanical)
+      (uri /home/ashton/kicad/kicad-library/library/mechanical.lib)))
+  (nets))
\ No newline at end of file
diff --git a/template/1593K_Enclosure/1593K_Enclosure.pro b/template/1593K_Enclosure/1593K_Enclosure.pro
index 0945013d..b72d5ead 100644
--- a/template/1593K_Enclosure/1593K_Enclosure.pro
+++ b/template/1593K_Enclosure/1593K_Enclosure.pro
@@ -1,60 +1,32 @@
-update=23/12/2015 15:43:07
-version=1
-last_client=kicad
-[pcbnew]
-version=1
-LastNetListRead=
-UseCmpFile=1
-PadDrill=0.600000000000
-PadDrillOvalY=0.600000000000
-PadSizeH=1.500000000000
-PadSizeV=1.500000000000
-PcbTextSizeV=1.500000000000
-PcbTextSizeH=1.500000000000
-PcbTextThickness=0.300000000000
-ModuleTextSizeV=1.000000000000
-ModuleTextSizeH=1.000000000000
-ModuleTextSizeThickness=0.150000000000
-SolderMaskClearance=0.000000000000
-SolderMaskMinWidth=0.000000000000
-DrawSegmentWidth=0.200000000000
-BoardOutlineThickness=0.100000000000
-ModuleOutlineThickness=0.150000000000
-[cvpcb]
-version=1
-NetIExt=net
-[eeschema]
-version=1
-LibDir=
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=microcontrollers
-LibName13=dsp
-LibName14=microchip
-LibName15=analog_switches
-LibName16=motorola
-LibName17=texas
-LibName18=intel
-LibName19=audio
-LibName20=interface
-LibName21=digital-audio
-LibName22=philips
-LibName23=display
-LibName24=cypress
-LibName25=siliconi
-LibName26=opto
-LibName27=atmel
-LibName28=contrib
-LibName29=valves
-[general]
-version=1
+update=Fri 30 Dec 2016 09:08:25 PM CST
+version=1
+last_client=kicad
+[pcbnew]
+version=1
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.500000000000
+PcbTextSizeH=1.500000000000
+PcbTextThickness=0.300000000000
+ModuleTextSizeV=1.000000000000
+ModuleTextSizeH=1.000000000000
+ModuleTextSizeThickness=0.150000000000
+SolderMaskClearance=0.000000000000
+SolderMaskMinWidth=0.000000000000
+DrawSegmentWidth=0.200000000000
+BoardOutlineThickness=0.100000000000
+ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net
+[general]
+version=1
+[eeschema]
+version=1
+LibDir=../../library
+[eeschema/libraries]
+LibName1=mechanical
diff --git a/template/1593K_Enclosure/1593K_Enclosure.sch b/template/1593K_Enclosure/1593K_Enclosure.sch
index 7719092d..66dc0d8b 100644
--- a/template/1593K_Enclosure/1593K_Enclosure.sch
+++ b/template/1593K_Enclosure/1593K_Enclosure.sch
@@ -1,38 +1,10 @@
 EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 25 0
+LIBS:mechanical
+EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 1 4
+Sheet 1 1
 Title ""
 Date ""
 Rev ""
@@ -42,4 +14,48 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+$Comp
+L Mounting_Hole MK1
+U 1 1 5867217E
+P 4200 7200
+F 0 "MK1" H 4300 7246 50  0000 L CNN
+F 1 "Mounting_Hole" H 4300 7155 50  0000 L CNN
+F 2 "Mounting_Holes:MountingHole_3.2mm_M3_ISO7380" H 4200 7200 60  0001 C CNN
+F 3 "" H 4200 7200 60  0001 C CNN
+	1    4200 7200
+	1    0    0    -1  
+$EndComp
+$Comp
+L Mounting_Hole MK3
+U 1 1 58672295
+P 5100 7200
+F 0 "MK3" H 5200 7246 50  0000 L CNN
+F 1 "Mounting_Hole" H 5200 7155 50  0000 L CNN
+F 2 "Mounting_Holes:MountingHole_3.2mm_M3_ISO7380" H 5100 7200 60  0001 C CNN
+F 3 "" H 5100 7200 60  0001 C CNN
+	1    5100 7200
+	1    0    0    -1  
+$EndComp
+$Comp
+L Mounting_Hole MK2
+U 1 1 586722B5
+P 4200 7450
+F 0 "MK2" H 4300 7496 50  0000 L CNN
+F 1 "Mounting_Hole" H 4300 7405 50  0000 L CNN
+F 2 "Mounting_Holes:MountingHole_3.2mm_M3_ISO7380" H 4200 7450 60  0001 C CNN
+F 3 "" H 4200 7450 60  0001 C CNN
+	1    4200 7450
+	1    0    0    -1  
+$EndComp
+$Comp
+L Mounting_Hole MK4
+U 1 1 5867236D
+P 5100 7450
+F 0 "MK4" H 5200 7496 50  0000 L CNN
+F 1 "Mounting_Hole" H 5200 7405 50  0000 L CNN
+F 2 "Mounting_Holes:MountingHole_3.2mm_M3_ISO7380" H 5100 7450 60  0001 C CNN
+F 3 "" H 5100 7450 60  0001 C CNN
+	1    5100 7450
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC