diff --git a/Hardware/Apple2IORPi-cache.lib b/Hardware/Apple2IORPi-cache.lib
index 3236702..91e906f 100644
--- a/Hardware/Apple2IORPi-cache.lib
+++ b/Hardware/Apple2IORPi-cache.lib
@@ -454,23 +454,6 @@ X ~ 2 0 -150 110 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device_R
-#
-DEF Device_R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "Device_R" 0 0 50 V V C CNN
-F2 "" -70 0 50 V I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- R_*
-$ENDFPLIST
-DRAW
-S -40 -100 40 100 0 1 10 N
-X ~ 1 0 150 50 D 50 50 1 1 P
-X ~ 2 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # Memory_EPROM_2764
 #
 DEF Memory_EPROM_2764 U 0 20 Y Y 1 F N
diff --git a/Hardware/Apple2IORPi.jpg b/Hardware/Apple2IORPi.jpg
index 08939cf..858c451 100644
Binary files a/Hardware/Apple2IORPi.jpg and b/Hardware/Apple2IORPi.jpg differ
diff --git a/Hardware/Apple2IORPi.kicad_pcb b/Hardware/Apple2IORPi.kicad_pcb
index 0a0ff47..2dae83f 100644
--- a/Hardware/Apple2IORPi.kicad_pcb
+++ b/Hardware/Apple2IORPi.kicad_pcb
@@ -3,10 +3,10 @@
   (general
     (thickness 1.6)
     (drawings 20)
-    (tracks 8)
+    (tracks 0)
     (zones 0)
-    (modules 30)
-    (nets 96)
+    (modules 14)
+    (nets 97)
   )
 
   (page USLetter)
@@ -19,8 +19,8 @@
     (35 F.Paste user hide)
     (36 B.SilkS user)
     (37 F.SilkS user)
-    (38 B.Mask user)
-    (39 F.Mask user)
+    (38 B.Mask user hide)
+    (39 F.Mask user hide)
     (40 Dwgs.User user hide)
     (41 Cmts.User user hide)
     (42 Eco1.User user hide)
@@ -146,46 +146,47 @@
   (net 53 "Net-(J0-Pad48)")
   (net 54 "Net-(J0-Pad49)")
   (net 55 "Net-(J0-Pad50)")
-  (net 56 "Net-(J1-Pad1)")
-  (net 57 "Net-(J1-Pad3)")
-  (net 58 "Net-(J1-Pad5)")
-  (net 59 "Net-(J1-Pad7)")
-  (net 60 "Net-(J1-Pad8)")
-  (net 61 "Net-(J1-Pad10)")
-  (net 62 "Net-(J1-Pad11)")
-  (net 63 "Net-(J1-Pad12)")
-  (net 64 "Net-(J1-Pad13)")
-  (net 65 "Net-(J1-Pad15)")
-  (net 66 "Net-(J1-Pad16)")
-  (net 67 "Net-(J1-Pad17)")
-  (net 68 "Net-(J1-Pad18)")
-  (net 69 "Net-(J1-Pad19)")
-  (net 70 "Net-(J1-Pad21)")
-  (net 71 "Net-(J1-Pad22)")
-  (net 72 "Net-(J1-Pad23)")
-  (net 73 "Net-(J1-Pad24)")
-  (net 74 "Net-(J1-Pad26)")
-  (net 75 "Net-(J1-Pad27)")
-  (net 76 "Net-(J1-Pad28)")
-  (net 77 "Net-(J1-Pad29)")
-  (net 78 "Net-(J1-Pad31)")
-  (net 79 "Net-(J1-Pad32)")
-  (net 80 "Net-(J1-Pad33)")
-  (net 81 "Net-(J1-Pad35)")
-  (net 82 "Net-(J1-Pad36)")
-  (net 83 "Net-(J1-Pad37)")
-  (net 84 "Net-(J1-Pad38)")
-  (net 85 "Net-(J1-Pad40)")
-  (net 86 "Net-(U0-Pad1)")
-  (net 87 "Net-(J0-Pad42)")
-  (net 88 "Net-(U0-Pad19)")
-  (net 89 "Net-(U2-Pad3)")
-  (net 90 "Net-(U2-Pad8)")
-  (net 91 "Net-(J0-Pad41)")
-  (net 92 "Net-(U3-Pad1)")
-  (net 93 "Net-(U3-Pad10)")
-  (net 94 "Net-(C1-Pad2)")
-  (net 95 "Net-(C1-Pad1)")
+  (net 56 "Net-(J1-Pad3)")
+  (net 57 "Net-(J1-Pad5)")
+  (net 58 "Net-(J1-Pad7)")
+  (net 59 "Net-(J1-Pad8)")
+  (net 60 "Net-(J1-Pad10)")
+  (net 61 "Net-(J1-Pad11)")
+  (net 62 "Net-(J1-Pad12)")
+  (net 63 "Net-(J1-Pad13)")
+  (net 64 "Net-(J1-Pad15)")
+  (net 65 "Net-(J1-Pad16)")
+  (net 66 "Net-(J1-Pad18)")
+  (net 67 "Net-(J1-Pad19)")
+  (net 68 "Net-(J1-Pad21)")
+  (net 69 "Net-(J1-Pad22)")
+  (net 70 "Net-(J1-Pad23)")
+  (net 71 "Net-(J1-Pad24)")
+  (net 72 "Net-(J1-Pad26)")
+  (net 73 "Net-(J1-Pad27)")
+  (net 74 "Net-(J1-Pad28)")
+  (net 75 "Net-(J1-Pad29)")
+  (net 76 "Net-(J1-Pad31)")
+  (net 77 "Net-(J1-Pad32)")
+  (net 78 "Net-(J1-Pad33)")
+  (net 79 "Net-(J1-Pad35)")
+  (net 80 "Net-(J1-Pad36)")
+  (net 81 "Net-(J1-Pad37)")
+  (net 82 "Net-(J1-Pad38)")
+  (net 83 "Net-(J1-Pad40)")
+  (net 84 "Net-(U0-Pad1)")
+  (net 85 "Net-(J0-Pad42)")
+  (net 86 "Net-(U0-Pad19)")
+  (net 87 "Net-(U2-Pad3)")
+  (net 88 "Net-(U2-Pad8)")
+  (net 89 "Net-(J0-Pad41)")
+  (net 90 "Net-(U3-Pad1)")
+  (net 91 "Net-(U3-Pad10)")
+  (net 92 "Net-(C1-Pad2)")
+  (net 93 "Net-(C1-Pad1)")
+  (net 94 "Net-(C5-Pad1)")
+  (net 95 "Net-(U3-Pad3)")
+  (net 96 "Net-(U3-Pad8)")
 
   (net_class Default "This is the default net class."
     (clearance 0.1778)
@@ -194,6 +195,7 @@
     (via_drill 0.50038)
     (uvia_dia 0.3)
     (uvia_drill 0.1)
+    (add_net "Net-(C5-Pad1)")
     (add_net "Net-(J0-Pad1)")
     (add_net "Net-(J0-Pad10)")
     (add_net "Net-(J0-Pad11)")
@@ -240,14 +242,12 @@
     (add_net "Net-(J0-Pad7)")
     (add_net "Net-(J0-Pad8)")
     (add_net "Net-(J0-Pad9)")
-    (add_net "Net-(J1-Pad1)")
     (add_net "Net-(J1-Pad10)")
     (add_net "Net-(J1-Pad11)")
     (add_net "Net-(J1-Pad12)")
     (add_net "Net-(J1-Pad13)")
     (add_net "Net-(J1-Pad15)")
     (add_net "Net-(J1-Pad16)")
-    (add_net "Net-(J1-Pad17)")
     (add_net "Net-(J1-Pad18)")
     (add_net "Net-(J1-Pad19)")
     (add_net "Net-(J1-Pad21)")
@@ -287,6 +287,8 @@
     (add_net "Net-(U2-Pad8)")
     (add_net "Net-(U3-Pad1)")
     (add_net "Net-(U3-Pad10)")
+    (add_net "Net-(U3-Pad3)")
+    (add_net "Net-(U3-Pad8)")
   )
 
   (net_class Ground ""
@@ -309,474 +311,12 @@
     (add_net "Net-(C1-Pad1)")
   )
 
-  (module "Apple2:Apple II Expansion Edge Connector" (layer F.Cu) (tedit 5CA41682) (tstamp 5FAE4676)
-    (at 134.025001 114.215001)
-    (path /5FA0A8C3)
-    (fp_text reference J0 (at 0 0.5) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value "Apple II Expansion Bus" (at 9.652 -5.08) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 48.895 7.62) (end 48.895 1.27) (layer F.SilkS) (width 0.15))
-    (fp_line (start 48.895 1.27) (end 49.53 1.27) (layer F.SilkS) (width 0.15))
-    (fp_line (start -15.875 7.62) (end -15.875 1.27) (layer F.SilkS) (width 0.15))
-    (fp_line (start -15.875 1.27) (end -16.51 1.27) (layer F.SilkS) (width 0.15))
-    (fp_text user "7 A5" (at 1.905 0 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "9 A7" (at 6.985 0 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "6 A4" (at -0.635 0 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "8 A6" (at 4.445 0 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "2 A0" (at -10.668 -0.127 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "49 D0" (at -12.446 10.668 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "4 A2" (at -5.588 0.127 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "5 A3" (at -3.048 0 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "3 A1" (at -8.128 -0.127 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "1 _I/O SELECT" (at -11.303 -2.032 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "50 +12V" (at -15.494 11.43 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_poly (pts (xy 48.895 8.89) (xy 48.895 1.27) (xy -15.875 1.27) (xy -15.875 8.89)) (layer F.Mask) (width 0.15))
-    (fp_poly (pts (xy 48.895 8.89) (xy 48.895 1.27) (xy -15.875 1.27) (xy -15.875 8.89)) (layer B.Mask) (width 0.15))
-    (fp_text user "10 A8" (at 9.779 -0.254 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "11 A9" (at 12.319 -0.254 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "12 A10" (at 15.113 -0.508 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "13 A11" (at 17.653 -0.508 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "15 A13" (at 22.733 -0.508 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "14 A12" (at 20.193 -0.508 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "17 A15" (at 27.813 -0.508 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "16 A14" (at 25.273 -0.508 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "18 R/W" (at 30.48 -0.635 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "19 N.C." (at 32.893 -0.635 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "20 _I/O STROBE" (at 37.084 -2.413 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "21 RDY" (at 37.973 -0.508 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "22 _DMA" (at 40.767 -0.762 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "23 INT OUT" (at 43.942 -1.397 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "24 DMA OUT" (at 46.609 -1.524 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "25 +5V" (at 48.26 -0.635 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "48 D1" (at -9.906 10.541 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "47 D2" (at -7.239 10.541 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "46 D3" (at -4.699 10.541 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "45 D4" (at -2.159 10.541 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "44 D5" (at 0.508 10.541 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "43 D6" (at 2.921 10.541 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "42 D7" (at 5.461 10.541 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "41 _DEVICE SELECT" (at 5.334 13.335 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "40 @0" (at 10.414 10.541 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "39 USER 1" (at 12.192 11.43 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "38 @1" (at 15.621 10.541 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "37 Q3" (at 18.161 10.541 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "36 7M" (at 20.701 10.541 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "35 N.C." (at 23.368 10.541 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "34 -5V" (at 25.527 10.922 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "33 -12V" (at 27.813 11.176 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "32 _INH" (at 30.607 10.922 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "31 _RES" (at 33.02 10.922 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "30 _IRQ" (at 35.687 10.922 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "29 _NMI" (at 38.1 10.922 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "28 INT IN" (at 40.386 11.303 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "27 DMA IN" (at 42.799 11.43 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (fp_text user "26 GND" (at 45.974 10.922 45) (layer F.Fab)
-      (effects (font (size 0.762 0.762) (thickness 0.127)))
-    )
-    (pad 1 connect roundrect (at -13.97 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 11 "Net-(J0-Pad1)"))
-    (pad 2 connect roundrect (at -11.43 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 17 "Net-(J0-Pad2)"))
-    (pad 3 connect roundrect (at -8.89 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 15 "Net-(J0-Pad3)"))
-    (pad 4 connect roundrect (at -6.35 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 14 "Net-(J0-Pad4)"))
-    (pad 5 connect roundrect (at -3.81 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 12 "Net-(J0-Pad5)"))
-    (pad 6 connect roundrect (at -1.27 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 10 "Net-(J0-Pad6)"))
-    (pad 7 connect roundrect (at 1.27 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 8 "Net-(J0-Pad7)"))
-    (pad 8 connect roundrect (at 3.81 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 6 "Net-(J0-Pad8)"))
-    (pad 9 connect roundrect (at 6.35 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 4 "Net-(J0-Pad9)"))
-    (pad 10 connect roundrect (at 8.89 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 20 "Net-(J0-Pad10)"))
-    (pad 11 connect roundrect (at 11.43 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 18 "Net-(J0-Pad11)"))
-    (pad 12 connect roundrect (at 13.97 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 13 "Net-(J0-Pad12)"))
-    (pad 13 connect roundrect (at 16.51 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 24 "Net-(J0-Pad13)"))
-    (pad 14 connect roundrect (at 19.05 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 25 "Net-(J0-Pad14)"))
-    (pad 15 connect roundrect (at 21.59 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 26 "Net-(J0-Pad15)"))
-    (pad 16 connect roundrect (at 24.13 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 27 "Net-(J0-Pad16)"))
-    (pad 17 connect roundrect (at 26.67 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 28 "Net-(J0-Pad17)"))
-    (pad 18 connect roundrect (at 29.21 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 29 "Net-(J0-Pad18)"))
-    (pad 19 connect roundrect (at 31.75 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 30 "Net-(J0-Pad19)"))
-    (pad 20 connect roundrect (at 34.29 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 31 "Net-(J0-Pad20)"))
-    (pad 21 connect roundrect (at 36.83 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 32 "Net-(J0-Pad21)"))
-    (pad 22 connect roundrect (at 39.37 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 33 "Net-(J0-Pad22)"))
-    (pad 23 connect roundrect (at 41.91 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 34 "Net-(J0-Pad23)"))
-    (pad 24 connect roundrect (at 44.45 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 35 "Net-(J0-Pad24)"))
-    (pad 25 connect roundrect (at 46.99 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 95 "Net-(C1-Pad1)"))
-    (pad 26 connect roundrect (at 46.99 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 27 connect roundrect (at 44.45 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 35 "Net-(J0-Pad24)"))
-    (pad 28 connect roundrect (at 41.91 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 34 "Net-(J0-Pad23)"))
-    (pad 29 connect roundrect (at 39.37 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 36 "Net-(J0-Pad29)"))
-    (pad 30 connect roundrect (at 36.83 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 37 "Net-(J0-Pad30)"))
-    (pad 31 connect roundrect (at 34.29 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 38 "Net-(J0-Pad31)"))
-    (pad 32 connect roundrect (at 31.75 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 39 "Net-(J0-Pad32)"))
-    (pad 33 connect roundrect (at 29.21 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 40 "Net-(J0-Pad33)"))
-    (pad 34 connect roundrect (at 26.67 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 41 "Net-(J0-Pad34)"))
-    (pad 35 connect roundrect (at 24.13 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 42 "Net-(J0-Pad35)"))
-    (pad 36 connect roundrect (at 21.59 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 43 "Net-(J0-Pad36)"))
-    (pad 38 connect roundrect (at 16.51 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 45 "Net-(J0-Pad38)"))
-    (pad 37 connect roundrect (at 19.05 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 44 "Net-(J0-Pad37)"))
-    (pad 39 connect roundrect (at 13.97 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 46 "Net-(J0-Pad39)"))
-    (pad 40 connect roundrect (at 11.43 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 47 "Net-(J0-Pad40)"))
-    (pad 41 connect roundrect (at 8.89 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 91 "Net-(J0-Pad41)"))
-    (pad 42 connect roundrect (at 6.35 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 87 "Net-(J0-Pad42)"))
-    (pad 43 connect roundrect (at 3.81 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 48 "Net-(J0-Pad43)"))
-    (pad 44 connect roundrect (at 1.27 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 49 "Net-(J0-Pad44)"))
-    (pad 45 connect roundrect (at -1.27 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 50 "Net-(J0-Pad45)"))
-    (pad 46 connect roundrect (at -3.81 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 51 "Net-(J0-Pad46)"))
-    (pad 47 connect roundrect (at -6.35 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 52 "Net-(J0-Pad47)"))
-    (pad 48 connect roundrect (at -8.89 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 53 "Net-(J0-Pad48)"))
-    (pad 49 connect roundrect (at -11.43 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 54 "Net-(J0-Pad49)"))
-    (pad 50 connect roundrect (at -13.97 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
-      (net 55 "Net-(J0-Pad50)"))
-  )
-
-  (module Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5FB22CF2)
-    (at 120.015 93.345 90)
-    (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.8*2.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
-    (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.8mm width 2.6mm Capacitor")
-    (path /5FB87862)
-    (fp_text reference C6 (at 1.25 -2.55 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value C (at 1.25 2.55 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 1.25 0 90) (layer F.Fab)
-      (effects (font (size 0.76 0.76) (thickness 0.114)))
-    )
-    (fp_line (start 3.55 -1.55) (end -1.05 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.55 1.55) (end 3.55 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.55) (end 3.55 1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.55) (end -1.05 1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.27 0.795) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.27 -1.42) (end 3.27 -0.795) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 0.795) (end -0.77 1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 -1.42) (end -0.77 -0.795) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 1.42) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 -1.42) (end 3.27 -1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.15 -1.3) (end -0.65 -1.3) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.15 1.3) (end 3.15 -1.3) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.65 1.3) (end 3.15 1.3) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.65 -1.3) (end -0.65 1.3) (layer F.Fab) (width 0.1))
-    (pad 2 thru_hole circle (at 2.5 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 1 thru_hole circle (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.8mm_W2.6mm_P2.50mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5FB22CDD)
-    (at 110.49 90.805)
-    (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.8*2.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
-    (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.8mm width 2.6mm Capacitor")
-    (path /5FB8694D)
-    (fp_text reference C5 (at 1.25 -2.55) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value C (at 1.25 2.55) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 1.25 0) (layer F.Fab)
-      (effects (font (size 0.76 0.76) (thickness 0.114)))
-    )
-    (fp_line (start 3.55 -1.55) (end -1.05 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.55 1.55) (end 3.55 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.55) (end 3.55 1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.55) (end -1.05 1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.27 0.795) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.27 -1.42) (end 3.27 -0.795) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 0.795) (end -0.77 1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 -1.42) (end -0.77 -0.795) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 1.42) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 -1.42) (end 3.27 -1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.15 -1.3) (end -0.65 -1.3) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.15 1.3) (end 3.15 -1.3) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.65 1.3) (end 3.15 1.3) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.65 -1.3) (end -0.65 1.3) (layer F.Fab) (width 0.1))
-    (pad 2 thru_hole circle (at 2.5 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.8mm_W2.6mm_P2.50mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5FB22CC8)
-    (at 120.015 104.775 90)
-    (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.8*2.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
-    (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.8mm width 2.6mm Capacitor")
-    (path /5FB82906)
-    (fp_text reference C4 (at 1.25 -2.55 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value C (at 1.25 2.55 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 1.25 0 90) (layer F.Fab)
-      (effects (font (size 0.76 0.76) (thickness 0.114)))
-    )
-    (fp_line (start 3.55 -1.55) (end -1.05 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.55 1.55) (end 3.55 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.55) (end 3.55 1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.55) (end -1.05 1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.27 0.795) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.27 -1.42) (end 3.27 -0.795) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 0.795) (end -0.77 1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 -1.42) (end -0.77 -0.795) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 1.42) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 -1.42) (end 3.27 -1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.15 -1.3) (end -0.65 -1.3) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.15 1.3) (end 3.15 -1.3) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.65 1.3) (end 3.15 1.3) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.65 -1.3) (end -0.65 1.3) (layer F.Fab) (width 0.1))
-    (pad 2 thru_hole circle (at 2.5 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 1 thru_hole circle (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.8mm_W2.6mm_P2.50mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5FB22CB3)
-    (at 175.895 83.82 180)
-    (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.8*2.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
-    (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.8mm width 2.6mm Capacitor")
-    (path /5FB81404)
-    (fp_text reference C3 (at 1.25 -2.55) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value C (at 1.25 2.55) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 1.25 0) (layer F.Fab)
-      (effects (font (size 0.76 0.76) (thickness 0.114)))
-    )
-    (fp_line (start 3.55 -1.55) (end -1.05 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.55 1.55) (end 3.55 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.55) (end 3.55 1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.55) (end -1.05 1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.27 0.795) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.27 -1.42) (end 3.27 -0.795) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 0.795) (end -0.77 1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 -1.42) (end -0.77 -0.795) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 1.42) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 -1.42) (end 3.27 -1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.15 -1.3) (end -0.65 -1.3) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.15 1.3) (end 3.15 -1.3) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.65 1.3) (end 3.15 1.3) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.65 -1.3) (end -0.65 1.3) (layer F.Fab) (width 0.1))
-    (pad 2 thru_hole circle (at 2.5 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 1 thru_hole circle (at 0 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.8mm_W2.6mm_P2.50mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5FB22C9E)
-    (at 175.895 108.585 180)
-    (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.8*2.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
-    (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.8mm width 2.6mm Capacitor")
-    (path /5FB849D8)
-    (fp_text reference C2 (at 1.25 -2.55) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value C (at 1.25 2.55) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 1.25 0) (layer F.Fab)
-      (effects (font (size 0.76 0.76) (thickness 0.114)))
-    )
-    (fp_line (start 3.55 -1.55) (end -1.05 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.55 1.55) (end 3.55 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.55) (end 3.55 1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.55) (end -1.05 1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.27 0.795) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.27 -1.42) (end 3.27 -0.795) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 0.795) (end -0.77 1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 -1.42) (end -0.77 -0.795) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 1.42) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.77 -1.42) (end 3.27 -1.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.15 -1.3) (end -0.65 -1.3) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.15 1.3) (end 3.15 -1.3) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.65 1.3) (end 3.15 1.3) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.65 -1.3) (end -0.65 1.3) (layer F.Fab) (width 0.1))
-    (pad 2 thru_hole circle (at 2.5 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 1 thru_hole circle (at 0 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.8mm_W2.6mm_P2.50mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5FB22C89)
-    (at 165.735 71.755 270)
+  (module Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5FB686E7)
+    (at 121.285 94.615 270)
     (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.8*2.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
     (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.8mm width 2.6mm Capacitor")
     (path /5FB85911)
-    (fp_text reference C1 (at 1.25 -2.55 90) (layer F.SilkS)
+    (fp_text reference C1 (at 1.25 -2.55 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value C (at 1.25 2.55 90) (layer F.Fab)
@@ -800,9 +340,9 @@
     (fp_line (start -0.65 1.3) (end 3.15 1.3) (layer F.Fab) (width 0.1))
     (fp_line (start -0.65 -1.3) (end -0.65 1.3) (layer F.Fab) (width 0.1))
     (pad 2 thru_hole circle (at 2.5 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
+      (net 92 "Net-(C1-Pad2)"))
     (pad 1 thru_hole circle (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
+      (net 93 "Net-(C1-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.8mm_W2.6mm_P2.50mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -810,100 +350,470 @@
     )
   )
 
-  (module Package_DIP:DIP-28_W15.24mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5FAE4127)
-    (at 162.56 65.405 270)
-    (descr "28-lead though-hole mounted DIP package, row spacing 15.24 mm (600 mils)")
-    (tags "THT DIP DIL PDIP 2.54mm 15.24mm 600mil")
-    (path /5FA0EF8B)
-    (fp_text reference U1 (at 7.62 -2.33 90) (layer F.SilkS)
+  (module Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5FB686FC)
+    (at 188.595 93.98 270)
+    (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.8*2.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
+    (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.8mm width 2.6mm Capacitor")
+    (path /5FB849D8)
+    (fp_text reference C2 (at 1.25 -2.55 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 2764 (at 7.62 35.35 90) (layer F.Fab)
+    (fp_text value C (at 1.25 2.55 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 7.62 16.51 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
+    (fp_line (start -0.65 -1.3) (end -0.65 1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.65 1.3) (end 3.15 1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.15 1.3) (end 3.15 -1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.15 -1.3) (end -0.65 -1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.77 -1.42) (end 3.27 -1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 1.42) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 -1.42) (end -0.77 -0.795) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 0.795) (end -0.77 1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.27 -1.42) (end 3.27 -0.795) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.27 0.795) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.05 -1.55) (end -1.05 1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.55) (end 3.55 1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.55 1.55) (end 3.55 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.55 -1.55) (end -1.05 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 1.25 0 90) (layer F.Fab)
+      (effects (font (size 0.76 0.76) (thickness 0.114)))
     )
-    (fp_line (start 16.3 -1.55) (end -1.05 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 16.3 34.55) (end 16.3 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 34.55) (end 16.3 34.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.55) (end -1.05 34.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 14.08 -1.33) (end 8.62 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 14.08 34.35) (end 14.08 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.16 34.35) (end 14.08 34.35) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.16 -1.33) (end 1.16 34.35) (layer F.SilkS) (width 0.12))
-    (fp_line (start 6.62 -1.33) (end 1.16 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.255 -0.27) (end 1.255 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.255 34.29) (end 0.255 -0.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 14.985 34.29) (end 0.255 34.29) (layer F.Fab) (width 0.1))
-    (fp_line (start 14.985 -1.27) (end 14.985 34.29) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.255 -1.27) (end 14.985 -1.27) (layer F.Fab) (width 0.1))
-    (fp_arc (start 7.62 -1.33) (end 6.62 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
-    (pad 28 thru_hole oval (at 15.24 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (pad 14 thru_hole oval (at 0 33.02 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 27 thru_hole oval (at 15.24 2.54 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (pad 13 thru_hole oval (at 0 30.48 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 23 "Net-(U0-Pad16)"))
-    (pad 26 thru_hole oval (at 15.24 5.08 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 22 "Net-(U1-Pad26)"))
-    (pad 12 thru_hole oval (at 0 27.94 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 21 "Net-(U0-Pad17)"))
-    (pad 25 thru_hole oval (at 15.24 7.62 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 20 "Net-(J0-Pad10)"))
-    (pad 11 thru_hole oval (at 0 25.4 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 19 "Net-(U0-Pad18)"))
-    (pad 24 thru_hole oval (at 15.24 10.16 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 18 "Net-(J0-Pad11)"))
-    (pad 10 thru_hole oval (at 0 22.86 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 17 "Net-(J0-Pad2)"))
-    (pad 23 thru_hole oval (at 15.24 12.7 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 16 "Net-(U1-Pad23)"))
-    (pad 9 thru_hole oval (at 0 20.32 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 15 "Net-(J0-Pad3)"))
-    (pad 22 thru_hole oval (at 15.24 15.24 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 11 "Net-(J0-Pad1)"))
-    (pad 8 thru_hole oval (at 0 17.78 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 14 "Net-(J0-Pad4)"))
-    (pad 21 thru_hole oval (at 15.24 17.78 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 13 "Net-(J0-Pad12)"))
-    (pad 7 thru_hole oval (at 0 15.24 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 12 "Net-(J0-Pad5)"))
-    (pad 20 thru_hole oval (at 15.24 20.32 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 11 "Net-(J0-Pad1)"))
-    (pad 6 thru_hole oval (at 0 12.7 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 10 "Net-(J0-Pad6)"))
-    (pad 19 thru_hole oval (at 15.24 22.86 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 9 "Net-(U0-Pad11)"))
-    (pad 5 thru_hole oval (at 0 10.16 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 8 "Net-(J0-Pad7)"))
-    (pad 18 thru_hole oval (at 15.24 25.4 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 7 "Net-(U0-Pad12)"))
-    (pad 4 thru_hole oval (at 0 7.62 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 6 "Net-(J0-Pad8)"))
-    (pad 17 thru_hole oval (at 15.24 27.94 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 5 "Net-(U0-Pad13)"))
-    (pad 3 thru_hole oval (at 0 5.08 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 4 "Net-(J0-Pad9)"))
-    (pad 16 thru_hole oval (at 15.24 30.48 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 3 "Net-(U0-Pad14)"))
-    (pad 2 thru_hole oval (at 0 2.54 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 2 "Net-(U1-Pad2)"))
-    (pad 15 thru_hole oval (at 15.24 33.02 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 1 "Net-(U0-Pad15)"))
-    (pad 1 thru_hole rect (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (model ${KISYS3DMOD}/Package_DIP.3dshapes/DIP-28_W15.24mm.wrl
+    (pad 1 thru_hole circle (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 93 "Net-(C1-Pad1)"))
+    (pad 2 thru_hole circle (at 2.5 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.8mm_W2.6mm_P2.50mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (module Connector_PinSocket_2.54mm:PinSocket_2x20_P2.54mm_Vertical (layer F.Cu) (tedit 5A19A433) (tstamp 5FAE46B4)
-    (at 90.17 111.125 180)
+  (module Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5FB68711)
+    (at 182.88 62.865 180)
+    (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.8*2.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
+    (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.8mm width 2.6mm Capacitor")
+    (path /5FB81404)
+    (fp_text reference C3 (at 1.25 -2.55) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value C (at 1.25 2.55) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -0.65 -1.3) (end -0.65 1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.65 1.3) (end 3.15 1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.15 1.3) (end 3.15 -1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.15 -1.3) (end -0.65 -1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.77 -1.42) (end 3.27 -1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 1.42) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 -1.42) (end -0.77 -0.795) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 0.795) (end -0.77 1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.27 -1.42) (end 3.27 -0.795) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.27 0.795) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.05 -1.55) (end -1.05 1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.55) (end 3.55 1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.55 1.55) (end 3.55 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.55 -1.55) (end -1.05 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 1.25 0) (layer F.Fab)
+      (effects (font (size 0.76 0.76) (thickness 0.114)))
+    )
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 93 "Net-(C1-Pad1)"))
+    (pad 2 thru_hole circle (at 2.5 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.8mm_W2.6mm_P2.50mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5FB68726)
+    (at 168.275 62.865 180)
+    (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.8*2.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
+    (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.8mm width 2.6mm Capacitor")
+    (path /5FB82906)
+    (fp_text reference C4 (at 1.25 -2.55) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value C (at 1.25 2.55) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 1.25 0) (layer F.Fab)
+      (effects (font (size 0.76 0.76) (thickness 0.114)))
+    )
+    (fp_line (start 3.55 -1.55) (end -1.05 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.55 1.55) (end 3.55 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.55) (end 3.55 1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.55) (end -1.05 1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.27 0.795) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.27 -1.42) (end 3.27 -0.795) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 0.795) (end -0.77 1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 -1.42) (end -0.77 -0.795) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 1.42) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 -1.42) (end 3.27 -1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.15 -1.3) (end -0.65 -1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.15 1.3) (end 3.15 -1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.65 1.3) (end 3.15 1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.65 -1.3) (end -0.65 1.3) (layer F.Fab) (width 0.1))
+    (pad 2 thru_hole circle (at 2.5 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 1 thru_hole circle (at 0 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 93 "Net-(C1-Pad1)"))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.8mm_W2.6mm_P2.50mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5FB6873B)
+    (at 121.285 81.28 270)
+    (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.8*2.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
+    (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.8mm width 2.6mm Capacitor")
+    (path /5FB8694D)
+    (fp_text reference C5 (at 1.25 -2.55 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value C (at 1.25 2.55 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -0.65 -1.3) (end -0.65 1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.65 1.3) (end 3.15 1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.15 1.3) (end 3.15 -1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.15 -1.3) (end -0.65 -1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.77 -1.42) (end 3.27 -1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 1.42) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 -1.42) (end -0.77 -0.795) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 0.795) (end -0.77 1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.27 -1.42) (end 3.27 -0.795) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.27 0.795) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.05 -1.55) (end -1.05 1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.55) (end 3.55 1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.55 1.55) (end 3.55 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.55 -1.55) (end -1.05 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 1.25 0 90) (layer F.Fab)
+      (effects (font (size 0.76 0.76) (thickness 0.114)))
+    )
+    (pad 1 thru_hole circle (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 94 "Net-(C5-Pad1)"))
+    (pad 2 thru_hole circle (at 2.5 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.8mm_W2.6mm_P2.50mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5FB68750)
+    (at 121.285 66.675 270)
+    (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.8*2.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
+    (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.8mm width 2.6mm Capacitor")
+    (path /5FB87862)
+    (fp_text reference C6 (at 1.25 -2.55 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value C (at 1.25 2.55 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 1.25 0 90) (layer F.Fab)
+      (effects (font (size 0.76 0.76) (thickness 0.114)))
+    )
+    (fp_line (start 3.55 -1.55) (end -1.05 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.55 1.55) (end 3.55 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.55) (end 3.55 1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.55) (end -1.05 1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.27 0.795) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.27 -1.42) (end 3.27 -0.795) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 0.795) (end -0.77 1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 -1.42) (end -0.77 -0.795) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 1.42) (end 3.27 1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.77 -1.42) (end 3.27 -1.42) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.15 -1.3) (end -0.65 -1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.15 1.3) (end 3.15 -1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.65 1.3) (end 3.15 1.3) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.65 -1.3) (end -0.65 1.3) (layer F.Fab) (width 0.1))
+    (pad 2 thru_hole circle (at 2.5 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 1 thru_hole circle (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 94 "Net-(C5-Pad1)"))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D3.8mm_W2.6mm_P2.50mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module "Apple2:Apple II Expansion Edge Connector" (layer F.Cu) (tedit 5CA41682) (tstamp 5FB687BE)
+    (at 138.505001 110.49)
+    (path /5FA0A8C3)
+    (fp_text reference J0 (at 0 0.5) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value "Apple II Expansion Bus" (at 9.652 -5.08) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user "26 GND" (at 45.974 10.922 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "27 DMA IN" (at 42.799 11.43 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "28 INT IN" (at 40.386 11.303 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "29 _NMI" (at 38.1 10.922 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "30 _IRQ" (at 35.687 10.922 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "31 _RES" (at 33.02 10.922 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "32 _INH" (at 30.607 10.922 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "33 -12V" (at 27.813 11.176 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "34 -5V" (at 25.527 10.922 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "35 N.C." (at 23.368 10.541 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "36 7M" (at 20.701 10.541 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "37 Q3" (at 18.161 10.541 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "38 @1" (at 15.621 10.541 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "39 USER 1" (at 12.192 11.43 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "40 @0" (at 10.414 10.541 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "41 _DEVICE SELECT" (at 5.334 13.335 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "42 D7" (at 5.461 10.541 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "43 D6" (at 2.921 10.541 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "44 D5" (at 0.508 10.541 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "45 D4" (at -2.159 10.541 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "46 D3" (at -4.699 10.541 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "47 D2" (at -7.239 10.541 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "48 D1" (at -9.906 10.541 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "25 +5V" (at 48.26 -0.635 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "24 DMA OUT" (at 46.609 -1.524 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "23 INT OUT" (at 43.942 -1.397 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "22 _DMA" (at 40.767 -0.762 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "21 RDY" (at 37.973 -0.508 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "20 _I/O STROBE" (at 37.084 -2.413 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "19 N.C." (at 32.893 -0.635 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "18 R/W" (at 30.48 -0.635 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "16 A14" (at 25.273 -0.508 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "17 A15" (at 27.813 -0.508 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "14 A12" (at 20.193 -0.508 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "15 A13" (at 22.733 -0.508 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "13 A11" (at 17.653 -0.508 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "12 A10" (at 15.113 -0.508 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "11 A9" (at 12.319 -0.254 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "10 A8" (at 9.779 -0.254 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_poly (pts (xy 48.895 8.89) (xy 48.895 1.27) (xy -15.875 1.27) (xy -15.875 8.89)) (layer B.Mask) (width 0.15))
+    (fp_poly (pts (xy 48.895 8.89) (xy 48.895 1.27) (xy -15.875 1.27) (xy -15.875 8.89)) (layer F.Mask) (width 0.15))
+    (fp_text user "50 +12V" (at -15.494 11.43 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "1 _I/O SELECT" (at -11.303 -2.032 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "3 A1" (at -8.128 -0.127 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "5 A3" (at -3.048 0 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "4 A2" (at -5.588 0.127 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "49 D0" (at -12.446 10.668 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "2 A0" (at -10.668 -0.127 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "8 A6" (at 4.445 0 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "6 A4" (at -0.635 0 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "9 A7" (at 6.985 0 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_text user "7 A5" (at 1.905 0 45) (layer F.Fab)
+      (effects (font (size 0.762 0.762) (thickness 0.127)))
+    )
+    (fp_line (start -15.875 1.27) (end -16.51 1.27) (layer F.SilkS) (width 0.15))
+    (fp_line (start -15.875 7.62) (end -15.875 1.27) (layer F.SilkS) (width 0.15))
+    (fp_line (start 48.895 1.27) (end 49.53 1.27) (layer F.SilkS) (width 0.15))
+    (fp_line (start 48.895 7.62) (end 48.895 1.27) (layer F.SilkS) (width 0.15))
+    (pad 50 connect roundrect (at -13.97 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 55 "Net-(J0-Pad50)"))
+    (pad 49 connect roundrect (at -11.43 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 54 "Net-(J0-Pad49)"))
+    (pad 48 connect roundrect (at -8.89 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 53 "Net-(J0-Pad48)"))
+    (pad 47 connect roundrect (at -6.35 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 52 "Net-(J0-Pad47)"))
+    (pad 46 connect roundrect (at -3.81 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 51 "Net-(J0-Pad46)"))
+    (pad 45 connect roundrect (at -1.27 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 50 "Net-(J0-Pad45)"))
+    (pad 44 connect roundrect (at 1.27 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 49 "Net-(J0-Pad44)"))
+    (pad 43 connect roundrect (at 3.81 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 48 "Net-(J0-Pad43)"))
+    (pad 42 connect roundrect (at 6.35 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 85 "Net-(J0-Pad42)"))
+    (pad 41 connect roundrect (at 8.89 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 89 "Net-(J0-Pad41)"))
+    (pad 40 connect roundrect (at 11.43 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 47 "Net-(J0-Pad40)"))
+    (pad 39 connect roundrect (at 13.97 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 46 "Net-(J0-Pad39)"))
+    (pad 37 connect roundrect (at 19.05 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 44 "Net-(J0-Pad37)"))
+    (pad 38 connect roundrect (at 16.51 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 45 "Net-(J0-Pad38)"))
+    (pad 36 connect roundrect (at 21.59 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 43 "Net-(J0-Pad36)"))
+    (pad 35 connect roundrect (at 24.13 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 42 "Net-(J0-Pad35)"))
+    (pad 34 connect roundrect (at 26.67 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 41 "Net-(J0-Pad34)"))
+    (pad 33 connect roundrect (at 29.21 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 40 "Net-(J0-Pad33)"))
+    (pad 32 connect roundrect (at 31.75 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 39 "Net-(J0-Pad32)"))
+    (pad 31 connect roundrect (at 34.29 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 38 "Net-(J0-Pad31)"))
+    (pad 30 connect roundrect (at 36.83 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 37 "Net-(J0-Pad30)"))
+    (pad 29 connect roundrect (at 39.37 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 36 "Net-(J0-Pad29)"))
+    (pad 28 connect roundrect (at 41.91 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 34 "Net-(J0-Pad23)"))
+    (pad 27 connect roundrect (at 44.45 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 35 "Net-(J0-Pad24)"))
+    (pad 26 connect roundrect (at 46.99 5.08) (size 1.27 7.62) (layers B.Cu B.Mask) (roundrect_rratio 0.25)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 25 connect roundrect (at 46.99 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 93 "Net-(C1-Pad1)"))
+    (pad 24 connect roundrect (at 44.45 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 35 "Net-(J0-Pad24)"))
+    (pad 23 connect roundrect (at 41.91 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 34 "Net-(J0-Pad23)"))
+    (pad 22 connect roundrect (at 39.37 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 33 "Net-(J0-Pad22)"))
+    (pad 21 connect roundrect (at 36.83 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 32 "Net-(J0-Pad21)"))
+    (pad 20 connect roundrect (at 34.29 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 31 "Net-(J0-Pad20)"))
+    (pad 19 connect roundrect (at 31.75 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 30 "Net-(J0-Pad19)"))
+    (pad 18 connect roundrect (at 29.21 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 29 "Net-(J0-Pad18)"))
+    (pad 17 connect roundrect (at 26.67 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 28 "Net-(J0-Pad17)"))
+    (pad 16 connect roundrect (at 24.13 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 27 "Net-(J0-Pad16)"))
+    (pad 15 connect roundrect (at 21.59 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 26 "Net-(J0-Pad15)"))
+    (pad 14 connect roundrect (at 19.05 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 25 "Net-(J0-Pad14)"))
+    (pad 13 connect roundrect (at 16.51 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 24 "Net-(J0-Pad13)"))
+    (pad 12 connect roundrect (at 13.97 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 13 "Net-(J0-Pad12)"))
+    (pad 11 connect roundrect (at 11.43 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 18 "Net-(J0-Pad11)"))
+    (pad 10 connect roundrect (at 8.89 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 20 "Net-(J0-Pad10)"))
+    (pad 9 connect roundrect (at 6.35 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 4 "Net-(J0-Pad9)"))
+    (pad 8 connect roundrect (at 3.81 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 6 "Net-(J0-Pad8)"))
+    (pad 7 connect roundrect (at 1.27 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 8 "Net-(J0-Pad7)"))
+    (pad 6 connect roundrect (at -1.27 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 10 "Net-(J0-Pad6)"))
+    (pad 5 connect roundrect (at -3.81 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 12 "Net-(J0-Pad5)"))
+    (pad 4 connect roundrect (at -6.35 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 14 "Net-(J0-Pad4)"))
+    (pad 3 connect roundrect (at -8.89 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 15 "Net-(J0-Pad3)"))
+    (pad 2 connect roundrect (at -11.43 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 17 "Net-(J0-Pad2)"))
+    (pad 1 connect roundrect (at -13.97 5.08) (size 1.27 7.62) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
+      (net 11 "Net-(J0-Pad1)"))
+  )
+
+  (module Connector_PinSocket_2.54mm:PinSocket_2x20_P2.54mm_Vertical (layer F.Cu) (tedit 5A19A433) (tstamp 5FB687FC)
+    (at 110.49 108.585 180)
     (descr "Through hole straight socket strip, 2x20, 2.54mm pitch, double cols (from Kicad 4.0.7), script generated")
     (tags "Through hole socket strip THT 2x20 2.54mm double row")
     (path /5FA19C2C)
@@ -913,106 +823,106 @@
     (fp_text value Raspberry_Pi_2_3 (at -1.27 51.03) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_line (start -3.81 -1.27) (end 0.27 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.27 -1.27) (end 1.27 -0.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.27 -0.27) (end 1.27 49.53) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.27 49.53) (end -3.81 49.53) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.81 49.53) (end -3.81 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.87 -1.33) (end -1.27 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.87 -1.33) (end -3.87 49.59) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.87 49.59) (end 1.33 49.59) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.33 1.27) (end 1.33 49.59) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.27 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.27 -1.33) (end -1.27 1.27) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.33 -1.33) (end 1.33 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 -1.33) (end 1.33 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -4.34 -1.8) (end 1.76 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.76 -1.8) (end 1.76 50) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.76 50) (end -4.34 50) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -4.34 50) (end -4.34 -1.8) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at -1.27 24.13 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -4.34 50) (end -4.34 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.76 50) (end -4.34 50) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.76 -1.8) (end 1.76 50) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -4.34 -1.8) (end 1.76 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 -1.33) (end 1.33 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.33 -1.33) (end 1.33 0) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.27 -1.33) (end -1.27 1.27) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.27 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.33 1.27) (end 1.33 49.59) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.87 49.59) (end 1.33 49.59) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.87 -1.33) (end -3.87 49.59) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.87 -1.33) (end -1.27 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.81 49.53) (end -3.81 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.27 49.53) (end -3.81 49.53) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.27 -0.27) (end 1.27 49.53) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.27 -1.27) (end 1.27 -0.27) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.81 -1.27) (end 0.27 -1.27) (layer F.Fab) (width 0.1))
-    (pad 40 thru_hole oval (at -2.54 48.26 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 85 "Net-(J1-Pad40)"))
-    (pad 39 thru_hole oval (at 0 48.26 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 38 thru_hole oval (at -2.54 45.72 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 84 "Net-(J1-Pad38)"))
-    (pad 37 thru_hole oval (at 0 45.72 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 83 "Net-(J1-Pad37)"))
-    (pad 36 thru_hole oval (at -2.54 43.18 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 82 "Net-(J1-Pad36)"))
-    (pad 35 thru_hole oval (at 0 43.18 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 81 "Net-(J1-Pad35)"))
-    (pad 34 thru_hole oval (at -2.54 40.64 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 33 thru_hole oval (at 0 40.64 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 80 "Net-(J1-Pad33)"))
-    (pad 32 thru_hole oval (at -2.54 38.1 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 79 "Net-(J1-Pad32)"))
-    (pad 31 thru_hole oval (at 0 38.1 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 78 "Net-(J1-Pad31)"))
-    (pad 30 thru_hole oval (at -2.54 35.56 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 29 thru_hole oval (at 0 35.56 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 77 "Net-(J1-Pad29)"))
-    (pad 28 thru_hole oval (at -2.54 33.02 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 76 "Net-(J1-Pad28)"))
-    (pad 27 thru_hole oval (at 0 33.02 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 75 "Net-(J1-Pad27)"))
-    (pad 26 thru_hole oval (at -2.54 30.48 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 74 "Net-(J1-Pad26)"))
-    (pad 25 thru_hole oval (at 0 30.48 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 24 thru_hole oval (at -2.54 27.94 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 73 "Net-(J1-Pad24)"))
-    (pad 23 thru_hole oval (at 0 27.94 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 72 "Net-(J1-Pad23)"))
-    (pad 22 thru_hole oval (at -2.54 25.4 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 71 "Net-(J1-Pad22)"))
-    (pad 21 thru_hole oval (at 0 25.4 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 70 "Net-(J1-Pad21)"))
-    (pad 20 thru_hole oval (at -2.54 22.86 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 19 thru_hole oval (at 0 22.86 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 69 "Net-(J1-Pad19)"))
-    (pad 18 thru_hole oval (at -2.54 20.32 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 68 "Net-(J1-Pad18)"))
-    (pad 17 thru_hole oval (at 0 20.32 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 67 "Net-(J1-Pad17)"))
-    (pad 16 thru_hole oval (at -2.54 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 66 "Net-(J1-Pad16)"))
-    (pad 15 thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 65 "Net-(J1-Pad15)"))
-    (pad 14 thru_hole oval (at -2.54 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 13 thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 64 "Net-(J1-Pad13)"))
-    (pad 12 thru_hole oval (at -2.54 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 63 "Net-(J1-Pad12)"))
-    (pad 11 thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 62 "Net-(J1-Pad11)"))
-    (pad 10 thru_hole oval (at -2.54 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 61 "Net-(J1-Pad10)"))
-    (pad 9 thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 8 thru_hole oval (at -2.54 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 60 "Net-(J1-Pad8)"))
-    (pad 7 thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 59 "Net-(J1-Pad7)"))
-    (pad 6 thru_hole oval (at -2.54 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 5 thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 58 "Net-(J1-Pad5)"))
-    (pad 4 thru_hole oval (at -2.54 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (pad 3 thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 57 "Net-(J1-Pad3)"))
-    (pad 2 thru_hole oval (at -2.54 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
     (pad 1 thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 56 "Net-(J1-Pad1)"))
+      (net 94 "Net-(C5-Pad1)"))
+    (pad 2 thru_hole oval (at -2.54 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 93 "Net-(C1-Pad1)"))
+    (pad 3 thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 56 "Net-(J1-Pad3)"))
+    (pad 4 thru_hole oval (at -2.54 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 93 "Net-(C1-Pad1)"))
+    (pad 5 thru_hole oval (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 57 "Net-(J1-Pad5)"))
+    (pad 6 thru_hole oval (at -2.54 5.08 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 7 thru_hole oval (at 0 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 58 "Net-(J1-Pad7)"))
+    (pad 8 thru_hole oval (at -2.54 7.62 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 59 "Net-(J1-Pad8)"))
+    (pad 9 thru_hole oval (at 0 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 10 thru_hole oval (at -2.54 10.16 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 60 "Net-(J1-Pad10)"))
+    (pad 11 thru_hole oval (at 0 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 61 "Net-(J1-Pad11)"))
+    (pad 12 thru_hole oval (at -2.54 12.7 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 62 "Net-(J1-Pad12)"))
+    (pad 13 thru_hole oval (at 0 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 63 "Net-(J1-Pad13)"))
+    (pad 14 thru_hole oval (at -2.54 15.24 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 15 thru_hole oval (at 0 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 64 "Net-(J1-Pad15)"))
+    (pad 16 thru_hole oval (at -2.54 17.78 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 65 "Net-(J1-Pad16)"))
+    (pad 17 thru_hole oval (at 0 20.32 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 94 "Net-(C5-Pad1)"))
+    (pad 18 thru_hole oval (at -2.54 20.32 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 66 "Net-(J1-Pad18)"))
+    (pad 19 thru_hole oval (at 0 22.86 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 67 "Net-(J1-Pad19)"))
+    (pad 20 thru_hole oval (at -2.54 22.86 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 21 thru_hole oval (at 0 25.4 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 68 "Net-(J1-Pad21)"))
+    (pad 22 thru_hole oval (at -2.54 25.4 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 69 "Net-(J1-Pad22)"))
+    (pad 23 thru_hole oval (at 0 27.94 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 70 "Net-(J1-Pad23)"))
+    (pad 24 thru_hole oval (at -2.54 27.94 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 71 "Net-(J1-Pad24)"))
+    (pad 25 thru_hole oval (at 0 30.48 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 26 thru_hole oval (at -2.54 30.48 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 72 "Net-(J1-Pad26)"))
+    (pad 27 thru_hole oval (at 0 33.02 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 73 "Net-(J1-Pad27)"))
+    (pad 28 thru_hole oval (at -2.54 33.02 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 74 "Net-(J1-Pad28)"))
+    (pad 29 thru_hole oval (at 0 35.56 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 75 "Net-(J1-Pad29)"))
+    (pad 30 thru_hole oval (at -2.54 35.56 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 31 thru_hole oval (at 0 38.1 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 76 "Net-(J1-Pad31)"))
+    (pad 32 thru_hole oval (at -2.54 38.1 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 77 "Net-(J1-Pad32)"))
+    (pad 33 thru_hole oval (at 0 40.64 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 78 "Net-(J1-Pad33)"))
+    (pad 34 thru_hole oval (at -2.54 40.64 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 35 thru_hole oval (at 0 43.18 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 79 "Net-(J1-Pad35)"))
+    (pad 36 thru_hole oval (at -2.54 43.18 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 80 "Net-(J1-Pad36)"))
+    (pad 37 thru_hole oval (at 0 45.72 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 81 "Net-(J1-Pad37)"))
+    (pad 38 thru_hole oval (at -2.54 45.72 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 82 "Net-(J1-Pad38)"))
+    (pad 39 thru_hole oval (at 0 48.26 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 40 thru_hole oval (at -2.54 48.26 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 83 "Net-(J1-Pad40)"))
     (model ${KISYS3DMOD}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_2x20_P2.54mm_Vertical.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1020,520 +930,8 @@
     )
   )
 
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE46C2)
-    (at 120.015 66.04 180)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FAAFB0D)
-    (fp_text reference R0 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 2K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 79 "Net-(J1-Pad32)"))
-    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE46D0)
-    (at 120.015 73.66 180)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FAAFB13)
-    (fp_text reference R1 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 2K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 82 "Net-(J1-Pad36)"))
-    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE46DE)
-    (at 120.015 76.2 180)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FAAFB19)
-    (fp_text reference R2 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 2K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 84 "Net-(J1-Pad38)"))
-    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE46EC)
-    (at 120.015 83.82 180)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FAAFB1F)
-    (fp_text reference R3 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 2K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 85 "Net-(J1-Pad40)"))
-    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE46FA)
-    (at 103.505 83.82)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FAAFB25)
-    (fp_text reference R4 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 2K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 83 "Net-(J1-Pad37)"))
-    (pad 1 thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE4708)
-    (at 103.51 76.2)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FAAFB2B)
-    (fp_text reference R5 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 2K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 81 "Net-(J1-Pad35)"))
-    (pad 1 thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE4716)
-    (at 103.505 73.66)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FAAFB31)
-    (fp_text reference R6 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 2K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 80 "Net-(J1-Pad33)"))
-    (pad 1 thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE4724)
-    (at 103.505 66.04)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FAAFB37)
-    (fp_text reference R7 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 2K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 78 "Net-(J1-Pad31)"))
-    (pad 1 thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE4732)
-    (at 122.555 66.04)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FA241D5)
-    (fp_text reference R8 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 3K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 1 thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 79 "Net-(J1-Pad32)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE4740)
-    (at 122.555 73.66)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FA246F6)
-    (fp_text reference R9 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 3K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 1 thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 82 "Net-(J1-Pad36)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE474E)
-    (at 122.555 76.2)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FA24EB1)
-    (fp_text reference RA1 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 3K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 1 thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 84 "Net-(J1-Pad38)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE475C)
-    (at 122.555 83.82)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FA253F4)
-    (fp_text reference RB1 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 3K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 1 thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 85 "Net-(J1-Pad40)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE476A)
-    (at 100.965 83.82 180)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FA25849)
-    (fp_text reference RC1 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 3K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 83 "Net-(J1-Pad37)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE4778)
-    (at 100.965 76.2 180)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FA25CA5)
-    (fp_text reference RD1 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 3K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 81 "Net-(J1-Pad35)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE4786)
-    (at 100.965 73.66 180)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FA2611D)
-    (fp_text reference RE1 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 3K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 80 "Net-(J1-Pad33)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical (layer F.Cu) (tedit 5AE5139B) (tstamp 5FAE4794)
-    (at 100.965 66.04 180)
-    (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=1.9mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 1.9mm 0.167W length 3.6mm diameter 1.6mm")
-    (path /5FA2686B)
-    (fp_text reference RF1 (at 0.95 -1.92) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 3K (at 0.95 1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0.95 -1.92) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 2.86 -1.05) (end -1.05 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.86 1.05) (end 2.86 -1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.05) (end 2.86 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.05) (end -1.05 1.05) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0 0) (end 1.9 0) (layer F.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.8 0) (layer F.Fab) (width 0.1))
-    (fp_arc (start 0 0) (end 0.417133 -0.7) (angle -233.92106) (layer F.SilkS) (width 0.12))
-    (pad 2 thru_hole oval (at 1.9 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 1 thru_hole circle (at 0 0 180) (size 1.4 1.4) (drill 0.7) (layers *.Cu *.Mask)
-      (net 78 "Net-(J1-Pad31)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Package_DIP:DIP-20_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5FAE47BC)
-    (at 124.46 107.95 90)
+  (module Package_DIP:DIP-20_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5FB68824)
+    (at 124.46 99.695 90)
     (descr "20-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
     (path /5FA15F43)
@@ -1543,64 +941,64 @@
     (fp_text value 74LS245 (at 3.81 25.19 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 -1.27) (end 6.985 24.13) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 24.13) (end 0.635 24.13) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 24.13) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.81 -1.33) (end 1.16 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.16 -1.33) (end 1.16 24.19) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.16 24.19) (end 6.46 24.19) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.46 24.19) (end 6.46 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.46 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.1 -1.55) (end -1.1 24.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.1 24.4) (end 8.7 24.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 24.4) (end 8.7 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 -1.55) (end -1.1 -1.55) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 3.81 11.43 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 8.7 -1.55) (end -1.1 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.7 24.4) (end 8.7 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.1 24.4) (end 8.7 24.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.1 -1.55) (end -1.1 24.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.46 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 6.46 24.19) (end 6.46 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.16 24.19) (end 6.46 24.19) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.16 -1.33) (end 1.16 24.19) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.81 -1.33) (end 1.16 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.635 24.13) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 24.13) (end 0.635 24.13) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 -1.27) (end 6.985 24.13) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
-    (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
-    (pad 20 thru_hole oval (at 7.62 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (pad 10 thru_hole oval (at 0 22.86 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 19 thru_hole oval (at 7.62 2.54 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 88 "Net-(U0-Pad19)"))
-    (pad 9 thru_hole oval (at 0 20.32 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 87 "Net-(J0-Pad42)"))
-    (pad 18 thru_hole oval (at 7.62 5.08 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 19 "Net-(U0-Pad18)"))
-    (pad 8 thru_hole oval (at 0 17.78 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 48 "Net-(J0-Pad43)"))
-    (pad 17 thru_hole oval (at 7.62 7.62 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 21 "Net-(U0-Pad17)"))
-    (pad 7 thru_hole oval (at 0 15.24 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 49 "Net-(J0-Pad44)"))
-    (pad 16 thru_hole oval (at 7.62 10.16 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 23 "Net-(U0-Pad16)"))
-    (pad 6 thru_hole oval (at 0 12.7 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 50 "Net-(J0-Pad45)"))
-    (pad 15 thru_hole oval (at 7.62 12.7 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 1 "Net-(U0-Pad15)"))
-    (pad 5 thru_hole oval (at 0 10.16 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 51 "Net-(J0-Pad46)"))
-    (pad 14 thru_hole oval (at 7.62 15.24 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 3 "Net-(U0-Pad14)"))
-    (pad 4 thru_hole oval (at 0 7.62 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 52 "Net-(J0-Pad47)"))
-    (pad 13 thru_hole oval (at 7.62 17.78 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 5 "Net-(U0-Pad13)"))
-    (pad 3 thru_hole oval (at 0 5.08 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 53 "Net-(J0-Pad48)"))
-    (pad 12 thru_hole oval (at 7.62 20.32 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 7 "Net-(U0-Pad12)"))
-    (pad 2 thru_hole oval (at 0 2.54 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 54 "Net-(J0-Pad49)"))
+    (pad 1 thru_hole rect (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 84 "Net-(U0-Pad1)"))
     (pad 11 thru_hole oval (at 7.62 22.86 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 9 "Net-(U0-Pad11)"))
-    (pad 1 thru_hole rect (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 86 "Net-(U0-Pad1)"))
+    (pad 2 thru_hole oval (at 0 2.54 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 54 "Net-(J0-Pad49)"))
+    (pad 12 thru_hole oval (at 7.62 20.32 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 7 "Net-(U0-Pad12)"))
+    (pad 3 thru_hole oval (at 0 5.08 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 53 "Net-(J0-Pad48)"))
+    (pad 13 thru_hole oval (at 7.62 17.78 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 5 "Net-(U0-Pad13)"))
+    (pad 4 thru_hole oval (at 0 7.62 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 52 "Net-(J0-Pad47)"))
+    (pad 14 thru_hole oval (at 7.62 15.24 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 3 "Net-(U0-Pad14)"))
+    (pad 5 thru_hole oval (at 0 10.16 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 51 "Net-(J0-Pad46)"))
+    (pad 15 thru_hole oval (at 7.62 12.7 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 "Net-(U0-Pad15)"))
+    (pad 6 thru_hole oval (at 0 12.7 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 50 "Net-(J0-Pad45)"))
+    (pad 16 thru_hole oval (at 7.62 10.16 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 23 "Net-(U0-Pad16)"))
+    (pad 7 thru_hole oval (at 0 15.24 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 49 "Net-(J0-Pad44)"))
+    (pad 17 thru_hole oval (at 7.62 7.62 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 21 "Net-(U0-Pad17)"))
+    (pad 8 thru_hole oval (at 0 17.78 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 48 "Net-(J0-Pad43)"))
+    (pad 18 thru_hole oval (at 7.62 5.08 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 19 "Net-(U0-Pad18)"))
+    (pad 9 thru_hole oval (at 0 20.32 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 85 "Net-(J0-Pad42)"))
+    (pad 19 thru_hole oval (at 7.62 2.54 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 86 "Net-(U0-Pad19)"))
+    (pad 10 thru_hole oval (at 0 22.86 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 20 thru_hole oval (at 7.62 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 93 "Net-(C1-Pad1)"))
     (model ${KISYS3DMOD}/Package_DIP.3dshapes/DIP-20_W7.62mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1608,8 +1006,100 @@
     )
   )
 
-  (module Package_DIP:DIP-14_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5FAE47DE)
-    (at 170.815 65.405)
+  (module Package_DIP:DIP-28_W15.24mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5FB68854)
+    (at 185.42 87.63 270)
+    (descr "28-lead though-hole mounted DIP package, row spacing 15.24 mm (600 mils)")
+    (tags "THT DIP DIL PDIP 2.54mm 15.24mm 600mil")
+    (path /5FA0EF8B)
+    (fp_text reference U1 (at 7.62 -2.33 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 2764 (at 7.62 35.35 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_arc (start 7.62 -1.33) (end 6.62 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.255 -1.27) (end 14.985 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 14.985 -1.27) (end 14.985 34.29) (layer F.Fab) (width 0.1))
+    (fp_line (start 14.985 34.29) (end 0.255 34.29) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.255 34.29) (end 0.255 -0.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.255 -0.27) (end 1.255 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.62 -1.33) (end 1.16 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.16 -1.33) (end 1.16 34.35) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.16 34.35) (end 14.08 34.35) (layer F.SilkS) (width 0.12))
+    (fp_line (start 14.08 34.35) (end 14.08 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 14.08 -1.33) (end 8.62 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.05 -1.55) (end -1.05 34.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 34.55) (end 16.3 34.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 16.3 34.55) (end 16.3 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 16.3 -1.55) (end -1.05 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 7.62 16.51 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole rect (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 93 "Net-(C1-Pad1)"))
+    (pad 15 thru_hole oval (at 15.24 33.02 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 "Net-(U0-Pad15)"))
+    (pad 2 thru_hole oval (at 0 2.54 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 2 "Net-(U1-Pad2)"))
+    (pad 16 thru_hole oval (at 15.24 30.48 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 3 "Net-(U0-Pad14)"))
+    (pad 3 thru_hole oval (at 0 5.08 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 4 "Net-(J0-Pad9)"))
+    (pad 17 thru_hole oval (at 15.24 27.94 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 5 "Net-(U0-Pad13)"))
+    (pad 4 thru_hole oval (at 0 7.62 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 6 "Net-(J0-Pad8)"))
+    (pad 18 thru_hole oval (at 15.24 25.4 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 7 "Net-(U0-Pad12)"))
+    (pad 5 thru_hole oval (at 0 10.16 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 8 "Net-(J0-Pad7)"))
+    (pad 19 thru_hole oval (at 15.24 22.86 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 9 "Net-(U0-Pad11)"))
+    (pad 6 thru_hole oval (at 0 12.7 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 10 "Net-(J0-Pad6)"))
+    (pad 20 thru_hole oval (at 15.24 20.32 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 11 "Net-(J0-Pad1)"))
+    (pad 7 thru_hole oval (at 0 15.24 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 12 "Net-(J0-Pad5)"))
+    (pad 21 thru_hole oval (at 15.24 17.78 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 13 "Net-(J0-Pad12)"))
+    (pad 8 thru_hole oval (at 0 17.78 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 14 "Net-(J0-Pad4)"))
+    (pad 22 thru_hole oval (at 15.24 15.24 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 11 "Net-(J0-Pad1)"))
+    (pad 9 thru_hole oval (at 0 20.32 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 15 "Net-(J0-Pad3)"))
+    (pad 23 thru_hole oval (at 15.24 12.7 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 16 "Net-(U1-Pad23)"))
+    (pad 10 thru_hole oval (at 0 22.86 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 17 "Net-(J0-Pad2)"))
+    (pad 24 thru_hole oval (at 15.24 10.16 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 18 "Net-(J0-Pad11)"))
+    (pad 11 thru_hole oval (at 0 25.4 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 19 "Net-(U0-Pad18)"))
+    (pad 25 thru_hole oval (at 15.24 7.62 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 20 "Net-(J0-Pad10)"))
+    (pad 12 thru_hole oval (at 0 27.94 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 21 "Net-(U0-Pad17)"))
+    (pad 26 thru_hole oval (at 15.24 5.08 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 22 "Net-(U1-Pad26)"))
+    (pad 13 thru_hole oval (at 0 30.48 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 23 "Net-(U0-Pad16)"))
+    (pad 27 thru_hole oval (at 15.24 2.54 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 93 "Net-(C1-Pad1)"))
+    (pad 14 thru_hole oval (at 0 33.02 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 28 thru_hole oval (at 15.24 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 93 "Net-(C1-Pad1)"))
+    (model ${KISYS3DMOD}/Package_DIP.3dshapes/DIP-28_W15.24mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Package_DIP:DIP-14_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5FB68876)
+    (at 177.8 66.04)
     (descr "14-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
     (path /5FD4E618)
@@ -1619,70 +1109,6 @@
     (fp_text value 74LS00 (at 3.81 17.57) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 3.81 7.62 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 8.7 -1.55) (end -1.1 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.7 16.8) (end 8.7 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.1 16.8) (end 8.7 16.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.1 -1.55) (end -1.1 16.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.46 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 6.46 16.57) (end 6.46 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.16 16.57) (end 6.46 16.57) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.16 -1.33) (end 1.16 16.57) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.81 -1.33) (end 1.16 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.635 16.51) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 16.51) (end 0.635 16.51) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 -1.27) (end 6.985 16.51) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
-    (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
-    (pad 14 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (pad 7 thru_hole oval (at 0 15.24) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 13 thru_hole oval (at 7.62 2.54) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 29 "Net-(J0-Pad18)"))
-    (pad 6 thru_hole oval (at 0 12.7) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 88 "Net-(U0-Pad19)"))
-    (pad 12 thru_hole oval (at 7.62 5.08) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 29 "Net-(J0-Pad18)"))
-    (pad 5 thru_hole oval (at 0 10.16) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 89 "Net-(U2-Pad3)"))
-    (pad 11 thru_hole oval (at 7.62 7.62) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 86 "Net-(U0-Pad1)"))
-    (pad 4 thru_hole oval (at 0 7.62) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 89 "Net-(U2-Pad3)"))
-    (pad 10 thru_hole oval (at 7.62 10.16) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 86 "Net-(U0-Pad1)"))
-    (pad 3 thru_hole oval (at 0 5.08) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 89 "Net-(U2-Pad3)"))
-    (pad 9 thru_hole oval (at 7.62 12.7) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 86 "Net-(U0-Pad1)"))
-    (pad 2 thru_hole oval (at 0 2.54) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 11 "Net-(J0-Pad1)"))
-    (pad 8 thru_hole oval (at 7.62 15.24) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 90 "Net-(U2-Pad8)"))
-    (pad 1 thru_hole rect (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 91 "Net-(J0-Pad41)"))
-    (model ${KISYS3DMOD}/Package_DIP.3dshapes/DIP-14_W7.62mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Package_DIP:DIP-14_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5FAE4800)
-    (at 170.815 90.17)
-    (descr "14-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
-    (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
-    (path /5FB50A31)
-    (fp_text reference U3 (at 3.81 -2.33) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 74LS32 (at 3.81 17.57) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
     (fp_text user %R (at 3.81 7.62) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1702,33 +1128,33 @@
     (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
     (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
     (pad 14 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
+      (net 93 "Net-(C1-Pad1)"))
     (pad 7 thru_hole oval (at 0 15.24) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
+      (net 92 "Net-(C1-Pad2)"))
     (pad 13 thru_hole oval (at 7.62 2.54) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 15 "Net-(J0-Pad3)"))
+      (net 29 "Net-(J0-Pad18)"))
     (pad 6 thru_hole oval (at 0 12.7) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 92 "Net-(U3-Pad1)"))
+      (net 86 "Net-(U0-Pad19)"))
     (pad 12 thru_hole oval (at 7.62 5.08) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 90 "Net-(U2-Pad8)"))
+      (net 29 "Net-(J0-Pad18)"))
     (pad 5 thru_hole oval (at 0 10.16) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 17 "Net-(J0-Pad2)"))
+      (net 87 "Net-(U2-Pad3)"))
     (pad 11 thru_hole oval (at 7.62 7.62) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 93 "Net-(U3-Pad10)"))
+      (net 84 "Net-(U0-Pad1)"))
     (pad 4 thru_hole oval (at 0 7.62) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 86 "Net-(U0-Pad1)"))
+      (net 87 "Net-(U2-Pad3)"))
     (pad 10 thru_hole oval (at 7.62 10.16) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 93 "Net-(U3-Pad10)"))
+      (net 84 "Net-(U0-Pad1)"))
     (pad 3 thru_hole oval (at 0 5.08) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 74 "Net-(J1-Pad26)"))
+      (net 87 "Net-(U2-Pad3)"))
     (pad 9 thru_hole oval (at 7.62 12.7) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 91 "Net-(J0-Pad41)"))
+      (net 84 "Net-(U0-Pad1)"))
     (pad 2 thru_hole oval (at 0 2.54) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 91 "Net-(J0-Pad41)"))
+      (net 11 "Net-(J0-Pad1)"))
     (pad 8 thru_hole oval (at 7.62 15.24) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 73 "Net-(J1-Pad24)"))
+      (net 88 "Net-(U2-Pad8)"))
     (pad 1 thru_hole rect (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 92 "Net-(U3-Pad1)"))
+      (net 89 "Net-(J0-Pad41)"))
     (model ${KISYS3DMOD}/Package_DIP.3dshapes/DIP-14_W7.62mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1736,15 +1162,79 @@
     )
   )
 
-  (module Package_DIP:DIP-20_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5FAE4828)
-    (at 124.46 95.25 90)
+  (module Package_DIP:DIP-14_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5FB68898)
+    (at 163.195 66.04)
+    (descr "14-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
+    (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
+    (path /5FB50A31)
+    (fp_text reference U3 (at 3.81 -2.33) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 74LS32 (at 3.81 17.57) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 -1.27) (end 6.985 16.51) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 16.51) (end 0.635 16.51) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 16.51) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.81 -1.33) (end 1.16 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.16 -1.33) (end 1.16 16.57) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.16 16.57) (end 6.46 16.57) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.46 16.57) (end 6.46 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.46 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.1 -1.55) (end -1.1 16.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.1 16.8) (end 8.7 16.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 16.8) (end 8.7 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 -1.55) (end -1.1 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 3.81 7.62) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole rect (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 90 "Net-(U3-Pad1)"))
+    (pad 8 thru_hole oval (at 7.62 15.24) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 96 "Net-(U3-Pad8)"))
+    (pad 2 thru_hole oval (at 0 2.54) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 89 "Net-(J0-Pad41)"))
+    (pad 9 thru_hole oval (at 7.62 12.7) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 89 "Net-(J0-Pad41)"))
+    (pad 3 thru_hole oval (at 0 5.08) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 95 "Net-(U3-Pad3)"))
+    (pad 10 thru_hole oval (at 7.62 10.16) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 91 "Net-(U3-Pad10)"))
+    (pad 4 thru_hole oval (at 0 7.62) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 84 "Net-(U0-Pad1)"))
+    (pad 11 thru_hole oval (at 7.62 7.62) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 91 "Net-(U3-Pad10)"))
+    (pad 5 thru_hole oval (at 0 10.16) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 17 "Net-(J0-Pad2)"))
+    (pad 12 thru_hole oval (at 7.62 5.08) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 88 "Net-(U2-Pad8)"))
+    (pad 6 thru_hole oval (at 0 12.7) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 90 "Net-(U3-Pad1)"))
+    (pad 13 thru_hole oval (at 7.62 2.54) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 15 "Net-(J0-Pad3)"))
+    (pad 7 thru_hole oval (at 0 15.24) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 14 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 93 "Net-(C1-Pad1)"))
+    (model ${KISYS3DMOD}/Package_DIP.3dshapes/DIP-14_W7.62mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Package_DIP:DIP-20_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5FB688C0)
+    (at 124.46 86.36 90)
     (descr "20-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
     (path /5FA19168)
     (fp_text reference U4 (at 3.81 -2.33 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 74LS245 (at 3.81 25.19 90) (layer F.Fab)
+    (fp_text value 74LVC245 (at 3.81 25.19 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 3.81 11.43 90) (layer F.Fab)
@@ -1766,45 +1256,45 @@
     (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
     (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
     (pad 20 thru_hole oval (at 7.62 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
+      (net 94 "Net-(C5-Pad1)"))
     (pad 10 thru_hole oval (at 0 22.86 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
+      (net 92 "Net-(C1-Pad2)"))
     (pad 19 thru_hole oval (at 7.62 2.54 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 74 "Net-(J1-Pad26)"))
+      (net 95 "Net-(U3-Pad3)"))
     (pad 9 thru_hole oval (at 0 20.32 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 9 "Net-(U0-Pad11)"))
     (pad 18 thru_hole oval (at 7.62 5.08 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 59 "Net-(J1-Pad7)"))
+      (net 58 "Net-(J1-Pad7)"))
     (pad 8 thru_hole oval (at 0 17.78 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 7 "Net-(U0-Pad12)"))
     (pad 17 thru_hole oval (at 7.62 7.62 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 62 "Net-(J1-Pad11)"))
+      (net 61 "Net-(J1-Pad11)"))
     (pad 7 thru_hole oval (at 0 15.24 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 5 "Net-(U0-Pad13)"))
     (pad 16 thru_hole oval (at 7.62 10.16 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 64 "Net-(J1-Pad13)"))
+      (net 63 "Net-(J1-Pad13)"))
     (pad 6 thru_hole oval (at 0 12.7 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 3 "Net-(U0-Pad14)"))
     (pad 15 thru_hole oval (at 7.62 12.7 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 65 "Net-(J1-Pad15)"))
+      (net 64 "Net-(J1-Pad15)"))
     (pad 5 thru_hole oval (at 0 10.16 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 1 "Net-(U0-Pad15)"))
     (pad 14 thru_hole oval (at 7.62 15.24 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 69 "Net-(J1-Pad19)"))
+      (net 67 "Net-(J1-Pad19)"))
     (pad 4 thru_hole oval (at 0 7.62 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 23 "Net-(U0-Pad16)"))
     (pad 13 thru_hole oval (at 7.62 17.78 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 70 "Net-(J1-Pad21)"))
+      (net 68 "Net-(J1-Pad21)"))
     (pad 3 thru_hole oval (at 0 5.08 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 21 "Net-(U0-Pad17)"))
     (pad 12 thru_hole oval (at 7.62 20.32 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 72 "Net-(J1-Pad23)"))
+      (net 70 "Net-(J1-Pad23)"))
     (pad 2 thru_hole oval (at 0 2.54 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 19 "Net-(U0-Pad18)"))
     (pad 11 thru_hole oval (at 7.62 22.86 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 77 "Net-(J1-Pad29)"))
+      (net 75 "Net-(J1-Pad29)"))
     (pad 1 thru_hole rect (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
+      (net 92 "Net-(C1-Pad2)"))
     (model ${KISYS3DMOD}/Package_DIP.3dshapes/DIP-20_W7.62mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1812,75 +1302,75 @@
     )
   )
 
-  (module Package_DIP:DIP-20_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5FAE4850)
-    (at 107.95 63.5)
+  (module Package_DIP:DIP-20_W7.62mm (layer F.Cu) (tedit 5A02E8C5) (tstamp 5FB688E8)
+    (at 124.46 71.755 90)
     (descr "20-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
     (path /5FA1EB22)
-    (fp_text reference U5 (at 3.81 -2.33) (layer F.SilkS)
+    (fp_text reference U5 (at 3.81 -2.33 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 74LS374 (at 3.81 25.19) (layer F.Fab)
+    (fp_text value 74LVC374 (at 3.81 25.19 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 3.81 11.43) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 8.7 -1.55) (end -1.1 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.7 24.4) (end 8.7 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.1 24.4) (end 8.7 24.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.1 -1.55) (end -1.1 24.4) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.46 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 6.46 24.19) (end 6.46 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.16 24.19) (end 6.46 24.19) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.16 -1.33) (end 1.16 24.19) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.81 -1.33) (end 1.16 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.635 24.13) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 24.13) (end 0.635 24.13) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 -1.27) (end 6.985 24.13) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
     (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
-    (pad 20 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 95 "Net-(C1-Pad1)"))
-    (pad 10 thru_hole oval (at 0 22.86) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
-    (pad 19 thru_hole oval (at 7.62 2.54) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 79 "Net-(J1-Pad32)"))
-    (pad 9 thru_hole oval (at 0 20.32) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 83 "Net-(J1-Pad37)"))
-    (pad 18 thru_hole oval (at 7.62 5.08) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 9 "Net-(U0-Pad11)"))
-    (pad 8 thru_hole oval (at 0 17.78) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 1 "Net-(U0-Pad15)"))
-    (pad 17 thru_hole oval (at 7.62 7.62) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 7 "Net-(U0-Pad12)"))
-    (pad 7 thru_hole oval (at 0 15.24) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 23 "Net-(U0-Pad16)"))
-    (pad 16 thru_hole oval (at 7.62 10.16) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 82 "Net-(J1-Pad36)"))
-    (pad 6 thru_hole oval (at 0 12.7) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 81 "Net-(J1-Pad35)"))
-    (pad 15 thru_hole oval (at 7.62 12.7) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 84 "Net-(J1-Pad38)"))
-    (pad 5 thru_hole oval (at 0 10.16) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 80 "Net-(J1-Pad33)"))
-    (pad 14 thru_hole oval (at 7.62 15.24) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 5 "Net-(U0-Pad13)"))
-    (pad 4 thru_hole oval (at 0 7.62) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 21 "Net-(U0-Pad17)"))
-    (pad 13 thru_hole oval (at 7.62 17.78) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 3 "Net-(U0-Pad14)"))
-    (pad 3 thru_hole oval (at 0 5.08) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 -1.27) (end 6.985 24.13) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 24.13) (end 0.635 24.13) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 24.13) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.81 -1.33) (end 1.16 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.16 -1.33) (end 1.16 24.19) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.16 24.19) (end 6.46 24.19) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.46 24.19) (end 6.46 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.46 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.1 -1.55) (end -1.1 24.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.1 24.4) (end 8.7 24.4) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 24.4) (end 8.7 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.7 -1.55) (end -1.1 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 3.81 11.43 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole rect (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 11 thru_hole oval (at 7.62 22.86 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 96 "Net-(U3-Pad8)"))
+    (pad 2 thru_hole oval (at 0 2.54 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 76 "Net-(J1-Pad31)"))
+    (pad 12 thru_hole oval (at 7.62 20.32 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 83 "Net-(J1-Pad40)"))
+    (pad 3 thru_hole oval (at 0 5.08 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 19 "Net-(U0-Pad18)"))
-    (pad 12 thru_hole oval (at 7.62 20.32) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 85 "Net-(J1-Pad40)"))
-    (pad 2 thru_hole oval (at 0 2.54) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 78 "Net-(J1-Pad31)"))
-    (pad 11 thru_hole oval (at 7.62 22.86) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 73 "Net-(J1-Pad24)"))
-    (pad 1 thru_hole rect (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 94 "Net-(C1-Pad2)"))
+    (pad 13 thru_hole oval (at 7.62 17.78 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 3 "Net-(U0-Pad14)"))
+    (pad 4 thru_hole oval (at 0 7.62 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 21 "Net-(U0-Pad17)"))
+    (pad 14 thru_hole oval (at 7.62 15.24 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 5 "Net-(U0-Pad13)"))
+    (pad 5 thru_hole oval (at 0 10.16 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 78 "Net-(J1-Pad33)"))
+    (pad 15 thru_hole oval (at 7.62 12.7 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 82 "Net-(J1-Pad38)"))
+    (pad 6 thru_hole oval (at 0 12.7 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 79 "Net-(J1-Pad35)"))
+    (pad 16 thru_hole oval (at 7.62 10.16 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 80 "Net-(J1-Pad36)"))
+    (pad 7 thru_hole oval (at 0 15.24 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 23 "Net-(U0-Pad16)"))
+    (pad 17 thru_hole oval (at 7.62 7.62 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 7 "Net-(U0-Pad12)"))
+    (pad 8 thru_hole oval (at 0 17.78 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 "Net-(U0-Pad15)"))
+    (pad 18 thru_hole oval (at 7.62 5.08 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 9 "Net-(U0-Pad11)"))
+    (pad 9 thru_hole oval (at 0 20.32 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 81 "Net-(J1-Pad37)"))
+    (pad 19 thru_hole oval (at 7.62 2.54 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 77 "Net-(J1-Pad32)"))
+    (pad 10 thru_hole oval (at 0 22.86 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 92 "Net-(C1-Pad2)"))
+    (pad 20 thru_hole oval (at 7.62 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 94 "Net-(C5-Pad1)"))
     (model ${KISYS3DMOD}/Package_DIP.3dshapes/DIP-20_W7.62mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1888,34 +1378,25 @@
     )
   )
 
-  (gr_line (start 118.745 123.19) (end 182.245 123.19) (layer Edge.Cuts) (width 0.05) (tstamp 5FB32B18))
-  (gr_line (start 118.11 122.555) (end 118.745 123.19) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 118.11 115.57) (end 118.11 122.555) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 87.63 115.57) (end 118.11 115.57) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 86.995 114.935) (end 87.63 115.57) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 86.995 60.325) (end 86.995 114.935) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 87.63 59.69) (end 86.995 60.325) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 184.785 59.69) (end 87.63 59.69) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 185.42 60.325) (end 184.785 59.69) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 185.42 115.57) (end 185.42 60.325) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 182.88 115.57) (end 185.42 115.57) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 182.88 122.555) (end 182.88 115.57) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 182.245 123.19) (end 182.88 122.555) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 188.468 115.57) (end 184.277 115.57) (layer Dwgs.User) (width 0.15))
-  (gr_line (start 185.42 108.458) (end 185.42 118.364) (layer Dwgs.User) (width 0.15))
-  (gr_line (start 185.42 55.626) (end 185.42 63.5) (layer Dwgs.User) (width 0.15))
-  (gr_line (start 181.864 59.69) (end 190.881 59.69) (layer Dwgs.User) (width 0.15))
-  (gr_line (start 93.853 59.69) (end 82.042 59.69) (layer Dwgs.User) (width 0.15))
-  (gr_line (start 76.2 115.57) (end 100.965 115.57) (layer Dwgs.User) (width 0.15))
-  (gr_line (start 86.995 50.8) (end 86.995 123.825) (layer Dwgs.User) (width 0.15))
-
-  (segment (start 141.645001 108.544999) (end 142.24 107.95) (width 0.1778) (layer B.Cu) (net 48))
-  (segment (start 139.105001 108.544999) (end 139.7 107.95) (width 0.1778) (layer B.Cu) (net 49))
-  (segment (start 136.565001 108.544999) (end 137.16 107.95) (width 0.1778) (layer B.Cu) (net 50))
-  (segment (start 134.025001 108.544999) (end 134.62 107.95) (width 0.1778) (layer B.Cu) (net 51))
-  (segment (start 131.485001 108.544999) (end 132.08 107.95) (width 0.1778) (layer B.Cu) (net 52))
-  (segment (start 128.945001 108.544999) (end 129.54 107.95) (width 0.1778) (layer B.Cu) (net 53))
-  (segment (start 126.405001 108.544999) (end 127 107.95) (width 0.1778) (layer B.Cu) (net 54))
-  (segment (start 144.185001 108.544999) (end 144.78 107.95) (width 0.1778) (layer B.Cu) (net 87))
+  (gr_line (start 123.19 119.38) (end 186.69 119.38) (layer Edge.Cuts) (width 0.05) (tstamp 5FB6A4EB))
+  (gr_line (start 122.555 118.745) (end 123.19 119.38) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 122.555 111.76) (end 122.555 118.745) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 107.95 111.76) (end 122.555 111.76) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 107.315 111.125) (end 107.95 111.76) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 107.315 58.42) (end 107.315 111.125) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 107.95 57.785) (end 107.315 58.42) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 191.135 57.785) (end 107.95 57.785) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 191.77 58.42) (end 191.135 57.785) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 191.77 111.125) (end 191.77 58.42) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 191.135 111.76) (end 191.77 111.125) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 187.325 111.76) (end 191.135 111.76) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 187.325 118.745) (end 187.325 111.76) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 186.69 119.38) (end 187.325 118.745) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 191.77 57.785) (end 191.77 111.76) (layer Dwgs.User) (width 0.15))
+  (gr_line (start 107.315 57.785) (end 213.995 57.785) (layer Dwgs.User) (width 0.15))
+  (gr_line (start 107.315 113.03) (end 107.315 55.245) (layer Dwgs.User) (width 0.15))
+  (gr_line (start 121.285 111.76) (end 101.6 111.76) (layer Dwgs.User) (width 0.15))
+  (gr_line (start 189.23 111.76) (end 207.645 111.76) (layer Dwgs.User) (width 0.15))
+  (gr_line (start 188.595 111.76) (end 189.865 111.76) (layer Dwgs.User) (width 0.15))
 
 )
diff --git a/Hardware/Apple2IORPi.net b/Hardware/Apple2IORPi.net
index 4107959..7583c2f 100644
--- a/Hardware/Apple2IORPi.net
+++ b/Hardware/Apple2IORPi.net
@@ -1,14 +1,14 @@
 (export (version D)
   (design
     (source /home/terence/source/Apple2-IO-RPi/Hardware/Apple2IORPi.sch)
-    (date "Thu 12 Nov 2020 09:25:57 PM")
+    (date "Thu 19 Nov 2020 08:35:13 AM")
     (tool "Eeschema 5.1.5+dfsg1-2build2")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
         (title "Apple II I/O RPi")
         (company "Terence J. Boldt")
-        (rev 0.3)
-        (date 2020-11-12)
+        (rev 0.5)
+        (date 2020-11-19)
         (source Apple2IORPi.sch)
         (comment (number 1) (value "Initial draft desgn"))
         (comment (number 2) (value "Provides storage and network for the Apple ]["))
@@ -17,7 +17,7 @@
   (components
     (comp (ref J0)
       (value "Apple II Expansion Bus")
-      (footprint Connector_PCBEdge:Samtec_MECF-50-02-L-DV-WT_2x50_P1.27mm_Polarized_Socket_Horizontal)
+      (footprint "Apple2:Apple II Expansion Edge Connector")
       (datasheet ~)
       (libsource (lib Connector_Generic) (part Conn_02x25_Counter_Clockwise) (description "Generic connector, double row, 02x25, counter clockwise pin numbering scheme (similar to DIP packge numbering), script generated (kicad-library-utils/schlib/autogen/connector/)"))
       (sheetpath (names /) (tstamps /))
@@ -37,7 +37,7 @@
       (sheetpath (names /) (tstamps /))
       (tstamp 5FA15F43))
     (comp (ref U4)
-      (value 74LS245)
+      (value 74LVC245)
       (footprint Package_DIP:DIP-20_W7.62mm)
       (datasheet http://www.ti.com/lit/gpn/sn74LS245)
       (libsource (lib 74xx) (part 74LS245) (description "Octal BUS Transceivers, 3-State outputs"))
@@ -51,124 +51,12 @@
       (sheetpath (names /) (tstamps /))
       (tstamp 5FA19C2C))
     (comp (ref U5)
-      (value 74LS374)
+      (value 74LVC374)
       (footprint Package_DIP:DIP-20_W7.62mm)
       (datasheet http://www.ti.com/lit/gpn/sn74LS374)
       (libsource (lib 74xx) (part 74LS374) (description "8-bit Register, 3-state outputs"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5FA1EB22))
-    (comp (ref R8)
-      (value 3K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FA241D5))
-    (comp (ref R9)
-      (value 3K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FA246F6))
-    (comp (ref RA1)
-      (value 3K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FA24EB1))
-    (comp (ref RB1)
-      (value 3K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FA253F4))
-    (comp (ref RC1)
-      (value 3K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FA25849))
-    (comp (ref RD1)
-      (value 3K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FA25CA5))
-    (comp (ref RE1)
-      (value 3K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FA2611D))
-    (comp (ref RF1)
-      (value 3K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FA2686B))
-    (comp (ref R0)
-      (value 2K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FAAFB0D))
-    (comp (ref R1)
-      (value 2K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FAAFB13))
-    (comp (ref R2)
-      (value 2K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FAAFB19))
-    (comp (ref R3)
-      (value 2K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FAAFB1F))
-    (comp (ref R4)
-      (value 2K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FAAFB25))
-    (comp (ref R5)
-      (value 2K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FAAFB2B))
-    (comp (ref R6)
-      (value 2K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FAAFB31))
-    (comp (ref R7)
-      (value 2K)
-      (footprint Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical)
-      (datasheet ~)
-      (libsource (lib Device) (part R) (description Resistor))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5FAAFB37))
     (comp (ref U3)
       (value 74LS32)
       (footprint Package_DIP:DIP-14_W7.62mm)
@@ -182,7 +70,49 @@
       (datasheet http://www.ti.com/lit/gpn/sn74ls00)
       (libsource (lib 74xx) (part 74LS00) (description "quad 2-input NAND gate"))
       (sheetpath (names /) (tstamps /))
-      (tstamp 5FD4E618)))
+      (tstamp 5FD4E618))
+    (comp (ref C3)
+      (value C)
+      (footprint Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm)
+      (datasheet ~)
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5FB81404))
+    (comp (ref C4)
+      (value C)
+      (footprint Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm)
+      (datasheet ~)
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5FB82906))
+    (comp (ref C2)
+      (value C)
+      (footprint Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm)
+      (datasheet ~)
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5FB849D8))
+    (comp (ref C1)
+      (value C)
+      (footprint Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm)
+      (datasheet ~)
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5FB85911))
+    (comp (ref C5)
+      (value C)
+      (footprint Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm)
+      (datasheet ~)
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5FB8694D))
+    (comp (ref C6)
+      (value C)
+      (footprint Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm)
+      (datasheet ~)
+      (libsource (lib Device) (part C) (description "Unpolarized capacitor"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5FB87862)))
   (libparts
     (libpart (lib 74xx) (part 74LS00)
       (aliases
@@ -412,14 +342,14 @@
         (pin (num 48) (name Pin_48) (type passive))
         (pin (num 49) (name Pin_49) (type passive))
         (pin (num 50) (name Pin_50) (type passive))))
-    (libpart (lib Device) (part R)
-      (description Resistor)
+    (libpart (lib Device) (part C)
+      (description "Unpolarized capacitor")
       (docs ~)
       (footprints
-        (fp R_*))
+        (fp C_*))
       (fields
-        (field (name Reference) R)
-        (field (name Value) R))
+        (field (name Reference) C)
+        (field (name Value) C))
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
@@ -475,338 +405,317 @@
     (library (logical Memory_EPROM)
       (uri /usr/share/kicad/library/Memory_EPROM.lib)))
   (nets
-    (net (code 1) (name "Net-(J1-Pad38)")
-      (node (ref RA1) (pin 1))
-      (node (ref J1) (pin 38))
-      (node (ref U5) (pin 15))
-      (node (ref R2) (pin 2)))
-    (net (code 2) (name "Net-(J1-Pad35)")
-      (node (ref J1) (pin 35))
+    (net (code 1) (name "Net-(J1-Pad37)")
+      (node (ref U5) (pin 9))
+      (node (ref J1) (pin 37)))
+    (net (code 2) (name "Net-(J1-Pad31)")
+      (node (ref J1) (pin 31))
+      (node (ref U5) (pin 2)))
+    (net (code 3) (name "Net-(J1-Pad33)")
+      (node (ref U5) (pin 5))
+      (node (ref J1) (pin 33)))
+    (net (code 4) (name "Net-(J1-Pad35)")
       (node (ref U5) (pin 6))
-      (node (ref RD1) (pin 1))
-      (node (ref R5) (pin 2)))
-    (net (code 3) (name "Net-(J1-Pad32)")
-      (node (ref U5) (pin 19))
-      (node (ref R0) (pin 2))
-      (node (ref R8) (pin 1))
-      (node (ref J1) (pin 32)))
-    (net (code 4) (name "Net-(J1-Pad36)")
-      (node (ref R1) (pin 2))
+      (node (ref J1) (pin 35)))
+    (net (code 5) (name "Net-(J1-Pad40)")
+      (node (ref J1) (pin 40))
+      (node (ref U5) (pin 12)))
+    (net (code 6) (name "Net-(J1-Pad38)")
+      (node (ref U5) (pin 15))
+      (node (ref J1) (pin 38)))
+    (net (code 7) (name "Net-(J1-Pad36)")
       (node (ref J1) (pin 36))
-      (node (ref R9) (pin 1))
       (node (ref U5) (pin 16)))
-    (net (code 5) (name "Net-(J1-Pad15)")
-      (node (ref U4) (pin 15))
-      (node (ref J1) (pin 15)))
-    (net (code 6) (name "Net-(J1-Pad7)")
-      (node (ref J1) (pin 7))
-      (node (ref U4) (pin 18)))
-    (net (code 7) (name "Net-(J1-Pad11)")
-      (node (ref J1) (pin 11))
-      (node (ref U4) (pin 17)))
-    (net (code 8) (name "Net-(J1-Pad13)")
-      (node (ref J1) (pin 13))
-      (node (ref U4) (pin 16)))
-    (net (code 9) (name "Net-(J1-Pad19)")
-      (node (ref J1) (pin 19))
-      (node (ref U4) (pin 14)))
-    (net (code 10) (name "Net-(J1-Pad21)")
+    (net (code 8) (name "Net-(J1-Pad32)")
+      (node (ref J1) (pin 32))
+      (node (ref U5) (pin 19)))
+    (net (code 9) (name "Net-(J1-Pad21)")
       (node (ref U4) (pin 13))
       (node (ref J1) (pin 21)))
-    (net (code 11) (name "Net-(J1-Pad33)")
-      (node (ref J1) (pin 33))
-      (node (ref RE1) (pin 1))
-      (node (ref R6) (pin 2))
-      (node (ref U5) (pin 5)))
-    (net (code 12) (name "Net-(J1-Pad37)")
-      (node (ref J1) (pin 37))
-      (node (ref RC1) (pin 1))
-      (node (ref R4) (pin 2))
-      (node (ref U5) (pin 9)))
-    (net (code 13) (name "Net-(J1-Pad29)")
+    (net (code 10) (name "Net-(J1-Pad23)")
+      (node (ref U4) (pin 12))
+      (node (ref J1) (pin 23)))
+    (net (code 11) (name "Net-(J1-Pad29)")
       (node (ref J1) (pin 29))
       (node (ref U4) (pin 11)))
-    (net (code 14) (name "Net-(J1-Pad23)")
-      (node (ref J1) (pin 23))
-      (node (ref U4) (pin 12)))
-    (net (code 15) (name "Net-(J1-Pad31)")
-      (node (ref RF1) (pin 1))
-      (node (ref U5) (pin 2))
-      (node (ref R7) (pin 2))
-      (node (ref J1) (pin 31)))
-    (net (code 16) (name "Net-(J1-Pad24)")
-      (node (ref J1) (pin 24))
+    (net (code 12) (name "Net-(U3-Pad8)")
       (node (ref U3) (pin 8))
       (node (ref U5) (pin 11)))
-    (net (code 17) (name "Net-(U2-Pad3)")
-      (node (ref U2) (pin 5))
-      (node (ref U2) (pin 4))
-      (node (ref U2) (pin 3)))
-    (net (code 18) (name "Net-(U3-Pad10)")
-      (node (ref U3) (pin 10))
-      (node (ref U3) (pin 11)))
-    (net (code 19) (name "Net-(J0-Pad41)")
-      (node (ref J0) (pin 41))
-      (node (ref U3) (pin 2))
-      (node (ref U3) (pin 9))
-      (node (ref U2) (pin 1)))
-    (net (code 20) (name "Net-(U2-Pad8)")
-      (node (ref U3) (pin 12))
-      (node (ref U2) (pin 8)))
-    (net (code 21) (name "Net-(U0-Pad19)")
-      (node (ref U0) (pin 19))
-      (node (ref U2) (pin 6)))
-    (net (code 22) (name "Net-(J1-Pad40)")
-      (node (ref R3) (pin 2))
-      (node (ref RB1) (pin 1))
-      (node (ref U5) (pin 12))
-      (node (ref J1) (pin 40)))
-    (net (code 23) (name "Net-(U0-Pad1)")
-      (node (ref U3) (pin 4))
-      (node (ref U2) (pin 9))
-      (node (ref U2) (pin 10))
-      (node (ref U2) (pin 11))
-      (node (ref U0) (pin 1)))
-    (net (code 24) (name "Net-(J1-Pad26)")
-      (node (ref U4) (pin 19))
-      (node (ref U3) (pin 3))
-      (node (ref J1) (pin 26)))
-    (net (code 25) (name "Net-(U3-Pad1)")
+    (net (code 13) (name "Net-(U3-Pad1)")
       (node (ref U3) (pin 6))
       (node (ref U3) (pin 1)))
-    (net (code 26) (name "Net-(J0-Pad18)")
-      (node (ref J0) (pin 18))
-      (node (ref U2) (pin 12))
-      (node (ref U2) (pin 13)))
-    (net (code 27) (name "Net-(U0-Pad11)")
-      (node (ref U5) (pin 18))
-      (node (ref U1) (pin 19))
-      (node (ref U0) (pin 11))
-      (node (ref U4) (pin 9)))
-    (net (code 28) (name "Net-(J1-Pad1)")
-      (node (ref J1) (pin 1)))
-    (net (code 29) (name "Net-(J1-Pad10)")
-      (node (ref J1) (pin 10)))
-    (net (code 30) (name "Net-(J1-Pad12)")
-      (node (ref J1) (pin 12)))
-    (net (code 31) (name "Net-(U0-Pad15)")
-      (node (ref U1) (pin 15))
-      (node (ref U5) (pin 8))
-      (node (ref U0) (pin 15))
-      (node (ref U4) (pin 5)))
-    (net (code 32) (name "Net-(J0-Pad26)")
-      (node (ref J1) (pin 6))
-      (node (ref U4) (pin 10))
-      (node (ref U4) (pin 1))
-      (node (ref J1) (pin 14))
-      (node (ref J1) (pin 34))
-      (node (ref U5) (pin 10))
-      (node (ref U1) (pin 14))
-      (node (ref J0) (pin 26))
-      (node (ref J1) (pin 30))
-      (node (ref J1) (pin 25))
-      (node (ref R8) (pin 2))
-      (node (ref J1) (pin 20))
-      (node (ref R9) (pin 2))
-      (node (ref RA1) (pin 2))
-      (node (ref RB1) (pin 2))
-      (node (ref RC1) (pin 2))
-      (node (ref U5) (pin 1))
-      (node (ref J1) (pin 9))
-      (node (ref RD1) (pin 2))
-      (node (ref RE1) (pin 2))
-      (node (ref RF1) (pin 2))
-      (node (ref J1) (pin 39))
-      (node (ref U0) (pin 10))
-      (node (ref U2) (pin 7))
-      (node (ref U3) (pin 7)))
-    (net (code 33) (name "Net-(J1-Pad5)")
-      (node (ref J1) (pin 5)))
-    (net (code 34) (name "Net-(J1-Pad8)")
-      (node (ref J1) (pin 8)))
-    (net (code 35) (name "Net-(U0-Pad13)")
-      (node (ref U0) (pin 13))
-      (node (ref U5) (pin 14))
-      (node (ref U1) (pin 17))
-      (node (ref U4) (pin 7)))
-    (net (code 36) (name "Net-(J1-Pad16)")
-      (node (ref J1) (pin 16)))
-    (net (code 37) (name "Net-(J1-Pad17)")
-      (node (ref J1) (pin 17)))
-    (net (code 38) (name "Net-(J1-Pad18)")
-      (node (ref J1) (pin 18)))
-    (net (code 39) (name "Net-(J1-Pad22)")
-      (node (ref J1) (pin 22)))
-    (net (code 40) (name "Net-(J1-Pad27)")
-      (node (ref J1) (pin 27)))
-    (net (code 41) (name "Net-(J1-Pad28)")
-      (node (ref J1) (pin 28)))
-    (net (code 42) (name "Net-(J1-Pad3)")
-      (node (ref J1) (pin 3)))
-    (net (code 43) (name "Net-(J0-Pad38)")
-      (node (ref J0) (pin 38)))
-    (net (code 44) (name "Net-(J0-Pad29)")
-      (node (ref J0) (pin 29)))
-    (net (code 45) (name "Net-(J0-Pad3)")
-      (node (ref J0) (pin 3))
-      (node (ref U3) (pin 13))
-      (node (ref U1) (pin 9)))
-    (net (code 46) (name "Net-(J0-Pad30)")
-      (node (ref J0) (pin 30)))
-    (net (code 47) (name "Net-(J0-Pad31)")
-      (node (ref J0) (pin 31)))
-    (net (code 48) (name "Net-(J0-Pad32)")
-      (node (ref J0) (pin 32)))
-    (net (code 49) (name "Net-(J0-Pad33)")
-      (node (ref J0) (pin 33)))
-    (net (code 50) (name "Net-(J0-Pad34)")
-      (node (ref J0) (pin 34)))
-    (net (code 51) (name "Net-(J0-Pad35)")
-      (node (ref J0) (pin 35)))
-    (net (code 52) (name "Net-(J0-Pad36)")
-      (node (ref J0) (pin 36)))
-    (net (code 53) (name "Net-(J0-Pad37)")
-      (node (ref J0) (pin 37)))
-    (net (code 54) (name "Net-(J0-Pad28)")
-      (node (ref J0) (pin 28)))
-    (net (code 55) (name "Net-(J0-Pad39)")
-      (node (ref J0) (pin 39)))
-    (net (code 56) (name "Net-(J0-Pad40)")
-      (node (ref J0) (pin 40)))
-    (net (code 57) (name "Net-(J0-Pad42)")
-      (node (ref U0) (pin 9))
-      (node (ref J0) (pin 42)))
-    (net (code 58) (name "Net-(J0-Pad43)")
-      (node (ref U0) (pin 8))
-      (node (ref J0) (pin 43)))
-    (net (code 59) (name "Net-(J0-Pad44)")
-      (node (ref U0) (pin 7))
-      (node (ref J0) (pin 44)))
-    (net (code 60) (name "Net-(J0-Pad45)")
-      (node (ref J0) (pin 45))
-      (node (ref U0) (pin 6)))
-    (net (code 61) (name "Net-(J0-Pad46)")
-      (node (ref J0) (pin 46))
-      (node (ref U0) (pin 5)))
-    (net (code 62) (name "Net-(J0-Pad19)")
-      (node (ref J0) (pin 19)))
-    (net (code 63) (name "Net-(J0-Pad11)")
-      (node (ref J0) (pin 11))
-      (node (ref U1) (pin 24)))
-    (net (code 64) (name "Net-(J0-Pad13)")
-      (node (ref J0) (pin 13)))
-    (net (code 65) (name "Net-(J0-Pad14)")
-      (node (ref J0) (pin 14)))
-    (net (code 66) (name "Net-(J0-Pad15)")
-      (node (ref J0) (pin 15)))
-    (net (code 67) (name "Net-(J0-Pad16)")
-      (node (ref J0) (pin 16)))
-    (net (code 68) (name "Net-(J0-Pad17)")
-      (node (ref J0) (pin 17)))
-    (net (code 69) (name "Net-(J0-Pad47)")
-      (node (ref J0) (pin 47))
-      (node (ref U0) (pin 4)))
-    (net (code 70) (name "Net-(J0-Pad20)")
-      (node (ref J0) (pin 20)))
-    (net (code 71) (name "Net-(J0-Pad21)")
-      (node (ref J0) (pin 21)))
-    (net (code 72) (name "Net-(J0-Pad22)")
-      (node (ref J0) (pin 22)))
-    (net (code 73) (name "Net-(J0-Pad23)")
-      (node (ref J0) (pin 23)))
-    (net (code 74) (name "Net-(J0-Pad24)")
-      (node (ref J0) (pin 24)))
-    (net (code 75) (name "Net-(J0-Pad25)")
-      (node (ref R7) (pin 1))
-      (node (ref U1) (pin 1))
-      (node (ref U3) (pin 14))
-      (node (ref U2) (pin 14))
-      (node (ref R2) (pin 1))
-      (node (ref J1) (pin 2))
-      (node (ref J1) (pin 4))
-      (node (ref R0) (pin 1))
-      (node (ref U0) (pin 20))
+    (net (code 14) (name "Net-(U3-Pad10)")
+      (node (ref U3) (pin 11))
+      (node (ref U3) (pin 10)))
+    (net (code 15) (name "Net-(C5-Pad1)")
       (node (ref U4) (pin 20))
-      (node (ref J0) (pin 25))
-      (node (ref R5) (pin 1))
-      (node (ref R6) (pin 1))
-      (node (ref R4) (pin 1))
-      (node (ref U1) (pin 27))
-      (node (ref R1) (pin 1))
-      (node (ref U1) (pin 28))
+      (node (ref J1) (pin 1))
       (node (ref U5) (pin 20))
-      (node (ref R3) (pin 1)))
-    (net (code 76) (name "Net-(J0-Pad27)")
-      (node (ref J0) (pin 27)))
-    (net (code 77) (name "Net-(U1-Pad26)")
-      (node (ref U1) (pin 26)))
-    (net (code 78) (name "Net-(J0-Pad12)")
+      (node (ref C6) (pin 1))
+      (node (ref J1) (pin 17))
+      (node (ref C5) (pin 1)))
+    (net (code 17) (name "Net-(U0-Pad1)")
+      (node (ref U2) (pin 9))
+      (node (ref U2) (pin 10))
+      (node (ref U0) (pin 1))
+      (node (ref U3) (pin 4))
+      (node (ref U2) (pin 11)))
+    (net (code 18) (name "Net-(J0-Pad41)")
+      (node (ref U3) (pin 2))
+      (node (ref U2) (pin 1))
+      (node (ref J0) (pin 41))
+      (node (ref U3) (pin 9)))
+    (net (code 19) (name "Net-(U3-Pad3)")
+      (node (ref U3) (pin 3))
+      (node (ref U4) (pin 19)))
+    (net (code 20) (name "Net-(J0-Pad12)")
       (node (ref U1) (pin 21))
       (node (ref J0) (pin 12)))
-    (net (code 79) (name "Net-(J0-Pad1)")
-      (node (ref J0) (pin 1))
-      (node (ref U1) (pin 20))
+    (net (code 21) (name "Net-(J0-Pad1)")
       (node (ref U1) (pin 22))
+      (node (ref U1) (pin 20))
+      (node (ref J0) (pin 1))
       (node (ref U2) (pin 2)))
-    (net (code 80) (name "Net-(U0-Pad16)")
-      (node (ref U4) (pin 4))
-      (node (ref U0) (pin 16))
-      (node (ref U5) (pin 7))
-      (node (ref U1) (pin 13)))
-    (net (code 81) (name "Net-(U1-Pad23)")
-      (node (ref U1) (pin 23)))
-    (net (code 82) (name "Net-(J0-Pad10)")
-      (node (ref J0) (pin 10))
-      (node (ref U1) (pin 25)))
-    (net (code 83) (name "Net-(U0-Pad14)")
-      (node (ref U0) (pin 14))
-      (node (ref U4) (pin 6))
-      (node (ref U5) (pin 13))
-      (node (ref U1) (pin 16)))
-    (net (code 84) (name "Net-(U0-Pad12)")
-      (node (ref U0) (pin 12))
-      (node (ref U1) (pin 18))
-      (node (ref U5) (pin 17))
-      (node (ref U4) (pin 8)))
-    (net (code 85) (name "Net-(U1-Pad2)")
-      (node (ref U1) (pin 2)))
-    (net (code 86) (name "Net-(J0-Pad48)")
-      (node (ref J0) (pin 48))
-      (node (ref U0) (pin 3)))
-    (net (code 87) (name "Net-(J0-Pad49)")
-      (node (ref J0) (pin 49))
-      (node (ref U0) (pin 2)))
-    (net (code 88) (name "Net-(J0-Pad50)")
-      (node (ref J0) (pin 50)))
-    (net (code 89) (name "Net-(J0-Pad6)")
-      (node (ref U1) (pin 6))
-      (node (ref J0) (pin 6)))
-    (net (code 90) (name "Net-(J0-Pad8)")
-      (node (ref J0) (pin 8))
-      (node (ref U1) (pin 4)))
-    (net (code 91) (name "Net-(J0-Pad9)")
-      (node (ref U1) (pin 3))
-      (node (ref J0) (pin 9)))
-    (net (code 92) (name "Net-(J0-Pad7)")
-      (node (ref U1) (pin 5))
-      (node (ref J0) (pin 7)))
-    (net (code 93) (name "Net-(J0-Pad4)")
+    (net (code 22) (name "Net-(J1-Pad13)")
+      (node (ref J1) (pin 13))
+      (node (ref U4) (pin 16)))
+    (net (code 23) (name "Net-(J1-Pad7)")
+      (node (ref J1) (pin 7))
+      (node (ref U4) (pin 18)))
+    (net (code 24) (name "Net-(J1-Pad11)")
+      (node (ref J1) (pin 11))
+      (node (ref U4) (pin 17)))
+    (net (code 25) (name "Net-(J1-Pad15)")
+      (node (ref J1) (pin 15))
+      (node (ref U4) (pin 15)))
+    (net (code 26) (name "Net-(J1-Pad19)")
+      (node (ref U4) (pin 14))
+      (node (ref J1) (pin 19)))
+    (net (code 27) (name "Net-(U0-Pad19)")
+      (node (ref U0) (pin 19))
+      (node (ref U2) (pin 6)))
+    (net (code 28) (name "Net-(U2-Pad3)")
+      (node (ref U2) (pin 3))
+      (node (ref U2) (pin 5))
+      (node (ref U2) (pin 4)))
+    (net (code 29) (name "Net-(U2-Pad8)")
+      (node (ref U2) (pin 8))
+      (node (ref U3) (pin 12)))
+    (net (code 30) (name "Net-(J0-Pad23)")
+      (node (ref J0) (pin 28))
+      (node (ref J0) (pin 23)))
+    (net (code 31) (name "Net-(J0-Pad24)")
+      (node (ref J0) (pin 27))
+      (node (ref J0) (pin 24)))
+    (net (code 32) (name "Net-(J0-Pad18)")
+      (node (ref U2) (pin 13))
+      (node (ref U2) (pin 12))
+      (node (ref J0) (pin 18)))
+    (net (code 33) (name "Net-(C1-Pad1)")
+      (node (ref U1) (pin 28))
+      (node (ref U1) (pin 27))
+      (node (ref U0) (pin 20))
+      (node (ref U3) (pin 14))
+      (node (ref J1) (pin 4))
+      (node (ref U1) (pin 1))
+      (node (ref J0) (pin 25))
+      (node (ref C3) (pin 1))
+      (node (ref C4) (pin 1))
+      (node (ref U2) (pin 14))
+      (node (ref J1) (pin 2))
+      (node (ref C1) (pin 1))
+      (node (ref C2) (pin 1)))
+    (net (code 34) (name "Net-(C1-Pad2)")
+      (node (ref J1) (pin 25))
+      (node (ref J1) (pin 34))
+      (node (ref U0) (pin 10))
+      (node (ref J0) (pin 26))
+      (node (ref J1) (pin 14))
+      (node (ref U1) (pin 14))
+      (node (ref J1) (pin 30))
+      (node (ref J1) (pin 20))
+      (node (ref U3) (pin 7))
+      (node (ref U2) (pin 7))
+      (node (ref C4) (pin 2))
+      (node (ref C3) (pin 2))
+      (node (ref C2) (pin 2))
+      (node (ref C1) (pin 2))
+      (node (ref C5) (pin 2))
+      (node (ref C6) (pin 2))
+      (node (ref U4) (pin 1))
+      (node (ref J1) (pin 39))
+      (node (ref J1) (pin 6))
+      (node (ref J1) (pin 9))
+      (node (ref U5) (pin 1))
+      (node (ref U5) (pin 10))
+      (node (ref U4) (pin 10)))
+    (net (code 35) (name "Net-(J1-Pad18)")
+      (node (ref J1) (pin 18)))
+    (net (code 36) (name "Net-(J1-Pad22)")
+      (node (ref J1) (pin 22)))
+    (net (code 37) (name "Net-(J1-Pad24)")
+      (node (ref J1) (pin 24)))
+    (net (code 38) (name "Net-(J1-Pad26)")
+      (node (ref J1) (pin 26)))
+    (net (code 39) (name "Net-(J1-Pad27)")
+      (node (ref J1) (pin 27)))
+    (net (code 40) (name "Net-(J1-Pad28)")
+      (node (ref J1) (pin 28)))
+    (net (code 41) (name "Net-(J1-Pad3)")
+      (node (ref J1) (pin 3)))
+    (net (code 42) (name "Net-(U1-Pad26)")
+      (node (ref U1) (pin 26)))
+    (net (code 43) (name "Net-(J1-Pad10)")
+      (node (ref J1) (pin 10)))
+    (net (code 44) (name "Net-(J1-Pad12)")
+      (node (ref J1) (pin 12)))
+    (net (code 45) (name "Net-(J1-Pad16)")
+      (node (ref J1) (pin 16)))
+    (net (code 46) (name "Net-(J0-Pad34)")
+      (node (ref J0) (pin 34)))
+    (net (code 47) (name "Net-(J0-Pad29)")
+      (node (ref J0) (pin 29)))
+    (net (code 48) (name "Net-(J0-Pad3)")
+      (node (ref U3) (pin 13))
+      (node (ref U1) (pin 9))
+      (node (ref J0) (pin 3)))
+    (net (code 49) (name "Net-(J0-Pad30)")
+      (node (ref J0) (pin 30)))
+    (net (code 50) (name "Net-(J0-Pad31)")
+      (node (ref J0) (pin 31)))
+    (net (code 51) (name "Net-(J0-Pad32)")
+      (node (ref J0) (pin 32)))
+    (net (code 52) (name "Net-(J0-Pad33)")
+      (node (ref J0) (pin 33)))
+    (net (code 53) (name "Net-(J0-Pad35)")
+      (node (ref J0) (pin 35)))
+    (net (code 54) (name "Net-(J0-Pad36)")
+      (node (ref J0) (pin 36)))
+    (net (code 55) (name "Net-(J0-Pad37)")
+      (node (ref J0) (pin 37)))
+    (net (code 56) (name "Net-(J0-Pad38)")
+      (node (ref J0) (pin 38)))
+    (net (code 57) (name "Net-(J0-Pad39)")
+      (node (ref J0) (pin 39)))
+    (net (code 58) (name "Net-(J0-Pad40)")
+      (node (ref J0) (pin 40)))
+    (net (code 59) (name "Net-(J0-Pad11)")
+      (node (ref U1) (pin 24))
+      (node (ref J0) (pin 11)))
+    (net (code 60) (name "Net-(J0-Pad13)")
+      (node (ref J0) (pin 13)))
+    (net (code 61) (name "Net-(J0-Pad14)")
+      (node (ref J0) (pin 14)))
+    (net (code 62) (name "Net-(J0-Pad15)")
+      (node (ref J0) (pin 15)))
+    (net (code 63) (name "Net-(J0-Pad16)")
+      (node (ref J0) (pin 16)))
+    (net (code 64) (name "Net-(J0-Pad17)")
+      (node (ref J0) (pin 17)))
+    (net (code 65) (name "Net-(J0-Pad42)")
+      (node (ref J0) (pin 42))
+      (node (ref U0) (pin 9)))
+    (net (code 66) (name "Net-(J0-Pad19)")
+      (node (ref J0) (pin 19)))
+    (net (code 67) (name "Net-(J0-Pad20)")
+      (node (ref J0) (pin 20)))
+    (net (code 68) (name "Net-(J0-Pad21)")
+      (node (ref J0) (pin 21)))
+    (net (code 69) (name "Net-(J0-Pad22)")
+      (node (ref J0) (pin 22)))
+    (net (code 70) (name "Net-(J0-Pad4)")
       (node (ref U1) (pin 8))
       (node (ref J0) (pin 4)))
-    (net (code 94) (name "Net-(J0-Pad2)")
+    (net (code 71) (name "Net-(J0-Pad2)")
+      (node (ref U1) (pin 10))
       (node (ref J0) (pin 2))
-      (node (ref U3) (pin 5))
-      (node (ref U1) (pin 10)))
-    (net (code 95) (name "Net-(J0-Pad5)")
-      (node (ref J0) (pin 5))
-      (node (ref U1) (pin 7)))
-    (net (code 96) (name "Net-(U0-Pad18)")
+      (node (ref U3) (pin 5)))
+    (net (code 72) (name "Net-(U0-Pad18)")
       (node (ref U4) (pin 2))
       (node (ref U5) (pin 3))
       (node (ref U0) (pin 18))
       (node (ref U1) (pin 11)))
-    (net (code 97) (name "Net-(U0-Pad17)")
+    (net (code 73) (name "Net-(J0-Pad7)")
+      (node (ref J0) (pin 7))
+      (node (ref U1) (pin 5)))
+    (net (code 74) (name "Net-(U1-Pad23)")
+      (node (ref U1) (pin 23)))
+    (net (code 75) (name "Net-(J0-Pad10)")
+      (node (ref U1) (pin 25))
+      (node (ref J0) (pin 10)))
+    (net (code 76) (name "Net-(J0-Pad50)")
+      (node (ref J0) (pin 50)))
+    (net (code 77) (name "Net-(J0-Pad43)")
+      (node (ref U0) (pin 8))
+      (node (ref J0) (pin 43)))
+    (net (code 78) (name "Net-(J0-Pad44)")
+      (node (ref U0) (pin 7))
+      (node (ref J0) (pin 44)))
+    (net (code 79) (name "Net-(J0-Pad45)")
+      (node (ref U0) (pin 6))
+      (node (ref J0) (pin 45)))
+    (net (code 80) (name "Net-(J0-Pad46)")
+      (node (ref U0) (pin 5))
+      (node (ref J0) (pin 46)))
+    (net (code 81) (name "Net-(J0-Pad47)")
+      (node (ref U0) (pin 4))
+      (node (ref J0) (pin 47)))
+    (net (code 82) (name "Net-(J0-Pad48)")
+      (node (ref J0) (pin 48))
+      (node (ref U0) (pin 3)))
+    (net (code 83) (name "Net-(J0-Pad49)")
+      (node (ref J0) (pin 49))
+      (node (ref U0) (pin 2)))
+    (net (code 84) (name "Net-(J0-Pad5)")
+      (node (ref J0) (pin 5))
+      (node (ref U1) (pin 7)))
+    (net (code 85) (name "Net-(J0-Pad8)")
+      (node (ref U1) (pin 4))
+      (node (ref J0) (pin 8)))
+    (net (code 86) (name "Net-(U1-Pad2)")
+      (node (ref U1) (pin 2)))
+    (net (code 87) (name "Net-(J0-Pad9)")
+      (node (ref J0) (pin 9))
+      (node (ref U1) (pin 3)))
+    (net (code 88) (name "Net-(U0-Pad14)")
+      (node (ref U0) (pin 14))
+      (node (ref U5) (pin 13))
+      (node (ref U1) (pin 16))
+      (node (ref U4) (pin 6)))
+    (net (code 89) (name "Net-(U0-Pad15)")
+      (node (ref U0) (pin 15))
+      (node (ref U5) (pin 8))
+      (node (ref U1) (pin 15))
+      (node (ref U4) (pin 5)))
+    (net (code 90) (name "Net-(U0-Pad11)")
+      (node (ref U4) (pin 9))
+      (node (ref U5) (pin 18))
+      (node (ref U1) (pin 19))
+      (node (ref U0) (pin 11)))
+    (net (code 91) (name "Net-(U0-Pad12)")
+      (node (ref U1) (pin 18))
+      (node (ref U0) (pin 12))
+      (node (ref U4) (pin 8))
+      (node (ref U5) (pin 17)))
+    (net (code 92) (name "Net-(U0-Pad17)")
+      (node (ref U1) (pin 12))
       (node (ref U4) (pin 3))
       (node (ref U0) (pin 17))
-      (node (ref U5) (pin 4))
-      (node (ref U1) (pin 12)))))
\ No newline at end of file
+      (node (ref U5) (pin 4)))
+    (net (code 93) (name "Net-(J0-Pad6)")
+      (node (ref U1) (pin 6))
+      (node (ref J0) (pin 6)))
+    (net (code 94) (name "Net-(U0-Pad13)")
+      (node (ref U5) (pin 14))
+      (node (ref U0) (pin 13))
+      (node (ref U1) (pin 17))
+      (node (ref U4) (pin 7)))
+    (net (code 95) (name "Net-(J1-Pad5)")
+      (node (ref J1) (pin 5)))
+    (net (code 96) (name "Net-(J1-Pad8)")
+      (node (ref J1) (pin 8)))
+    (net (code 97) (name "Net-(U0-Pad16)")
+      (node (ref U0) (pin 16))
+      (node (ref U4) (pin 4))
+      (node (ref U5) (pin 7))
+      (node (ref U1) (pin 13)))))
\ No newline at end of file
diff --git a/Hardware/Apple2IORPi.pdf b/Hardware/Apple2IORPi.pdf
index 50c30e9..df2d12c 100644
Binary files a/Hardware/Apple2IORPi.pdf and b/Hardware/Apple2IORPi.pdf differ
diff --git a/Hardware/Apple2IORPi.sch b/Hardware/Apple2IORPi.sch
index 13331f4..d8389de 100644
--- a/Hardware/Apple2IORPi.sch
+++ b/Hardware/Apple2IORPi.sch
@@ -5,8 +5,8 @@ $Descr USLedger 17000 11000
 encoding utf-8
 Sheet 1 1
 Title "Apple II I/O RPi"
-Date "2020-11-12"
-Rev "0.4"
+Date "2020-11-19"
+Rev "0.5"
 Comp "Terence J. Boldt"
 Comment1 "Initial draft desgn"
 Comment2 "Provides storage and network for the Apple ]["
@@ -16,1268 +16,924 @@ $EndDescr
 $Comp
 L Connector_Generic:Conn_02x25_Counter_Clockwise J0
 U 1 1 5FA0A8C3
-P 3000 2700
-F 0 "J0" H 3050 4117 50  0000 C CNN
-F 1 "Apple II Expansion Bus" H 3050 4026 50  0000 C CNN
-F 2 "Apple2:Apple II Expansion Edge Connector" H 3000 2700 50  0001 C CNN
-F 3 "~" H 3000 2700 50  0001 C CNN
-	1    3000 2700
+P 3300 4100
+F 0 "J0" H 3350 5517 50  0000 C CNN
+F 1 "Apple II Expansion Bus" H 3350 5426 50  0000 C CNN
+F 2 "Apple2:Apple II Expansion Edge Connector" H 3300 4100 50  0001 C CNN
+F 3 "~" H 3300 4100 50  0001 C CNN
+	1    3300 4100
 	1    0    0    -1  
 $EndComp
 $Comp
 L Memory_EPROM:2764 U1
 U 1 1 5FA0EF8B
-P 5950 6400
-F 0 "U1" H 5950 7581 50  0000 C CNN
-F 1 "2764" H 5950 7490 50  0000 C CNN
-F 2 "Package_DIP:DIP-28_W15.24mm" H 5950 6400 50  0001 C CNN
-F 3 "https://downloads.reactivemicro.com/Electronics/ROM/2764%20EPROM.pdf" H 5950 6400 50  0001 C CNN
-	1    5950 6400
+P 6250 7800
+F 0 "U1" H 6250 8981 50  0000 C CNN
+F 1 "2764" H 6250 8890 50  0000 C CNN
+F 2 "Package_DIP:DIP-28_W15.24mm" H 6250 7800 50  0001 C CNN
+F 3 "https://downloads.reactivemicro.com/Electronics/ROM/2764%20EPROM.pdf" H 6250 7800 50  0001 C CNN
+	1    6250 7800
 	1    0    0    -1  
 $EndComp
 $Comp
 L 74xx:74LS245 U0
 U 1 1 5FA15F43
-P 4850 2100
-F 0 "U0" H 4850 3081 50  0000 C CNN
-F 1 "74LS245" H 4850 2990 50  0000 C CNN
-F 2 "Package_DIP:DIP-20_W7.62mm" H 4850 2100 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74LS245" H 4850 2100 50  0001 C CNN
-	1    4850 2100
+P 5150 3500
+F 0 "U0" H 5150 4481 50  0000 C CNN
+F 1 "74LS245" H 5150 4390 50  0000 C CNN
+F 2 "Package_DIP:DIP-20_W7.62mm" H 5150 3500 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74LS245" H 5150 3500 50  0001 C CNN
+	1    5150 3500
 	1    0    0    -1  
 $EndComp
 $Comp
 L 74xx:74LS245 U4
 U 1 1 5FA19168
-P 9100 2100
-F 0 "U4" H 9100 3081 50  0000 C CNN
-F 1 "74LS245" H 9100 2990 50  0000 C CNN
-F 2 "Package_DIP:DIP-20_W7.62mm" H 9100 2100 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74LS245" H 9100 2100 50  0001 C CNN
-	1    9100 2100
+P 9400 3500
+F 0 "U4" H 9400 4481 50  0000 C CNN
+F 1 "74LVC245" H 9400 4390 50  0000 C CNN
+F 2 "Package_DIP:DIP-20_W7.62mm" H 9400 3500 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74LS245" H 9400 3500 50  0001 C CNN
+	1    9400 3500
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector:Raspberry_Pi_2_3 J1
 U 1 1 5FA19C2C
-P 13050 2550
-F 0 "J1" H 13050 4031 50  0000 C CNN
-F 1 "Raspberry_Pi_2_3" H 13050 3940 50  0000 C CNN
-F 2 "Connector_PinSocket_2.54mm:PinSocket_2x20_P2.54mm_Vertical" H 13050 2550 50  0001 C CNN
-F 3 "https://www.raspberrypi.org/documentation/hardware/raspberrypi/schematics/rpi_SCH_3bplus_1p0_reduced.pdf" H 13050 2550 50  0001 C CNN
-	1    13050 2550
+P 13350 3950
+F 0 "J1" H 13350 5431 50  0000 C CNN
+F 1 "Raspberry_Pi_2_3" H 13350 5340 50  0000 C CNN
+F 2 "Connector_PinSocket_2.54mm:PinSocket_2x20_P2.54mm_Vertical" H 13350 3950 50  0001 C CNN
+F 3 "https://www.raspberrypi.org/documentation/hardware/raspberrypi/schematics/rpi_SCH_3bplus_1p0_reduced.pdf" H 13350 3950 50  0001 C CNN
+	1    13350 3950
 	1    0    0    -1  
 $EndComp
 $Comp
 L 74xx:74LS374 U5
 U 1 1 5FA1EB22
-P 9100 4100
-F 0 "U5" H 9100 5081 50  0000 C CNN
-F 1 "74LS374" H 9100 4990 50  0000 C CNN
-F 2 "Package_DIP:DIP-20_W7.62mm" H 9100 4100 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74LS374" H 9100 4100 50  0001 C CNN
-	1    9100 4100
+P 9400 5500
+F 0 "U5" H 9400 6481 50  0000 C CNN
+F 1 "74LVC374" H 9400 6390 50  0000 C CNN
+F 2 "Package_DIP:DIP-20_W7.62mm" H 9400 5500 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74LS374" H 9400 5500 50  0001 C CNN
+	1    9400 5500
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4350 1600 3300 1600
+	4650 3000 3600 3000
 Wire Wire Line
-	4350 1700 3300 1700
+	4650 3100 3600 3100
 Wire Wire Line
-	4350 1800 3300 1800
+	4650 3200 3600 3200
 Wire Wire Line
-	3300 1900 4350 1900
+	3600 3300 4650 3300
 Wire Wire Line
-	4350 2000 3300 2000
+	4650 3400 3600 3400
 Wire Wire Line
-	3300 2100 4350 2100
+	3600 3500 4650 3500
 Wire Wire Line
-	4350 2200 3300 2200
+	4650 3600 3600 3600
 Wire Wire Line
-	3300 2300 4350 2300
+	3600 3700 4650 3700
 Wire Wire Line
-	5350 1600 6350 1600
+	5650 3000 6650 3000
 Wire Wire Line
-	5350 1700 6400 1700
+	5650 3100 6700 3100
 Wire Wire Line
-	8600 1800 8000 1800
+	8900 3200 8300 3200
 Wire Wire Line
-	5350 1900 6500 1900
+	5650 3300 6800 3300
 Wire Wire Line
-	5350 2000 6550 2000
+	5650 3400 6850 3400
 Wire Wire Line
-	8600 2100 7850 2100
+	8900 3500 8150 3500
 Wire Wire Line
-	5350 2200 6650 2200
+	5650 3600 6950 3600
 Wire Wire Line
-	8600 2300 7750 2300
+	8900 3700 8050 3700
 Wire Wire Line
-	8100 1600 8100 3600
+	8400 3000 8400 5000
 Wire Wire Line
-	8100 3600 8600 3600
-Connection ~ 8100 1600
+	8400 5000 8900 5000
+Connection ~ 8400 3000
 Wire Wire Line
-	8100 1600 8600 1600
+	8400 3000 8900 3000
 Wire Wire Line
-	8050 1700 8050 3700
+	8350 3100 8350 5100
 Wire Wire Line
-	8050 3700 8600 3700
-Connection ~ 8050 1700
+	8350 5100 8900 5100
+Connection ~ 8350 3100
 Wire Wire Line
-	8050 1700 8600 1700
+	8350 3100 8900 3100
 Wire Wire Line
-	8000 1800 8000 3800
+	8300 3200 8300 5200
 Wire Wire Line
-	8000 3800 8600 3800
-Connection ~ 8000 1800
+	8300 5200 8900 5200
+Connection ~ 8300 3200
 Wire Wire Line
-	8000 1800 6450 1800
+	8300 3200 6750 3200
 Wire Wire Line
-	7950 1900 7950 3900
+	8250 3300 8250 5300
 Wire Wire Line
-	7950 3900 8600 3900
-Connection ~ 7950 1900
+	8250 5300 8900 5300
+Connection ~ 8250 3300
 Wire Wire Line
-	7950 1900 8600 1900
+	8250 3300 8900 3300
 Wire Wire Line
-	7900 2000 7900 4000
+	8200 3400 8200 5400
 Wire Wire Line
-	7900 4000 8600 4000
-Connection ~ 7900 2000
+	8200 5400 8900 5400
+Connection ~ 8200 3400
 Wire Wire Line
-	7900 2000 8600 2000
+	8200 3400 8900 3400
 Wire Wire Line
-	7850 2100 7850 4100
+	8150 3500 8150 5500
 Wire Wire Line
-	7850 4100 8600 4100
-Connection ~ 7850 2100
+	8150 5500 8900 5500
+Connection ~ 8150 3500
 Wire Wire Line
-	7850 2100 6600 2100
+	8150 3500 6900 3500
 Wire Wire Line
-	7800 2200 7800 4200
+	8100 3600 8100 5600
 Wire Wire Line
-	7800 4200 8600 4200
-Connection ~ 7800 2200
+	8100 5600 8900 5600
+Connection ~ 8100 3600
 Wire Wire Line
-	7800 2200 8600 2200
+	8100 3600 8900 3600
 Wire Wire Line
-	7750 2300 7750 4300
+	8050 3700 8050 5700
 Wire Wire Line
-	7750 4300 8600 4300
-Connection ~ 7750 2300
+	8050 5700 8900 5700
+Connection ~ 8050 3700
 Wire Wire Line
-	7750 2300 6700 2300
+	8050 3700 7000 3700
 Wire Wire Line
-	6350 5600 6350 1600
-Connection ~ 6350 1600
+	6650 7000 6650 3000
+Connection ~ 6650 3000
 Wire Wire Line
-	6350 1600 8100 1600
+	6650 3000 8400 3000
 Wire Wire Line
-	6400 1700 6400 5700
+	6700 3100 6700 7100
 Wire Wire Line
-	6400 5700 6350 5700
-Connection ~ 6400 1700
+	6700 7100 6650 7100
+Connection ~ 6700 3100
 Wire Wire Line
-	6400 1700 8050 1700
+	6700 3100 8350 3100
 Wire Wire Line
-	6450 5800 6350 5800
+	6750 7200 6650 7200
 Wire Wire Line
-	6450 1800 6450 5800
-Connection ~ 6450 1800
+	6750 3200 6750 7200
+Connection ~ 6750 3200
 Wire Wire Line
-	6450 1800 5350 1800
+	6750 3200 5650 3200
 Wire Wire Line
-	6500 1900 6500 5900
+	6800 3300 6800 7300
 Wire Wire Line
-	6500 5900 6350 5900
-Connection ~ 6500 1900
+	6800 7300 6650 7300
+Connection ~ 6800 3300
 Wire Wire Line
-	6500 1900 7950 1900
+	6800 3300 8250 3300
 Wire Wire Line
-	6350 6000 6550 6000
+	6650 7400 6850 7400
 Wire Wire Line
-	6550 6000 6550 2000
-Connection ~ 6550 2000
+	6850 7400 6850 3400
+Connection ~ 6850 3400
 Wire Wire Line
-	6550 2000 7900 2000
+	6850 3400 8200 3400
 Wire Wire Line
-	6600 2100 6600 6100
+	6900 3500 6900 7500
 Wire Wire Line
-	6600 6100 6350 6100
-Connection ~ 6600 2100
+	6900 7500 6650 7500
+Connection ~ 6900 3500
 Wire Wire Line
-	6600 2100 5350 2100
+	6900 3500 5650 3500
 Wire Wire Line
-	6350 6200 6650 6200
+	6650 7600 6950 7600
 Wire Wire Line
-	6650 6200 6650 2200
-Connection ~ 6650 2200
+	6950 7600 6950 3600
+Connection ~ 6950 3600
 Wire Wire Line
-	6650 2200 7800 2200
+	6950 3600 8100 3600
 Wire Wire Line
-	6700 2300 6700 6300
+	7000 3700 7000 7700
 Wire Wire Line
-	6700 6300 6350 6300
-Connection ~ 6700 2300
+	7000 7700 6650 7700
+Connection ~ 7000 3700
 Wire Wire Line
-	6700 2300 5350 2300
+	7000 3700 5650 3700
 Wire Wire Line
-	5550 5600 2650 5600
+	5850 7000 2950 7000
 Wire Wire Line
-	2650 5600 2650 4550
+	2950 7000 2950 5950
 Wire Wire Line
-	2650 1600 2800 1600
+	2950 3000 3100 3000
 Wire Wire Line
-	2800 1700 2600 1700
+	3100 3100 2900 3100
 Wire Wire Line
-	2600 1700 2600 5050
+	2900 3100 2900 6450
 Wire Wire Line
-	2600 5700 5550 5700
+	2900 7100 5850 7100
 Wire Wire Line
-	5550 5800 2550 5800
+	5850 7200 2850 7200
 Wire Wire Line
-	2550 5800 2550 1800
+	2850 7200 2850 3200
 Wire Wire Line
-	2550 1800 2800 1800
+	2850 3200 3100 3200
 Wire Wire Line
-	2800 1900 2500 1900
+	3100 3300 2800 3300
 Wire Wire Line
-	2500 1900 2500 5900
+	2800 3300 2800 7300
 Wire Wire Line
-	2500 5900 5550 5900
+	2800 7300 5850 7300
 Wire Wire Line
-	2800 2000 2450 2000
+	3100 3400 2750 3400
 Wire Wire Line
-	2450 2000 2450 6000
+	2750 3400 2750 7400
 Wire Wire Line
-	2450 6000 5550 6000
+	2750 7400 5850 7400
 Wire Wire Line
-	5550 6100 2400 6100
+	5850 7500 2700 7500
 Wire Wire Line
-	2400 6100 2400 2100
+	2700 7500 2700 3500
 Wire Wire Line
-	2400 2100 2800 2100
+	2700 3500 3100 3500
 Wire Wire Line
-	2800 2200 2350 2200
+	3100 3600 2650 3600
 Wire Wire Line
-	2350 2200 2350 6200
+	2650 3600 2650 7600
 Wire Wire Line
-	2350 6200 5550 6200
+	2650 7600 5850 7600
 Wire Wire Line
-	5550 6300 2300 6300
+	5850 7700 2600 7700
 Wire Wire Line
-	2300 6300 2300 2300
+	2600 7700 2600 3700
 Wire Wire Line
-	2300 2300 2800 2300
+	2600 3700 3100 3700
 Wire Wire Line
-	5550 6400 2250 6400
+	5850 7800 2550 7800
 Wire Wire Line
-	2250 6400 2250 2400
+	2550 7800 2550 3800
 Wire Wire Line
-	2250 2400 2800 2400
+	2550 3800 3100 3800
 Wire Wire Line
-	2800 2500 2200 2500
+	3100 3900 2500 3900
 Wire Wire Line
-	2200 2500 2200 6500
+	2500 3900 2500 7900
 Wire Wire Line
-	2200 6500 5550 6500
+	2500 7900 5850 7900
 Wire Wire Line
-	5550 6600 2150 6600
+	5850 8000 2450 8000
 Wire Wire Line
-	2150 6600 2150 2600
+	2450 8000 2450 4000
 Wire Wire Line
-	2150 2600 2800 2600
+	2450 4000 3100 4000
 Wire Wire Line
-	2800 1500 2700 1500
+	3100 2900 3000 2900
 Wire Wire Line
-	2700 1500 2700 4100
+	3000 2900 3000 5500
 Wire Wire Line
-	2700 7200 5400 7200
+	3000 8600 5700 8600
 Wire Wire Line
-	5550 7300 5400 7300
+	5850 8700 5700 8700
 Wire Wire Line
-	5400 7300 5400 7200
-Connection ~ 5400 7200
+	5700 8700 5700 8600
+Connection ~ 5700 8600
 Wire Wire Line
-	5400 7200 5550 7200
+	5700 8600 5850 8600
 Wire Wire Line
-	5400 7100 5400 7000
+	5700 8500 5700 8400
 Wire Wire Line
-	5400 7000 5550 7000
+	5700 8400 5850 8400
 Wire Wire Line
-	5400 7100 5550 7100
+	5700 8500 5850 8500
 Wire Wire Line
-	5400 7000 5400 5400
+	5700 8400 5700 6800
 Wire Wire Line
-	5400 5400 5950 5400
-Connection ~ 5400 7000
+	5700 6800 6250 6800
+Connection ~ 5700 8400
 Wire Wire Line
-	2800 3900 2800 5400
+	3100 5300 3100 6800
 Wire Wire Line
-	2800 5400 5400 5400
-Connection ~ 5400 5400
+	3100 6800 5700 6800
+Connection ~ 5700 6800
 Wire Wire Line
-	3300 3900 3300 7500
+	3600 5300 3600 8900
 Wire Wire Line
-	3300 7500 5950 7500
+	3600 8900 6250 8900
 Wire Wire Line
-	5400 1300 4850 1300
+	5700 2700 7700 2700
 Wire Wire Line
-	5400 1300 9100 1300
-Connection ~ 5400 1300
+	5700 2700 5700 3850
 Wire Wire Line
-	9100 3300 5400 3300
+	6250 8900 6750 8900
 Wire Wire Line
-	5400 1300 5400 2450
-Connection ~ 5400 3300
+	8600 8900 8600 7750
 Wire Wire Line
-	5400 3300 5400 5400
+	8600 6300 9400 6300
+Connection ~ 6250 8900
 Wire Wire Line
-	5950 7500 6450 7500
+	8600 6300 8600 6000
 Wire Wire Line
-	8300 7500 8300 6350
+	8600 4300 9400 4300
+Connection ~ 8600 6300
 Wire Wire Line
-	8300 4900 9100 4900
-Connection ~ 5950 7500
+	8900 3900 8600 3900
 Wire Wire Line
-	8300 4900 8300 4600
+	8600 3900 8600 4300
+Connection ~ 8600 4300
 Wire Wire Line
-	8300 2900 9100 2900
-Connection ~ 8300 4900
+	8900 6000 8600 6000
+Connection ~ 8600 6000
 Wire Wire Line
-	8600 2500 8300 2500
+	8600 6000 8600 4300
 Wire Wire Line
-	8300 2500 8300 2900
-Connection ~ 8300 2900
+	13250 2650 13150 2650
+Connection ~ 13150 2650
 Wire Wire Line
-	8600 4600 8300 4600
-Connection ~ 8300 4600
+	9400 4300 9900 4300
 Wire Wire Line
-	8300 4600 8300 2900
+	10950 4300 10950 5250
 Wire Wire Line
-	12950 1250 12850 1250
-Connection ~ 12850 1250
-Connection ~ 9100 1300
+	10950 5250 12950 5250
+Connection ~ 9400 4300
 Wire Wire Line
-	9100 2900 9600 2900
+	12950 5250 13050 5250
+Connection ~ 12950 5250
 Wire Wire Line
-	10650 2900 10650 3850
+	13050 5250 13150 5250
+Connection ~ 13050 5250
 Wire Wire Line
-	10650 3850 12650 3850
-Connection ~ 9100 2900
+	13150 5250 13250 5250
+Connection ~ 13150 5250
 Wire Wire Line
-	12650 3850 12750 3850
-Connection ~ 12650 3850
+	13250 5250 13350 5250
+Connection ~ 13250 5250
 Wire Wire Line
-	12750 3850 12850 3850
-Connection ~ 12750 3850
+	13350 5250 13450 5250
+Connection ~ 13350 5250
 Wire Wire Line
-	12850 3850 12950 3850
-Connection ~ 12850 3850
+	13450 5250 13550 5250
+Connection ~ 13450 5250
 Wire Wire Line
-	12950 3850 13050 3850
-Connection ~ 12950 3850
+	13550 5250 13650 5250
+Connection ~ 13550 5250
+Connection ~ 3600 5300
 Wire Wire Line
-	13050 3850 13150 3850
-Connection ~ 13050 3850
+	14150 3650 14400 3650
 Wire Wire Line
-	13150 3850 13250 3850
-Connection ~ 13150 3850
+	14400 3650 14400 2500
 Wire Wire Line
-	13250 3850 13350 3850
-Connection ~ 13250 3850
-Connection ~ 3300 3900
+	14400 2500 9900 2500
 Wire Wire Line
-	13850 2250 14100 2250
+	9900 2500 9900 3000
 Wire Wire Line
-	14100 2250 14100 1100
+	11000 3450 11000 3100
 Wire Wire Line
-	14100 1100 9600 1100
+	12550 4650 11050 4650
 Wire Wire Line
-	9600 1100 9600 1600
+	11050 4650 11050 3200
 Wire Wire Line
-	10700 2050 10700 1700
+	11050 3200 9900 3200
 Wire Wire Line
-	12250 3250 10750 3250
+	12550 4150 11100 4150
 Wire Wire Line
-	10750 3250 10750 1800
+	11100 4150 11100 3300
 Wire Wire Line
-	10750 1800 9600 1800
+	11100 3300 9900 3300
 Wire Wire Line
-	12250 2750 10800 2750
+	12550 3450 11000 3450
 Wire Wire Line
-	10800 2750 10800 1900
+	14150 4350 14450 4350
 Wire Wire Line
-	10800 1900 9600 1900
+	14450 4350 14450 2300
 Wire Wire Line
-	12250 2050 10700 2050
+	14450 2300 10050 2300
 Wire Wire Line
-	13850 2950 14150 2950
+	10050 2300 10050 3400
 Wire Wire Line
-	14150 2950 14150 900 
+	10050 3400 9900 3400
 Wire Wire Line
-	14150 900  9750 900 
+	14150 4250 14500 4250
 Wire Wire Line
-	9750 900  9750 2000
+	14500 4250 14500 2250
 Wire Wire Line
-	9750 2000 9600 2000
+	14500 2250 10100 2250
 Wire Wire Line
-	13850 2850 14200 2850
+	10100 2250 10100 3500
 Wire Wire Line
-	14200 2850 14200 850 
+	10100 3500 9900 3500
 Wire Wire Line
-	14200 850  9800 850 
+	14150 4450 14550 4450
 Wire Wire Line
-	9800 850  9800 2100
+	14550 4450 14550 2200
 Wire Wire Line
-	9800 2100 9600 2100
+	14550 2200 10150 2200
 Wire Wire Line
-	13850 3050 14250 3050
+	10150 2200 10150 3600
 Wire Wire Line
-	14250 3050 14250 800 
+	10150 3600 9900 3600
 Wire Wire Line
-	14250 800  9850 800 
+	14150 3750 14600 3750
 Wire Wire Line
-	9850 800  9850 2200
+	14600 3750 14600 2150
 Wire Wire Line
-	9850 2200 9600 2200
+	14600 2150 10200 2150
 Wire Wire Line
-	13850 2350 14300 2350
+	10200 2150 10200 3700
 Wire Wire Line
-	14300 2350 14300 750 
+	10200 3700 9900 3700
 Wire Wire Line
-	14300 750  9900 750 
+	14150 3850 14600 3850
 Wire Wire Line
-	9900 750  9900 2300
+	14600 3850 14600 5400
 Wire Wire Line
-	9900 2300 9600 2300
+	14600 5400 10800 5400
 Wire Wire Line
-	9100 1250 9100 1300
+	10800 5400 10800 5000
 Wire Wire Line
-	13850 2450 14300 2450
+	10750 5100 10750 5450
 Wire Wire Line
-	14300 2450 14300 4000
+	10750 5450 14300 5450
 Wire Wire Line
-	14300 4000 10500 4000
+	14300 5450 14300 4750
 Wire Wire Line
-	10500 4000 10500 3600
+	14300 4750 14150 4750
 Wire Wire Line
-	10500 3600 10250 3600
+	11150 3750 11150 5200
 Wire Wire Line
-	9600 3700 10200 3700
+	11150 3750 12550 3750
 Wire Wire Line
-	10450 3700 10450 4050
+	12550 4550 11200 4550
 Wire Wire Line
-	10450 4050 14000 4050
+	11200 4550 11200 5300
 Wire Wire Line
-	14000 4050 14000 3350
+	10700 3950 12550 3950
 Wire Wire Line
-	14000 3350 13850 3350
+	10700 3950 10700 5400
 Wire Wire Line
-	10850 2350 10850 3800
+	12550 3850 10650 3850
 Wire Wire Line
-	10850 3800 10150 3800
+	10650 3850 10650 5500
 Wire Wire Line
-	10850 2350 12250 2350
+	12550 3350 10600 3350
 Wire Wire Line
-	12250 3150 10900 3150
+	10600 3350 10600 5600
 Wire Wire Line
-	10900 3150 10900 3900
+	14150 4650 14350 4650
 Wire Wire Line
-	10900 3900 10100 3900
+	14350 4650 14350 5700
 Wire Wire Line
-	9600 4000 10050 4000
-Wire Wire Line
-	10400 2550 12250 2550
-Wire Wire Line
-	10400 2550 10400 4000
-Wire Wire Line
-	12250 2450 10350 2450
-Wire Wire Line
-	10350 2450 10350 4100
-Wire Wire Line
-	10350 4100 10000 4100
-Wire Wire Line
-	12250 1950 10300 1950
-Wire Wire Line
-	10300 1950 10300 4200
-Wire Wire Line
-	10300 4200 9950 4200
-Wire Wire Line
-	13850 3250 14050 3250
-Wire Wire Line
-	14050 3250 14050 4300
-Wire Wire Line
-	14050 4300 9900 4300
-$Comp
-L Device:R R8
-U 1 1 5FA241D5
-P 10050 5450
-F 0 "R8" H 10120 5496 50  0000 L CNN
-F 1 "3K" H 10120 5405 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 9980 5450 50  0001 C CNN
-F 3 "~" H 10050 5450 50  0001 C CNN
-	1    10050 5450
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R9
-U 1 1 5FA246F6
-P 10300 5450
-F 0 "R9" H 10370 5496 50  0000 L CNN
-F 1 "3K" H 10370 5405 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 10230 5450 50  0001 C CNN
-F 3 "~" H 10300 5450 50  0001 C CNN
-	1    10300 5450
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R RA1
-U 1 1 5FA24EB1
-P 10550 5450
-F 0 "RA1" H 10620 5496 50  0000 L CNN
-F 1 "3K" H 10620 5405 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 10480 5450 50  0001 C CNN
-F 3 "~" H 10550 5450 50  0001 C CNN
-	1    10550 5450
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R RB1
-U 1 1 5FA253F4
-P 10800 5450
-F 0 "RB1" H 10870 5496 50  0000 L CNN
-F 1 "3K" H 10870 5405 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 10730 5450 50  0001 C CNN
-F 3 "~" H 10800 5450 50  0001 C CNN
-	1    10800 5450
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R RC1
-U 1 1 5FA25849
-P 11050 5450
-F 0 "RC1" H 11120 5496 50  0000 L CNN
-F 1 "3K" H 11120 5405 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 10980 5450 50  0001 C CNN
-F 3 "~" H 11050 5450 50  0001 C CNN
-	1    11050 5450
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R RD1
-U 1 1 5FA25CA5
-P 11300 5450
-F 0 "RD1" H 11370 5496 50  0000 L CNN
-F 1 "3K" H 11370 5405 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 11230 5450 50  0001 C CNN
-F 3 "~" H 11300 5450 50  0001 C CNN
-	1    11300 5450
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R RE1
-U 1 1 5FA2611D
-P 11550 5450
-F 0 "RE1" H 11620 5496 50  0000 L CNN
-F 1 "3K" H 11620 5405 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 11480 5450 50  0001 C CNN
-F 3 "~" H 11550 5450 50  0001 C CNN
-	1    11550 5450
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R RF1
-U 1 1 5FA2686B
-P 11800 5450
-F 0 "RF1" H 11870 5496 50  0000 L CNN
-F 1 "3K" H 11870 5405 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 11730 5450 50  0001 C CNN
-F 3 "~" H 11800 5450 50  0001 C CNN
-	1    11800 5450
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R0
-U 1 1 5FAAFB0D
-P 10050 4950
-F 0 "R0" H 10120 4996 50  0000 L CNN
-F 1 "2K" H 10120 4905 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 9980 4950 50  0001 C CNN
-F 3 "~" H 10050 4950 50  0001 C CNN
-	1    10050 4950
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R1
-U 1 1 5FAAFB13
-P 10300 4950
-F 0 "R1" H 10370 4996 50  0000 L CNN
-F 1 "2K" H 10370 4905 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 10230 4950 50  0001 C CNN
-F 3 "~" H 10300 4950 50  0001 C CNN
-	1    10300 4950
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R2
-U 1 1 5FAAFB19
-P 10550 4950
-F 0 "R2" H 10620 4996 50  0000 L CNN
-F 1 "2K" H 10620 4905 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 10480 4950 50  0001 C CNN
-F 3 "~" H 10550 4950 50  0001 C CNN
-	1    10550 4950
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R3
-U 1 1 5FAAFB1F
-P 10800 4950
-F 0 "R3" H 10870 4996 50  0000 L CNN
-F 1 "2K" H 10870 4905 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 10730 4950 50  0001 C CNN
-F 3 "~" H 10800 4950 50  0001 C CNN
-	1    10800 4950
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R4
-U 1 1 5FAAFB25
-P 11050 4950
-F 0 "R4" H 11120 4996 50  0000 L CNN
-F 1 "2K" H 11120 4905 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 10980 4950 50  0001 C CNN
-F 3 "~" H 11050 4950 50  0001 C CNN
-	1    11050 4950
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R5
-U 1 1 5FAAFB2B
-P 11300 4950
-F 0 "R5" H 11370 4996 50  0000 L CNN
-F 1 "2K" H 11370 4905 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 11230 4950 50  0001 C CNN
-F 3 "~" H 11300 4950 50  0001 C CNN
-	1    11300 4950
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R6
-U 1 1 5FAAFB31
-P 11550 4950
-F 0 "R6" H 11620 4996 50  0000 L CNN
-F 1 "2K" H 11620 4905 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 11480 4950 50  0001 C CNN
-F 3 "~" H 11550 4950 50  0001 C CNN
-	1    11550 4950
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R7
-U 1 1 5FAAFB37
-P 11800 4950
-F 0 "R7" H 11870 4996 50  0000 L CNN
-F 1 "2K" H 11870 4905 50  0000 L CNN
-F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P1.90mm_Vertical" V 11730 4950 50  0001 C CNN
-F 3 "~" H 11800 4950 50  0001 C CNN
-	1    11800 4950
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	9100 3300 9650 3300
-Wire Wire Line
-	10600 3300 10600 4800
-Wire Wire Line
-	10600 4800 10550 4800
-Connection ~ 9100 3300
-Wire Wire Line
-	10550 4800 10300 4800
-Connection ~ 10550 4800
-Wire Wire Line
-	10300 4800 10050 4800
-Connection ~ 10300 4800
-Wire Wire Line
-	10600 4800 10800 4800
-Wire Wire Line
-	10800 4800 11050 4800
-Connection ~ 10600 4800
-Connection ~ 10800 4800
-Wire Wire Line
-	11050 4800 11300 4800
-Connection ~ 11050 4800
-Wire Wire Line
-	11300 4800 11550 4800
-Connection ~ 11300 4800
-Wire Wire Line
-	11550 4800 11800 4800
-Connection ~ 11550 4800
-Wire Wire Line
-	9100 4900 9100 5600
-Wire Wire Line
-	9100 5600 10050 5600
-Connection ~ 9100 4900
-Wire Wire Line
-	10050 5600 10300 5600
-Connection ~ 10050 5600
-Wire Wire Line
-	10300 5600 10550 5600
-Connection ~ 10300 5600
-Wire Wire Line
-	10550 5600 10800 5600
-Connection ~ 10550 5600
-Wire Wire Line
-	10800 5600 11050 5600
-Connection ~ 10800 5600
-Wire Wire Line
-	11300 5600 11050 5600
-Connection ~ 11050 5600
-Wire Wire Line
-	11300 5600 11550 5600
-Connection ~ 11300 5600
-Wire Wire Line
-	11550 5600 11800 5600
-Connection ~ 11550 5600
-Wire Wire Line
-	10050 5200 10050 5100
-Wire Wire Line
-	10050 5350 10050 5300
-Connection ~ 10050 5200
-Connection ~ 10050 5300
-Wire Wire Line
-	10050 5300 10050 5200
-Wire Wire Line
-	10250 3600 10250 4700
-Wire Wire Line
-	10250 4700 11700 4700
-Wire Wire Line
-	11700 4700 11700 5200
-Wire Wire Line
-	11700 5200 11800 5200
-Wire Wire Line
-	11800 5200 11800 5100
-Connection ~ 10250 3600
-Wire Wire Line
-	10250 3600 9600 3600
-Wire Wire Line
-	11800 5300 11800 5200
-Connection ~ 11800 5200
-Wire Wire Line
-	10200 3700 10200 4650
-Wire Wire Line
-	10200 4650 11450 4650
-Wire Wire Line
-	11450 4650 11450 5200
-Wire Wire Line
-	11450 5200 11550 5200
-Connection ~ 10200 3700
-Wire Wire Line
-	10200 3700 10450 3700
-Connection ~ 11550 5200
-Wire Wire Line
-	11550 5200 11550 5300
-Wire Wire Line
-	11300 5300 11300 5200
-Wire Wire Line
-	11550 5100 11550 5200
-Wire Wire Line
-	11050 5100 11050 5200
-Wire Wire Line
-	10800 5300 10800 5200
-Wire Wire Line
-	10550 5100 10550 5200
-Wire Wire Line
-	10300 5300 10300 5200
-Wire Wire Line
-	11300 5200 11200 5200
-Wire Wire Line
-	11200 5200 11200 4600
-Wire Wire Line
-	11200 4600 10150 4600
-Wire Wire Line
-	10150 4600 10150 3800
-Connection ~ 11300 5200
-Wire Wire Line
-	11300 5200 11300 5100
-Connection ~ 10150 3800
-Wire Wire Line
-	10150 3800 9600 3800
-Wire Wire Line
-	10100 3900 10100 4550
-Wire Wire Line
-	10100 4550 10950 4550
-Wire Wire Line
-	10950 4550 10950 5200
-Wire Wire Line
-	10950 5200 11050 5200
-Connection ~ 10100 3900
-Wire Wire Line
-	10100 3900 9600 3900
-Connection ~ 11050 5200
-Wire Wire Line
-	11050 5200 11050 5300
-Wire Wire Line
-	10800 5200 10700 5200
-Wire Wire Line
-	10700 5200 10700 4500
-Wire Wire Line
-	10700 4500 10050 4500
-Wire Wire Line
-	10050 4500 10050 4000
-Connection ~ 10800 5200
-Wire Wire Line
-	10800 5200 10800 5100
-Connection ~ 10050 4000
-Wire Wire Line
-	10050 4000 10400 4000
-Wire Wire Line
-	10000 4100 10000 4450
-Wire Wire Line
-	10000 4450 10450 4450
-Wire Wire Line
-	10450 4450 10450 5200
-Wire Wire Line
-	10450 5200 10550 5200
-Connection ~ 10000 4100
-Wire Wire Line
-	10000 4100 9600 4100
-Connection ~ 10550 5200
-Wire Wire Line
-	10550 5200 10550 5300
-Wire Wire Line
-	10300 5200 10200 5200
-Wire Wire Line
-	10200 5200 10200 4700
-Wire Wire Line
-	10200 4700 9950 4700
-Wire Wire Line
-	9950 4700 9950 4200
-Connection ~ 10300 5200
-Wire Wire Line
-	10300 5200 10300 5100
-Connection ~ 9950 4200
-Wire Wire Line
-	9950 4200 9600 4200
-Wire Wire Line
-	9900 4300 9900 5200
-Connection ~ 9900 4300
-Wire Wire Line
-	9900 4300 9600 4300
-Wire Wire Line
-	9900 5200 10050 5200
-Text Notes 4400 7400 0    50   ~ 0
+	9400 4700 9950 4700
+Connection ~ 9400 6300
+Text Notes 4700 8800 0    50   ~ 0
 Enable Firmware EPROM\non IO_SELECT low
 Wire Wire Line
-	2800 3200 2100 3200
+	3100 4600 2400 4600
 Wire Wire Line
-	2100 3200 2100 4300
+	2400 4600 2400 5700
 Wire Wire Line
-	4250 4300 4250 2500
+	5350 6350 5350 4550
 Wire Wire Line
-	4250 2500 4350 2500
-Text Notes 3700 2550 0    50   ~ 0
+	4550 3900 4650 3900
+Text Notes 4000 3950 0    50   ~ 0
 Direction is\nR/W Inverted
 Wire Wire Line
-	2650 4550 4500 4550
+	2950 5950 4800 5950
 Wire Wire Line
-	5900 2600 7000 2600
-Connection ~ 2650 4550
+	6200 4000 7300 4000
+Connection ~ 2950 5950
 Wire Wire Line
-	2650 4550 2650 1600
+	2950 5950 2950 3000
 $Comp
 L 74xx:74LS32 U3
 U 1 1 5FB50A31
-P 7300 2700
-F 0 "U3" H 7300 3025 50  0000 C CNN
-F 1 "74LS32" H 7300 2934 50  0000 C CNN
-F 2 "Package_DIP:DIP-14_W7.62mm" H 7300 2700 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74LS32" H 7300 2700 50  0001 C CNN
-	1    7300 2700
+P 7600 4100
+F 0 "U3" H 7600 4425 50  0000 C CNN
+F 1 "74LS32" H 7600 4334 50  0000 C CNN
+F 2 "Package_DIP:DIP-14_W7.62mm" H 7600 4100 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74LS32" H 7600 4100 50  0001 C CNN
+	1    7600 4100
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3300 2400 3600 2400
+	3600 3800 3900 3800
 Wire Wire Line
-	3600 3100 7000 3100
+	3900 4500 7300 4500
 Wire Wire Line
-	7000 3100 7000 2800
+	7300 4500 7300 4200
 Wire Wire Line
-	7600 2700 8400 2700
-Wire Wire Line
-	8600 2700 8600 2600
+	8900 4100 8900 4000
 $Comp
 L 74xx:74LS32 U3
 U 2 1 5FB9C73F
-P 4800 4450
-F 0 "U3" H 4800 4775 50  0000 C CNN
-F 1 "74LS32" H 4800 4684 50  0000 C CNN
-F 2 "Package_DIP:DIP-14_W7.62mm" H 4800 4450 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74LS32" H 4800 4450 50  0001 C CNN
-	2    4800 4450
+P 5100 5850
+F 0 "U3" H 5100 6175 50  0000 C CNN
+F 1 "74LS32" H 5100 6084 50  0000 C CNN
+F 2 "Package_DIP:DIP-14_W7.62mm" H 5100 5850 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74LS32" H 5100 5850 50  0001 C CNN
+	2    5100 5850
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4250 4300 4500 4300
+	4550 5700 4800 5700
 Wire Wire Line
-	4500 4300 4500 4350
-Connection ~ 4250 4300
+	4800 5700 4800 5750
+Connection ~ 4550 5700
 Wire Wire Line
-	5100 4450 5900 4450
+	5400 5850 6200 5850
 Wire Wire Line
-	5900 4450 5900 2600
+	6200 5850 6200 4000
 $Comp
 L 74xx:74LS32 U3
 U 3 1 5FBF09C5
-P 7400 4500
-F 0 "U3" H 7400 4825 50  0000 C CNN
-F 1 "74LS32" H 7400 4734 50  0000 C CNN
-F 2 "Package_DIP:DIP-14_W7.62mm" H 7400 4500 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74LS32" H 7400 4500 50  0001 C CNN
-	3    7400 4500
+P 7700 5900
+F 0 "U3" H 7700 6225 50  0000 C CNN
+F 1 "74LS32" H 7700 6134 50  0000 C CNN
+F 2 "Package_DIP:DIP-14_W7.62mm" H 7700 5900 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74LS32" H 7700 5900 50  0001 C CNN
+	3    7700 5900
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8600 4500 8500 4500
+	7300 5800 7400 5800
 Wire Wire Line
-	7000 4400 7100 4400
-Wire Wire Line
-	7000 3100 7000 4400
-Connection ~ 7000 3100
+	7300 4500 7300 5800
+Connection ~ 7300 4500
 $Comp
 L 74xx:74LS32 U3
 U 4 1 5FC54438
-P 4800 4950
-F 0 "U3" H 4800 5275 50  0000 C CNN
-F 1 "74LS32" H 4800 5184 50  0000 C CNN
-F 2 "Package_DIP:DIP-14_W7.62mm" H 4800 4950 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74LS32" H 4800 4950 50  0001 C CNN
-	4    4800 4950
+P 5100 6350
+F 0 "U3" H 5100 6675 50  0000 C CNN
+F 1 "74LS32" H 5100 6584 50  0000 C CNN
+F 2 "Package_DIP:DIP-14_W7.62mm" H 5100 6350 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74LS32" H 5100 6350 50  0001 C CNN
+	4    5100 6350
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	7100 4600 5100 4600
+	7400 6000 5400 6000
 Wire Wire Line
-	5100 4600 5100 4950
+	5400 6000 5400 6350
 Wire Wire Line
-	4500 5050 2600 5050
-Connection ~ 2600 5050
+	4800 6450 2900 6450
+Connection ~ 2900 6450
 Wire Wire Line
-	2600 5050 2600 5700
-Text Notes 7600 4950 0    50   ~ 0
+	2900 6450 2900 7100
+Text Notes 7900 6350 0    50   ~ 0
 Latch Clock on\nR/W low\nA1 low\nDEV_SELECT low
 Wire Wire Line
-	4400 4850 4500 4850
+	4700 6250 4800 6250
 Wire Wire Line
-	4250 4300 4250 4650
+	4550 5700 4550 6050
 Wire Wire Line
-	4250 4650 3800 4650
+	4550 6050 4100 6050
 Wire Wire Line
-	3800 4650 3800 4750
+	4100 6050 4100 6150
 Wire Wire Line
-	2100 4300 3650 4300
+	2400 5700 3950 5700
 Wire Wire Line
-	3600 2400 3600 3100
-Wire Wire Line
-	8500 4500 8500 6000
-Wire Wire Line
-	8500 6000 14500 6000
-Wire Wire Line
-	14500 6000 14500 2750
-Wire Wire Line
-	14500 2750 13850 2750
-Connection ~ 8500 4500
-Wire Wire Line
-	8500 4500 7700 4500
-Wire Wire Line
-	8400 2700 8400 6100
-Wire Wire Line
-	8400 6100 14550 6100
-Wire Wire Line
-	14550 6100 14550 2650
-Wire Wire Line
-	14550 2650 13850 2650
-Connection ~ 8400 2700
-Wire Wire Line
-	8400 2700 8600 2700
+	3900 3800 3900 4500
 $Comp
 L 74xx:74LS00 U2
 U 1 1 5FD4E618
-P 3850 3500
-F 0 "U2" H 3850 3825 50  0000 C CNN
-F 1 "74LS00" H 3850 3734 50  0000 C CNN
-F 2 "Package_DIP:DIP-14_W7.62mm" H 3850 3500 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74ls00" H 3850 3500 50  0001 C CNN
-	1    3850 3500
+P 4150 4900
+F 0 "U2" H 4150 5225 50  0000 C CNN
+F 1 "74LS00" H 4150 5134 50  0000 C CNN
+F 2 "Package_DIP:DIP-14_W7.62mm" H 4150 4900 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74ls00" H 4150 4900 50  0001 C CNN
+	1    4150 4900
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3600 3100 3550 3100
+	3900 4500 3850 4500
 Wire Wire Line
-	3550 3100 3550 3400
-Connection ~ 3600 3100
+	3850 4500 3850 4800
+Connection ~ 3900 4500
 $Comp
 L 74xx:74LS00 U2
 U 2 1 5FD74B7A
-P 4650 3500
-F 0 "U2" H 4650 3825 50  0000 C CNN
-F 1 "74LS00" H 4650 3734 50  0000 C CNN
-F 2 "Package_DIP:DIP-14_W7.62mm" H 4650 3500 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74ls00" H 4650 3500 50  0001 C CNN
-	2    4650 3500
+P 4950 4900
+F 0 "U2" H 4950 5225 50  0000 C CNN
+F 1 "74LS00" H 4950 5134 50  0000 C CNN
+F 2 "Package_DIP:DIP-14_W7.62mm" H 4950 4900 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74ls00" H 4950 4900 50  0001 C CNN
+	2    4950 4900
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	5150 3900 5150 2900
+	5450 5300 5450 4300
 Wire Wire Line
-	5150 2900 4850 2900
+	5450 4300 5150 4300
 Wire Wire Line
-	3300 3900 5150 3900
+	3600 5300 5450 5300
 Wire Wire Line
-	4150 3500 4350 3500
+	4450 4900 4650 4900
 Wire Wire Line
-	4350 3500 4350 3400
+	4650 4900 4650 4800
 Wire Wire Line
-	4350 3600 4350 3500
-Connection ~ 4350 3500
+	4650 5000 4650 4900
+Connection ~ 4650 4900
 Wire Wire Line
-	4950 3500 4950 2950
+	5250 4900 5250 4350
 Wire Wire Line
-	4950 2950 4350 2950
+	5250 4350 4650 4350
 Wire Wire Line
-	4350 2950 4350 2600
+	4650 4350 4650 4000
 Wire Wire Line
-	2700 4100 3550 4100
+	3000 5500 3850 5500
 Wire Wire Line
-	3550 4100 3550 3600
-Connection ~ 2700 4100
+	3850 5500 3850 5000
+Connection ~ 3000 5500
 Wire Wire Line
-	2700 4100 2700 7200
+	3000 5500 3000 8600
 $Comp
 L 74xx:74LS00 U2
 U 3 1 5FE27921
-P 4100 4850
-F 0 "U2" H 4100 5175 50  0000 C CNN
-F 1 "74LS00" H 4100 5084 50  0000 C CNN
-F 2 "Package_DIP:DIP-14_W7.62mm" H 4100 4850 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74ls00" H 4100 4850 50  0001 C CNN
-	3    4100 4850
+P 4400 6250
+F 0 "U2" H 4400 6575 50  0000 C CNN
+F 1 "74LS00" H 4400 6484 50  0000 C CNN
+F 2 "Package_DIP:DIP-14_W7.62mm" H 4400 6250 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74ls00" H 4400 6250 50  0001 C CNN
+	3    4400 6250
 	1    0    0    -1  
 $EndComp
-Connection ~ 3800 4750
+Connection ~ 4100 6150
 Wire Wire Line
-	3800 4750 3800 4950
+	4100 6150 4100 6350
 $Comp
 L 74xx:74LS00 U2
 U 4 1 5FE48B46
-P 3950 4300
-F 0 "U2" H 3950 4625 50  0000 C CNN
-F 1 "74LS00" H 3950 4534 50  0000 C CNN
-F 2 "Package_DIP:DIP-14_W7.62mm" H 3950 4300 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74ls00" H 3950 4300 50  0001 C CNN
-	4    3950 4300
+P 4250 5700
+F 0 "U2" H 4250 6025 50  0000 C CNN
+F 1 "74LS00" H 4250 5934 50  0000 C CNN
+F 2 "Package_DIP:DIP-14_W7.62mm" H 4250 5700 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74ls00" H 4250 5700 50  0001 C CNN
+	4    4250 5700
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3650 4200 3650 4300
+	3950 5600 3950 5700
 Wire Wire Line
-	3650 4300 3650 4400
-Connection ~ 3650 4300
-Text Notes 8500 3000 0    50   ~ 0
+	3950 5700 3950 5800
+Connection ~ 3950 5700
+Text Notes 8800 4400 0    50   ~ 0
 Enable on\nR/W high\nA0 low\nDEV_SELECT low
-Text Notes 4150 2950 0    50   ~ 0
+Text Notes 5250 5000 0    50   ~ 0
 Enable on either\nDEV_SELECT low\nIO_SELECT low
 $Comp
 L 74xx:74LS00 U2
 U 5 1 5FED8457
-P 7250 5850
-F 0 "U2" H 7480 5896 50  0000 L CNN
-F 1 "74LS00" H 7480 5805 50  0000 L CNN
-F 2 "Package_DIP:DIP-14_W7.62mm" H 7250 5850 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74ls00" H 7250 5850 50  0001 C CNN
-	5    7250 5850
+P 7550 7250
+F 0 "U2" H 7780 7296 50  0000 L CNN
+F 1 "74LS00" H 7780 7205 50  0000 L CNN
+F 2 "Package_DIP:DIP-14_W7.62mm" H 7550 7250 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74ls00" H 7550 7250 50  0001 C CNN
+	5    7550 7250
 	1    0    0    -1  
 $EndComp
 $Comp
 L 74xx:74LS32 U3
 U 5 1 5FEDB516
-P 8000 5850
-F 0 "U3" H 8230 5896 50  0000 L CNN
-F 1 "74LS32" H 8230 5805 50  0000 L CNN
-F 2 "Package_DIP:DIP-14_W7.62mm" H 8000 5850 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74LS32" H 8000 5850 50  0001 C CNN
-	5    8000 5850
+P 8300 7250
+F 0 "U3" H 8530 7296 50  0000 L CNN
+F 1 "74LS32" H 8530 7205 50  0000 L CNN
+F 2 "Package_DIP:DIP-14_W7.62mm" H 8300 7250 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74LS32" H 8300 7250 50  0001 C CNN
+	5    8300 7250
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8000 6350 8300 6350
-Connection ~ 8300 6350
+	8300 7750 8600 7750
+Connection ~ 8600 7750
 Wire Wire Line
-	8300 6350 8300 4900
+	8600 7750 8600 6300
 Wire Wire Line
-	8000 6350 7700 6350
-Connection ~ 8000 6350
+	8300 7750 8000 7750
+Connection ~ 8300 7750
 Wire Wire Line
-	8000 5350 7700 5350
+	8300 6750 8000 6750
 Wire Wire Line
-	7250 5350 6900 5350
+	7550 6750 7200 6750
 Wire Wire Line
-	5950 5350 5950 5400
-Connection ~ 7250 5350
-Connection ~ 5950 5400
+	6250 6750 6250 6800
+Connection ~ 7550 6750
+Connection ~ 6250 6800
 Wire Wire Line
-	2800 3800 2750 3800
+	3100 5200 3050 5200
 Wire Wire Line
-	2750 3800 2750 4000
+	3050 5200 3050 5400
 Wire Wire Line
-	2750 4000 3400 4000
+	3050 5400 3700 5400
 Wire Wire Line
-	3400 4000 3400 3800
+	3700 5400 3700 5200
 Wire Wire Line
-	3400 3800 3300 3800
+	3700 5200 3600 5200
 Wire Wire Line
-	3300 3700 3450 3700
+	3600 5100 3750 5100
 Wire Wire Line
-	3450 3700 3450 4050
+	3750 5100 3750 5450
 Wire Wire Line
-	3450 4050 2050 4050
+	3750 5450 2350 5450
 Wire Wire Line
-	2050 4050 2050 3700
+	2350 5450 2350 5100
 Wire Wire Line
-	2050 3700 2800 3700
+	2350 5100 3100 5100
 $Comp
 L Device:C C3
 U 1 1 5FB81404
-P 6900 6200
-F 0 "C3" H 7015 6246 50  0000 L CNN
-F 1 "C" H 7015 6155 50  0000 L CNN
-F 2 "Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm" H 6938 6050 50  0001 C CNN
-F 3 "~" H 6900 6200 50  0001 C CNN
-	1    6900 6200
+P 7200 7600
+F 0 "C3" H 7315 7646 50  0000 L CNN
+F 1 "C" H 7315 7555 50  0000 L CNN
+F 2 "Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm" H 7238 7450 50  0001 C CNN
+F 3 "~" H 7200 7600 50  0001 C CNN
+	1    7200 7600
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C4
 U 1 1 5FB82906
-P 7700 6200
-F 0 "C4" H 7815 6246 50  0000 L CNN
-F 1 "C" H 7815 6155 50  0000 L CNN
-F 2 "Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm" H 7738 6050 50  0001 C CNN
-F 3 "~" H 7700 6200 50  0001 C CNN
-	1    7700 6200
+P 8000 7600
+F 0 "C4" H 8115 7646 50  0000 L CNN
+F 1 "C" H 8115 7555 50  0000 L CNN
+F 2 "Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm" H 8038 7450 50  0001 C CNN
+F 3 "~" H 8000 7600 50  0001 C CNN
+	1    8000 7600
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C2
 U 1 1 5FB849D8
-P 6450 7100
-F 0 "C2" H 6565 7146 50  0000 L CNN
-F 1 "C" H 6565 7055 50  0000 L CNN
-F 2 "Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm" H 6488 6950 50  0001 C CNN
-F 3 "~" H 6450 7100 50  0001 C CNN
-	1    6450 7100
+P 6750 8500
+F 0 "C2" H 6865 8546 50  0000 L CNN
+F 1 "C" H 6865 8455 50  0000 L CNN
+F 2 "Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm" H 6788 8350 50  0001 C CNN
+F 3 "~" H 6750 8500 50  0001 C CNN
+	1    6750 8500
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C1
 U 1 1 5FB85911
-P 5300 2600
-F 0 "C1" H 5415 2646 50  0000 L CNN
-F 1 "C" H 5415 2555 50  0000 L CNN
-F 2 "Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm" H 5338 2450 50  0001 C CNN
-F 3 "~" H 5300 2600 50  0001 C CNN
-	1    5300 2600
+P 5600 4000
+F 0 "C1" H 5715 4046 50  0000 L CNN
+F 1 "C" H 5715 3955 50  0000 L CNN
+F 2 "Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm" H 5638 3850 50  0001 C CNN
+F 3 "~" H 5600 4000 50  0001 C CNN
+	1    5600 4000
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C5
 U 1 1 5FB8694D
-P 9600 2550
-F 0 "C5" H 9715 2596 50  0000 L CNN
-F 1 "C" H 9715 2505 50  0000 L CNN
-F 2 "Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm" H 9638 2400 50  0001 C CNN
-F 3 "~" H 9600 2550 50  0001 C CNN
-	1    9600 2550
+P 9900 3950
+F 0 "C5" H 10015 3996 50  0000 L CNN
+F 1 "C" H 10015 3905 50  0000 L CNN
+F 2 "Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm" H 9938 3800 50  0001 C CNN
+F 3 "~" H 9900 3950 50  0001 C CNN
+	1    9900 3950
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C6
 U 1 1 5FB87862
-P 9600 4650
-F 0 "C6" H 9715 4696 50  0000 L CNN
-F 1 "C" H 9715 4605 50  0000 L CNN
-F 2 "Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm" H 9638 4500 50  0001 C CNN
-F 3 "~" H 9600 4650 50  0001 C CNN
-	1    9600 4650
+P 9900 6050
+F 0 "C6" H 10015 6096 50  0000 L CNN
+F 1 "C" H 10015 6005 50  0000 L CNN
+F 2 "Capacitor_THT:C_Disc_D3.8mm_W2.6mm_P2.50mm" H 9938 5900 50  0001 C CNN
+F 3 "~" H 9900 6050 50  0001 C CNN
+	1    9900 6050
 	1    0    0    -1  
 $EndComp
-Connection ~ 9600 2900
+Connection ~ 9900 4300
 Wire Wire Line
-	9600 2900 10650 2900
+	9900 4300 10950 4300
 Wire Wire Line
-	9600 2700 9600 2900
+	9900 4100 9900 4300
 Wire Wire Line
-	10700 1700 9600 1700
+	11000 3100 9900 3100
 Wire Wire Line
-	9100 1250 9700 1250
+	10000 2650 10000 3800
 Wire Wire Line
-	9700 1250 9700 2400
+	10000 3800 9900 3800
 Wire Wire Line
-	9700 2400 9600 2400
-Connection ~ 9700 1250
+	9950 4700 9950 5800
 Wire Wire Line
-	9700 1250 12850 1250
+	9950 5800 9900 5800
 Wire Wire Line
-	9650 3300 9650 4400
+	9900 5800 9900 5900
 Wire Wire Line
-	9650 4400 9600 4400
+	9900 6300 9400 6300
 Wire Wire Line
-	9600 4400 9600 4500
-Connection ~ 9650 3300
+	9900 6200 9900 6300
+Connection ~ 8000 7750
 Wire Wire Line
-	9650 3300 10600 3300
+	8000 7750 7550 7750
 Wire Wire Line
-	9600 4900 9100 4900
+	8000 7450 8000 6750
+Connection ~ 8000 6750
 Wire Wire Line
-	9600 4800 9600 4900
-Connection ~ 7700 6350
+	8000 6750 7550 6750
 Wire Wire Line
-	7700 6350 7250 6350
+	7550 7750 7200 7750
+Connection ~ 7550 7750
 Wire Wire Line
-	7700 6050 7700 5350
-Connection ~ 7700 5350
+	7200 7450 7200 6750
+Connection ~ 7200 6750
 Wire Wire Line
-	7700 5350 7250 5350
+	7200 6750 7050 6750
 Wire Wire Line
-	7250 6350 6900 6350
-Connection ~ 7250 6350
+	6750 8650 6750 8900
+Connection ~ 6750 8900
 Wire Wire Line
-	6900 6050 6900 5350
-Connection ~ 6900 5350
+	6750 8900 8600 8900
 Wire Wire Line
-	6900 5350 6750 5350
+	6750 8350 6750 7800
 Wire Wire Line
-	6450 7250 6450 7500
-Connection ~ 6450 7500
+	6750 7800 7050 7800
 Wire Wire Line
-	6450 7500 8300 7500
+	7050 7800 7050 6750
+Connection ~ 7050 6750
 Wire Wire Line
-	6450 6950 6450 6400
+	7050 6750 6250 6750
 Wire Wire Line
-	6450 6400 6750 6400
+	5450 4300 5600 4300
 Wire Wire Line
-	6750 6400 6750 5350
-Connection ~ 6750 5350
+	5600 4300 5600 4150
+Connection ~ 5450 4300
 Wire Wire Line
-	6750 5350 5950 5350
+	5600 3850 5700 3850
+Connection ~ 5700 3850
 Wire Wire Line
-	5150 2900 5300 2900
+	9900 5000 10800 5000
 Wire Wire Line
-	5300 2900 5300 2750
-Connection ~ 5150 2900
+	9900 5100 10750 5100
 Wire Wire Line
-	5300 2450 5400 2450
-Connection ~ 5400 2450
+	9900 5200 11150 5200
 Wire Wire Line
-	5400 2450 5400 3300
+	9900 5300 11200 5300
+Wire Wire Line
+	9900 5400 10700 5400
+Wire Wire Line
+	9900 5500 10650 5500
+Wire Wire Line
+	9900 5600 10600 5600
+Wire Wire Line
+	9900 5700 14350 5700
+Wire Wire Line
+	8000 5900 8900 5900
+Wire Wire Line
+	7900 4100 8900 4100
+Wire Wire Line
+	7700 2700 7700 2400
+Wire Wire Line
+	7700 2400 13150 2400
+Wire Wire Line
+	13150 2400 13150 2650
+Wire Wire Line
+	13550 2650 13450 2650
+Wire Wire Line
+	13450 2650 13450 2350
+Wire Wire Line
+	13450 2350 9400 2350
+Wire Wire Line
+	9400 2350 9400 2650
+Connection ~ 13450 2650
+Wire Wire Line
+	9400 2650 10000 2650
+Connection ~ 9400 2650
+Wire Wire Line
+	9400 2650 9400 2700
+Wire Wire Line
+	5700 3850 5700 6800
+Wire Wire Line
+	9950 4700 10400 4700
+Wire Wire Line
+	10400 4700 10400 2650
+Wire Wire Line
+	10400 2650 10000 2650
+Connection ~ 9950 4700
+Connection ~ 10000 2650
+Text Notes 3700 5800 0    50   ~ 0
+R/W
+Text Notes 4350 4550 0    50   ~ 0
+Device Select\n($C08+n0 - $C08+nF peripheral)
+Text Notes 3850 5250 0    50   ~ 0
+I/O Select\n($Cn00 - $CnFF Firmware)
+Text Notes 4750 6050 0    50   ~ 0
+A0
+Text Notes 4750 6550 0    50   ~ 0
+A1
+Text Notes 4450 5600 0    50   ~ 0
+Inverted R/W
+Text Notes 4600 6400 0    50   ~ 0
+R/W
+Text Notes 6200 6250 0    50   ~ 0
+Low on\nA1 low\nR/W low
+Text Notes 6250 4250 0    50   ~ 0
+Low on\nR/W high\nA0 low\n
+Wire Wire Line
+	5700 2700 5150 2700
+Connection ~ 5700 2700
+Wire Wire Line
+	4550 3900 4550 5700
 $EndSCHEMATC