diff --git a/Board Files/Motherboard.kicad_pcb b/Board Files/Motherboard.kicad_pcb
index e8d1fa7..28508e8 100644
--- a/Board Files/Motherboard.kicad_pcb	
+++ b/Board Files/Motherboard.kicad_pcb	
@@ -2,10 +2,10 @@
 
   (general
     (thickness 1.6)
-    (drawings 24)
+    (drawings 31)
     (tracks 0)
     (zones 0)
-    (modules 35)
+    (modules 36)
     (nets 1)
   )
 
@@ -86,9 +86,9 @@
       (subtractmaskfromsilk false)
       (outputformat 1)
       (mirror false)
-      (drillshape 1)
+      (drillshape 0)
       (scaleselection 1)
-      (outputdirectory ""))
+      (outputdirectory "./"))
   )
 
   (net 0 "")
@@ -102,8 +102,42 @@
     (uvia_drill 0.1)
   )
 
+  (module Capacitor_THT:C_Disc_D7.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5D57B782)
+    (at 193.675 118.275 90)
+    (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=7*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
+    (tags "C Disc series Radial pin pitch 5.00mm  diameter 7mm width 2.5mm Capacitor")
+    (fp_text reference REF** (at 2.5 -2.5 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value C_Disc_D7.0mm_W2.5mm_P5.00mm (at 2.5 2.5 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 2.5 0 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 6.25 -1.5) (end -1.25 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.25 1.5) (end 6.25 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.25 1.5) (end 6.25 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.25 -1.5) (end -1.25 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.12 -1.37) (end 6.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.12 -1.37) (end -1.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.12 1.37) (end 6.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.12 -1.37) (end 6.12 -1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6 -1.25) (end -1 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 6 1.25) (end 6 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 1.25) (end 6 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -1 -1.25) (end -1 1.25) (layer F.Fab) (width 0.1))
+    (pad 2 thru_hole circle (at 5 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D7.0mm_W2.5mm_P5.00mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (module Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5D53667D)
-    (at 199.575 111.625 180)
+    (at 199.575 112.125 180)
     (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.0*1.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
     (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.0mm width 1.6mm Capacitor")
     (fp_text reference REF** (at 1.25 -2.05) (layer F.SilkS)
@@ -135,7 +169,7 @@
   )
 
   (module Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5D53665D)
-    (at 199.575 108.55 180)
+    (at 199.55 109.625 180)
     (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.0*1.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
     (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.0mm width 1.6mm Capacitor")
     (fp_text reference REF** (at 1.25 -2.05) (layer F.SilkS)
@@ -167,7 +201,7 @@
   )
 
   (module Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5D53663D)
-    (at 199.575 105.9 180)
+    (at 199.575 107.125 180)
     (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.0*1.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
     (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.0mm width 1.6mm Capacitor")
     (fp_text reference REF** (at 1.25 -2.05) (layer F.SilkS)
@@ -199,7 +233,7 @@
   )
 
   (module Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5D53661D)
-    (at 199.575 103.55 180)
+    (at 199.575 104.625 180)
     (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.0*1.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
     (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.0mm width 1.6mm Capacitor")
     (fp_text reference REF** (at 1.25 -2.05) (layer F.SilkS)
@@ -231,7 +265,7 @@
   )
 
   (module Capacitor_THT:C_Disc_D3.0mm_W1.6mm_P2.50mm (layer F.Cu) (tedit 5AE50EF0) (tstamp 5D5365FD)
-    (at 199.575 100.975 180)
+    (at 199.575 102.125 180)
     (descr "C, Disc series, Radial, pin pitch=2.50mm, , diameter*width=3.0*1.6mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf")
     (tags "C Disc series Radial pin pitch 2.50mm  diameter 3.0mm width 1.6mm Capacitor")
     (fp_text reference REF** (at 1.25 -2.05) (layer F.SilkS)
@@ -432,9 +466,6 @@
     (fp_text value DIP-14_W7.62mm (at 3.81 17.57 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 3.81 7.62 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 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))
@@ -717,9 +748,6 @@
     (fp_text value DIP-16_W7.62mm (at 3.81 20.11 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 3.81 8.89 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 19.3) (end 8.7 -1.55) (layer F.CrtYd) (width 0.05))
     (fp_line (start -1.1 19.3) (end 8.7 19.3) (layer F.CrtYd) (width 0.05))
@@ -768,9 +796,6 @@
     (fp_text value DIP-20_W7.62mm (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)
-      (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))
@@ -817,7 +842,7 @@
     (at 106.575 142.925 90)
     (descr "40-lead though-hole mounted DIP package, row spacing 15.24 mm (600 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 15.24mm 600mil")
-    (fp_text reference REF** (at 7.62 -2.33 90) (layer F.SilkS)
+    (fp_text reference "U5 PPU" (at 7.62 -2.33 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value DIP-40_W15.24mm (at 7.62 50.59 90) (layer F.Fab)
@@ -838,7 +863,7 @@
     (fp_line (start -1.05 49.8) (end 16.3 49.8) (layer F.CrtYd) (width 0.05))
     (fp_line (start 16.3 49.8) (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 24.13 90) (layer F.Fab)
+    (fp_text user PPU (at 7.62 24.13 180) (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))
@@ -1197,13 +1222,13 @@
     (at 30.55 155.725 90)
     (descr "40-lead though-hole mounted DIP package, row spacing 15.24 mm (600 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 15.24mm 600mil")
-    (fp_text reference REF** (at 7.62 -2.33 90) (layer F.SilkS)
+    (fp_text reference "U6 CPU" (at 7.62 -2.33 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value DIP-40_W15.24mm (at 7.62 50.59 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 7.62 24.13 90) (layer F.Fab)
+    (fp_text user CPU (at 7.62 24.13 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 16.3 -1.55) (end -1.05 -1.55) (layer F.CrtYd) (width 0.05))
@@ -1278,9 +1303,6 @@
     (fp_text value DIP-24_W7.62mm (at 3.81 30.27 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 3.81 13.97 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 29.5) (end 8.7 -1.55) (layer F.CrtYd) (width 0.05))
     (fp_line (start -1.1 29.5) (end 8.7 29.5) (layer F.CrtYd) (width 0.05))
@@ -1331,7 +1353,7 @@
     (at 106.55 178.425 90)
     (descr "24-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
-    (fp_text reference REF** (at 3.81 -2.33 90) (layer F.SilkS)
+    (fp_text reference SRAM (at 3.81 -2.33 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value DIP-24_W7.62mm (at 3.81 30.27 90) (layer F.Fab)
@@ -1352,9 +1374,6 @@
     (fp_line (start -1.1 29.5) (end 8.7 29.5) (layer F.CrtYd) (width 0.05))
     (fp_line (start 8.7 29.5) (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 13.97 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))
     (pad 13 thru_hole oval (at 7.62 27.94 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
     (pad 2 thru_hole oval (at 0 2.54 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
@@ -1411,9 +1430,6 @@
     (fp_line (start -1.1 29.5) (end 8.7 29.5) (layer F.CrtYd) (width 0.05))
     (fp_line (start 8.7 29.5) (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 13.97 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))
     (pad 13 thru_hole oval (at 7.62 27.94 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
     (pad 2 thru_hole oval (at 0 2.54 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask))
@@ -1449,15 +1465,12 @@
     (at 50.775 175.925 90)
     (descr "24-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils)")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil")
-    (fp_text reference REF** (at 3.81 -2.33 90) (layer F.SilkS)
+    (fp_text reference SRAM (at 3.81 -2.33 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value DIP-24_W7.62mm (at 3.81 30.27 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 3.81 13.97 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 29.5) (end 8.7 -1.55) (layer F.CrtYd) (width 0.05))
     (fp_line (start -1.1 29.5) (end 8.7 29.5) (layer F.CrtYd) (width 0.05))
@@ -1698,6 +1711,31 @@
     (pad 1 smd rect (at 17.75 6.25) (size 3 9) (layers F.Cu F.Paste F.Mask))
   )
 
+  (gr_line (start 12.1 77.95) (end 28.05 77.95) (layer Edge.Cuts) (width 0.05) (tstamp 5D57C8FF))
+  (gr_text "U6      CPU" (at 52.25 137.925) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (gr_text "U5        PPU" (at 125.675 145.1) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (gr_text "U4                      SRAM (VRAM)\n" (at 120.45 181.425) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (gr_text "U1                      SRAM (WRAM)\n" (at 64.7 179.375) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (gr_text "SRAM (VRAM)\n" (at 120.525 174.675) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (gr_text "SRAM (WRAM)" (at 64.7 172.15) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (gr_text Redherring32 (at 133.375 124.475) (layer F.Cu)
+    (effects (font (size 1.5 1.5) (thickness 0.3)))
+  )
+  (gr_text NES-CPU-12 (at 97.875 146.8) (layer F.Cu)
+    (effects (font (size 1.5 3) (thickness 0.2)))
+  )
   (gr_line (start 208.35 77.95) (end 160.2 77.95) (layer Edge.Cuts) (width 0.05) (tstamp 5D50BB42))
   (gr_line (start 208.35 153.075) (end 208.35 77.95) (layer Edge.Cuts) (width 0.05) (tstamp 5D50BB2E))
   (gr_line (start 205.35 153.075) (end 208.35 153.075) (layer Edge.Cuts) (width 0.05) (tstamp 5D50BB17))
@@ -1712,7 +1750,6 @@
   (gr_line (start 37.05 197.9) (end 37.05 187.9) (layer Edge.Cuts) (width 0.05) (tstamp 5D50BA23))
   (gr_line (start 12.1 197.9) (end 37.05 197.9) (layer Edge.Cuts) (width 0.05) (tstamp 5D50BA0D))
   (gr_line (start 12.1 197.9) (end 12.1 77.95) (layer Edge.Cuts) (width 0.05) (tstamp 5D50B9F3))
-  (gr_line (start 28.05 77.95) (end 12.1 77.95) (layer Edge.Cuts) (width 0.05) (tstamp 5D50B9D8))
   (dimension 93.3 (width 0.15) (layer Dwgs.User)
     (gr_text "93.300 mm" (at 94.15 200.999939) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -1740,7 +1777,6 @@
   (gr_line (start 160.2 80.95) (end 160.2 77.95) (layer Edge.Cuts) (width 0.05))
   (gr_line (start 28.05 80.95) (end 160.2 80.95) (layer Edge.Cuts) (width 0.05))
   (gr_line (start 28.05 77.95) (end 28.05 80.95) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 28.05 77.95) (end 28.05 78.15) (layer Edge.Cuts) (width 0.05))
   (dimension 196.3 (width 0.15) (layer Dwgs.User)
     (gr_text "196.300 mm" (at 110.25 69.399314) (layer Dwgs.User)
       (effects (font (size 1 1) (thickness 0.15)))