From 9edba2e26bc55753d6353a992d17fdab56fec45e Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mark@hermeling.org>
Date: Tue, 14 May 2024 08:11:48 -0400
Subject: [PATCH 01/16] Latest files from Alex

---
 Transistor_Calculator_V2.kicad_sch | 4491 ++++++++++++++--------------
 1 file changed, 2230 insertions(+), 2261 deletions(-)

diff --git a/Transistor_Calculator_V2.kicad_sch b/Transistor_Calculator_V2.kicad_sch
index f84839e..aefaaa4 100644
--- a/Transistor_Calculator_V2.kicad_sch
+++ b/Transistor_Calculator_V2.kicad_sch
@@ -10,24 +10,22 @@
 		(rev "1.0")
 	)
 	(lib_symbols
-		(symbol "Device:R_US"
-			(pin_numbers hide)
+		(symbol "Connector:Conn_01x01_Pin"
 			(pin_names
-				(offset 0)
-			)
+				(offset 1.016) hide)
 			(exclude_from_sim no)
 			(in_bom yes)
 			(on_board yes)
-			(property "Reference" "R"
-				(at 2.54 0 90)
+			(property "Reference" "J"
+				(at 0 2.54 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
 				)
 			)
-			(property "Value" "R_US"
-				(at -2.54 0 90)
+			(property "Value" "Conn_01x01_Pin"
+				(at 0 -2.54 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -35,7 +33,7 @@
 				)
 			)
 			(property "Footprint" ""
-				(at 1.016 -0.254 90)
+				(at 0 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -52,7 +50,7 @@
 					(hide yes)
 				)
 			)
-			(property "Description" "Resistor, US symbol"
+			(property "Description" "Generic connector, single row, 01x01, script generated"
 				(at 0 0 0)
 				(effects
 					(font
@@ -61,16 +59,15 @@
 					(hide yes)
 				)
 			)
-			(property "ki_keywords" "R res resistor"
+			(property "ki_locked" ""
 				(at 0 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
-					(hide yes)
 				)
 			)
-			(property "ki_fp_filters" "R_*"
+			(property "ki_keywords" "connector"
 				(at 0 0 0)
 				(effects
 					(font
@@ -79,73 +76,43 @@
 					(hide yes)
 				)
 			)
-			(symbol "R_US_0_1"
-				(polyline
-					(pts
-						(xy 0 -2.286) (xy 0 -2.54)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0 2.286) (xy 0 2.54)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0 -0.762) (xy 1.016 -1.143) (xy 0 -1.524) (xy -1.016 -1.905) (xy 0 -2.286)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
+			(property "ki_fp_filters" "Connector*:*_1x??_*"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
 					)
+					(hide yes)
 				)
+			)
+			(symbol "Conn_01x01_Pin_1_1"
 				(polyline
 					(pts
-						(xy 0 0.762) (xy 1.016 0.381) (xy 0 0) (xy -1.016 -0.381) (xy 0 -0.762)
+						(xy 1.27 0) (xy 0.8636 0)
 					)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
 						(type none)
 					)
 				)
-				(polyline
-					(pts
-						(xy 0 2.286) (xy 1.016 1.905) (xy 0 1.524) (xy -1.016 1.143) (xy 0 0.762)
-					)
+				(rectangle
+					(start 0.8636 0.127)
+					(end 0 -0.127)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
-						(type none)
+						(type outline)
 					)
 				)
-			)
-			(symbol "R_US_1_1"
 				(pin passive line
-					(at 0 3.81 270)
-					(length 1.27)
-					(name "~"
+					(at 5.08 0 180)
+					(length 3.81)
+					(name "Pin_1"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -160,50 +127,28 @@
 						)
 					)
 				)
-				(pin passive line
-					(at 0 -3.81 90)
-					(length 1.27)
-					(name "~"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "2"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
 			)
 		)
-		(symbol "Simulation_SPICE:VDC"
-			(pin_numbers hide)
+		(symbol "Connector:Conn_01x02_Pin"
 			(pin_names
-				(offset 0.0254)
-			)
+				(offset 1.016) hide)
 			(exclude_from_sim no)
 			(in_bom yes)
 			(on_board yes)
-			(property "Reference" "V"
-				(at 2.54 2.54 0)
+			(property "Reference" "J"
+				(at 0 2.54 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
-					(justify left)
 				)
 			)
-			(property "Value" "1"
-				(at 2.54 0 0)
+			(property "Value" "Conn_01x02_Pin"
+				(at 0 -5.08 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
-					(justify left)
 				)
 			)
 			(property "Footprint" ""
@@ -215,16 +160,7 @@
 					(hide yes)
 				)
 			)
-			(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#sec_Independent_Sources_for"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Description" "Voltage source, DC"
+			(property "Datasheet" "~"
 				(at 0 0 0)
 				(effects
 					(font
@@ -233,7 +169,7 @@
 					(hide yes)
 				)
 			)
-			(property "Sim.Pins" "1=+ 2=-"
+			(property "Description" "Generic connector, single row, 01x02, script generated"
 				(at 0 0 0)
 				(effects
 					(font
@@ -242,26 +178,24 @@
 					(hide yes)
 				)
 			)
-			(property "Sim.Type" "DC"
+			(property "ki_locked" ""
 				(at 0 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
-					(hide yes)
 				)
 			)
-			(property "Sim.Device" "V"
+			(property "ki_keywords" "connector"
 				(at 0 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
-					(justify left)
 					(hide yes)
 				)
 			)
-			(property "ki_keywords" "simulation"
+			(property "ki_fp_filters" "Connector*:*_1x??_*"
 				(at 0 0 0)
 				(effects
 					(font
@@ -270,25 +204,13 @@
 					(hide yes)
 				)
 			)
-			(symbol "VDC_0_0"
-				(polyline
-					(pts
-						(xy -1.27 0.254) (xy 1.27 0.254)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
+			(symbol "Conn_01x02_Pin_1_1"
 				(polyline
 					(pts
-						(xy -0.762 -0.254) (xy -1.27 -0.254)
+						(xy 1.27 -2.54) (xy 0.8636 -2.54)
 					)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
@@ -297,55 +219,42 @@
 				)
 				(polyline
 					(pts
-						(xy 0.254 -0.254) (xy -0.254 -0.254)
+						(xy 1.27 0) (xy 0.8636 0)
 					)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
 						(type none)
 					)
 				)
-				(polyline
-					(pts
-						(xy 1.27 -0.254) (xy 0.762 -0.254)
-					)
+				(rectangle
+					(start 0.8636 -2.413)
+					(end 0 -2.667)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
-						(type none)
-					)
-				)
-				(text "+"
-					(at 0 1.905 0)
-					(effects
-						(font
-							(size 1.27 1.27)
-						)
+						(type outline)
 					)
 				)
-			)
-			(symbol "VDC_0_1"
-				(circle
-					(center 0 0)
-					(radius 2.54)
+				(rectangle
+					(start 0.8636 0.127)
+					(end 0 -0.127)
 					(stroke
-						(width 0.254)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
-						(type background)
+						(type outline)
 					)
 				)
-			)
-			(symbol "VDC_1_1"
 				(pin passive line
-					(at 0 5.08 270)
-					(length 2.54)
-					(name "~"
+					(at 5.08 0 180)
+					(length 3.81)
+					(name "Pin_1"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -361,9 +270,9 @@
 					)
 				)
 				(pin passive line
-					(at 0 -5.08 90)
-					(length 2.54)
-					(name "~"
+					(at 5.08 -2.54 180)
+					(length 3.81)
+					(name "Pin_2"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -380,52 +289,47 @@
 				)
 			)
 		)
-		(symbol "Transistor_BJT:2N3904"
+		(symbol "Connector:Conn_01x03_Pin"
 			(pin_names
-				(offset 0) hide)
+				(offset 1.016) hide)
 			(exclude_from_sim no)
 			(in_bom yes)
 			(on_board yes)
-			(property "Reference" "Q"
-				(at 5.08 1.905 0)
+			(property "Reference" "J"
+				(at 0 5.08 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
-					(justify left)
 				)
 			)
-			(property "Value" "2N3904"
-				(at 5.08 0 0)
+			(property "Value" "Conn_01x03_Pin"
+				(at 0 -5.08 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
-					(justify left)
 				)
 			)
-			(property "Footprint" "Package_TO_SOT_THT:TO-92_Inline"
-				(at 5.08 -1.905 0)
+			(property "Footprint" ""
+				(at 0 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
-						(italic yes)
 					)
-					(justify left)
 					(hide yes)
 				)
 			)
-			(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
+			(property "Datasheet" "~"
 				(at 0 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
-					(justify left)
 					(hide yes)
 				)
 			)
-			(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
+			(property "Description" "Generic connector, single row, 01x03, script generated"
 				(at 0 0 0)
 				(effects
 					(font
@@ -434,7 +338,15 @@
 					(hide yes)
 				)
 			)
-			(property "ki_keywords" "NPN Transistor"
+			(property "ki_locked" ""
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "ki_keywords" "connector"
 				(at 0 0 0)
 				(effects
 					(font
@@ -443,7 +355,7 @@
 					(hide yes)
 				)
 			)
-			(property "ki_fp_filters" "TO?92*"
+			(property "ki_fp_filters" "Connector*:*_1x??_*"
 				(at 0 0 0)
 				(effects
 					(font
@@ -452,13 +364,13 @@
 					(hide yes)
 				)
 			)
-			(symbol "2N3904_0_1"
+			(symbol "Conn_01x03_Pin_1_1"
 				(polyline
 					(pts
-						(xy 0.635 0.635) (xy 2.54 2.54)
+						(xy 1.27 -2.54) (xy 0.8636 -2.54)
 					)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
@@ -467,10 +379,10 @@
 				)
 				(polyline
 					(pts
-						(xy 0.635 -0.635) (xy 2.54 -2.54) (xy 2.54 -2.54)
+						(xy 1.27 0) (xy 0.8636 0)
 					)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
@@ -479,45 +391,53 @@
 				)
 				(polyline
 					(pts
-						(xy 0.635 1.905) (xy 0.635 -1.905) (xy 0.635 -1.905)
+						(xy 1.27 2.54) (xy 0.8636 2.54)
 					)
 					(stroke
-						(width 0.508)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
 						(type none)
 					)
 				)
-				(polyline
-					(pts
-						(xy 1.27 -1.778) (xy 1.778 -1.27) (xy 2.286 -2.286) (xy 1.27 -1.778) (xy 1.27 -1.778)
+				(rectangle
+					(start 0.8636 -2.413)
+					(end 0 -2.667)
+					(stroke
+						(width 0.1524)
+						(type default)
 					)
+					(fill
+						(type outline)
+					)
+				)
+				(rectangle
+					(start 0.8636 0.127)
+					(end 0 -0.127)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
 						(type outline)
 					)
 				)
-				(circle
-					(center 1.27 0)
-					(radius 2.8194)
+				(rectangle
+					(start 0.8636 2.667)
+					(end 0 2.413)
 					(stroke
-						(width 0.254)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
-						(type none)
+						(type outline)
 					)
 				)
-			)
-			(symbol "2N3904_1_1"
 				(pin passive line
-					(at 2.54 -5.08 90)
-					(length 2.54)
-					(name "E"
+					(at 5.08 2.54 180)
+					(length 3.81)
+					(name "Pin_1"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -533,9 +453,9 @@
 					)
 				)
 				(pin passive line
-					(at -5.08 0 0)
-					(length 5.715)
-					(name "B"
+					(at 5.08 0 180)
+					(length 3.81)
+					(name "Pin_2"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -551,9 +471,9 @@
 					)
 				)
 				(pin passive line
-					(at 2.54 5.08 270)
-					(length 2.54)
-					(name "C"
+					(at 5.08 -2.54 180)
+					(length 3.81)
+					(name "Pin_3"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -570,25 +490,23 @@
 				)
 			)
 		)
-		(symbol "power:GND"
-			(power)
+		(symbol "Connector:TestPoint"
 			(pin_numbers hide)
 			(pin_names
-				(offset 0) hide)
+				(offset 0.762) hide)
 			(exclude_from_sim no)
 			(in_bom yes)
 			(on_board yes)
-			(property "Reference" "#PWR"
-				(at 0 -6.35 0)
+			(property "Reference" "TP"
+				(at 0 6.858 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
-					(hide yes)
 				)
 			)
-			(property "Value" "GND"
-				(at 0 -3.81 0)
+			(property "Value" "TestPoint"
+				(at 0 5.08 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -596,7 +514,7 @@
 				)
 			)
 			(property "Footprint" ""
-				(at 0 0 0)
+				(at 5.08 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -604,8 +522,8 @@
 					(hide yes)
 				)
 			)
-			(property "Datasheet" ""
-				(at 0 0 0)
+			(property "Datasheet" "~"
+				(at 5.08 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -613,7 +531,7 @@
 					(hide yes)
 				)
 			)
-			(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(property "Description" "test point"
 				(at 0 0 0)
 				(effects
 					(font
@@ -622,7 +540,7 @@
 					(hide yes)
 				)
 			)
-			(property "ki_keywords" "global power"
+			(property "ki_keywords" "test point tp"
 				(at 0 0 0)
 				(effects
 					(font
@@ -631,11 +549,19 @@
 					(hide yes)
 				)
 			)
-			(symbol "GND_0_1"
-				(polyline
-					(pts
-						(xy 0 0) (xy 0 -1.27) (xy 1.27 -1.27) (xy 0 -2.54) (xy -1.27 -1.27) (xy 0 -1.27)
+			(property "ki_fp_filters" "Pin* Test*"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
 					)
+					(hide yes)
+				)
+			)
+			(symbol "TestPoint_0_1"
+				(circle
+					(center 0 3.302)
+					(radius 0.762)
 					(stroke
 						(width 0)
 						(type default)
@@ -645,11 +571,11 @@
 					)
 				)
 			)
-			(symbol "GND_1_1"
-				(pin power_in line
-					(at 0 0 270)
-					(length 0)
-					(name "~"
+			(symbol "TestPoint_1_1"
+				(pin passive line
+					(at 0 0 90)
+					(length 2.54)
+					(name "1"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -666,49 +592,828 @@
 				)
 			)
 		)
-	)
-	(junction
-		(at 54.61 64.77)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "06416571-0ecf-4cdb-aa95-498fc40b9044")
-	)
-	(junction
-		(at 152.4 144.78)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "0c710c5a-2a02-449b-9ba9-a9421388145c")
-	)
-	(junction
-		(at 127 72.39)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "133ade90-a981-40d5-9f88-75c7472ed1ba")
-	)
-	(junction
-		(at 107.95 39.37)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "13544412-6f12-48e9-a894-d263ddd8e457")
-	)
-	(junction
-		(at 179.07 85.09)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "145b0c3b-54ec-46ca-9d84-cea0933d0732")
-	)
-	(junction
-		(at 214.63 39.37)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "19a434c8-b2d9-490d-a753-c55136fdb96f")
-	)
-	(junction
-		(at 80.01 50.8)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "1ba12dd6-c77e-4092-8d5c-c3bb2283fc57")
-	)
+		(symbol "Device:R_US"
+			(pin_numbers hide)
+			(pin_names
+				(offset 0)
+			)
+			(exclude_from_sim no)
+			(in_bom yes)
+			(on_board yes)
+			(property "Reference" "R"
+				(at 2.54 0 90)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Value" "R_US"
+				(at -2.54 0 90)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Footprint" ""
+				(at 1.016 -0.254 90)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Datasheet" "~"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Description" "Resistor, US symbol"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_keywords" "R res resistor"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_fp_filters" "R_*"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(symbol "R_US_0_1"
+				(polyline
+					(pts
+						(xy 0 -2.286) (xy 0 -2.54)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0 2.286) (xy 0 2.54)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0 -0.762) (xy 1.016 -1.143) (xy 0 -1.524) (xy -1.016 -1.905) (xy 0 -2.286)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0 0.762) (xy 1.016 0.381) (xy 0 0) (xy -1.016 -0.381) (xy 0 -0.762)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0 2.286) (xy 1.016 1.905) (xy 0 1.524) (xy -1.016 1.143) (xy 0 0.762)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+			)
+			(symbol "R_US_1_1"
+				(pin passive line
+					(at 0 3.81 270)
+					(length 1.27)
+					(name "~"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "1"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 0 -3.81 90)
+					(length 1.27)
+					(name "~"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+		)
+		(symbol "Jumper:SolderJumper_2_Open"
+			(pin_names
+				(offset 0) hide)
+			(exclude_from_sim no)
+			(in_bom yes)
+			(on_board yes)
+			(property "Reference" "JP"
+				(at 0 2.032 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Value" "SolderJumper_2_Open"
+				(at 0 -2.54 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Footprint" ""
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Datasheet" "~"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Description" "Solder Jumper, 2-pole, open"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_keywords" "solder jumper SPST"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_fp_filters" "SolderJumper*Open*"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(symbol "SolderJumper_2_Open_0_1"
+				(arc
+					(start -0.254 1.016)
+					(mid -1.2656 0)
+					(end -0.254 -1.016)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(arc
+					(start -0.254 1.016)
+					(mid -1.2656 0)
+					(end -0.254 -1.016)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+				(polyline
+					(pts
+						(xy -0.254 1.016) (xy -0.254 -1.016)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0.254 1.016) (xy 0.254 -1.016)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(arc
+					(start 0.254 -1.016)
+					(mid 1.2656 0)
+					(end 0.254 1.016)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(arc
+					(start 0.254 -1.016)
+					(mid 1.2656 0)
+					(end 0.254 1.016)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+			)
+			(symbol "SolderJumper_2_Open_1_1"
+				(pin passive line
+					(at -3.81 0 0)
+					(length 2.54)
+					(name "A"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "1"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 3.81 0 180)
+					(length 2.54)
+					(name "B"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+		)
+		(symbol "Jumper:SolderJumper_3_Open"
+			(pin_names
+				(offset 0) hide)
+			(exclude_from_sim no)
+			(in_bom yes)
+			(on_board yes)
+			(property "Reference" "JP"
+				(at -2.54 -2.54 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Value" "SolderJumper_3_Open"
+				(at 0 2.794 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Footprint" ""
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Datasheet" "~"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Description" "Solder Jumper, 3-pole, open"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_keywords" "Solder Jumper SPDT"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_fp_filters" "SolderJumper*Open*"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(symbol "SolderJumper_3_Open_0_1"
+				(arc
+					(start -1.016 1.016)
+					(mid -2.0276 0)
+					(end -1.016 -1.016)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(arc
+					(start -1.016 1.016)
+					(mid -2.0276 0)
+					(end -1.016 -1.016)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+				(rectangle
+					(start -0.508 1.016)
+					(end 0.508 -1.016)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+				(polyline
+					(pts
+						(xy -2.54 0) (xy -2.032 0)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy -1.016 1.016) (xy -1.016 -1.016)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0 -1.27) (xy 0 -1.016)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 1.016 1.016) (xy 1.016 -1.016)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 2.54 0) (xy 2.032 0)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(arc
+					(start 1.016 -1.016)
+					(mid 2.0276 0)
+					(end 1.016 1.016)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(arc
+					(start 1.016 -1.016)
+					(mid 2.0276 0)
+					(end 1.016 1.016)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+			)
+			(symbol "SolderJumper_3_Open_1_1"
+				(pin passive line
+					(at -5.08 0 0)
+					(length 2.54)
+					(name "A"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "1"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 0 -3.81 90)
+					(length 2.54)
+					(name "C"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 5.08 0 180)
+					(length 2.54)
+					(name "B"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "3"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+		)
+		(symbol "Transistor_BJT:2N3904"
+			(pin_names
+				(offset 0) hide)
+			(exclude_from_sim no)
+			(in_bom yes)
+			(on_board yes)
+			(property "Reference" "Q"
+				(at 5.08 1.905 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(justify left)
+				)
+			)
+			(property "Value" "2N3904"
+				(at 5.08 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(justify left)
+				)
+			)
+			(property "Footprint" "Package_TO_SOT_THT:TO-92_Inline"
+				(at 5.08 -1.905 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+						(italic yes)
+					)
+					(justify left)
+					(hide yes)
+				)
+			)
+			(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(justify left)
+					(hide yes)
+				)
+			)
+			(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_keywords" "NPN Transistor"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_fp_filters" "TO?92*"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(symbol "2N3904_0_1"
+				(polyline
+					(pts
+						(xy 0.635 0.635) (xy 2.54 2.54)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0.635 -0.635) (xy 2.54 -2.54) (xy 2.54 -2.54)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 0.635 1.905) (xy 0.635 -1.905) (xy 0.635 -1.905)
+					)
+					(stroke
+						(width 0.508)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 1.27 -1.778) (xy 1.778 -1.27) (xy 2.286 -2.286) (xy 1.27 -1.778) (xy 1.27 -1.778)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type outline)
+					)
+				)
+				(circle
+					(center 1.27 0)
+					(radius 2.8194)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+			)
+			(symbol "2N3904_1_1"
+				(pin passive line
+					(at 2.54 -5.08 90)
+					(length 2.54)
+					(name "E"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "1"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at -5.08 0 0)
+					(length 5.715)
+					(name "B"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 2.54 5.08 270)
+					(length 2.54)
+					(name "C"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "3"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+		)
+	)
+	(junction
+		(at 54.61 64.77)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "06416571-0ecf-4cdb-aa95-498fc40b9044")
+	)
+	(junction
+		(at 127 72.39)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "133ade90-a981-40d5-9f88-75c7472ed1ba")
+	)
+	(junction
+		(at 107.95 39.37)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "13544412-6f12-48e9-a894-d263ddd8e457")
+	)
+	(junction
+		(at 179.07 85.09)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "145b0c3b-54ec-46ca-9d84-cea0933d0732")
+	)
+	(junction
+		(at 214.63 39.37)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "19a434c8-b2d9-490d-a753-c55136fdb96f")
+	)
+	(junction
+		(at 80.01 50.8)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "1ba12dd6-c77e-4092-8d5c-c3bb2283fc57")
+	)
 	(junction
 		(at 121.92 182.88)
 		(diameter 0)
@@ -728,10 +1433,10 @@
 		(uuid "2a0f25cc-a737-46ba-9abf-4f51c94ccaac")
 	)
 	(junction
-		(at 165.1 135.89)
+		(at 104.14 177.8)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "37316d1b-a39a-4fb5-ab40-23afcee00731")
+		(uuid "3f23c806-2321-4cf1-8e8f-c2ccf9c192f7")
 	)
 	(junction
 		(at 121.92 149.86)
@@ -751,12 +1456,6 @@
 		(color 0 0 0 0)
 		(uuid "471dbd09-eb49-428c-b520-a06ab32ffe66")
 	)
-	(junction
-		(at 153.67 156.21)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "4ccafeec-f74c-44a7-818f-9e6c02ac3e73")
-	)
 	(junction
 		(at 198.12 31.75)
 		(diameter 0)
@@ -818,10 +1517,10 @@
 		(uuid "713384b9-ae22-4ae2-bcc1-74e478c4be9e")
 	)
 	(junction
-		(at 236.22 133.35)
+		(at 152.4 144.78)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "7cf4491e-30ff-4825-8000-2b295738e4d5")
+		(uuid "78eaec35-58fe-4122-828b-69084c523b16")
 	)
 	(junction
 		(at 91.44 39.37)
@@ -841,6 +1540,12 @@
 		(color 0 0 0 0)
 		(uuid "87bd7e66-1d6e-47a6-90f3-760987378834")
 	)
+	(junction
+		(at 153.67 156.21)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "8b674d93-7f53-4f46-9277-2a2c2041347b")
+	)
 	(junction
 		(at 73.66 193.04)
 		(diameter 0)
@@ -859,6 +1564,12 @@
 		(color 0 0 0 0)
 		(uuid "9a224719-cd9a-4689-9464-52ac4009147a")
 	)
+	(junction
+		(at 139.7 72.39)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "aabad6df-eb22-467d-bfbd-f3b00ffc20c3")
+	)
 	(junction
 		(at 72.39 50.8)
 		(diameter 0)
@@ -895,6 +1606,12 @@
 		(color 0 0 0 0)
 		(uuid "c552e045-a0ac-4808-aa56-e9bff340fd1c")
 	)
+	(junction
+		(at 236.22 133.35)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "c9c80fe6-5f1f-4e1c-b380-db6d86af5c9d")
+	)
 	(junction
 		(at 58.42 162.56)
 		(diameter 0)
@@ -931,6 +1648,18 @@
 		(color 0 0 0 0)
 		(uuid "e2060199-a649-41d0-852a-1eda0ef6e095")
 	)
+	(junction
+		(at 163.83 83.82)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "e47f79cd-9eee-4126-8ecf-959e247e555f")
+	)
+	(junction
+		(at 104.14 167.64)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "e7d99f11-9748-45c3-a072-889e9f3eec01")
+	)
 	(junction
 		(at 29.21 102.87)
 		(diameter 0)
@@ -1015,16 +1744,6 @@
 		)
 		(uuid "066d7e4b-bc5f-403a-9d2e-9c9a06f79894")
 	)
-	(wire
-		(pts
-			(xy 254 39.37) (xy 254 113.03)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "08873f3d-0254-4fdc-8cf0-e088ca2052a5")
-	)
 	(wire
 		(pts
 			(xy 121.92 139.7) (xy 121.92 31.75)
@@ -1185,6 +1904,16 @@
 		)
 		(uuid "21e0336a-c923-44ae-991b-25beb3d77f86")
 	)
+	(wire
+		(pts
+			(xy 104.14 177.8) (xy 106.68 177.8)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "220d2ce3-dbfa-444a-8b4e-c55d4d132348")
+	)
 	(wire
 		(pts
 			(xy 58.42 149.86) (xy 73.66 149.86)
@@ -1217,7 +1946,7 @@
 	)
 	(wire
 		(pts
-			(xy 92.71 177.8) (xy 106.68 177.8)
+			(xy 92.71 177.8) (xy 104.14 177.8)
 		)
 		(stroke
 			(width 0)
@@ -1235,16 +1964,6 @@
 		)
 		(uuid "28aa4545-ae47-4b8d-a5e9-bc913f4ae3b6")
 	)
-	(wire
-		(pts
-			(xy 113.03 24.13) (xy 121.92 24.13)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "28d887f4-553a-4e2f-aced-4c673f3d0d97")
-	)
 	(wire
 		(pts
 			(xy 88.9 149.86) (xy 88.9 139.7)
@@ -1385,6 +2104,16 @@
 		)
 		(uuid "33726147-3df6-4293-8509-a4185da1acef")
 	)
+	(wire
+		(pts
+			(xy 254 113.03) (xy 254 57.15)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "3414ccf9-7293-44d0-8928-349d3c4d7492")
+	)
 	(wire
 		(pts
 			(xy 179.07 85.09) (xy 214.63 85.09)
@@ -1397,43 +2126,43 @@
 	)
 	(wire
 		(pts
-			(xy 107.95 31.75) (xy 113.03 31.75)
+			(xy 104.14 167.64) (xy 106.68 167.64)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "36dd5569-8804-401d-9975-3c56af3448f9")
+		(uuid "3685716c-d8b5-4051-b69f-e737cea263d3")
 	)
 	(wire
 		(pts
-			(xy 96.52 107.95) (xy 96.52 167.64)
+			(xy 107.95 31.75) (xy 113.03 31.75)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "3703520a-c53c-49bd-bea2-a13851030cf3")
+		(uuid "36dd5569-8804-401d-9975-3c56af3448f9")
 	)
 	(wire
 		(pts
-			(xy 74.93 39.37) (xy 74.93 36.83)
+			(xy 96.52 107.95) (xy 96.52 167.64)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "3ac2365f-64af-4c22-8770-237dd8ee02eb")
+		(uuid "3703520a-c53c-49bd-bea2-a13851030cf3")
 	)
 	(wire
 		(pts
-			(xy 17.78 107.95) (xy 96.52 107.95)
+			(xy 74.93 39.37) (xy 74.93 36.83)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "3c4b5a28-db2f-4f19-8da7-ef96718a5e89")
+		(uuid "3ac2365f-64af-4c22-8770-237dd8ee02eb")
 	)
 	(wire
 		(pts
@@ -1587,7 +2316,7 @@
 	)
 	(wire
 		(pts
-			(xy 92.71 195.58) (xy 92.71 193.04)
+			(xy 92.71 194.31) (xy 92.71 193.04)
 		)
 		(stroke
 			(width 0)
@@ -1597,33 +2326,33 @@
 	)
 	(wire
 		(pts
-			(xy 165.1 121.92) (xy 165.1 135.89)
+			(xy 143.51 144.78) (xy 152.4 144.78)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "5ac9dc7e-53a7-44ba-bde4-fec01b6ac807")
+		(uuid "5bdc54a8-103d-44f2-8d8f-177816ba3bb7")
 	)
 	(wire
 		(pts
-			(xy 143.51 144.78) (xy 152.4 144.78)
+			(xy 165.1 121.92) (xy 236.22 121.92)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "5bdc54a8-103d-44f2-8d8f-177816ba3bb7")
+		(uuid "5c02b686-97e9-4a29-8aea-9e899a2c1fd4")
 	)
 	(wire
 		(pts
-			(xy 165.1 121.92) (xy 236.22 121.92)
+			(xy 254 49.53) (xy 254 39.37)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "5c02b686-97e9-4a29-8aea-9e899a2c1fd4")
+		(uuid "5ecec069-a94f-447a-aa21-7a0ff6bae89c")
 	)
 	(wire
 		(pts
@@ -1745,16 +2474,6 @@
 		)
 		(uuid "747b8833-4ce1-4a4e-b0cf-095c684f9648")
 	)
-	(wire
-		(pts
-			(xy 17.78 105.41) (xy 31.75 105.41)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "7490ded1-657c-4a9b-a665-ce4986ea80d6")
-	)
 	(wire
 		(pts
 			(xy 113.03 31.75) (xy 121.92 31.75)
@@ -1767,7 +2486,7 @@
 	)
 	(wire
 		(pts
-			(xy 127 72.39) (xy 146.05 72.39)
+			(xy 146.05 72.39) (xy 139.7 72.39)
 		)
 		(stroke
 			(width 0)
@@ -1775,16 +2494,6 @@
 		)
 		(uuid "781f2d8e-6564-4871-9bf6-d620f62eda23")
 	)
-	(wire
-		(pts
-			(xy 153.67 156.21) (xy 176.53 156.21)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "788fa62f-4054-414a-b774-c5ecd69eaa4c")
-	)
 	(wire
 		(pts
 			(xy 148.59 64.77) (xy 148.59 43.18)
@@ -1937,23 +2646,13 @@
 	)
 	(wire
 		(pts
-			(xy 165.1 135.89) (xy 170.18 135.89)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "904b391c-7803-4f6e-9fd1-b7c706657f7f")
-	)
-	(wire
-		(pts
-			(xy 17.78 102.87) (xy 29.21 102.87)
+			(xy 127 39.37) (xy 127 50.8)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "91947a2c-e9bf-4cda-a516-d61aa436eca8")
+		(uuid "904970bf-2d54-4f3d-8d3c-b41575a24499")
 	)
 	(wire
 		(pts
@@ -1973,1149 +2672,790 @@
 			(width 0)
 			(type default)
 		)
-		(uuid "9337be05-c79d-410b-8afa-4f6c828dd869")
-	)
-	(wire
-		(pts
-			(xy 100.33 125.73) (xy 100.33 149.86)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "93ba033d-8fa5-42c3-b402-81c2611a4a47")
-	)
-	(wire
-		(pts
-			(xy 215.9 133.35) (xy 236.22 133.35)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "947fb102-153e-45fb-9a35-c47a7376a080")
-	)
-	(wire
-		(pts
-			(xy 161.29 64.77) (xy 161.29 67.31)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "948f304f-8aac-4457-b0e0-6e8bbe5e549b")
-	)
-	(wire
-		(pts
-			(xy -30.48 114.3) (xy -30.48 115.57)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "94a918c1-2a08-4c1c-b9e2-53bca9d3b4b9")
-	)
-	(wire
-		(pts
-			(xy 127 39.37) (xy 127 72.39)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "955ec9f6-a824-4fa6-8cf6-21eaa4997023")
-	)
-	(wire
-		(pts
-			(xy 80.01 31.75) (xy 91.44 31.75)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "9b0851c5-4c54-4eb5-9134-7bb6a7f3fd91")
-	)
-	(wire
-		(pts
-			(xy 270.51 113.03) (xy 254 113.03)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "9e2e12b7-1013-4fe0-b809-b2b6ce61a345")
-	)
-	(wire
-		(pts
-			(xy 127 72.39) (xy 127 105.41)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "a168dc5f-bb6d-4670-94a3-e9116d46c7c9")
-	)
-	(wire
-		(pts
-			(xy 63.5 50.8) (xy 63.5 54.61)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "a33e42fa-f87f-41dc-8a30-dbabd899080d")
-	)
-	(wire
-		(pts
-			(xy 54.61 85.09) (xy 72.39 85.09)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "a54efc55-ca4f-446f-9d44-02cc93b14c59")
-	)
-	(wire
-		(pts
-			(xy 63.5 54.61) (xy 91.44 54.61)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "a5d79d68-d392-416b-95c5-b44d71999e3a")
-	)
-	(wire
-		(pts
-			(xy 137.16 157.48) (xy 143.51 157.48)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "a7057f26-c4b4-4241-8bce-9fea3a0ab8c7")
-	)
-	(wire
-		(pts
-			(xy 99.06 193.04) (xy 121.92 193.04)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "a95893a5-3543-40e8-9b8c-0d9128ace91f")
-	)
-	(wire
-		(pts
-			(xy 66.04 162.56) (xy 58.42 162.56)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "ad2389b1-f9b3-45b3-8631-ecf051b5620c")
-	)
-	(wire
-		(pts
-			(xy 45.72 55.88) (xy 46.99 55.88)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "adfd1ecd-9675-46b3-a136-faae876a20c1")
+		(uuid "9337be05-c79d-410b-8afa-4f6c828dd869")
 	)
 	(wire
 		(pts
-			(xy 54.61 50.8) (xy 63.5 50.8)
+			(xy 100.33 125.73) (xy 100.33 149.86)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "b23f36d7-ab2d-4267-9457-3dd09fdfef3e")
+		(uuid "93ba033d-8fa5-42c3-b402-81c2611a4a47")
 	)
 	(wire
 		(pts
-			(xy 46.99 64.77) (xy 41.91 64.77)
+			(xy 228.6 133.35) (xy 215.9 133.35)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "b2867d4b-7a54-4b4e-944c-16fc4f69b623")
+		(uuid "947fb102-153e-45fb-9a35-c47a7376a080")
 	)
 	(wire
 		(pts
-			(xy 153.67 156.21) (xy 151.13 156.21)
+			(xy 161.29 64.77) (xy 161.29 67.31)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "b97e251d-c7f4-4f44-b0a0-e7eba8fd375d")
+		(uuid "948f304f-8aac-4457-b0e0-6e8bbe5e549b")
 	)
 	(wire
 		(pts
-			(xy 180.34 38.1) (xy 180.34 39.37)
+			(xy 127 58.42) (xy 127 72.39)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "ba32d4c6-58c7-4b5c-bb56-a211f08c2a29")
+		(uuid "955ec9f6-a824-4fa6-8cf6-21eaa4997023")
 	)
 	(wire
 		(pts
-			(xy 41.91 64.77) (xy 41.91 41.91)
+			(xy 80.01 31.75) (xy 91.44 31.75)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "ba7bca30-c45e-4932-bde9-5c82daaedca0")
+		(uuid "9b0851c5-4c54-4eb5-9134-7bb6a7f3fd91")
 	)
 	(wire
 		(pts
-			(xy 62.23 64.77) (xy 80.01 64.77)
+			(xy 270.51 113.03) (xy 254 113.03)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "bda10281-d1b7-4541-994a-86deee9df927")
+		(uuid "9e2e12b7-1013-4fe0-b809-b2b6ce61a345")
 	)
 	(wire
 		(pts
-			(xy 153.67 64.77) (xy 148.59 64.77)
+			(xy 127 72.39) (xy 127 105.41)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "c1c5ccfe-6531-4ca8-ad26-00a6b2d8da3c")
+		(uuid "a168dc5f-bb6d-4670-94a3-e9116d46c7c9")
 	)
 	(wire
 		(pts
-			(xy 161.29 50.8) (xy 170.18 50.8)
+			(xy 63.5 50.8) (xy 63.5 54.61)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "c26ca6b4-39d0-4c61-912a-7e36cdb6b986")
+		(uuid "a33e42fa-f87f-41dc-8a30-dbabd899080d")
 	)
 	(wire
 		(pts
-			(xy 163.83 80.01) (xy 163.83 107.95)
+			(xy 54.61 85.09) (xy 72.39 85.09)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "c3c9723b-0309-460c-98c6-e5541ac6d006")
+		(uuid "a54efc55-ca4f-446f-9d44-02cc93b14c59")
 	)
 	(wire
 		(pts
-			(xy 151.13 135.89) (xy 165.1 135.89)
+			(xy 63.5 54.61) (xy 91.44 54.61)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "c8b4b99f-e48f-4d12-9e6d-d23ac628562f")
+		(uuid "a5d79d68-d392-416b-95c5-b44d71999e3a")
 	)
 	(wire
 		(pts
-			(xy 207.01 44.45) (xy 207.01 39.37)
+			(xy 165.1 132.08) (xy 165.1 121.92)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "c976b37e-8599-4b69-93c8-b952fb5655cd")
+		(uuid "a6537d81-dc3b-41af-ad00-275b516eb47e")
 	)
 	(wire
 		(pts
-			(xy 127 39.37) (xy 107.95 39.37)
+			(xy 137.16 157.48) (xy 143.51 157.48)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "ca667e88-d5a3-49de-8ba4-066c45eefe8c")
+		(uuid "a7057f26-c4b4-4241-8bce-9fea3a0ab8c7")
 	)
 	(wire
 		(pts
-			(xy 121.92 191.77) (xy 121.92 193.04)
+			(xy 99.06 193.04) (xy 121.92 193.04)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "ccb64b89-f040-4de1-97b3-dca6270f88d6")
+		(uuid "a95893a5-3543-40e8-9b8c-0d9128ace91f")
 	)
 	(wire
 		(pts
-			(xy 92.71 195.58) (xy 97.79 195.58)
+			(xy 66.04 162.56) (xy 58.42 162.56)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "cd4e5605-81fc-493f-bbb0-b1697dfc3f81")
+		(uuid "ad2389b1-f9b3-45b3-8631-ecf051b5620c")
 	)
 	(wire
 		(pts
-			(xy 152.4 144.78) (xy 175.26 144.78)
+			(xy 45.72 55.88) (xy 46.99 55.88)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "ce4f43ff-d750-47c6-96e6-787c045d6e2f")
+		(uuid "adfd1ecd-9675-46b3-a136-faae876a20c1")
 	)
 	(wire
 		(pts
-			(xy 161.29 85.09) (xy 179.07 85.09)
+			(xy 163.83 83.82) (xy 163.83 80.01)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "cfbd1948-6065-46b4-acaa-64f5876739e2")
+		(uuid "ae3137a1-3109-48ae-a5a8-f6c7de2c0515")
 	)
 	(wire
 		(pts
-			(xy 170.18 50.8) (xy 170.18 54.61)
+			(xy 160.02 144.78) (xy 175.26 144.78)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "d2a95d4c-ed05-4a53-b313-b34176b313c5")
+		(uuid "af0939d6-eb56-4f64-89a9-7ceeb1e0ef5a")
 	)
 	(wire
 		(pts
-			(xy 29.21 177.8) (xy 29.21 102.87)
+			(xy 139.7 72.39) (xy 127 72.39)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "d423daf9-e609-4e90-930b-db9592e2bbf7")
+		(uuid "af8e7337-33ea-40bb-8a71-6f3df01364d2")
 	)
 	(wire
 		(pts
-			(xy 113.03 24.13) (xy 113.03 31.75)
+			(xy 54.61 50.8) (xy 63.5 50.8)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "d44828bb-b26b-49cb-a8bd-a934321e0350")
+		(uuid "b23f36d7-ab2d-4267-9457-3dd09fdfef3e")
 	)
 	(wire
 		(pts
-			(xy 39.37 102.87) (xy 39.37 72.39)
+			(xy 46.99 64.77) (xy 41.91 64.77)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "d44c0a0c-3d74-4880-93da-9ed5f8070a01")
+		(uuid "b2867d4b-7a54-4b4e-944c-16fc4f69b623")
 	)
 	(wire
 		(pts
-			(xy 201.93 138.43) (xy 208.28 138.43)
+			(xy 153.67 156.21) (xy 151.13 156.21)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "d55558b1-c0d0-4bd6-8124-76143993cbb3")
+		(uuid "b97e251d-c7f4-4f44-b0a0-e7eba8fd375d")
 	)
 	(wire
 		(pts
-			(xy 73.66 167.64) (xy 73.66 193.04)
+			(xy 180.34 38.1) (xy 180.34 39.37)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "d86de55e-060d-4288-b464-38029a132a5e")
+		(uuid "ba32d4c6-58c7-4b5c-bb56-a211f08c2a29")
 	)
 	(wire
 		(pts
-			(xy 152.4 142.24) (xy 170.18 142.24)
+			(xy 41.91 64.77) (xy 41.91 41.91)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "d9f4ac2d-ff2c-44c9-b3ad-6845005b86fb")
+		(uuid "ba7bca30-c45e-4932-bde9-5c82daaedca0")
 	)
 	(wire
 		(pts
-			(xy 148.59 43.18) (xy 171.45 43.18)
+			(xy 62.23 64.77) (xy 80.01 64.77)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "db0024b2-c212-4755-be23-40d4118d0237")
+		(uuid "bda10281-d1b7-4541-994a-86deee9df927")
 	)
 	(wire
 		(pts
-			(xy 96.52 167.64) (xy 106.68 167.64)
+			(xy 153.67 64.77) (xy 148.59 64.77)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "e1ba50d0-207d-42aa-a619-cc0958438f26")
+		(uuid "c1c5ccfe-6531-4ca8-ad26-00a6b2d8da3c")
 	)
 	(wire
 		(pts
-			(xy 100.33 149.86) (xy 121.92 149.86)
+			(xy 161.29 50.8) (xy 170.18 50.8)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "e2290dec-4df0-45c3-9cc9-de0f1e59f5ff")
+		(uuid "c26ca6b4-39d0-4c61-912a-7e36cdb6b986")
 	)
 	(wire
 		(pts
-			(xy 214.63 49.53) (xy 214.63 85.09)
+			(xy 163.83 107.95) (xy 163.83 83.82)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "e319c45c-b3af-4fb8-b5c9-6dcdd3aff356")
+		(uuid "c3c9723b-0309-460c-98c6-e5541ac6d006")
 	)
 	(wire
 		(pts
-			(xy 152.4 55.88) (xy 152.4 48.26)
+			(xy 151.13 135.89) (xy 160.02 135.89)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "e5a2ae9a-ce12-452b-9553-7e2814b885e1")
+		(uuid "c8b4b99f-e48f-4d12-9e6d-d23ac628562f")
 	)
 	(wire
 		(pts
-			(xy 168.91 64.77) (xy 186.69 64.77)
+			(xy 207.01 44.45) (xy 207.01 39.37)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "eb303f0f-d1f8-45d0-b3c8-36693cb5e3f4")
+		(uuid "c976b37e-8599-4b69-93c8-b952fb5655cd")
 	)
 	(wire
 		(pts
-			(xy 143.51 157.48) (xy 143.51 144.78)
+			(xy 127 39.37) (xy 107.95 39.37)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "ebad3ce3-2660-4755-a2f9-dd503925ab49")
+		(uuid "ca667e88-d5a3-49de-8ba4-066c45eefe8c")
 	)
 	(wire
 		(pts
-			(xy 127 105.41) (xy 92.71 105.41)
+			(xy 121.92 191.77) (xy 121.92 193.04)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "ef025ede-9200-4e50-93f7-4005f2a1a6ac")
+		(uuid "ccb64b89-f040-4de1-97b3-dca6270f88d6")
 	)
 	(wire
 		(pts
-			(xy 190.5 161.29) (xy 175.26 161.29)
+			(xy 95.25 194.31) (xy 92.71 194.31)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "f0f7eb54-e91b-4ac5-9eab-f8bb3b8686b7")
+		(uuid "cd4e5605-81fc-493f-bbb0-b1697dfc3f81")
 	)
 	(wire
 		(pts
-			(xy 91.44 39.37) (xy 100.33 39.37)
+			(xy 22.86 102.87) (xy 29.21 102.87)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "f4b45ddd-5b4b-4b6a-8ebb-611eb76df39a")
+		(uuid "ce427c3a-0eb0-40cb-b5a5-82f5158f4e44")
 	)
 	(wire
 		(pts
-			(xy 270.51 115.57) (xy 252.73 115.57)
+			(xy 161.29 85.09) (xy 179.07 85.09)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "f6e435f1-fea1-4e9e-a950-8b159fd94277")
+		(uuid "cfbd1948-6065-46b4-acaa-64f5876739e2")
 	)
 	(wire
 		(pts
-			(xy 80.01 50.8) (xy 80.01 64.77)
+			(xy 170.18 50.8) (xy 170.18 54.61)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "f7db6e73-963a-4f28-b208-461ec31a6517")
+		(uuid "d2a95d4c-ed05-4a53-b313-b34176b313c5")
 	)
 	(wire
 		(pts
-			(xy 201.93 161.29) (xy 215.9 161.29)
+			(xy 29.21 177.8) (xy 29.21 102.87)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "f84833a5-2f93-4d3c-aad8-983bd4f74f8e")
+		(uuid "d423daf9-e609-4e90-930b-db9592e2bbf7")
 	)
 	(wire
 		(pts
-			(xy 179.07 38.1) (xy 180.34 38.1)
+			(xy 113.03 24.13) (xy 113.03 31.75)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "fabf234d-b62e-45b6-b2f9-d929ac5fc8e0")
+		(uuid "d44828bb-b26b-49cb-a8bd-a934321e0350")
 	)
 	(wire
 		(pts
-			(xy 41.91 41.91) (xy 64.77 41.91)
+			(xy 39.37 102.87) (xy 39.37 72.39)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "fc75350d-f545-4855-8373-0885e239966d")
+		(uuid "d44c0a0c-3d74-4880-93da-9ed5f8070a01")
 	)
 	(wire
 		(pts
-			(xy 96.52 107.95) (xy 163.83 107.95)
+			(xy 201.93 138.43) (xy 208.28 138.43)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "fe40197f-c929-44f0-9bf4-7bd647bf9228")
+		(uuid "d55558b1-c0d0-4bd6-8124-76143993cbb3")
 	)
 	(wire
 		(pts
-			(xy 161.29 60.96) (xy 161.29 64.77)
+			(xy 22.86 107.95) (xy 96.52 107.95)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "ff4646f7-4d14-46e6-8266-d035468f5123")
+		(uuid "d5e444ce-1246-4dd3-b79e-376b97c73733")
 	)
 	(wire
 		(pts
-			(xy 153.67 187.96) (xy 87.63 187.96)
+			(xy 73.66 167.64) (xy 73.66 193.04)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "ffae4661-2fdd-4d8f-afb1-83a3debd8264")
+		(uuid "d86de55e-060d-4288-b464-38029a132a5e")
 	)
-	(rectangle
-		(start 102.87 148.59)
-		(end 149.86 185.42)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(fill
-			(type none)
+	(wire
+		(pts
+			(xy 152.4 142.24) (xy 170.18 142.24)
 		)
-		(uuid 31c776cc-9028-4e64-8f4c-88d7114c0e70)
-	)
-	(rectangle
-		(start 137.16 30.48)
-		(end 224.79 92.71)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(fill
-			(type none)
-		)
-		(uuid 3fa713c9-d3fb-438d-b7b8-5be820ecea31)
+		(uuid "d9f4ac2d-ff2c-44c9-b3ad-6845005b86fb")
 	)
-	(rectangle
-		(start 172.72 123.19)
-		(end 227.33 162.56)
+	(wire
+		(pts
+			(xy 148.59 43.18) (xy 171.45 43.18)
+		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(fill
-			(type none)
-		)
-		(uuid c2a15bd4-5142-46fe-97d4-e5bbfd78d562)
+		(uuid "db0024b2-c212-4755-be23-40d4118d0237")
 	)
-	(rectangle
-		(start 30.48 30.48)
-		(end 118.11 92.71)
+	(wire
+		(pts
+			(xy 96.52 167.64) (xy 104.14 167.64)
+		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(fill
-			(type none)
-		)
-		(uuid eda269b7-4023-4abe-974c-157a13fe2fac)
+		(uuid "e1ba50d0-207d-42aa-a619-cc0958438f26")
 	)
-	(rectangle
-		(start 39.37 148.59)
-		(end 86.36 185.42)
+	(wire
+		(pts
+			(xy 100.33 149.86) (xy 121.92 149.86)
+		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(fill
-			(type none)
-		)
-		(uuid f2c036a1-7af9-4d6d-bec9-4753378d0146)
+		(uuid "e2290dec-4df0-45c3-9cc9-de0f1e59f5ff")
 	)
-	(text_box "XOR\n"
-		(exclude_from_sim no)
-		(at 109.22 88.9 0)
-		(size 8.89 3.81)
+	(wire
+		(pts
+			(xy 214.63 49.53) (xy 214.63 85.09)
+		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(fill
-			(type none)
-		)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-		(uuid "21566c5d-89ac-4880-a953-b1cfe47eac91")
+		(uuid "e319c45c-b3af-4fb8-b5c9-6dcdd3aff356")
 	)
-	(text_box "OR"
-		(exclude_from_sim no)
-		(at 220.98 158.75 0)
-		(size 6.35 3.81)
+	(wire
+		(pts
+			(xy 152.4 55.88) (xy 152.4 48.26)
+		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(fill
-			(type none)
-		)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-		)
-		(uuid "89e5cbf3-5cdc-4a06-95c3-ef347d814d57")
+		(uuid "e5a2ae9a-ce12-452b-9553-7e2814b885e1")
 	)
-	(text_box "AND"
-		(exclude_from_sim no)
-		(at 80.01 181.61 0)
-		(size 6.35 3.81)
+	(wire
+		(pts
+			(xy 168.91 64.77) (xy 186.69 64.77)
+		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(fill
-			(type none)
-		)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
+		(uuid "eb303f0f-d1f8-45d0-b3c8-36693cb5e3f4")
+	)
+	(wire
+		(pts
+			(xy 143.51 157.48) (xy 143.51 144.78)
 		)
-		(uuid "996bc686-eb9b-4991-85a4-4e268a289c17")
-	)
-	(text_box "AND"
-		(exclude_from_sim no)
-		(at 143.51 181.61 0)
-		(size 6.35 3.81)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(fill
-			(type none)
+		(uuid "ebad3ce3-2660-4755-a2f9-dd503925ab49")
+	)
+	(wire
+		(pts
+			(xy 161.29 156.21) (xy 176.53 156.21)
 		)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(uuid "a089338a-0b63-4e48-afe1-504e8ab1d1a0")
+		(uuid "ed05775e-f5c4-45f0-a91a-36dfd60c90e2")
 	)
-	(text_box "XOR\n"
-		(exclude_from_sim no)
-		(at 215.9 88.9 0)
-		(size 8.89 3.81)
+	(wire
+		(pts
+			(xy 127 105.41) (xy 92.71 105.41)
+		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(fill
-			(type none)
+		(uuid "ef025ede-9200-4e50-93f7-4005f2a1a6ac")
+	)
+	(wire
+		(pts
+			(xy 190.5 161.29) (xy 175.26 161.29)
 		)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(uuid "cc6d8b9f-d54b-4af2-83b1-6eeda0337a2d")
+		(uuid "f0f7eb54-e91b-4ac5-9eab-f8bb3b8686b7")
 	)
-	(label "Vin2"
-		(at -30.48 115.57 0)
-		(fields_autoplaced yes)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left bottom)
+	(wire
+		(pts
+			(xy 91.44 39.37) (xy 100.33 39.37)
 		)
-		(uuid "6fe2617f-d4ba-4006-af3c-4f230e9c0feb")
-	)
-	(label "Vin1"
-		(at -46.99 115.57 0)
-		(fields_autoplaced yes)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left bottom)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(uuid "7ce64869-a748-4218-b65b-1f129bfa20f4")
+		(uuid "f4b45ddd-5b4b-4b6a-8ebb-611eb76df39a")
 	)
-	(label "Vinc"
-		(at -15.24 115.57 0)
-		(fields_autoplaced yes)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left bottom)
+	(wire
+		(pts
+			(xy 31.75 105.41) (xy 22.86 105.41)
 		)
-		(uuid "7dd58764-969f-41b1-b89a-1a8ed5c823d1")
-	)
-	(label "Vcc"
-		(at 121.92 24.13 0)
-		(fields_autoplaced yes)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left bottom)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(uuid "ebc8afd7-33ad-4a24-8c0a-6d4a16e5f656")
+		(uuid "f621dc40-c312-4cf0-9707-9dfa5e0f694c")
 	)
-	(label "Vcc"
-		(at -15.24 135.89 0)
-		(fields_autoplaced yes)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left bottom)
+	(wire
+		(pts
+			(xy 270.51 115.57) (xy 252.73 115.57)
+		)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(uuid "fb84f74a-aa0b-4ce4-8df0-36ae4b909fd6")
+		(uuid "f6e435f1-fea1-4e9e-a950-8b159fd94277")
 	)
-	(global_label "Vo1"
-		(shape input)
-		(at 270.51 113.03 0)
-		(fields_autoplaced yes)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
+	(wire
+		(pts
+			(xy 80.01 50.8) (xy 80.01 64.77)
 		)
-		(uuid "60d9dc9f-6d8e-474c-8dff-81cfa71efd68")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 276.9423 113.03 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
+		(stroke
+			(width 0)
+			(type default)
 		)
+		(uuid "f7db6e73-963a-4f28-b208-461ec31a6517")
 	)
-	(global_label "Vin2"
-		(shape input)
-		(at 17.78 105.41 0)
-		(fields_autoplaced yes)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
+	(wire
+		(pts
+			(xy 201.93 161.29) (xy 215.9 161.29)
 		)
-		(uuid "6a1c31e8-3d35-465f-a3a1-f9e825163524")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 24.8171 105.41 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
+		(stroke
+			(width 0)
+			(type default)
 		)
+		(uuid "f84833a5-2f93-4d3c-aad8-983bd4f74f8e")
 	)
-	(global_label "Vin1"
-		(shape input)
-		(at 17.78 102.87 0)
-		(fields_autoplaced yes)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
+	(wire
+		(pts
+			(xy 179.07 38.1) (xy 180.34 38.1)
 		)
-		(uuid "986ae94f-7398-4b75-81ff-8e17b7d927d4")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 24.8171 102.87 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
+		(stroke
+			(width 0)
+			(type default)
 		)
+		(uuid "fabf234d-b62e-45b6-b2f9-d929ac5fc8e0")
 	)
-	(global_label "Vo2"
-		(shape input)
-		(at 270.51 115.57 0)
-		(fields_autoplaced yes)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
+	(wire
+		(pts
+			(xy 41.91 41.91) (xy 64.77 41.91)
 		)
-		(uuid "a2f1fe69-e00e-4df1-af46-b33c6432c11b")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 276.9423 115.57 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
+		(stroke
+			(width 0)
+			(type default)
 		)
+		(uuid "fc75350d-f545-4855-8373-0885e239966d")
 	)
-	(global_label "Vinc"
-		(shape input)
-		(at 17.78 107.95 0)
-		(fields_autoplaced yes)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left)
+	(wire
+		(pts
+			(xy 96.52 107.95) (xy 163.83 107.95)
 		)
-		(uuid "acd62de3-058e-42f8-8b3b-8dcea39bf723")
-		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 24.6962 107.95 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
+		(stroke
+			(width 0)
+			(type default)
 		)
+		(uuid "fe40197f-c929-44f0-9bf4-7bd647bf9228")
 	)
-	(symbol
-		(lib_id "Transistor_BJT:2N3904")
-		(at 213.36 138.43 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "011b6283-2bdd-4463-bf5d-baa7bec55f4e")
-		(property "Reference" "Q19"
-			(at 218.44 137.1599 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
+	(wire
+		(pts
+			(xy 161.29 60.96) (xy 161.29 64.77)
 		)
-		(property "Value" "2N3904"
-			(at 218.44 139.6999 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
-			(at 218.44 140.335 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-					(italic yes)
-				)
-				(justify left)
-				(hide yes)
-			)
+		(uuid "ff4646f7-4d14-46e6-8266-d035468f5123")
+	)
+	(wire
+		(pts
+			(xy 153.67 187.96) (xy 87.63 187.96)
 		)
-		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
-			(at 213.36 138.43 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
-			(at 213.36 138.43 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
+		(uuid "ffae4661-2fdd-4d8f-afb1-83a3debd8264")
+	)
+	(rectangle
+		(start 102.87 148.59)
+		(end 149.86 185.42)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 213.36 138.43 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
+		(fill
+			(type none)
 		)
-		(property "Sim.Name" "2N3904"
-			(at 213.36 138.43 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
+		(uuid 31c776cc-9028-4e64-8f4c-88d7114c0e70)
+	)
+	(rectangle
+		(start 137.16 30.48)
+		(end 224.79 92.71)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(property "Sim.Device" "NPN"
-			(at 213.36 138.43 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
+		(fill
+			(type none)
 		)
-		(property "Sim.Type" "GUMMELPOON"
-			(at 213.36 138.43 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
+		(uuid 3fa713c9-d3fb-438d-b7b8-5be820ecea31)
+	)
+	(rectangle
+		(start 172.72 123.19)
+		(end 227.33 162.56)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
-			(at 213.36 138.43 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
+		(fill
+			(type none)
 		)
-		(pin "1"
-			(uuid "80a5dcf3-157e-46bc-b6be-28824d4deb23")
+		(uuid c2a15bd4-5142-46fe-97d4-e5bbfd78d562)
+	)
+	(rectangle
+		(start 30.48 30.48)
+		(end 118.11 92.71)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(pin "2"
-			(uuid "d01cf0aa-2acd-49a9-ac3b-7da6cc238895")
+		(fill
+			(type none)
 		)
-		(pin "3"
-			(uuid "c2f60036-f87c-4f77-8a05-5a168b33eff5")
+		(uuid eda269b7-4023-4abe-974c-157a13fe2fac)
+	)
+	(rectangle
+		(start 39.37 148.59)
+		(end 86.36 185.42)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(instances
-			(project "Transistor_Calculator_V2-2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Q19")
-					(unit 1)
-				)
-			)
+		(fill
+			(type none)
 		)
+		(uuid f2c036a1-7af9-4d6d-bec9-4753378d0146)
 	)
-	(symbol
-		(lib_id "power:GND")
-		(at -15.24 125.73 0)
-		(unit 1)
+	(text_box "XOR\n"
 		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "022440aa-246d-45bb-860a-7a9992467232")
-		(property "Reference" "#PWR02"
-			(at -15.24 132.08 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Value" "GND"
-			(at -15.24 130.81 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
+		(at 109.22 88.9 0)
+		(size 8.89 3.81)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(property "Footprint" ""
-			(at -15.24 125.73 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
+		(fill
+			(type none)
 		)
-		(property "Datasheet" ""
-			(at -15.24 125.73 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
+		(effects
+			(font
+				(size 1.27 1.27)
 			)
 		)
-		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at -15.24 125.73 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
+		(uuid "21566c5d-89ac-4880-a953-b1cfe47eac91")
+	)
+	(text_box "OR"
+		(exclude_from_sim no)
+		(at 220.98 158.75 0)
+		(size 6.35 3.81)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(pin "1"
-			(uuid "3f230423-666f-45b3-a8ff-4346c1134e6c")
+		(fill
+			(type none)
 		)
-		(instances
-			(project "Transistor_Calculator_V2-2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "#PWR02")
-					(unit 1)
-				)
+		(effects
+			(font
+				(size 1.27 1.27)
 			)
 		)
+		(uuid "89e5cbf3-5cdc-4a06-95c3-ef347d814d57")
 	)
-	(symbol
-		(lib_id "Device:R_US")
-		(at 137.16 153.67 180)
-		(unit 1)
+	(text_box "AND"
 		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(uuid "0347e206-33c3-4a8b-8912-a72e45b01d5c")
-		(property "Reference" "R24"
-			(at 133.35 153.67 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
+		(at 80.01 181.61 0)
+		(size 6.35 3.81)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(property "Value" "47K"
-			(at 135.128 153.67 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
+		(fill
+			(type none)
 		)
-		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 136.144 153.416 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
+		(effects
+			(font
+				(size 1.27 1.27)
 			)
 		)
-		(property "Datasheet" "~"
-			(at 137.16 153.67 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
+		(uuid "996bc686-eb9b-4991-85a4-4e268a289c17")
+	)
+	(text_box "AND"
+		(exclude_from_sim no)
+		(at 143.51 181.61 0)
+		(size 6.35 3.81)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(property "Description" "Resistor, US symbol"
-			(at 137.16 153.67 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
+		(fill
+			(type none)
+		)
+		(effects
+			(font
+				(size 1.27 1.27)
 			)
 		)
-		(pin "1"
-			(uuid "5aee33db-9870-4ec5-8c71-0fede13d54e8")
+		(uuid "a089338a-0b63-4e48-afe1-504e8ab1d1a0")
+	)
+	(text_box "XOR\n"
+		(exclude_from_sim no)
+		(at 215.9 88.9 0)
+		(size 8.89 3.81)
+		(stroke
+			(width 0)
+			(type default)
 		)
-		(pin "2"
-			(uuid "f9597836-55a2-4cf2-b2ee-f3adb5f6d748")
+		(fill
+			(type none)
 		)
-		(instances
-			(project "Transistor_Calculator_V2-2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R24")
-					(unit 1)
-				)
+		(effects
+			(font
+				(size 1.27 1.27)
 			)
 		)
+		(uuid "cc6d8b9f-d54b-4af2-83b1-6eeda0337a2d")
 	)
 	(symbol
 		(lib_id "Transistor_BJT:2N3904")
-		(at 212.09 44.45 0)
+		(at 213.36 138.43 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
 		(fields_autoplaced yes)
-		(uuid "130690cc-9d48-4d15-90e6-0eab89fe3a2f")
-		(property "Reference" "Q10"
-			(at 217.17 43.1799 0)
+		(uuid "011b6283-2bdd-4463-bf5d-baa7bec55f4e")
+		(property "Reference" "Q19"
+			(at 218.44 137.1599 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3124,7 +3464,7 @@
 			)
 		)
 		(property "Value" "2N3904"
-			(at 217.17 45.7199 0)
+			(at 218.44 139.6999 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3133,7 +3473,7 @@
 			)
 		)
 		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
-			(at 217.17 46.355 0)
+			(at 218.44 140.335 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3144,7 +3484,7 @@
 			)
 		)
 		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
-			(at 212.09 44.45 0)
+			(at 213.36 138.43 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3154,7 +3494,7 @@
 			)
 		)
 		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
-			(at 212.09 44.45 0)
+			(at 213.36 138.43 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3162,26 +3502,53 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 212.09 44.45 0)
+		(pin "1"
+			(uuid "80a5dcf3-157e-46bc-b6be-28824d4deb23")
+		)
+		(pin "2"
+			(uuid "d01cf0aa-2acd-49a9-ac3b-7da6cc238895")
+		)
+		(pin "3"
+			(uuid "c2f60036-f87c-4f77-8a05-5a168b33eff5")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "Q19")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Connector:TestPoint")
+		(at 104.14 167.64 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "0163d8a4-f36d-46d9-8068-be136004b68d")
+		(property "Reference" "TP4"
+			(at 103.886 162.814 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Name" "2N3904"
-			(at 212.09 44.45 0)
+		(property "Value" "~"
+			(at 106.68 165.608 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Device" "NPN"
-			(at 212.09 44.45 0)
+		(property "Footprint" "TestPoint:TestPoint_Pad_1.0x1.0mm"
+			(at 109.22 167.64 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3189,8 +3556,8 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Type" "GUMMELPOON"
-			(at 212.09 44.45 0)
+		(property "Datasheet" "~"
+			(at 109.22 167.64 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3198,8 +3565,8 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
-			(at 212.09 44.45 0)
+		(property "Description" "test point"
+			(at 104.14 167.64 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3208,18 +3575,12 @@
 			)
 		)
 		(pin "1"
-			(uuid "a891938a-73b9-42af-a9db-fee912c0ed45")
-		)
-		(pin "2"
-			(uuid "d3021461-99d9-448a-a60a-f55caf30f05b")
-		)
-		(pin "3"
-			(uuid "d7ecb0db-86dc-4a4d-a468-ad8f1713d1e0")
+			(uuid "77e400bf-0cc6-403b-a785-4e8a5b91e3d8")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Q10")
+					(reference "TP4")
 					(unit 1)
 				)
 			)
@@ -3227,23 +3588,23 @@
 	)
 	(symbol
 		(lib_id "Device:R_US")
-		(at 46.99 177.8 90)
+		(at 137.16 153.67 180)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "14e9717a-7a29-446e-b2ad-09920094a012")
-		(property "Reference" "R18"
-			(at 46.99 173.99 90)
+		(uuid "0347e206-33c3-4a8b-8912-a72e45b01d5c")
+		(property "Reference" "R24"
+			(at 133.35 153.67 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Value" "220K"
-			(at 46.99 175.768 90)
+		(property "Value" "47K"
+			(at 135.128 153.67 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3251,7 +3612,7 @@
 			)
 		)
 		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 47.244 176.784 90)
+			(at 136.144 153.416 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3260,7 +3621,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 46.99 177.8 0)
+			(at 137.16 153.67 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3269,7 +3630,7 @@
 			)
 		)
 		(property "Description" "Resistor, US symbol"
-			(at 46.99 177.8 0)
+			(at 137.16 153.67 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3278,71 +3639,67 @@
 			)
 		)
 		(pin "1"
-			(uuid "fd2e1047-392b-40fc-bda1-50d87e1200e9")
+			(uuid "5aee33db-9870-4ec5-8c71-0fede13d54e8")
 		)
 		(pin "2"
-			(uuid "2ad0b384-4a54-4624-830b-fae4f9d203bd")
+			(uuid "f9597836-55a2-4cf2-b2ee-f3adb5f6d748")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R18")
+					(reference "R24")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Transistor_BJT:2N3904")
-		(at 69.85 41.91 0)
+		(lib_id "Connector:Conn_01x02_Pin")
+		(at 275.59 115.57 180)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "14ea4323-cdf8-4de3-8750-698b7b105f7d")
-		(property "Reference" "Q3"
-			(at 74.93 40.6399 0)
+		(uuid "050b1104-1b19-4aaf-8206-57f35c1d3bc3")
+		(property "Reference" "Output_Pins1"
+			(at 270.51 110.49 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
+				(justify right)
 			)
 		)
-		(property "Value" "2N3904"
-			(at 74.93 43.1799 0)
+		(property "Value" "~"
+			(at 276.86 115.57 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
+				(justify right)
 			)
 		)
-		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
-			(at 74.93 43.815 0)
+		(property "Footprint" "Connector_Wire:SolderWire-0.5sqmm_1x02_P4.6mm_D0.9mm_OD2.1mm"
+			(at 275.59 115.57 0)
 			(effects
 				(font
 					(size 1.27 1.27)
-					(italic yes)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
-			(at 69.85 41.91 0)
+		(property "Datasheet" "~"
+			(at 275.59 115.57 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
-			(at 69.85 41.91 0)
+		(property "Description" "Generic connector, single row, 01x02, script generated"
+			(at 275.59 115.57 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3350,26 +3707,51 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 69.85 41.91 0)
+		(pin "1"
+			(uuid "06f5c843-833f-4ef5-b453-9885f186a4e7")
+		)
+		(pin "2"
+			(uuid "5604197c-3861-49ff-9444-6b170b9f3785")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "Output_Pins1")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Connector:TestPoint")
+		(at 163.83 83.82 270)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "06090a79-500e-4b83-98fc-823bd3f9df56")
+		(property "Reference" "TP2"
+			(at 168.91 83.1849 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Name" "2N3904"
-			(at 69.85 41.91 0)
+		(property "Value" "~"
+			(at 168.91 85.09 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Device" "NPN"
-			(at 69.85 41.91 0)
+		(property "Footprint" "TestPoint:TestPoint_Pad_1.0x1.0mm"
+			(at 163.83 88.9 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3377,8 +3759,8 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Type" "GUMMELPOON"
-			(at 69.85 41.91 0)
+		(property "Datasheet" "~"
+			(at 163.83 88.9 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3386,8 +3768,8 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
-			(at 69.85 41.91 0)
+		(property "Description" "test point"
+			(at 163.83 83.82 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3396,50 +3778,45 @@
 			)
 		)
 		(pin "1"
-			(uuid "e4b42550-c57c-47ae-9feb-86d4739776ca")
-		)
-		(pin "2"
-			(uuid "8a44de53-5b6f-410f-9cce-8b65a8a28128")
-		)
-		(pin "3"
-			(uuid "ecf45f72-da25-4272-b4ac-3f1ffd33b0fb")
+			(uuid "ff20eb15-416f-482f-8ffa-a37a93ad9ebf")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Q3")
+					(reference "TP2")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Device:R_US")
-		(at 149.86 72.39 90)
+		(lib_id "Jumper:SolderJumper_3_Open")
+		(at 165.1 135.89 180)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "15c578bd-cac7-4d12-85ee-079c85b2109f")
-		(property "Reference" "R9"
-			(at 149.86 68.58 90)
+		(fields_autoplaced yes)
+		(uuid "0aaaf171-8685-427d-9d6f-0b9528eb423b")
+		(property "Reference" "JP6"
+			(at 165.1 139.7 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Value" "220K"
-			(at 149.86 70.358 90)
+		(property "Value" "~"
+			(at 165.1 140.97 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 150.114 71.374 90)
+		(property "Footprint" "Jumper:SolderJumper-3_P1.3mm_Open_RoundedPad1.0x1.5mm"
+			(at 165.1 135.89 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3448,7 +3825,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 149.86 72.39 0)
+			(at 165.1 135.89 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3456,8 +3833,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Resistor, US symbol"
-			(at 149.86 72.39 0)
+		(property "Description" "Solder Jumper, 3-pole, open"
+			(at 165.1 135.89 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3465,66 +3842,75 @@
 				(hide yes)
 			)
 		)
+		(pin "2"
+			(uuid "a07a3770-0fc6-42b5-a1c1-35b47683300e")
+		)
 		(pin "1"
-			(uuid "4dcc530f-2d8b-4e53-b0b7-1d287fcb93e7")
+			(uuid "46f970d3-bd39-48d7-b7bb-43663b61b730")
 		)
-		(pin "2"
-			(uuid "d7db9e97-db51-4486-82c3-53c597a44f62")
+		(pin "3"
+			(uuid "d9a4f019-449b-45f8-8ded-895bae6dc766")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R9")
+					(reference "JP6")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Device:R_US")
-		(at 214.63 35.56 180)
+		(lib_id "Transistor_BJT:2N3904")
+		(at 212.09 44.45 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "1722dbbe-d490-46cb-834e-85f657def765")
-		(property "Reference" "R8"
-			(at 210.82 35.56 90)
+		(fields_autoplaced yes)
+		(uuid "130690cc-9d48-4d15-90e6-0eab89fe3a2f")
+		(property "Reference" "Q10"
+			(at 217.17 43.1799 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 			)
 		)
-		(property "Value" "47K"
-			(at 212.598 35.56 90)
+		(property "Value" "2N3904"
+			(at 217.17 45.7199 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 			)
 		)
-		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 213.614 35.306 90)
+		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
+			(at 217.17 46.355 0)
 			(effects
 				(font
 					(size 1.27 1.27)
+					(italic yes)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "~"
-			(at 214.63 35.56 0)
+		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
+			(at 212.09 44.45 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Description" "Resistor, US symbol"
-			(at 214.63 35.56 0)
+		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
+			(at 212.09 44.45 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3533,71 +3919,68 @@
 			)
 		)
 		(pin "1"
-			(uuid "62952aa5-d7e2-4767-8ca5-16a081c6c3a9")
+			(uuid "a891938a-73b9-42af-a9db-fee912c0ed45")
 		)
 		(pin "2"
-			(uuid "6083e2eb-7750-4785-8536-fdc9cb4e6d98")
+			(uuid "d3021461-99d9-448a-a60a-f55caf30f05b")
+		)
+		(pin "3"
+			(uuid "d7ecb0db-86dc-4a4d-a468-ad8f1713d1e0")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R8")
+					(reference "Q10")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Transistor_BJT:2N3904")
-		(at 105.41 44.45 0)
+		(lib_id "Device:R_US")
+		(at 46.99 177.8 90)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "1e65777f-3472-489f-9200-8b24d66f9e36")
-		(property "Reference" "Q5"
-			(at 110.49 43.1799 0)
+		(uuid "14e9717a-7a29-446e-b2ad-09920094a012")
+		(property "Reference" "R18"
+			(at 46.99 173.99 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Value" "2N3904"
-			(at 110.49 45.7199 0)
+		(property "Value" "220K"
+			(at 46.99 175.768 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
-			(at 110.49 46.355 0)
+		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
+			(at 47.244 176.784 90)
 			(effects
 				(font
 					(size 1.27 1.27)
-					(italic yes)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
-			(at 105.41 44.45 0)
+		(property "Datasheet" "~"
+			(at 46.99 177.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
-			(at 105.41 44.45 0)
+		(property "Description" "Resistor, US symbol"
+			(at 46.99 177.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3605,44 +3988,72 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 105.41 44.45 0)
+		(pin "1"
+			(uuid "fd2e1047-392b-40fc-bda1-50d87e1200e9")
+		)
+		(pin "2"
+			(uuid "2ad0b384-4a54-4624-830b-fae4f9d203bd")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "R18")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Transistor_BJT:2N3904")
+		(at 69.85 41.91 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "14ea4323-cdf8-4de3-8750-698b7b105f7d")
+		(property "Reference" "Q3"
+			(at 74.93 40.6399 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Name" "2N3904"
-			(at 105.41 44.45 0)
+		(property "Value" "2N3904"
+			(at 74.93 43.1799 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Device" "NPN"
-			(at 105.41 44.45 0)
+		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
+			(at 74.93 43.815 0)
 			(effects
 				(font
 					(size 1.27 1.27)
+					(italic yes)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Type" "GUMMELPOON"
-			(at 105.41 44.45 0)
+		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
+			(at 69.85 41.91 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
-			(at 105.41 44.45 0)
+		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
+			(at 69.85 41.91 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3651,18 +4062,18 @@
 			)
 		)
 		(pin "1"
-			(uuid "6c37812f-9949-4051-941a-18cc1248e175")
+			(uuid "e4b42550-c57c-47ae-9feb-86d4739776ca")
 		)
 		(pin "2"
-			(uuid "59e8f84f-8569-45e2-a383-a47cb216f13f")
+			(uuid "8a44de53-5b6f-410f-9cce-8b65a8a28128")
 		)
 		(pin "3"
-			(uuid "1e3145fe-09ce-4b65-96bf-954c47f5ad2c")
+			(uuid "ecf45f72-da25-4272-b4ac-3f1ffd33b0fb")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Q5")
+					(reference "Q3")
 					(unit 1)
 				)
 			)
@@ -3670,15 +4081,15 @@
 	)
 	(symbol
 		(lib_id "Device:R_US")
-		(at 180.34 156.21 90)
+		(at 149.86 72.39 90)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "20c625b5-c6d7-4323-8fa1-9f8035db40ed")
-		(property "Reference" "R26"
-			(at 180.34 152.4 90)
+		(uuid "15c578bd-cac7-4d12-85ee-079c85b2109f")
+		(property "Reference" "R9"
+			(at 149.86 68.58 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3686,7 +4097,7 @@
 			)
 		)
 		(property "Value" "220K"
-			(at 180.34 154.178 90)
+			(at 149.86 70.358 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3694,7 +4105,7 @@
 			)
 		)
 		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 180.594 155.194 90)
+			(at 150.114 71.374 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3703,7 +4114,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 180.34 156.21 0)
+			(at 149.86 72.39 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3712,7 +4123,7 @@
 			)
 		)
 		(property "Description" "Resistor, US symbol"
-			(at 180.34 156.21 0)
+			(at 149.86 72.39 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3721,71 +4132,65 @@
 			)
 		)
 		(pin "1"
-			(uuid "523e3b4e-e513-40fd-ab04-d256ca3a43f7")
+			(uuid "4dcc530f-2d8b-4e53-b0b7-1d287fcb93e7")
 		)
 		(pin "2"
-			(uuid "d2e157b2-4de8-4933-a4ce-a419a8ddc9dc")
+			(uuid "d7db9e97-db51-4486-82c3-53c597a44f62")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R26")
+					(reference "R9")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Transistor_BJT:2N3904")
-		(at 55.88 167.64 0)
+		(lib_id "Device:R_US")
+		(at 214.63 35.56 180)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "2fad2046-9d0c-4b29-a594-7a844eb03b4b")
-		(property "Reference" "Q11"
-			(at 60.96 166.3699 0)
+		(uuid "1722dbbe-d490-46cb-834e-85f657def765")
+		(property "Reference" "R8"
+			(at 210.82 35.56 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Value" "2N3904"
-			(at 60.96 168.9099 0)
+		(property "Value" "47K"
+			(at 212.598 35.56 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
-			(at 60.96 169.545 0)
+		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
+			(at 213.614 35.306 90)
 			(effects
 				(font
 					(size 1.27 1.27)
-					(italic yes)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
-			(at 55.88 167.64 0)
+		(property "Datasheet" "~"
+			(at 214.63 35.56 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
-			(at 55.88 167.64 0)
+		(property "Description" "Resistor, US symbol"
+			(at 214.63 35.56 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3793,26 +4198,51 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 55.88 167.64 0)
+		(pin "1"
+			(uuid "62952aa5-d7e2-4767-8ca5-16a081c6c3a9")
+		)
+		(pin "2"
+			(uuid "6083e2eb-7750-4785-8536-fdc9cb4e6d98")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "R8")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Jumper:SolderJumper_2_Open")
+		(at 254 53.34 270)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "17fbd868-6ce4-45b4-8042-aed5974dd45d")
+		(property "Reference" "JP2"
+			(at 256.54 52.7049 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Name" "2N3904"
-			(at 55.88 167.64 0)
+		(property "Value" "~"
+			(at 256.54 54.61 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Device" "NPN"
-			(at 55.88 167.64 0)
+		(property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm"
+			(at 254 53.34 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3820,8 +4250,8 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Type" "GUMMELPOON"
-			(at 55.88 167.64 0)
+		(property "Datasheet" "~"
+			(at 254 53.34 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3829,8 +4259,8 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
-			(at 55.88 167.64 0)
+		(property "Description" "Solder Jumper, 2-pole, open"
+			(at 254 53.34 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3839,50 +4269,48 @@
 			)
 		)
 		(pin "1"
-			(uuid "55318c87-95cb-4f13-8f87-b6c62ebc69f8")
+			(uuid "2e73c59b-3821-4fd5-afd3-c6d6599834ee")
 		)
 		(pin "2"
-			(uuid "6b20cdca-7839-4081-945c-7bd35ea0ec6a")
-		)
-		(pin "3"
-			(uuid "88123491-b91e-4c67-9969-c6ac60e05766")
+			(uuid "02e1fb5d-904a-4797-9e3d-bc0e9afa3164")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Q11")
+					(reference "JP2")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Device:R_US")
-		(at 165.1 64.77 90)
+		(lib_id "Jumper:SolderJumper_2_Open")
+		(at 232.41 133.35 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "37ca60e6-d374-4a65-b3e7-fb7c32b1e1b4")
-		(property "Reference" "R12"
-			(at 165.1 60.96 90)
+		(fields_autoplaced yes)
+		(uuid "1aec06e2-a3f1-4d37-b0f8-3c656e61f976")
+		(property "Reference" "JP3"
+			(at 232.41 128.27 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Value" "220K"
-			(at 165.1 62.738 90)
+		(property "Value" "~"
+			(at 232.41 130.81 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 165.354 63.754 90)
+		(property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm"
+			(at 232.41 133.35 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3891,7 +4319,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 165.1 64.77 0)
+			(at 232.41 133.35 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3899,8 +4327,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Resistor, US symbol"
-			(at 165.1 64.77 0)
+		(property "Description" "Solder Jumper, 2-pole, open"
+			(at 232.41 133.35 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3909,65 +4337,71 @@
 			)
 		)
 		(pin "1"
-			(uuid "2e0b42f4-f3bd-4516-995b-aae965dcc839")
+			(uuid "fb603156-17d1-4432-bea9-cf46b558b829")
 		)
 		(pin "2"
-			(uuid "bac66822-ef97-442f-a58f-853fbb2f6c26")
+			(uuid "34258c68-0374-4f6d-b8f4-bde73fbabc49")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R12")
+					(reference "JP3")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Device:R_US")
-		(at 121.92 153.67 180)
+		(lib_id "Transistor_BJT:2N3904")
+		(at 105.41 44.45 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "3b07d4c3-10ef-483b-9b59-5841f3257be6")
-		(property "Reference" "R23"
-			(at 118.11 153.67 90)
+		(fields_autoplaced yes)
+		(uuid "1e65777f-3472-489f-9200-8b24d66f9e36")
+		(property "Reference" "Q5"
+			(at 110.49 43.1799 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 			)
 		)
-		(property "Value" "220K"
-			(at 119.888 153.67 90)
+		(property "Value" "2N3904"
+			(at 110.49 45.7199 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 			)
 		)
-		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 120.904 153.416 90)
+		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
+			(at 110.49 46.355 0)
 			(effects
 				(font
 					(size 1.27 1.27)
+					(italic yes)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "~"
-			(at 121.92 153.67 0)
+		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
+			(at 105.41 44.45 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Description" "Resistor, US symbol"
-			(at 121.92 153.67 0)
+		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
+			(at 105.41 44.45 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3976,47 +4410,51 @@
 			)
 		)
 		(pin "1"
-			(uuid "53d9832b-75bc-435f-a9c1-e7a00edf72e1")
+			(uuid "6c37812f-9949-4051-941a-18cc1248e175")
 		)
 		(pin "2"
-			(uuid "a1fb3f52-7ede-4bb0-97d0-9a496c40e2c1")
+			(uuid "59e8f84f-8569-45e2-a383-a47cb216f13f")
+		)
+		(pin "3"
+			(uuid "1e3145fe-09ce-4b65-96bf-954c47f5ad2c")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R23")
+					(reference "Q5")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Device:R_US")
-		(at 91.44 35.56 180)
+		(lib_id "Connector:Conn_01x01_Pin")
+		(at 118.11 24.13 180)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "3b63b2ef-de40-4b5e-ab3e-bdfe1af89be4")
-		(property "Reference" "R17"
-			(at 87.63 35.56 90)
+		(fields_autoplaced yes)
+		(uuid "20002300-a552-4eb9-9e72-a979d1173616")
+		(property "Reference" "J1"
+			(at 117.475 19.05 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Value" "220K"
-			(at 89.408 35.56 90)
+		(property "Value" "5V"
+			(at 117.475 21.59 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 90.424 35.306 90)
+		(property "Footprint" "Connector_Pin:Pin_D1.0mm_L10.0mm_LooseFit"
+			(at 118.11 24.13 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4025,7 +4463,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 91.44 35.56 0)
+			(at 118.11 24.13 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4033,8 +4471,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Resistor, US symbol"
-			(at 91.44 35.56 0)
+		(property "Description" "Generic connector, single row, 01x01, script generated"
+			(at 118.11 24.13 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4043,71 +4481,62 @@
 			)
 		)
 		(pin "1"
-			(uuid "d0acdaad-445f-4700-bd5a-e4ec578476c3")
-		)
-		(pin "2"
-			(uuid "a62dbe27-2d97-4ebc-862e-16e90f6499a3")
+			(uuid "281fcb55-bff7-4e41-bbc4-1512a7eb70e2")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R17")
+					(reference "J1")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Transistor_BJT:2N3904")
-		(at 71.12 162.56 0)
+		(lib_id "Device:R_US")
+		(at 180.34 156.21 90)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "3e3bac9c-c5ac-409e-bbc7-e95cb666dfcd")
-		(property "Reference" "Q13"
-			(at 76.2 161.2899 0)
+		(uuid "20c625b5-c6d7-4323-8fa1-9f8035db40ed")
+		(property "Reference" "R26"
+			(at 180.34 152.4 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Value" "2N3904"
-			(at 76.2 163.8299 0)
+		(property "Value" "220K"
+			(at 180.34 154.178 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
-			(at 76.2 164.465 0)
+		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
+			(at 180.594 155.194 90)
 			(effects
 				(font
 					(size 1.27 1.27)
-					(italic yes)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
-			(at 71.12 162.56 0)
+		(property "Datasheet" "~"
+			(at 180.34 156.21 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
-			(at 71.12 162.56 0)
+		(property "Description" "Resistor, US symbol"
+			(at 180.34 156.21 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4115,44 +4544,72 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 71.12 162.56 0)
+		(pin "1"
+			(uuid "523e3b4e-e513-40fd-ab04-d256ca3a43f7")
+		)
+		(pin "2"
+			(uuid "d2e157b2-4de8-4933-a4ce-a419a8ddc9dc")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "R26")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Transistor_BJT:2N3904")
+		(at 55.88 167.64 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "2fad2046-9d0c-4b29-a594-7a844eb03b4b")
+		(property "Reference" "Q11"
+			(at 60.96 166.3699 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Name" "2N3904"
-			(at 71.12 162.56 0)
+		(property "Value" "2N3904"
+			(at 60.96 168.9099 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Device" "NPN"
-			(at 71.12 162.56 0)
+		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
+			(at 60.96 169.545 0)
 			(effects
 				(font
 					(size 1.27 1.27)
+					(italic yes)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Type" "GUMMELPOON"
-			(at 71.12 162.56 0)
+		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
+			(at 55.88 167.64 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
-			(at 71.12 162.56 0)
+		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
+			(at 55.88 167.64 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4161,18 +4618,18 @@
 			)
 		)
 		(pin "1"
-			(uuid "4e191dbf-7031-46af-9f46-566ae8328e0c")
+			(uuid "55318c87-95cb-4f13-8f87-b6c62ebc69f8")
 		)
 		(pin "2"
-			(uuid "64e12149-c556-48ab-9669-3b31ff4031bd")
+			(uuid "6b20cdca-7839-4081-945c-7bd35ea0ec6a")
 		)
 		(pin "3"
-			(uuid "a490d97c-92a0-4f1f-97d5-b8a9c3d85b18")
+			(uuid "88123491-b91e-4c67-9969-c6ac60e05766")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Q13")
+					(reference "Q11")
 					(unit 1)
 				)
 			)
@@ -4180,15 +4637,15 @@
 	)
 	(symbol
 		(lib_id "Device:R_US")
-		(at 179.07 144.78 90)
+		(at 165.1 64.77 90)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "41ee7ffd-960b-4277-b3d1-7626f85846b7")
-		(property "Reference" "R25"
-			(at 179.07 140.97 90)
+		(uuid "37ca60e6-d374-4a65-b3e7-fb7c32b1e1b4")
+		(property "Reference" "R12"
+			(at 165.1 60.96 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4196,7 +4653,7 @@
 			)
 		)
 		(property "Value" "220K"
-			(at 179.07 142.748 90)
+			(at 165.1 62.738 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4204,7 +4661,7 @@
 			)
 		)
 		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 179.324 143.764 90)
+			(at 165.354 63.754 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4213,7 +4670,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 179.07 144.78 0)
+			(at 165.1 64.77 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4222,7 +4679,7 @@
 			)
 		)
 		(property "Description" "Resistor, US symbol"
-			(at 179.07 144.78 0)
+			(at 165.1 64.77 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4231,50 +4688,47 @@
 			)
 		)
 		(pin "1"
-			(uuid "03d915ae-b3a5-450e-ba70-8fceaf509d3b")
+			(uuid "2e0b42f4-f3bd-4516-995b-aae965dcc839")
 		)
 		(pin "2"
-			(uuid "14f12586-4d2f-4026-b18b-fdd814e56708")
+			(uuid "bac66822-ef97-442f-a58f-853fbb2f6c26")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R25")
+					(reference "R12")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Simulation_SPICE:VDC")
-		(at -15.24 140.97 0)
+		(lib_id "Device:R_US")
+		(at 121.92 153.67 180)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "44ad177f-8360-4566-87de-aff7a039b41b")
-		(property "Reference" "Vcc1"
-			(at -10.16 139.5701 0)
+		(uuid "3b07d4c3-10ef-483b-9b59-5841f3257be6")
+		(property "Reference" "R23"
+			(at 118.11 153.67 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Value" "5"
-			(at -10.16 142.1101 0)
+		(property "Value" "220K"
+			(at 119.888 153.67 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Footprint" ""
-			(at -15.24 140.97 0)
+		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
+			(at 120.904 153.416 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4282,8 +4736,8 @@
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#sec_Independent_Sources_for"
-			(at -15.24 140.97 0)
+		(property "Datasheet" "~"
+			(at 121.92 153.67 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4291,8 +4745,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Voltage source, DC"
-			(at -15.24 140.97 0)
+		(property "Description" "Resistor, US symbol"
+			(at 121.92 153.67 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4300,17 +4754,48 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=+ 2=-"
-			(at -15.24 140.97 0)
+		(pin "1"
+			(uuid "53d9832b-75bc-435f-a9c1-e7a00edf72e1")
+		)
+		(pin "2"
+			(uuid "a1fb3f52-7ede-4bb0-97d0-9a496c40e2c1")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "R23")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Device:R_US")
+		(at 91.44 35.56 180)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "3b63b2ef-de40-4b5e-ab3e-bdfe1af89be4")
+		(property "Reference" "R17"
+			(at 87.63 35.56 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "220K"
+			(at 89.408 35.56 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
-		(property "Sim.Type" "DC"
-			(at -15.24 140.97 0)
+		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
+			(at 90.424 35.306 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4318,78 +4803,90 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Device" "V"
-			(at -15.24 140.97 0)
+		(property "Datasheet" "~"
+			(at 91.44 35.56 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
-		(pin "2"
-			(uuid "ae369593-e550-4ca0-aa7b-ce7b6beec49f")
+		(property "Description" "Resistor, US symbol"
+			(at 91.44 35.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
 		)
 		(pin "1"
-			(uuid "4c634940-7d49-439b-8730-e9b53ed8ba83")
+			(uuid "d0acdaad-445f-4700-bd5a-e4ec578476c3")
+		)
+		(pin "2"
+			(uuid "a62dbe27-2d97-4ebc-862e-16e90f6499a3")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Vcc1")
+					(reference "R17")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "power:GND")
-		(at -15.24 146.05 0)
+		(lib_id "Transistor_BJT:2N3904")
+		(at 71.12 162.56 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
 		(fields_autoplaced yes)
-		(uuid "4b1c3cc0-bfef-401a-ae9a-4a51710d31f8")
-		(property "Reference" "#PWR03"
-			(at -15.24 152.4 0)
+		(uuid "3e3bac9c-c5ac-409e-bbc7-e95cb666dfcd")
+		(property "Reference" "Q13"
+			(at 76.2 161.2899 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Value" "GND"
-			(at -15.24 151.13 0)
+		(property "Value" "2N3904"
+			(at 76.2 163.8299 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 			)
 		)
-		(property "Footprint" ""
-			(at -15.24 146.05 0)
+		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
+			(at 76.2 164.465 0)
 			(effects
 				(font
 					(size 1.27 1.27)
+					(italic yes)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Datasheet" ""
-			(at -15.24 146.05 0)
+		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
+			(at 71.12 162.56 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at -15.24 146.05 0)
+		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
+			(at 71.12 162.56 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4398,12 +4895,18 @@
 			)
 		)
 		(pin "1"
-			(uuid "a2e6bae4-039a-499b-b92f-8a8e653204ee")
+			(uuid "4e191dbf-7031-46af-9f46-566ae8328e0c")
+		)
+		(pin "2"
+			(uuid "64e12149-c556-48ab-9669-3b31ff4031bd")
+		)
+		(pin "3"
+			(uuid "a490d97c-92a0-4f1f-97d5-b8a9c3d85b18")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "#PWR03")
+					(reference "Q13")
 					(unit 1)
 				)
 			)
@@ -4411,15 +4914,15 @@
 	)
 	(symbol
 		(lib_id "Device:R_US")
-		(at 68.58 50.8 90)
+		(at 179.07 144.78 90)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "4b2b4dd4-c32e-4c68-ace7-9d0ce2553c71")
-		(property "Reference" "R6"
-			(at 68.58 46.99 90)
+		(uuid "41ee7ffd-960b-4277-b3d1-7626f85846b7")
+		(property "Reference" "R25"
+			(at 179.07 140.97 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4427,7 +4930,7 @@
 			)
 		)
 		(property "Value" "220K"
-			(at 68.58 48.768 90)
+			(at 179.07 142.748 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4435,7 +4938,7 @@
 			)
 		)
 		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 68.834 49.784 90)
+			(at 179.324 143.764 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4444,7 +4947,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 68.58 50.8 0)
+			(at 179.07 144.78 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4453,7 +4956,7 @@
 			)
 		)
 		(property "Description" "Resistor, US symbol"
-			(at 68.58 50.8 0)
+			(at 179.07 144.78 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4462,49 +4965,47 @@
 			)
 		)
 		(pin "1"
-			(uuid "ba16a147-2564-4086-8e0c-819f4494cb9f")
+			(uuid "03d915ae-b3a5-450e-ba70-8fceaf509d3b")
 		)
 		(pin "2"
-			(uuid "3ccc2ddb-4585-45b8-8b29-ab3120f2623a")
+			(uuid "14f12586-4d2f-4026-b18b-fdd814e56708")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R6")
+					(reference "R25")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "power:GND")
-		(at -30.48 124.46 0)
+		(lib_id "Device:R_US")
+		(at 68.58 50.8 90)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "50bbbcc7-0881-4637-b59f-3151b75bb059")
-		(property "Reference" "#PWR01"
-			(at -30.48 130.81 0)
+		(uuid "4b2b4dd4-c32e-4c68-ace7-9d0ce2553c71")
+		(property "Reference" "R6"
+			(at 68.58 46.99 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
-		(property "Value" "GND"
-			(at -30.48 129.54 0)
+		(property "Value" "220K"
+			(at 68.58 48.768 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Footprint" ""
-			(at -30.48 124.46 0)
+		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
+			(at 68.834 49.784 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4512,8 +5013,8 @@
 				(hide yes)
 			)
 		)
-		(property "Datasheet" ""
-			(at -30.48 124.46 0)
+		(property "Datasheet" "~"
+			(at 68.58 50.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4521,8 +5022,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at -30.48 124.46 0)
+		(property "Description" "Resistor, US symbol"
+			(at 68.58 50.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4531,29 +5032,32 @@
 			)
 		)
 		(pin "1"
-			(uuid "b5b96b65-4081-4ea8-9440-e5b2ea23daac")
+			(uuid "ba16a147-2564-4086-8e0c-819f4494cb9f")
+		)
+		(pin "2"
+			(uuid "3ccc2ddb-4585-45b8-8b29-ab3120f2623a")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "#PWR01")
+					(reference "R6")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Simulation_SPICE:VDC")
-		(at -15.24 120.65 0)
+		(lib_id "Connector:TestPoint")
+		(at 139.7 72.39 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
 		(fields_autoplaced yes)
-		(uuid "5380ceb8-e493-4755-a3f1-15edf73f3487")
-		(property "Reference" "Vinc1"
-			(at -10.16 119.2501 0)
+		(uuid "54d8e9df-3e47-4c81-a945-58bdc6380205")
+		(property "Reference" "TP1"
+			(at 142.24 68.4529 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4561,8 +5065,8 @@
 				(justify left)
 			)
 		)
-		(property "Value" "0"
-			(at -10.16 121.7901 0)
+		(property "Value" "~"
+			(at 142.24 70.358 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4570,35 +5074,8 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
-			(at -15.24 120.65 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#sec_Independent_Sources_for"
-			(at -15.24 120.65 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Voltage source, DC"
-			(at -15.24 120.65 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Pins" "1=+ 2=-"
-			(at -15.24 120.65 0)
+		(property "Footprint" "TestPoint:TestPoint_Pad_1.0x1.0mm"
+			(at 144.78 72.39 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4606,8 +5083,8 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Type" "DC"
-			(at -15.24 120.65 0)
+		(property "Datasheet" "~"
+			(at 144.78 72.39 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4615,26 +5092,22 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Device" "V"
-			(at -15.24 120.65 0)
+		(property "Description" "test point"
+			(at 139.7 72.39 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
 		(pin "1"
-			(uuid "85f0158b-e080-4b27-a5a9-ea93ea1f1e8e")
-		)
-		(pin "2"
-			(uuid "0a8eb304-4a75-4084-bc3e-f2ef4b50fed8")
+			(uuid "b4274657-1d27-4dcb-b680-bbb38b426304")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Vinc1")
+					(reference "TP1")
 					(unit 1)
 				)
 			)
@@ -4699,7 +5172,7 @@
 			(uuid "ebc47589-6ac4-43c6-8465-22e5e3234855")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R27")
 					(unit 1)
@@ -4742,66 +5215,21 @@
 					(size 1.27 1.27)
 					(italic yes)
 				)
-				(justify left)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
-			(at 134.62 162.56 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
-		)
-		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
-			(at 134.62 162.56 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 134.62 162.56 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Name" "2N3904"
-			(at 134.62 162.56 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Device" "NPN"
-			(at 134.62 162.56 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Type" "GUMMELPOON"
+		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
 			(at 134.62 162.56 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
+		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
 			(at 134.62 162.56 0)
 			(effects
 				(font
@@ -4820,7 +5248,7 @@
 			(uuid "49db4143-bc78-4237-a3f3-34840addcffb")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "Q16")
 					(unit 1)
@@ -4887,7 +5315,7 @@
 			(uuid "51f708e1-1020-4890-a3d2-5dfe83729931")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R5")
 					(unit 1)
@@ -4896,32 +5324,35 @@
 		)
 	)
 	(symbol
-		(lib_id "Device:R_US")
-		(at 110.49 167.64 90)
+		(lib_id "Jumper:SolderJumper_2_Open")
+		(at 127 54.61 270)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "6b97f01d-7ade-4bf6-b385-036f437cc331")
-		(property "Reference" "R21"
-			(at 110.49 163.83 90)
+		(fields_autoplaced yes)
+		(uuid "677d031a-e276-4a12-8858-5821b677cb2f")
+		(property "Reference" "JP1"
+			(at 129.54 53.9749 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 			)
 		)
-		(property "Value" "220K"
-			(at 110.49 165.608 90)
+		(property "Value" "~"
+			(at 129.54 55.88 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 			)
 		)
-		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 110.744 166.624 90)
+		(property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm"
+			(at 127 54.61 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4930,7 +5361,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 110.49 167.64 0)
+			(at 127 54.61 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4938,8 +5369,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Resistor, US symbol"
-			(at 110.49 167.64 0)
+		(property "Description" "Solder Jumper, 2-pole, open"
+			(at 127 54.61 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4948,49 +5379,47 @@
 			)
 		)
 		(pin "1"
-			(uuid "7815ea61-4c2e-4efc-87c7-13d9f2abd09f")
+			(uuid "5786e8bf-4828-46ee-a067-4e31fa32b416")
 		)
 		(pin "2"
-			(uuid "ba47f8fe-1033-4951-9139-e9f801ec2545")
+			(uuid "867f8964-7b18-464b-95e1-9aa56a4bf939")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R21")
+					(reference "JP1")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "power:GND")
-		(at 97.79 195.58 90)
+		(lib_id "Device:R_US")
+		(at 110.49 167.64 90)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "6ea2c505-97aa-46f4-ac02-ac9cb53a2ee0")
-		(property "Reference" "#PWR04"
-			(at 104.14 195.58 0)
+		(uuid "6b97f01d-7ade-4bf6-b385-036f437cc331")
+		(property "Reference" "R21"
+			(at 110.49 163.83 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
-		(property "Value" "GND"
-			(at 102.87 195.58 0)
+		(property "Value" "220K"
+			(at 110.49 165.608 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Footprint" ""
-			(at 97.79 195.58 0)
+		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
+			(at 110.744 166.624 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4998,8 +5427,8 @@
 				(hide yes)
 			)
 		)
-		(property "Datasheet" ""
-			(at 97.79 195.58 0)
+		(property "Datasheet" "~"
+			(at 110.49 167.64 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5007,8 +5436,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at 97.79 195.58 0)
+		(property "Description" "Resistor, US symbol"
+			(at 110.49 167.64 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5017,74 +5446,48 @@
 			)
 		)
 		(pin "1"
-			(uuid "85ca7eee-32a3-44e7-9bc0-ad8e781eedd0")
+			(uuid "7815ea61-4c2e-4efc-87c7-13d9f2abd09f")
+		)
+		(pin "2"
+			(uuid "ba47f8fe-1033-4951-9139-e9f801ec2545")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "#PWR04")
+					(reference "R21")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Simulation_SPICE:VDC")
-		(at -30.48 119.38 0)
+		(lib_id "Jumper:SolderJumper_2_Open")
+		(at 156.21 144.78 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
 		(fields_autoplaced yes)
-		(uuid "6eb856a6-6720-480c-b02f-aa608ff88c2b")
-		(property "Reference" "Vin2"
-			(at -25.4 117.9801 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "5"
-			(at -25.4 120.5201 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" ""
-			(at -30.48 119.38 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#sec_Independent_Sources_for"
-			(at -30.48 119.38 0)
+		(uuid "6f2ada05-1cfc-4095-bc45-02b41dfb7b0b")
+		(property "Reference" "JP4"
+			(at 156.21 139.6482 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
-		(property "Description" "Voltage source, DC"
-			(at -30.48 119.38 0)
+		(property "Value" "~"
+			(at 156.21 142.1882 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=+ 2=-"
-			(at -30.48 119.38 0)
+		(property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm"
+			(at 156.21 144.78 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5092,8 +5495,8 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Type" "DC"
-			(at -30.48 119.38 0)
+		(property "Datasheet" "~"
+			(at 156.21 144.78 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5101,26 +5504,25 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Device" "V"
-			(at -30.48 119.38 0)
+		(property "Description" "Solder Jumper, 2-pole, open"
+			(at 156.21 144.78 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
 		(pin "1"
-			(uuid "3a70f174-9941-4a4b-a6ee-ebab172ba35f")
+			(uuid "a6fb636b-9869-40bc-8737-d6fece49f2f3")
 		)
 		(pin "2"
-			(uuid "2a59ecc3-d8ff-4836-a740-9b951c8a9ded")
+			(uuid "9abd46be-3662-4ac7-a83e-c84231d43eed")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Vin2")
+					(reference "JP4")
 					(unit 1)
 				)
 			)
@@ -5185,7 +5587,7 @@
 			(uuid "cc0fd0a5-78c0-4b76-b916-d2338739407a")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R2")
 					(unit 1)
@@ -5252,7 +5654,7 @@
 			(uuid "e86b48ba-30d8-44ef-bbe2-d50256c42a36")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R7")
 					(unit 1)
@@ -5319,7 +5721,7 @@
 			(uuid "c5ac37f9-1388-406b-b9fd-b4ec46da952b")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R11")
 					(unit 1)
@@ -5328,32 +5730,33 @@
 		)
 	)
 	(symbol
-		(lib_id "Device:R_US")
-		(at 58.42 153.67 180)
+		(lib_id "Jumper:SolderJumper_2_Open")
+		(at 157.48 156.21 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "809cf97a-2d21-4d7f-b181-c940f1e1ead5")
-		(property "Reference" "R20"
-			(at 54.61 153.67 90)
+		(fields_autoplaced yes)
+		(uuid "7c0ef4a4-75ca-49ae-8be4-894330013761")
+		(property "Reference" "JP5"
+			(at 157.48 151.13 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Value" "220K"
-			(at 56.388 153.67 90)
+		(property "Value" "~"
+			(at 157.48 153.67 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 57.404 153.416 90)
+		(property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm"
+			(at 157.48 156.21 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5362,7 +5765,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 58.42 153.67 0)
+			(at 157.48 156.21 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5370,8 +5773,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Resistor, US symbol"
-			(at 58.42 153.67 0)
+		(property "Description" "Solder Jumper, 2-pole, open"
+			(at 157.48 156.21 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5380,71 +5783,65 @@
 			)
 		)
 		(pin "1"
-			(uuid "7dfaa500-1196-42f6-a571-5c63ae3efdce")
+			(uuid "33fcafa2-0d17-4238-a349-6c6340b367f9")
 		)
 		(pin "2"
-			(uuid "f20452ce-0e6d-4279-8cf5-ca4b96fc5f6d")
+			(uuid "117ab0b8-432e-4516-83e4-13f45d7bc3a0")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R20")
+					(reference "JP5")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Transistor_BJT:2N3904")
-		(at 176.53 43.18 0)
+		(lib_id "Device:R_US")
+		(at 58.42 153.67 180)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "82a67afa-5cac-481a-b972-149d8accc8c7")
-		(property "Reference" "Q8"
-			(at 181.61 41.9099 0)
+		(uuid "809cf97a-2d21-4d7f-b181-c940f1e1ead5")
+		(property "Reference" "R20"
+			(at 54.61 153.67 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Value" "2N3904"
-			(at 181.61 44.4499 0)
+		(property "Value" "220K"
+			(at 56.388 153.67 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
-			(at 181.61 45.085 0)
+		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
+			(at 57.404 153.416 90)
 			(effects
 				(font
 					(size 1.27 1.27)
-					(italic yes)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
-			(at 176.53 43.18 0)
+		(property "Datasheet" "~"
+			(at 58.42 153.67 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
-			(at 176.53 43.18 0)
+		(property "Description" "Resistor, US symbol"
+			(at 58.42 153.67 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5452,43 +5849,71 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 176.53 43.18 0)
+		(pin "1"
+			(uuid "7dfaa500-1196-42f6-a571-5c63ae3efdce")
+		)
+		(pin "2"
+			(uuid "f20452ce-0e6d-4279-8cf5-ca4b96fc5f6d")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "R20")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Transistor_BJT:2N3904")
+		(at 176.53 43.18 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "82a67afa-5cac-481a-b972-149d8accc8c7")
+		(property "Reference" "Q8"
+			(at 181.61 41.9099 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Name" "2N3904"
-			(at 176.53 43.18 0)
+		(property "Value" "2N3904"
+			(at 181.61 44.4499 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Device" "NPN"
-			(at 176.53 43.18 0)
+		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
+			(at 181.61 45.085 0)
 			(effects
 				(font
 					(size 1.27 1.27)
+					(italic yes)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Type" "GUMMELPOON"
+		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
 			(at 176.53 43.18 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
+		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
 			(at 176.53 43.18 0)
 			(effects
 				(font
@@ -5507,7 +5932,7 @@
 			(uuid "13afb499-d70d-4d39-a21b-a40cca7dbdde")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "Q8")
 					(unit 1)
@@ -5574,7 +5999,7 @@
 			(uuid "8d21bcfc-57b2-4928-a056-7c1ff681d896")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R15")
 					(unit 1)
@@ -5640,51 +6065,6 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 69.85 80.01 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Name" "2N3904"
-			(at 69.85 80.01 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Device" "NPN"
-			(at 69.85 80.01 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Type" "GUMMELPOON"
-			(at 69.85 80.01 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
-			(at 69.85 80.01 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
 		(pin "1"
 			(uuid "3ac00611-4792-4682-ad34-a618ddf1b5f1")
 		)
@@ -5695,7 +6075,7 @@
 			(uuid "d8297850-bf04-45d2-a82c-0f50680a399b")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "Q4")
 					(unit 1)
@@ -5704,100 +6084,55 @@
 		)
 	)
 	(symbol
-		(lib_id "Transistor_BJT:2N3904")
-		(at 158.75 72.39 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "8bd756c7-5436-47e7-9b80-c1f769c4d70a")
-		(property "Reference" "Q6"
-			(at 163.83 71.1199 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "2N3904"
-			(at 163.83 73.6599 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
-			(at 163.83 74.295 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-					(italic yes)
-				)
-				(justify left)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
-			(at 158.75 72.39 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
-		)
-		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
-			(at 158.75 72.39 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 158.75 72.39 0)
+		(lib_id "Transistor_BJT:2N3904")
+		(at 158.75 72.39 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "8bd756c7-5436-47e7-9b80-c1f769c4d70a")
+		(property "Reference" "Q6"
+			(at 163.83 71.1199 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Name" "2N3904"
-			(at 158.75 72.39 0)
+		(property "Value" "2N3904"
+			(at 163.83 73.6599 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Device" "NPN"
-			(at 158.75 72.39 0)
+		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
+			(at 163.83 74.295 0)
 			(effects
 				(font
 					(size 1.27 1.27)
+					(italic yes)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Type" "GUMMELPOON"
+		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
 			(at 158.75 72.39 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
+		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
 			(at 158.75 72.39 0)
 			(effects
 				(font
@@ -5816,7 +6151,7 @@
 			(uuid "f4428cdb-2b65-4ca2-a3af-73c25bd0177c")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "Q6")
 					(unit 1)
@@ -5883,7 +6218,7 @@
 			(uuid "94e58043-acca-47fb-bbe6-dd03941fed71")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R22")
 					(unit 1)
@@ -5950,7 +6285,7 @@
 			(uuid "62f576be-ed8e-4607-acfc-7cfc4d914dc4")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R3")
 					(unit 1)
@@ -5959,56 +6294,51 @@
 		)
 	)
 	(symbol
-		(lib_id "Transistor_BJT:2N3904")
-		(at 187.96 144.78 0)
+		(lib_id "Connector:Conn_01x03_Pin")
+		(at 17.78 105.41 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
 		(fields_autoplaced yes)
-		(uuid "a3505f42-9801-40a4-a455-35e09a95abd2")
-		(property "Reference" "Q17"
-			(at 193.04 143.5099 0)
+		(uuid "99b0d4a4-86d5-43e7-8ff2-a5e859c55766")
+		(property "Reference" "Input_Pins1"
+			(at 18.415 99.06 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Value" "2N3904"
-			(at 193.04 146.0499 0)
+		(property "Value" "~"
+			(at 18.415 101.6 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
-			(at 193.04 146.685 0)
+		(property "Footprint" "Connector_Wire:SolderWire-0.5sqmm_1x03_P4.6mm_D0.9mm_OD2.1mm"
+			(at 17.78 105.41 0)
 			(effects
 				(font
 					(size 1.27 1.27)
-					(italic yes)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
-			(at 187.96 144.78 0)
+		(property "Datasheet" "~"
+			(at 17.78 105.41 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
-			(at 187.96 144.78 0)
+		(property "Description" "Generic connector, single row, 01x03, script generated"
+			(at 17.78 105.41 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6016,43 +6346,74 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 187.96 144.78 0)
+		(pin "2"
+			(uuid "8fe8a347-f15e-47ee-b28d-a1ec540bd813")
+		)
+		(pin "1"
+			(uuid "85dfe1b3-2879-4a13-961e-b4f641ec0f4f")
+		)
+		(pin "3"
+			(uuid "9696a8a5-ad04-428c-a81a-97de50fc1ead")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "Input_Pins1")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Transistor_BJT:2N3904")
+		(at 187.96 144.78 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "a3505f42-9801-40a4-a455-35e09a95abd2")
+		(property "Reference" "Q17"
+			(at 193.04 143.5099 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Name" "2N3904"
-			(at 187.96 144.78 0)
+		(property "Value" "2N3904"
+			(at 193.04 146.0499 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Device" "NPN"
-			(at 187.96 144.78 0)
+		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
+			(at 193.04 146.685 0)
 			(effects
 				(font
 					(size 1.27 1.27)
+					(italic yes)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Type" "GUMMELPOON"
+		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
 			(at 187.96 144.78 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
+		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
 			(at 187.96 144.78 0)
 			(effects
 				(font
@@ -6071,7 +6432,7 @@
 			(uuid "18957da5-e8a4-4962-b232-9fd610975d42")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "Q17")
 					(unit 1)
@@ -6137,51 +6498,6 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 176.53 80.01 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Name" "2N3904"
-			(at 176.53 80.01 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Device" "NPN"
-			(at 176.53 80.01 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Type" "GUMMELPOON"
-			(at 176.53 80.01 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
-			(at 176.53 80.01 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
 		(pin "1"
 			(uuid "7e1358ec-8664-4761-93f7-cb18df6ec5db")
 		)
@@ -6192,7 +6508,7 @@
 			(uuid "0ef23852-6991-44b0-9708-84bc5ed33ff2")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "Q9")
 					(unit 1)
@@ -6201,33 +6517,34 @@
 		)
 	)
 	(symbol
-		(lib_id "power:GND")
-		(at -46.99 125.73 0)
+		(lib_id "Connector:TestPoint")
+		(at 104.14 177.8 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "ae08e7fb-c4b1-4e48-abfd-7a7c64b51e76")
-		(property "Reference" "#PWR05"
-			(at -46.99 132.08 0)
+		(uuid "ac73d15f-62c3-47bb-a3af-30146843fd1e")
+		(property "Reference" "TP3"
+			(at 102.87 172.72 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Value" "GND"
-			(at -47.244 130.302 0)
+		(property "Value" "~"
+			(at 106.68 175.768 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 			)
 		)
-		(property "Footprint" ""
-			(at -46.99 125.73 0)
+		(property "Footprint" "TestPoint:TestPoint_Pad_1.0x1.0mm"
+			(at 109.22 177.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6235,8 +6552,8 @@
 				(hide yes)
 			)
 		)
-		(property "Datasheet" ""
-			(at -46.99 125.73 0)
+		(property "Datasheet" "~"
+			(at 109.22 177.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6244,8 +6561,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at -46.99 125.73 0)
+		(property "Description" "test point"
+			(at 104.14 177.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6254,12 +6571,12 @@
 			)
 		)
 		(pin "1"
-			(uuid "915a0fe8-907f-44cc-b1ac-e1214e761ca0")
+			(uuid "7247363a-d2e0-42e8-87d2-c75831c50db0")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "#PWR05")
+					(reference "TP3")
 					(unit 1)
 				)
 			)
@@ -6323,51 +6640,6 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 158.75 55.88 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Name" "2N3904"
-			(at 158.75 55.88 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Device" "NPN"
-			(at 158.75 55.88 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Type" "GUMMELPOON"
-			(at 158.75 55.88 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
-			(at 158.75 55.88 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
 		(pin "1"
 			(uuid "cf16a24f-c30c-4725-bd38-c2137b2a678f")
 		)
@@ -6378,7 +6650,7 @@
 			(uuid "4fe8dd64-13f3-43a9-b444-d6681997f6aa")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "Q7")
 					(unit 1)
@@ -6444,51 +6716,6 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 119.38 177.8 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Name" "2N3904"
-			(at 119.38 177.8 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Device" "NPN"
-			(at 119.38 177.8 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Type" "GUMMELPOON"
-			(at 119.38 177.8 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
-			(at 119.38 177.8 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
 		(pin "1"
 			(uuid "7c673109-9dc5-4058-9c68-7dae41061e43")
 		)
@@ -6499,7 +6726,7 @@
 			(uuid "41de6949-077d-4312-8310-35fa88caa1af")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "Q15")
 					(unit 1)
@@ -6566,7 +6793,7 @@
 			(uuid "31dea856-7456-4c6f-afd9-6af604354c7d")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R13")
 					(unit 1)
@@ -6633,7 +6860,7 @@
 			(uuid "084da9bb-b3f4-45ef-b93b-fd98cec1b984")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R19")
 					(unit 1)
@@ -6700,7 +6927,7 @@
 			(uuid "c0179439-2de6-4751-8220-4ce07e7f8fea")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R14")
 					(unit 1)
@@ -6743,66 +6970,21 @@
 					(size 1.27 1.27)
 					(italic yes)
 				)
-				(justify left)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
-			(at 55.88 177.8 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
-		)
-		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
-			(at 55.88 177.8 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 55.88 177.8 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Name" "2N3904"
-			(at 55.88 177.8 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Device" "NPN"
-			(at 55.88 177.8 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Type" "GUMMELPOON"
+		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
 			(at 55.88 177.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
+		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
 			(at 55.88 177.8 0)
 			(effects
 				(font
@@ -6821,7 +7003,7 @@
 			(uuid "2cb3b9a0-f6f8-45d2-9625-57612d0985af")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "Q12")
 					(unit 1)
@@ -6888,7 +7070,7 @@
 			(uuid "683c9238-0583-42fc-b69e-e5608a97f3ed")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R10")
 					(unit 1)
@@ -6954,51 +7136,6 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 52.07 72.39 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Name" "2N3904"
-			(at 52.07 72.39 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Device" "NPN"
-			(at 52.07 72.39 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Type" "GUMMELPOON"
-			(at 52.07 72.39 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
-			(at 52.07 72.39 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
 		(pin "1"
 			(uuid "c3c878e0-0377-4af9-bea0-b2957727e9ca")
 		)
@@ -7009,7 +7146,7 @@
 			(uuid "3c2b7656-8060-4d8e-bea9-ed3b7bc716db")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "Q1")
 					(unit 1)
@@ -7076,7 +7213,7 @@
 			(uuid "aab1912d-c4c1-4f01-b973-4e01a68fad39")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R16")
 					(unit 1)
@@ -7085,56 +7222,51 @@
 		)
 	)
 	(symbol
-		(lib_id "Transistor_BJT:2N3904")
-		(at 119.38 167.64 0)
+		(lib_id "Connector:Conn_01x01_Pin")
+		(at 100.33 194.31 180)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
 		(fields_autoplaced yes)
-		(uuid "e67dcc20-f3a7-4436-88bd-8a538fd21226")
-		(property "Reference" "Q14"
-			(at 124.46 166.3699 0)
+		(uuid "e420a62f-a66c-4c48-8b85-bc3a31a3d1cb")
+		(property "Reference" "J2"
+			(at 99.695 189.23 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Value" "2N3904"
-			(at 124.46 168.9099 0)
+		(property "Value" "GND"
+			(at 99.695 191.77 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
-			(at 124.46 169.545 0)
+		(property "Footprint" "Connector_Pin:Pin_D1.0mm_L10.0mm_LooseFit"
+			(at 100.33 194.31 0)
 			(effects
 				(font
 					(size 1.27 1.27)
-					(italic yes)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
-			(at 119.38 167.64 0)
+		(property "Datasheet" "~"
+			(at 100.33 194.31 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
-			(at 119.38 167.64 0)
+		(property "Description" "Generic connector, single row, 01x01, script generated"
+			(at 100.33 194.31 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -7142,43 +7274,68 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 119.38 167.64 0)
+		(pin "1"
+			(uuid "f480aecb-9924-4ef4-aabf-7d6a9f2e8591")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "J2")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Transistor_BJT:2N3904")
+		(at 119.38 167.64 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "e67dcc20-f3a7-4436-88bd-8a538fd21226")
+		(property "Reference" "Q14"
+			(at 124.46 166.3699 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Name" "2N3904"
-			(at 119.38 167.64 0)
+		(property "Value" "2N3904"
+			(at 124.46 168.9099 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Sim.Device" "NPN"
-			(at 119.38 167.64 0)
+		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
+			(at 124.46 169.545 0)
 			(effects
 				(font
 					(size 1.27 1.27)
+					(italic yes)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Type" "GUMMELPOON"
+		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
 			(at 119.38 167.64 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
+		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
 			(at 119.38 167.64 0)
 			(effects
 				(font
@@ -7197,7 +7354,7 @@
 			(uuid "bc7a61dd-d79c-4067-b716-d4bf6b97054f")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "Q14")
 					(unit 1)
@@ -7264,7 +7421,7 @@
 			(uuid "28bc0014-b70c-4bd8-ab9a-5083ec51493d")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R28")
 					(unit 1)
@@ -7330,51 +7487,6 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 199.39 156.21 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Name" "2N3904"
-			(at 199.39 156.21 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Device" "NPN"
-			(at 199.39 156.21 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Type" "GUMMELPOON"
-			(at 199.39 156.21 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
-			(at 199.39 156.21 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
 		(pin "1"
 			(uuid "54fdd2e7-a92f-4a6e-accc-fcd0fcd18842")
 		)
@@ -7385,7 +7497,7 @@
 			(uuid "9b8d1ab9-bdc3-463f-975d-3a31ad0d2731")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "Q18")
 					(unit 1)
@@ -7393,104 +7505,6 @@
 			)
 		)
 	)
-	(symbol
-		(lib_id "Simulation_SPICE:VDC")
-		(at -46.99 120.65 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "f082d9ef-908e-4751-9ea6-768b4e1ae70f")
-		(property "Reference" "Vin1"
-			(at -41.91 119.2501 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "0"
-			(at -41.91 121.7901 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" ""
-			(at -46.99 120.65 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#sec_Independent_Sources_for"
-			(at -46.99 120.65 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Voltage source, DC"
-			(at -46.99 120.65 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Pins" "1=+ 2=-"
-			(at -46.99 120.65 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Type" "DC"
-			(at -46.99 120.65 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Device" "V"
-			(at -46.99 120.65 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "007ba346-ea1c-4853-bcbd-0c2527526df9")
-		)
-		(pin "2"
-			(uuid "c4b559cc-18ee-4dfc-9031-887a1a33b110")
-		)
-		(instances
-			(project "Transistor_Calculator_V2-2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Vin1")
-					(unit 1)
-				)
-			)
-		)
-	)
 	(symbol
 		(lib_id "Device:R_US")
 		(at 43.18 72.39 90)
@@ -7550,7 +7564,7 @@
 			(uuid "825364ef-d8dd-49d2-8cbb-160d3eb14fe7")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R1")
 					(unit 1)
@@ -7617,7 +7631,7 @@
 			(uuid "0a2700f1-01d2-4c88-9698-7e6c8cc3ce7e")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "R4")
 					(unit 1)
@@ -7683,51 +7697,6 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Library" "2N3904.lib"
-			(at 52.07 55.88 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Name" "2N3904"
-			(at 52.07 55.88 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Device" "NPN"
-			(at 52.07 55.88 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Type" "GUMMELPOON"
-			(at 52.07 55.88 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
-			(at 52.07 55.88 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
 		(pin "1"
 			(uuid "5c718913-1645-4785-8ca6-1983fd095475")
 		)
@@ -7738,7 +7707,7 @@
 			(uuid "abd8ef87-bc33-403a-bce1-8ec7a92a4868")
 		)
 		(instances
-			(project "Transistor_Calculator_V2-2"
+			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
 					(reference "Q2")
 					(unit 1)
@@ -7751,4 +7720,4 @@
 			(page "1")
 		)
 	)
-)
+)
\ No newline at end of file

From 2ce0a9c9d6f3900925d728ef6b1fe3001e0b2c6b Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mark@hermeling.org>
Date: Tue, 14 May 2024 08:17:52 -0400
Subject: [PATCH 02/16] remove test ports

---
 Transistor_Calculator_V2.kicad_sch | 1624 +++-------------------------
 1 file changed, 174 insertions(+), 1450 deletions(-)

diff --git a/Transistor_Calculator_V2.kicad_sch b/Transistor_Calculator_V2.kicad_sch
index aefaaa4..c7602ac 100644
--- a/Transistor_Calculator_V2.kicad_sch
+++ b/Transistor_Calculator_V2.kicad_sch
@@ -490,474 +490,24 @@
 				)
 			)
 		)
-		(symbol "Connector:TestPoint"
-			(pin_numbers hide)
-			(pin_names
-				(offset 0.762) hide)
-			(exclude_from_sim no)
-			(in_bom yes)
-			(on_board yes)
-			(property "Reference" "TP"
-				(at 0 6.858 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "Value" "TestPoint"
-				(at 0 5.08 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "Footprint" ""
-				(at 5.08 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Datasheet" "~"
-				(at 5.08 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Description" "test point"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_keywords" "test point tp"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_fp_filters" "Pin* Test*"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(symbol "TestPoint_0_1"
-				(circle
-					(center 0 3.302)
-					(radius 0.762)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-			)
-			(symbol "TestPoint_1_1"
-				(pin passive line
-					(at 0 0 90)
-					(length 2.54)
-					(name "1"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "1"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-			)
-		)
-		(symbol "Device:R_US"
-			(pin_numbers hide)
-			(pin_names
-				(offset 0)
-			)
-			(exclude_from_sim no)
-			(in_bom yes)
-			(on_board yes)
-			(property "Reference" "R"
-				(at 2.54 0 90)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "Value" "R_US"
-				(at -2.54 0 90)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "Footprint" ""
-				(at 1.016 -0.254 90)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Datasheet" "~"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Description" "Resistor, US symbol"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_keywords" "R res resistor"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_fp_filters" "R_*"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(symbol "R_US_0_1"
-				(polyline
-					(pts
-						(xy 0 -2.286) (xy 0 -2.54)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0 2.286) (xy 0 2.54)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0 -0.762) (xy 1.016 -1.143) (xy 0 -1.524) (xy -1.016 -1.905) (xy 0 -2.286)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0 0.762) (xy 1.016 0.381) (xy 0 0) (xy -1.016 -0.381) (xy 0 -0.762)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0 2.286) (xy 1.016 1.905) (xy 0 1.524) (xy -1.016 1.143) (xy 0 0.762)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-			)
-			(symbol "R_US_1_1"
-				(pin passive line
-					(at 0 3.81 270)
-					(length 1.27)
-					(name "~"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "1"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin passive line
-					(at 0 -3.81 90)
-					(length 1.27)
-					(name "~"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "2"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-			)
-		)
-		(symbol "Jumper:SolderJumper_2_Open"
-			(pin_names
-				(offset 0) hide)
-			(exclude_from_sim no)
-			(in_bom yes)
-			(on_board yes)
-			(property "Reference" "JP"
-				(at 0 2.032 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "Value" "SolderJumper_2_Open"
-				(at 0 -2.54 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "Footprint" ""
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Datasheet" "~"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Description" "Solder Jumper, 2-pole, open"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_keywords" "solder jumper SPST"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_fp_filters" "SolderJumper*Open*"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(symbol "SolderJumper_2_Open_0_1"
-				(arc
-					(start -0.254 1.016)
-					(mid -1.2656 0)
-					(end -0.254 -1.016)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(arc
-					(start -0.254 1.016)
-					(mid -1.2656 0)
-					(end -0.254 -1.016)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type outline)
-					)
-				)
-				(polyline
-					(pts
-						(xy -0.254 1.016) (xy -0.254 -1.016)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0.254 1.016) (xy 0.254 -1.016)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(arc
-					(start 0.254 -1.016)
-					(mid 1.2656 0)
-					(end 0.254 1.016)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(arc
-					(start 0.254 -1.016)
-					(mid 1.2656 0)
-					(end 0.254 1.016)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type outline)
-					)
-				)
-			)
-			(symbol "SolderJumper_2_Open_1_1"
-				(pin passive line
-					(at -3.81 0 0)
-					(length 2.54)
-					(name "A"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "1"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin passive line
-					(at 3.81 0 180)
-					(length 2.54)
-					(name "B"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "2"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-			)
-		)
-		(symbol "Jumper:SolderJumper_3_Open"
+		(symbol "Device:R_US"
+			(pin_numbers hide)
 			(pin_names
-				(offset 0) hide)
+				(offset 0)
+			)
 			(exclude_from_sim no)
 			(in_bom yes)
 			(on_board yes)
-			(property "Reference" "JP"
-				(at -2.54 -2.54 0)
+			(property "Reference" "R"
+				(at 2.54 0 90)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
 				)
 			)
-			(property "Value" "SolderJumper_3_Open"
-				(at 0 2.794 0)
+			(property "Value" "R_US"
+				(at -2.54 0 90)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -965,7 +515,7 @@
 				)
 			)
 			(property "Footprint" ""
-				(at 0 0 0)
+				(at 1.016 -0.254 90)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -982,7 +532,7 @@
 					(hide yes)
 				)
 			)
-			(property "Description" "Solder Jumper, 3-pole, open"
+			(property "Description" "Resistor, US symbol"
 				(at 0 0 0)
 				(effects
 					(font
@@ -991,7 +541,7 @@
 					(hide yes)
 				)
 			)
-			(property "ki_keywords" "Solder Jumper SPDT"
+			(property "ki_keywords" "R res resistor"
 				(at 0 0 0)
 				(effects
 					(font
@@ -1000,7 +550,7 @@
 					(hide yes)
 				)
 			)
-			(property "ki_fp_filters" "SolderJumper*Open*"
+			(property "ki_fp_filters" "R_*"
 				(at 0 0 0)
 				(effects
 					(font
@@ -1009,45 +559,10 @@
 					(hide yes)
 				)
 			)
-			(symbol "SolderJumper_3_Open_0_1"
-				(arc
-					(start -1.016 1.016)
-					(mid -2.0276 0)
-					(end -1.016 -1.016)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(arc
-					(start -1.016 1.016)
-					(mid -2.0276 0)
-					(end -1.016 -1.016)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type outline)
-					)
-				)
-				(rectangle
-					(start -0.508 1.016)
-					(end 0.508 -1.016)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type outline)
-					)
-				)
+			(symbol "R_US_0_1"
 				(polyline
 					(pts
-						(xy -2.54 0) (xy -2.032 0)
+						(xy 0 -2.286) (xy 0 -2.54)
 					)
 					(stroke
 						(width 0)
@@ -1059,7 +574,7 @@
 				)
 				(polyline
 					(pts
-						(xy -1.016 1.016) (xy -1.016 -1.016)
+						(xy 0 2.286) (xy 0 2.54)
 					)
 					(stroke
 						(width 0)
@@ -1071,7 +586,7 @@
 				)
 				(polyline
 					(pts
-						(xy 0 -1.27) (xy 0 -1.016)
+						(xy 0 -0.762) (xy 1.016 -1.143) (xy 0 -1.524) (xy -1.016 -1.905) (xy 0 -2.286)
 					)
 					(stroke
 						(width 0)
@@ -1083,7 +598,7 @@
 				)
 				(polyline
 					(pts
-						(xy 1.016 1.016) (xy 1.016 -1.016)
+						(xy 0 0.762) (xy 1.016 0.381) (xy 0 0) (xy -1.016 -0.381) (xy 0 -0.762)
 					)
 					(stroke
 						(width 0)
@@ -1095,20 +610,8 @@
 				)
 				(polyline
 					(pts
-						(xy 2.54 0) (xy 2.032 0)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
+						(xy 0 2.286) (xy 1.016 1.905) (xy 0 1.524) (xy -1.016 1.143) (xy 0 0.762)
 					)
-				)
-				(arc
-					(start 1.016 -1.016)
-					(mid 2.0276 0)
-					(end 1.016 1.016)
 					(stroke
 						(width 0)
 						(type default)
@@ -1117,24 +620,12 @@
 						(type none)
 					)
 				)
-				(arc
-					(start 1.016 -1.016)
-					(mid 2.0276 0)
-					(end 1.016 1.016)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type outline)
-					)
-				)
 			)
-			(symbol "SolderJumper_3_Open_1_1"
+			(symbol "R_US_1_1"
 				(pin passive line
-					(at -5.08 0 0)
-					(length 2.54)
-					(name "A"
+					(at 0 3.81 270)
+					(length 1.27)
+					(name "~"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -1151,8 +642,8 @@
 				)
 				(pin passive line
 					(at 0 -3.81 90)
-					(length 2.54)
-					(name "C"
+					(length 1.27)
+					(name "~"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -1167,24 +658,6 @@
 						)
 					)
 				)
-				(pin passive line
-					(at 5.08 0 180)
-					(length 2.54)
-					(name "B"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "3"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
 			)
 		)
 		(symbol "Transistor_BJT:2N3904"
@@ -1432,12 +905,6 @@
 		(color 0 0 0 0)
 		(uuid "2a0f25cc-a737-46ba-9abf-4f51c94ccaac")
 	)
-	(junction
-		(at 104.14 177.8)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "3f23c806-2321-4cf1-8e8f-c2ccf9c192f7")
-	)
 	(junction
 		(at 121.92 149.86)
 		(diameter 0)
@@ -1474,6 +941,12 @@
 		(color 0 0 0 0)
 		(uuid "598a3eb2-2f2b-440d-9eb5-68ced9387982")
 	)
+	(junction
+		(at 165.1 135.89)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "5b74c8da-0d82-40e6-9c78-1b534e2d6f78")
+	)
 	(junction
 		(at 121.92 31.75)
 		(diameter 0)
@@ -1517,16 +990,16 @@
 		(uuid "713384b9-ae22-4ae2-bcc1-74e478c4be9e")
 	)
 	(junction
-		(at 152.4 144.78)
+		(at 91.44 39.37)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "78eaec35-58fe-4122-828b-69084c523b16")
+		(uuid "8103c5f9-6c5f-4798-b40d-348f77e08358")
 	)
 	(junction
-		(at 91.44 39.37)
+		(at 153.67 156.21)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "8103c5f9-6c5f-4798-b40d-348f77e08358")
+		(uuid "82dd5051-8d30-466d-bb3c-9e438f82fe35")
 	)
 	(junction
 		(at 100.33 85.09)
@@ -1540,12 +1013,6 @@
 		(color 0 0 0 0)
 		(uuid "87bd7e66-1d6e-47a6-90f3-760987378834")
 	)
-	(junction
-		(at 153.67 156.21)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "8b674d93-7f53-4f46-9277-2a2c2041347b")
-	)
 	(junction
 		(at 73.66 193.04)
 		(diameter 0)
@@ -1565,10 +1032,10 @@
 		(uuid "9a224719-cd9a-4689-9464-52ac4009147a")
 	)
 	(junction
-		(at 139.7 72.39)
+		(at 152.4 144.78)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "aabad6df-eb22-467d-bfbd-f3b00ffc20c3")
+		(uuid "a93e5554-4a48-4036-8e08-8015a7df198e")
 	)
 	(junction
 		(at 72.39 50.8)
@@ -1610,7 +1077,7 @@
 		(at 236.22 133.35)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "c9c80fe6-5f1f-4e1c-b380-db6d86af5c9d")
+		(uuid "c807948e-7a8f-4dd8-add8-8401ea806c48")
 	)
 	(junction
 		(at 58.42 162.56)
@@ -1648,18 +1115,6 @@
 		(color 0 0 0 0)
 		(uuid "e2060199-a649-41d0-852a-1eda0ef6e095")
 	)
-	(junction
-		(at 163.83 83.82)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "e47f79cd-9eee-4126-8ecf-959e247e555f")
-	)
-	(junction
-		(at 104.14 167.64)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "e7d99f11-9748-45c3-a072-889e9f3eec01")
-	)
 	(junction
 		(at 29.21 102.87)
 		(diameter 0)
@@ -1734,6 +1189,16 @@
 		)
 		(uuid "05f1a048-c001-4e08-b7dd-86578e313a0c")
 	)
+	(wire
+		(pts
+			(xy 152.4 144.78) (xy 175.26 144.78)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "060537a8-cfbe-48b1-9bd9-9f21b0940c62")
+	)
 	(wire
 		(pts
 			(xy 72.39 85.09) (xy 100.33 85.09)
@@ -1904,16 +1369,6 @@
 		)
 		(uuid "21e0336a-c923-44ae-991b-25beb3d77f86")
 	)
-	(wire
-		(pts
-			(xy 104.14 177.8) (xy 106.68 177.8)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "220d2ce3-dbfa-444a-8b4e-c55d4d132348")
-	)
 	(wire
 		(pts
 			(xy 58.42 149.86) (xy 73.66 149.86)
@@ -1946,7 +1401,7 @@
 	)
 	(wire
 		(pts
-			(xy 92.71 177.8) (xy 104.14 177.8)
+			(xy 92.71 177.8) (xy 106.68 177.8)
 		)
 		(stroke
 			(width 0)
@@ -2104,16 +1559,6 @@
 		)
 		(uuid "33726147-3df6-4293-8509-a4185da1acef")
 	)
-	(wire
-		(pts
-			(xy 254 113.03) (xy 254 57.15)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "3414ccf9-7293-44d0-8928-349d3c4d7492")
-	)
 	(wire
 		(pts
 			(xy 179.07 85.09) (xy 214.63 85.09)
@@ -2124,16 +1569,6 @@
 		)
 		(uuid "35b894d8-5165-4e81-a8b5-27fdecebc9bd")
 	)
-	(wire
-		(pts
-			(xy 104.14 167.64) (xy 106.68 167.64)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "3685716c-d8b5-4051-b69f-e737cea263d3")
-	)
 	(wire
 		(pts
 			(xy 107.95 31.75) (xy 113.03 31.75)
@@ -2346,7 +1781,7 @@
 	)
 	(wire
 		(pts
-			(xy 254 49.53) (xy 254 39.37)
+			(xy 254 39.37) (xy 254 113.03)
 		)
 		(stroke
 			(width 0)
@@ -2486,7 +1921,7 @@
 	)
 	(wire
 		(pts
-			(xy 146.05 72.39) (xy 139.7 72.39)
+			(xy 127 72.39) (xy 146.05 72.39)
 		)
 		(stroke
 			(width 0)
@@ -2556,23 +1991,23 @@
 	)
 	(wire
 		(pts
-			(xy 236.22 133.35) (xy 252.73 133.35)
+			(xy 121.92 182.88) (xy 121.92 191.77)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "84733509-873b-461f-8382-6d35677cc076")
+		(uuid "85687ab6-5a35-43d5-8b27-38ea9b0243c2")
 	)
 	(wire
 		(pts
-			(xy 121.92 182.88) (xy 121.92 191.77)
+			(xy 165.1 121.92) (xy 165.1 135.89)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "85687ab6-5a35-43d5-8b27-38ea9b0243c2")
+		(uuid "86189c9c-a0f6-496a-bde9-99eb2b2a3044")
 	)
 	(wire
 		(pts
@@ -2644,16 +2079,6 @@
 		)
 		(uuid "8f8213aa-725d-4546-a4b7-7d372e0ee6d8")
 	)
-	(wire
-		(pts
-			(xy 127 39.37) (xy 127 50.8)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "904970bf-2d54-4f3d-8d3c-b41575a24499")
-	)
 	(wire
 		(pts
 			(xy 137.16 167.64) (xy 137.16 182.88)
@@ -2686,7 +2111,7 @@
 	)
 	(wire
 		(pts
-			(xy 228.6 133.35) (xy 215.9 133.35)
+			(xy 215.9 133.35) (xy 236.22 133.35)
 		)
 		(stroke
 			(width 0)
@@ -2706,7 +2131,7 @@
 	)
 	(wire
 		(pts
-			(xy 127 58.42) (xy 127 72.39)
+			(xy 127 39.37) (xy 127 72.39)
 		)
 		(stroke
 			(width 0)
@@ -2726,13 +2151,23 @@
 	)
 	(wire
 		(pts
-			(xy 270.51 113.03) (xy 254 113.03)
+			(xy 270.51 113.03) (xy 254 113.03)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "9e2e12b7-1013-4fe0-b809-b2b6ce61a345")
+	)
+	(wire
+		(pts
+			(xy 236.22 133.35) (xy 252.73 133.35)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "9e2e12b7-1013-4fe0-b809-b2b6ce61a345")
+		(uuid "9ee2fe06-af7b-43df-b505-5aede8288146")
 	)
 	(wire
 		(pts
@@ -2774,16 +2209,6 @@
 		)
 		(uuid "a5d79d68-d392-416b-95c5-b44d71999e3a")
 	)
-	(wire
-		(pts
-			(xy 165.1 132.08) (xy 165.1 121.92)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "a6537d81-dc3b-41af-ad00-275b516eb47e")
-	)
 	(wire
 		(pts
 			(xy 137.16 157.48) (xy 143.51 157.48)
@@ -2826,7 +2251,7 @@
 	)
 	(wire
 		(pts
-			(xy 163.83 83.82) (xy 163.83 80.01)
+			(xy 163.83 80.01) (xy 163.83 107.95)
 		)
 		(stroke
 			(width 0)
@@ -2834,26 +2259,6 @@
 		)
 		(uuid "ae3137a1-3109-48ae-a5a8-f6c7de2c0515")
 	)
-	(wire
-		(pts
-			(xy 160.02 144.78) (xy 175.26 144.78)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "af0939d6-eb56-4f64-89a9-7ceeb1e0ef5a")
-	)
-	(wire
-		(pts
-			(xy 139.7 72.39) (xy 127 72.39)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "af8e7337-33ea-40bb-8a71-6f3df01364d2")
-	)
 	(wire
 		(pts
 			(xy 54.61 50.8) (xy 63.5 50.8)
@@ -2936,17 +2341,7 @@
 	)
 	(wire
 		(pts
-			(xy 163.83 107.95) (xy 163.83 83.82)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "c3c9723b-0309-460c-98c6-e5541ac6d006")
-	)
-	(wire
-		(pts
-			(xy 151.13 135.89) (xy 160.02 135.89)
+			(xy 151.13 135.89) (xy 165.1 135.89)
 		)
 		(stroke
 			(width 0)
@@ -3014,6 +2409,16 @@
 		)
 		(uuid "cfbd1948-6065-46b4-acaa-64f5876739e2")
 	)
+	(wire
+		(pts
+			(xy 165.1 135.89) (xy 170.18 135.89)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "d0768d43-b8bb-491b-84ac-31fd01dfadf8")
+	)
 	(wire
 		(pts
 			(xy 170.18 50.8) (xy 170.18 54.61)
@@ -3106,7 +2511,17 @@
 	)
 	(wire
 		(pts
-			(xy 96.52 167.64) (xy 104.14 167.64)
+			(xy 153.67 156.21) (xy 176.53 156.21)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "dd0f46e1-13a8-4b6b-8ecf-0683b3467d11")
+	)
+	(wire
+		(pts
+			(xy 96.52 167.64) (xy 106.68 167.64)
 		)
 		(stroke
 			(width 0)
@@ -3164,16 +2579,6 @@
 		)
 		(uuid "ebad3ce3-2660-4755-a2f9-dd503925ab49")
 	)
-	(wire
-		(pts
-			(xy 161.29 156.21) (xy 176.53 156.21)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "ed05775e-f5c4-45f0-a91a-36dfd60c90e2")
-	)
 	(wire
 		(pts
 			(xy 127 105.41) (xy 92.71 105.41)
@@ -3455,251 +2860,46 @@
 		(fields_autoplaced yes)
 		(uuid "011b6283-2bdd-4463-bf5d-baa7bec55f4e")
 		(property "Reference" "Q19"
-			(at 218.44 137.1599 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "2N3904"
-			(at 218.44 139.6999 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
-			(at 218.44 140.335 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-					(italic yes)
-				)
-				(justify left)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
-			(at 213.36 138.43 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-				(hide yes)
-			)
-		)
-		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
-			(at 213.36 138.43 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "80a5dcf3-157e-46bc-b6be-28824d4deb23")
-		)
-		(pin "2"
-			(uuid "d01cf0aa-2acd-49a9-ac3b-7da6cc238895")
-		)
-		(pin "3"
-			(uuid "c2f60036-f87c-4f77-8a05-5a168b33eff5")
-		)
-		(instances
-			(project "Transistor_Calculator_V2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Q19")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "Connector:TestPoint")
-		(at 104.14 167.64 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(uuid "0163d8a4-f36d-46d9-8068-be136004b68d")
-		(property "Reference" "TP4"
-			(at 103.886 162.814 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "~"
-			(at 106.68 165.608 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" "TestPoint:TestPoint_Pad_1.0x1.0mm"
-			(at 109.22 167.64 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 109.22 167.64 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "test point"
-			(at 104.14 167.64 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "77e400bf-0cc6-403b-a785-4e8a5b91e3d8")
-		)
-		(instances
-			(project "Transistor_Calculator_V2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "TP4")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "Device:R_US")
-		(at 137.16 153.67 180)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(uuid "0347e206-33c3-4a8b-8912-a72e45b01d5c")
-		(property "Reference" "R24"
-			(at 133.35 153.67 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Value" "47K"
-			(at 135.128 153.67 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 136.144 153.416 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 137.16 153.67 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Resistor, US symbol"
-			(at 137.16 153.67 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "5aee33db-9870-4ec5-8c71-0fede13d54e8")
-		)
-		(pin "2"
-			(uuid "f9597836-55a2-4cf2-b2ee-f3adb5f6d748")
-		)
-		(instances
-			(project "Transistor_Calculator_V2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R24")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "Connector:Conn_01x02_Pin")
-		(at 275.59 115.57 180)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(uuid "050b1104-1b19-4aaf-8206-57f35c1d3bc3")
-		(property "Reference" "Output_Pins1"
-			(at 270.51 110.49 0)
+			(at 218.44 137.1599 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify right)
+				(justify left)
 			)
 		)
-		(property "Value" "~"
-			(at 276.86 115.57 0)
+		(property "Value" "2N3904"
+			(at 218.44 139.6999 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify right)
+				(justify left)
 			)
 		)
-		(property "Footprint" "Connector_Wire:SolderWire-0.5sqmm_1x02_P4.6mm_D0.9mm_OD2.1mm"
-			(at 275.59 115.57 0)
+		(property "Footprint" "Package_TO_SOT_THT:TO-92_HandSolder"
+			(at 218.44 140.335 0)
 			(effects
 				(font
 					(size 1.27 1.27)
+					(italic yes)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "~"
-			(at 275.59 115.57 0)
+		(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
+			(at 213.36 138.43 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
-		(property "Description" "Generic connector, single row, 01x02, script generated"
-			(at 275.59 115.57 0)
+		(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
+			(at 213.36 138.43 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3708,50 +2908,50 @@
 			)
 		)
 		(pin "1"
-			(uuid "06f5c843-833f-4ef5-b453-9885f186a4e7")
+			(uuid "80a5dcf3-157e-46bc-b6be-28824d4deb23")
 		)
 		(pin "2"
-			(uuid "5604197c-3861-49ff-9444-6b170b9f3785")
+			(uuid "d01cf0aa-2acd-49a9-ac3b-7da6cc238895")
+		)
+		(pin "3"
+			(uuid "c2f60036-f87c-4f77-8a05-5a168b33eff5")
 		)
 		(instances
 			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Output_Pins1")
+					(reference "Q19")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Connector:TestPoint")
-		(at 163.83 83.82 270)
+		(lib_id "Device:R_US")
+		(at 137.16 153.67 180)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "06090a79-500e-4b83-98fc-823bd3f9df56")
-		(property "Reference" "TP2"
-			(at 168.91 83.1849 90)
+		(uuid "0347e206-33c3-4a8b-8912-a72e45b01d5c")
+		(property "Reference" "R24"
+			(at 133.35 153.67 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Value" "~"
-			(at 168.91 85.09 90)
+		(property "Value" "47K"
+			(at 135.128 153.67 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Footprint" "TestPoint:TestPoint_Pad_1.0x1.0mm"
-			(at 163.83 88.9 0)
+		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
+			(at 136.144 153.416 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3760,7 +2960,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 163.83 88.9 0)
+			(at 137.16 153.67 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3768,8 +2968,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "test point"
-			(at 163.83 83.82 0)
+		(property "Description" "Resistor, US symbol"
+			(at 137.16 153.67 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3778,45 +2978,49 @@
 			)
 		)
 		(pin "1"
-			(uuid "ff20eb15-416f-482f-8ffa-a37a93ad9ebf")
+			(uuid "5aee33db-9870-4ec5-8c71-0fede13d54e8")
+		)
+		(pin "2"
+			(uuid "f9597836-55a2-4cf2-b2ee-f3adb5f6d748")
 		)
 		(instances
 			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "TP2")
+					(reference "R24")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Jumper:SolderJumper_3_Open")
-		(at 165.1 135.89 180)
+		(lib_id "Connector:Conn_01x02_Pin")
+		(at 275.59 115.57 180)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "0aaaf171-8685-427d-9d6f-0b9528eb423b")
-		(property "Reference" "JP6"
-			(at 165.1 139.7 0)
+		(uuid "050b1104-1b19-4aaf-8206-57f35c1d3bc3")
+		(property "Reference" "Output_Pins1"
+			(at 270.51 110.49 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify right)
 			)
 		)
 		(property "Value" "~"
-			(at 165.1 140.97 0)
+			(at 276.86 115.57 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify right)
 			)
 		)
-		(property "Footprint" "Jumper:SolderJumper-3_P1.3mm_Open_RoundedPad1.0x1.5mm"
-			(at 165.1 135.89 0)
+		(property "Footprint" "Connector_Wire:SolderWire-0.5sqmm_1x02_P4.6mm_D0.9mm_OD2.1mm"
+			(at 275.59 115.57 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3825,7 +3029,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 165.1 135.89 0)
+			(at 275.59 115.57 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3833,8 +3037,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Solder Jumper, 3-pole, open"
-			(at 165.1 135.89 0)
+		(property "Description" "Generic connector, single row, 01x02, script generated"
+			(at 275.59 115.57 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3842,19 +3046,16 @@
 				(hide yes)
 			)
 		)
-		(pin "2"
-			(uuid "a07a3770-0fc6-42b5-a1c1-35b47683300e")
-		)
 		(pin "1"
-			(uuid "46f970d3-bd39-48d7-b7bb-43663b61b730")
+			(uuid "06f5c843-833f-4ef5-b453-9885f186a4e7")
 		)
-		(pin "3"
-			(uuid "d9a4f019-449b-45f8-8ded-895bae6dc766")
+		(pin "2"
+			(uuid "5604197c-3861-49ff-9444-6b170b9f3785")
 		)
 		(instances
 			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "JP6")
+					(reference "Output_Pins1")
 					(unit 1)
 				)
 			)
@@ -4213,144 +3414,6 @@
 			)
 		)
 	)
-	(symbol
-		(lib_id "Jumper:SolderJumper_2_Open")
-		(at 254 53.34 270)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "17fbd868-6ce4-45b4-8042-aed5974dd45d")
-		(property "Reference" "JP2"
-			(at 256.54 52.7049 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "~"
-			(at 256.54 54.61 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm"
-			(at 254 53.34 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 254 53.34 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Solder Jumper, 2-pole, open"
-			(at 254 53.34 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "2e73c59b-3821-4fd5-afd3-c6d6599834ee")
-		)
-		(pin "2"
-			(uuid "02e1fb5d-904a-4797-9e3d-bc0e9afa3164")
-		)
-		(instances
-			(project "Transistor_Calculator_V2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "JP2")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "Jumper:SolderJumper_2_Open")
-		(at 232.41 133.35 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "1aec06e2-a3f1-4d37-b0f8-3c656e61f976")
-		(property "Reference" "JP3"
-			(at 232.41 128.27 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Value" "~"
-			(at 232.41 130.81 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm"
-			(at 232.41 133.35 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 232.41 133.35 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Solder Jumper, 2-pole, open"
-			(at 232.41 133.35 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "fb603156-17d1-4432-bea9-cf46b558b829")
-		)
-		(pin "2"
-			(uuid "34258c68-0374-4f6d-b8f4-bde73fbabc49")
-		)
-		(instances
-			(project "Transistor_Calculator_V2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "JP3")
-					(unit 1)
-				)
-			)
-		)
-	)
 	(symbol
 		(lib_id "Transistor_BJT:2N3904")
 		(at 105.41 44.45 0)
@@ -4919,77 +3982,10 @@
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
-		(dnp no)
-		(uuid "41ee7ffd-960b-4277-b3d1-7626f85846b7")
-		(property "Reference" "R25"
-			(at 179.07 140.97 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Value" "220K"
-			(at 179.07 142.748 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 179.324 143.764 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 179.07 144.78 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Resistor, US symbol"
-			(at 179.07 144.78 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "03d915ae-b3a5-450e-ba70-8fceaf509d3b")
-		)
-		(pin "2"
-			(uuid "14f12586-4d2f-4026-b18b-fdd814e56708")
-		)
-		(instances
-			(project "Transistor_Calculator_V2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R25")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "Device:R_US")
-		(at 68.58 50.8 90)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(uuid "4b2b4dd4-c32e-4c68-ace7-9d0ce2553c71")
-		(property "Reference" "R6"
-			(at 68.58 46.99 90)
+		(dnp no)
+		(uuid "41ee7ffd-960b-4277-b3d1-7626f85846b7")
+		(property "Reference" "R25"
+			(at 179.07 140.97 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4997,7 +3993,7 @@
 			)
 		)
 		(property "Value" "220K"
-			(at 68.58 48.768 90)
+			(at 179.07 142.748 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5005,7 +4001,7 @@
 			)
 		)
 		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 68.834 49.784 90)
+			(at 179.324 143.764 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5014,7 +4010,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 68.58 50.8 0)
+			(at 179.07 144.78 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5023,7 +4019,7 @@
 			)
 		)
 		(property "Description" "Resistor, US symbol"
-			(at 68.58 50.8 0)
+			(at 179.07 144.78 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5032,50 +4028,47 @@
 			)
 		)
 		(pin "1"
-			(uuid "ba16a147-2564-4086-8e0c-819f4494cb9f")
+			(uuid "03d915ae-b3a5-450e-ba70-8fceaf509d3b")
 		)
 		(pin "2"
-			(uuid "3ccc2ddb-4585-45b8-8b29-ab3120f2623a")
+			(uuid "14f12586-4d2f-4026-b18b-fdd814e56708")
 		)
 		(instances
 			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R6")
+					(reference "R25")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Connector:TestPoint")
-		(at 139.7 72.39 0)
+		(lib_id "Device:R_US")
+		(at 68.58 50.8 90)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "54d8e9df-3e47-4c81-a945-58bdc6380205")
-		(property "Reference" "TP1"
-			(at 142.24 68.4529 0)
+		(uuid "4b2b4dd4-c32e-4c68-ace7-9d0ce2553c71")
+		(property "Reference" "R6"
+			(at 68.58 46.99 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Value" "~"
-			(at 142.24 70.358 0)
+		(property "Value" "220K"
+			(at 68.58 48.768 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
 			)
 		)
-		(property "Footprint" "TestPoint:TestPoint_Pad_1.0x1.0mm"
-			(at 144.78 72.39 0)
+		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
+			(at 68.834 49.784 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5084,7 +4077,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 144.78 72.39 0)
+			(at 68.58 50.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5092,8 +4085,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "test point"
-			(at 139.7 72.39 0)
+		(property "Description" "Resistor, US symbol"
+			(at 68.58 50.8 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5102,12 +4095,15 @@
 			)
 		)
 		(pin "1"
-			(uuid "b4274657-1d27-4dcb-b680-bbb38b426304")
+			(uuid "ba16a147-2564-4086-8e0c-819f4494cb9f")
+		)
+		(pin "2"
+			(uuid "3ccc2ddb-4585-45b8-8b29-ab3120f2623a")
 		)
 		(instances
 			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "TP1")
+					(reference "R6")
 					(unit 1)
 				)
 			)
@@ -5323,76 +4319,6 @@
 			)
 		)
 	)
-	(symbol
-		(lib_id "Jumper:SolderJumper_2_Open")
-		(at 127 54.61 270)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "677d031a-e276-4a12-8858-5821b677cb2f")
-		(property "Reference" "JP1"
-			(at 129.54 53.9749 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "~"
-			(at 129.54 55.88 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm"
-			(at 127 54.61 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 127 54.61 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Solder Jumper, 2-pole, open"
-			(at 127 54.61 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "5786e8bf-4828-46ee-a067-4e31fa32b416")
-		)
-		(pin "2"
-			(uuid "867f8964-7b18-464b-95e1-9aa56a4bf939")
-		)
-		(instances
-			(project "Transistor_Calculator_V2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "JP1")
-					(unit 1)
-				)
-			)
-		)
-	)
 	(symbol
 		(lib_id "Device:R_US")
 		(at 110.49 167.64 90)
@@ -5460,74 +4386,6 @@
 			)
 		)
 	)
-	(symbol
-		(lib_id "Jumper:SolderJumper_2_Open")
-		(at 156.21 144.78 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "6f2ada05-1cfc-4095-bc45-02b41dfb7b0b")
-		(property "Reference" "JP4"
-			(at 156.21 139.6482 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Value" "~"
-			(at 156.21 142.1882 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm"
-			(at 156.21 144.78 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 156.21 144.78 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Solder Jumper, 2-pole, open"
-			(at 156.21 144.78 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "a6fb636b-9869-40bc-8737-d6fece49f2f3")
-		)
-		(pin "2"
-			(uuid "9abd46be-3662-4ac7-a83e-c84231d43eed")
-		)
-		(instances
-			(project "Transistor_Calculator_V2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "JP4")
-					(unit 1)
-				)
-			)
-		)
-	)
 	(symbol
 		(lib_id "Device:R_US")
 		(at 60.96 80.01 90)
@@ -5729,74 +4587,6 @@
 			)
 		)
 	)
-	(symbol
-		(lib_id "Jumper:SolderJumper_2_Open")
-		(at 157.48 156.21 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "7c0ef4a4-75ca-49ae-8be4-894330013761")
-		(property "Reference" "JP5"
-			(at 157.48 151.13 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Value" "~"
-			(at 157.48 153.67 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Footprint" "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm"
-			(at 157.48 156.21 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 157.48 156.21 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Solder Jumper, 2-pole, open"
-			(at 157.48 156.21 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "33fcafa2-0d17-4238-a349-6c6340b367f9")
-		)
-		(pin "2"
-			(uuid "117ab0b8-432e-4516-83e4-13f45d7bc3a0")
-		)
-		(instances
-			(project "Transistor_Calculator_V2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "JP5")
-					(unit 1)
-				)
-			)
-		)
-	)
 	(symbol
 		(lib_id "Device:R_US")
 		(at 58.42 153.67 180)
@@ -6516,72 +5306,6 @@
 			)
 		)
 	)
-	(symbol
-		(lib_id "Connector:TestPoint")
-		(at 104.14 177.8 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(uuid "ac73d15f-62c3-47bb-a3af-30146843fd1e")
-		(property "Reference" "TP3"
-			(at 102.87 172.72 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Value" "~"
-			(at 106.68 175.768 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" "TestPoint:TestPoint_Pad_1.0x1.0mm"
-			(at 109.22 177.8 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 109.22 177.8 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "test point"
-			(at 104.14 177.8 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "7247363a-d2e0-42e8-87d2-c75831c50db0")
-		)
-		(instances
-			(project "Transistor_Calculator_V2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "TP3")
-					(unit 1)
-				)
-			)
-		)
-	)
 	(symbol
 		(lib_id "Transistor_BJT:2N3904")
 		(at 158.75 55.88 0)
@@ -7720,4 +6444,4 @@
 			(page "1")
 		)
 	)
-)
\ No newline at end of file
+)

From 8e2da7e7196da88900503791fc0d97462dae911a Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mark@hermeling.org>
Date: Tue, 14 May 2024 08:23:45 -0400
Subject: [PATCH 03/16] fix q5

---
 Transistor_Calculator_V2.kicad_sch | 45 ++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/Transistor_Calculator_V2.kicad_sch b/Transistor_Calculator_V2.kicad_sch
index c7602ac..321426d 100644
--- a/Transistor_Calculator_V2.kicad_sch
+++ b/Transistor_Calculator_V2.kicad_sch
@@ -3472,6 +3472,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 105.41 44.45 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 105.41 44.45 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 105.41 44.45 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 105.41 44.45 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 105.41 44.45 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "6c37812f-9949-4051-941a-18cc1248e175")
 		)

From 9f2cf3a32c20e5e7b6ad5641fdb198511ac49063 Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mark@hermeling.org>
Date: Tue, 14 May 2024 23:06:17 -0400
Subject: [PATCH 04/16] update transistors

---
 Transistor_Calculator_V2.kicad_sch | 878 +++++++++++++++++++++++++++--
 1 file changed, 844 insertions(+), 34 deletions(-)

diff --git a/Transistor_Calculator_V2.kicad_sch b/Transistor_Calculator_V2.kicad_sch
index 321426d..acb4387 100644
--- a/Transistor_Calculator_V2.kicad_sch
+++ b/Transistor_Calculator_V2.kicad_sch
@@ -2907,6 +2907,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 213.36 138.43 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 213.36 138.43 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 213.36 138.43 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 213.36 138.43 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 213.36 138.43 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "80a5dcf3-157e-46bc-b6be-28824d4deb23")
 		)
@@ -3119,6 +3164,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 212.09 44.45 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 212.09 44.45 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 212.09 44.45 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 212.09 44.45 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 212.09 44.45 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "a891938a-73b9-42af-a9db-fee912c0ed45")
 		)
@@ -3262,6 +3352,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 69.85 41.91 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 69.85 41.91 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 69.85 41.91 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 69.85 41.91 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=C 2=B 3=E"
+			(at 69.85 41.91 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "e4b42550-c57c-47ae-9feb-86d4739776ca")
 		)
@@ -3725,6 +3860,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 55.88 167.64 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 55.88 167.64 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 55.88 167.64 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 55.88 167.64 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 55.88 167.64 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "55318c87-95cb-4f13-8f87-b6c62ebc69f8")
 		)
@@ -4002,6 +4182,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 71.12 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 71.12 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 71.12 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 71.12 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 71.12 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "4e191dbf-7031-46af-9f46-566ae8328e0c")
 		)
@@ -4279,35 +4504,80 @@
 				(hide yes)
 			)
 		)
-		(pin "1"
-			(uuid "73a00e87-da08-475c-abda-d5acb93c1e5f")
-		)
-		(pin "2"
-			(uuid "13fb4ed3-4fff-4abc-9333-7e84e75c9f9f")
-		)
-		(pin "3"
-			(uuid "49db4143-bc78-4237-a3f3-34840addcffb")
-		)
-		(instances
-			(project "Transistor_Calculator_V2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Q16")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
-		(lib_id "Device:R_US")
-		(at 58.42 64.77 90)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(uuid "65c87cf6-ab6a-403b-af08-f25f38e77f60")
-		(property "Reference" "R5"
-			(at 58.42 60.96 90)
+		(property "Sim.Library" "2N3904.lib"
+			(at 134.62 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 134.62 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 134.62 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 134.62 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 134.62 162.56 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "73a00e87-da08-475c-abda-d5acb93c1e5f")
+		)
+		(pin "2"
+			(uuid "13fb4ed3-4fff-4abc-9333-7e84e75c9f9f")
+		)
+		(pin "3"
+			(uuid "49db4143-bc78-4237-a3f3-34840addcffb")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "Q16")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Device:R_US")
+		(at 58.42 64.77 90)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "65c87cf6-ab6a-403b-af08-f25f38e77f60")
+		(property "Reference" "R5"
+			(at 58.42 60.96 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4757,6 +5027,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 176.53 43.18 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 176.53 43.18 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 176.53 43.18 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 176.53 43.18 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 176.53 43.18 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "75deca54-2a43-446b-aa62-6bb4fd5e88f6")
 		)
@@ -4900,6 +5215,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 69.85 80.01 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 69.85 80.01 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 69.85 80.01 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 69.85 80.01 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 69.85 80.01 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "3ac00611-4792-4682-ad34-a618ddf1b5f1")
 		)
@@ -4976,6 +5336,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 158.75 72.39 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 158.75 72.39 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 158.75 72.39 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 158.75 72.39 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 158.75 72.39 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "06b20f2c-e783-4194-b35f-526f5194e4f9")
 		)
@@ -5257,6 +5662,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 187.96 144.78 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 187.96 144.78 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 187.96 144.78 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 187.96 144.78 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 187.96 144.78 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "5e341b48-a548-4ae7-93a4-40e27fd06433")
 		)
@@ -5333,11 +5783,56 @@
 				(hide yes)
 			)
 		)
-		(pin "1"
-			(uuid "7e1358ec-8664-4761-93f7-cb18df6ec5db")
-		)
-		(pin "2"
-			(uuid "e0775ad7-95dd-4b75-bb32-c298b0b4c495")
+		(property "Sim.Library" "2N3904.lib"
+			(at 176.53 80.01 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 176.53 80.01 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 176.53 80.01 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 176.53 80.01 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 176.53 80.01 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "7e1358ec-8664-4761-93f7-cb18df6ec5db")
+		)
+		(pin "2"
+			(uuid "e0775ad7-95dd-4b75-bb32-c298b0b4c495")
 		)
 		(pin "3"
 			(uuid "0ef23852-6991-44b0-9708-84bc5ed33ff2")
@@ -5409,6 +5904,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 158.75 55.88 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 158.75 55.88 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 158.75 55.88 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 158.75 55.88 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 158.75 55.88 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "cf16a24f-c30c-4725-bd38-c2137b2a678f")
 		)
@@ -5485,6 +6025,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 119.38 177.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 119.38 177.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 119.38 177.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 119.38 177.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 119.38 177.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "7c673109-9dc5-4058-9c68-7dae41061e43")
 		)
@@ -5762,6 +6347,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 55.88 177.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 55.88 177.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 55.88 177.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 55.88 177.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 55.88 177.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "29046d52-aecd-4718-9711-60e3dfee6ac4")
 		)
@@ -5905,6 +6535,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 52.07 72.39 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 52.07 72.39 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 52.07 72.39 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 52.07 72.39 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 52.07 72.39 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "c3c878e0-0377-4af9-bea0-b2957727e9ca")
 		)
@@ -6113,6 +6788,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 119.38 167.64 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 119.38 167.64 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 119.38 167.64 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 119.38 167.64 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 119.38 167.64 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "e8d43c3e-5a78-4b40-b387-453a35a8f0ff")
 		)
@@ -6256,6 +6976,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 199.39 156.21 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 199.39 156.21 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 199.39 156.21 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 199.39 156.21 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 199.39 156.21 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "54fdd2e7-a92f-4a6e-accc-fcd0fcd18842")
 		)
@@ -6466,6 +7231,51 @@
 				(hide yes)
 			)
 		)
+		(property "Sim.Library" "2N3904.lib"
+			(at 52.07 55.88 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Name" "2N3904"
+			(at 52.07 55.88 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "NPN"
+			(at 52.07 55.88 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "GUMMELPOON"
+			(at 52.07 55.88 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=E 2=B 3=C"
+			(at 52.07 55.88 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
 		(pin "1"
 			(uuid "5c718913-1645-4785-8ca6-1983fd095475")
 		)

From 9d8f1ee306d0580796b6a1ad008af88a1fd43c70 Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mark@hermeling.org>
Date: Tue, 14 May 2024 23:09:51 -0400
Subject: [PATCH 05/16] update transistors

---
 Transistor_Calculator_V2.kicad_sch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Transistor_Calculator_V2.kicad_sch b/Transistor_Calculator_V2.kicad_sch
index acb4387..6503116 100644
--- a/Transistor_Calculator_V2.kicad_sch
+++ b/Transistor_Calculator_V2.kicad_sch
@@ -6681,6 +6681,7 @@
 				(font
 					(size 1.27 1.27)
 				)
+				(hide yes)
 			)
 		)
 		(property "Value" "GND"

From ab7a9d1a238170a15dc21652800616f61d06f21c Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mark@hermeling.org>
Date: Tue, 14 May 2024 23:13:16 -0400
Subject: [PATCH 06/16] update transistors

---
 Transistor_Calculator_V2.kicad_sch | 104 +----------------------------
 1 file changed, 1 insertion(+), 103 deletions(-)

diff --git a/Transistor_Calculator_V2.kicad_sch b/Transistor_Calculator_V2.kicad_sch
index 6503116..43a3573 100644
--- a/Transistor_Calculator_V2.kicad_sch
+++ b/Transistor_Calculator_V2.kicad_sch
@@ -953,12 +953,6 @@
 		(color 0 0 0 0)
 		(uuid "5bd6ea70-e285-4963-9339-ac09b4ca260f")
 	)
-	(junction
-		(at 92.71 193.04)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "5f7a16f5-cf7a-4130-99df-89c11e92e935")
-	)
 	(junction
 		(at 137.16 157.48)
 		(diameter 0)
@@ -1681,7 +1675,7 @@
 	)
 	(wire
 		(pts
-			(xy 92.71 193.04) (xy 99.06 193.04)
+			(xy 73.66 193.04) (xy 99.06 193.04)
 		)
 		(stroke
 			(width 0)
@@ -1689,16 +1683,6 @@
 		)
 		(uuid "4b59ac73-f879-4d1a-8ae5-881ae2e5b04f")
 	)
-	(wire
-		(pts
-			(xy 73.66 193.04) (xy 92.71 193.04)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "4da582f1-5774-4617-96b6-3269242c153f")
-	)
 	(wire
 		(pts
 			(xy 129.54 162.56) (xy 121.92 162.56)
@@ -1749,16 +1733,6 @@
 		)
 		(uuid "58f3fccb-3490-4769-9053-9d9dbc1dc5f0")
 	)
-	(wire
-		(pts
-			(xy 92.71 194.31) (xy 92.71 193.04)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "59bfdd99-40cf-4310-9bc6-2e6a2cfe3216")
-	)
 	(wire
 		(pts
 			(xy 143.51 144.78) (xy 152.4 144.78)
@@ -2379,16 +2353,6 @@
 		)
 		(uuid "ccb64b89-f040-4de1-97b3-dca6270f88d6")
 	)
-	(wire
-		(pts
-			(xy 95.25 194.31) (xy 92.71 194.31)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "cd4e5605-81fc-493f-bbb0-b1697dfc3f81")
-	)
 	(wire
 		(pts
 			(xy 22.86 102.87) (xy 29.21 102.87)
@@ -6665,72 +6629,6 @@
 			)
 		)
 	)
-	(symbol
-		(lib_id "Connector:Conn_01x01_Pin")
-		(at 100.33 194.31 180)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "e420a62f-a66c-4c48-8b85-bc3a31a3d1cb")
-		(property "Reference" "J2"
-			(at 99.695 189.23 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Value" "GND"
-			(at 99.695 191.77 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Footprint" "Connector_Pin:Pin_D1.0mm_L10.0mm_LooseFit"
-			(at 100.33 194.31 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 100.33 194.31 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Generic connector, single row, 01x01, script generated"
-			(at 100.33 194.31 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "f480aecb-9924-4ef4-aabf-7d6a9f2e8591")
-		)
-		(instances
-			(project "Transistor_Calculator_V2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "J2")
-					(unit 1)
-				)
-			)
-		)
-	)
 	(symbol
 		(lib_id "Transistor_BJT:2N3904")
 		(at 119.38 167.64 0)

From f3c9759cb3cd2838392966b21a18278c2422fb25 Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mark@hermeling.org>
Date: Tue, 14 May 2024 23:17:22 -0400
Subject: [PATCH 07/16] update transistors

---
 Transistor_Calculator_V2.kicad_sch | 212 +----------------------------
 1 file changed, 1 insertion(+), 211 deletions(-)

diff --git a/Transistor_Calculator_V2.kicad_sch b/Transistor_Calculator_V2.kicad_sch
index 43a3573..f7f4148 100644
--- a/Transistor_Calculator_V2.kicad_sch
+++ b/Transistor_Calculator_V2.kicad_sch
@@ -10,125 +10,6 @@
 		(rev "1.0")
 	)
 	(lib_symbols
-		(symbol "Connector:Conn_01x01_Pin"
-			(pin_names
-				(offset 1.016) hide)
-			(exclude_from_sim no)
-			(in_bom yes)
-			(on_board yes)
-			(property "Reference" "J"
-				(at 0 2.54 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "Value" "Conn_01x01_Pin"
-				(at 0 -2.54 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "Footprint" ""
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Datasheet" "~"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Description" "Generic connector, single row, 01x01, script generated"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_locked" ""
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "ki_keywords" "connector"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_fp_filters" "Connector*:*_1x??_*"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(symbol "Conn_01x01_Pin_1_1"
-				(polyline
-					(pts
-						(xy 1.27 0) (xy 0.8636 0)
-					)
-					(stroke
-						(width 0.1524)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(rectangle
-					(start 0.8636 0.127)
-					(end 0 -0.127)
-					(stroke
-						(width 0.1524)
-						(type default)
-					)
-					(fill
-						(type outline)
-					)
-				)
-				(pin passive line
-					(at 5.08 0 180)
-					(length 3.81)
-					(name "Pin_1"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "1"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-			)
-		)
 		(symbol "Connector:Conn_01x02_Pin"
 			(pin_names
 				(offset 1.016) hide)
@@ -1001,12 +882,6 @@
 		(color 0 0 0 0)
 		(uuid "878b4eda-5ec8-4151-889e-2bdcf2e95daa")
 	)
-	(junction
-		(at 113.03 31.75)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "87bd7e66-1d6e-47a6-90f3-760987378834")
-	)
 	(junction
 		(at 73.66 193.04)
 		(diameter 0)
@@ -1565,7 +1440,7 @@
 	)
 	(wire
 		(pts
-			(xy 107.95 31.75) (xy 113.03 31.75)
+			(xy 107.95 31.75) (xy 121.92 31.75)
 		)
 		(stroke
 			(width 0)
@@ -1883,16 +1758,6 @@
 		)
 		(uuid "747b8833-4ce1-4a4e-b0cf-095c684f9648")
 	)
-	(wire
-		(pts
-			(xy 113.03 31.75) (xy 121.92 31.75)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "776b3e7d-52ef-445f-80e6-2db3683957eb")
-	)
 	(wire
 		(pts
 			(xy 127 72.39) (xy 146.05 72.39)
@@ -2403,16 +2268,6 @@
 		)
 		(uuid "d423daf9-e609-4e90-930b-db9592e2bbf7")
 	)
-	(wire
-		(pts
-			(xy 113.03 24.13) (xy 113.03 31.75)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "d44828bb-b26b-49cb-a8bd-a934321e0350")
-	)
 	(wire
 		(pts
 			(xy 39.37 102.87) (xy 39.37 72.39)
@@ -3634,71 +3489,6 @@
 			)
 		)
 	)
-	(symbol
-		(lib_id "Connector:Conn_01x01_Pin")
-		(at 118.11 24.13 180)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "20002300-a552-4eb9-9e72-a979d1173616")
-		(property "Reference" "J1"
-			(at 117.475 19.05 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Value" "5V"
-			(at 117.475 21.59 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Footprint" "Connector_Pin:Pin_D1.0mm_L10.0mm_LooseFit"
-			(at 118.11 24.13 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 118.11 24.13 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Generic connector, single row, 01x01, script generated"
-			(at 118.11 24.13 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "281fcb55-bff7-4e41-bbc4-1512a7eb70e2")
-		)
-		(instances
-			(project "Transistor_Calculator_V2"
-				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "J1")
-					(unit 1)
-				)
-			)
-		)
-	)
 	(symbol
 		(lib_id "Device:R_US")
 		(at 180.34 156.21 90)

From 7c4d5c9b59856c4f851259b3d4aaf90ed9dab78a Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mark@hermeling.org>
Date: Tue, 14 May 2024 23:26:43 -0400
Subject: [PATCH 08/16] update transistors

---
 Transistor_Calculator_V2.kicad_sch | 1272 +++++++++++++++++++++-------
 1 file changed, 943 insertions(+), 329 deletions(-)

diff --git a/Transistor_Calculator_V2.kicad_sch b/Transistor_Calculator_V2.kicad_sch
index f7f4148..9432e0c 100644
--- a/Transistor_Calculator_V2.kicad_sch
+++ b/Transistor_Calculator_V2.kicad_sch
@@ -10,22 +10,24 @@
 		(rev "1.0")
 	)
 	(lib_symbols
-		(symbol "Connector:Conn_01x02_Pin"
+		(symbol "Device:R_US"
+			(pin_numbers hide)
 			(pin_names
-				(offset 1.016) hide)
+				(offset 0)
+			)
 			(exclude_from_sim no)
 			(in_bom yes)
 			(on_board yes)
-			(property "Reference" "J"
-				(at 0 2.54 0)
+			(property "Reference" "R"
+				(at 2.54 0 90)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
 				)
 			)
-			(property "Value" "Conn_01x02_Pin"
-				(at 0 -5.08 0)
+			(property "Value" "R_US"
+				(at -2.54 0 90)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -33,7 +35,7 @@
 				)
 			)
 			(property "Footprint" ""
-				(at 0 0 0)
+				(at 1.016 -0.254 90)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -50,7 +52,7 @@
 					(hide yes)
 				)
 			)
-			(property "Description" "Generic connector, single row, 01x02, script generated"
+			(property "Description" "Resistor, US symbol"
 				(at 0 0 0)
 				(effects
 					(font
@@ -59,15 +61,16 @@
 					(hide yes)
 				)
 			)
-			(property "ki_locked" ""
+			(property "ki_keywords" "R res resistor"
 				(at 0 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
+					(hide yes)
 				)
 			)
-			(property "ki_keywords" "connector"
+			(property "ki_fp_filters" "R_*"
 				(at 0 0 0)
 				(effects
 					(font
@@ -76,22 +79,25 @@
 					(hide yes)
 				)
 			)
-			(property "ki_fp_filters" "Connector*:*_1x??_*"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
+			(symbol "R_US_0_1"
+				(polyline
+					(pts
+						(xy 0 -2.286) (xy 0 -2.54)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
 					)
-					(hide yes)
 				)
-			)
-			(symbol "Conn_01x02_Pin_1_1"
 				(polyline
 					(pts
-						(xy 1.27 -2.54) (xy 0.8636 -2.54)
+						(xy 0 2.286) (xy 0 2.54)
 					)
 					(stroke
-						(width 0.1524)
+						(width 0)
 						(type default)
 					)
 					(fill
@@ -100,42 +106,46 @@
 				)
 				(polyline
 					(pts
-						(xy 1.27 0) (xy 0.8636 0)
+						(xy 0 -0.762) (xy 1.016 -1.143) (xy 0 -1.524) (xy -1.016 -1.905) (xy 0 -2.286)
 					)
 					(stroke
-						(width 0.1524)
+						(width 0)
 						(type default)
 					)
 					(fill
 						(type none)
 					)
 				)
-				(rectangle
-					(start 0.8636 -2.413)
-					(end 0 -2.667)
+				(polyline
+					(pts
+						(xy 0 0.762) (xy 1.016 0.381) (xy 0 0) (xy -1.016 -0.381) (xy 0 -0.762)
+					)
 					(stroke
-						(width 0.1524)
+						(width 0)
 						(type default)
 					)
 					(fill
-						(type outline)
+						(type none)
 					)
 				)
-				(rectangle
-					(start 0.8636 0.127)
-					(end 0 -0.127)
+				(polyline
+					(pts
+						(xy 0 2.286) (xy 1.016 1.905) (xy 0 1.524) (xy -1.016 1.143) (xy 0 0.762)
+					)
 					(stroke
-						(width 0.1524)
+						(width 0)
 						(type default)
 					)
 					(fill
-						(type outline)
+						(type none)
 					)
 				)
+			)
+			(symbol "R_US_1_1"
 				(pin passive line
-					(at 5.08 0 180)
-					(length 3.81)
-					(name "Pin_1"
+					(at 0 3.81 270)
+					(length 1.27)
+					(name "~"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -151,9 +161,9 @@
 					)
 				)
 				(pin passive line
-					(at 5.08 -2.54 180)
-					(length 3.81)
-					(name "Pin_2"
+					(at 0 -3.81 90)
+					(length 1.27)
+					(name "~"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -170,26 +180,30 @@
 				)
 			)
 		)
-		(symbol "Connector:Conn_01x03_Pin"
+		(symbol "Simulation_SPICE:VDC"
+			(pin_numbers hide)
 			(pin_names
-				(offset 1.016) hide)
+				(offset 0.0254)
+			)
 			(exclude_from_sim no)
 			(in_bom yes)
 			(on_board yes)
-			(property "Reference" "J"
-				(at 0 5.08 0)
+			(property "Reference" "V"
+				(at 2.54 2.54 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
+					(justify left)
 				)
 			)
-			(property "Value" "Conn_01x03_Pin"
-				(at 0 -5.08 0)
+			(property "Value" "1"
+				(at 2.54 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
+					(justify left)
 				)
 			)
 			(property "Footprint" ""
@@ -201,7 +215,16 @@
 					(hide yes)
 				)
 			)
-			(property "Datasheet" "~"
+			(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#sec_Independent_Sources_for"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Description" "Voltage source, DC"
 				(at 0 0 0)
 				(effects
 					(font
@@ -210,7 +233,7 @@
 					(hide yes)
 				)
 			)
-			(property "Description" "Generic connector, single row, 01x03, script generated"
+			(property "Sim.Pins" "1=+ 2=-"
 				(at 0 0 0)
 				(effects
 					(font
@@ -219,24 +242,26 @@
 					(hide yes)
 				)
 			)
-			(property "ki_locked" ""
+			(property "Sim.Type" "DC"
 				(at 0 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
+					(hide yes)
 				)
 			)
-			(property "ki_keywords" "connector"
+			(property "Sim.Device" "V"
 				(at 0 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
+					(justify left)
 					(hide yes)
 				)
 			)
-			(property "ki_fp_filters" "Connector*:*_1x??_*"
+			(property "ki_keywords" "simulation"
 				(at 0 0 0)
 				(effects
 					(font
@@ -245,13 +270,13 @@
 					(hide yes)
 				)
 			)
-			(symbol "Conn_01x03_Pin_1_1"
+			(symbol "VDC_0_0"
 				(polyline
 					(pts
-						(xy 1.27 -2.54) (xy 0.8636 -2.54)
+						(xy -1.27 0.254) (xy 1.27 0.254)
 					)
 					(stroke
-						(width 0.1524)
+						(width 0)
 						(type default)
 					)
 					(fill
@@ -260,10 +285,10 @@
 				)
 				(polyline
 					(pts
-						(xy 1.27 0) (xy 0.8636 0)
+						(xy -0.762 -0.254) (xy -1.27 -0.254)
 					)
 					(stroke
-						(width 0.1524)
+						(width 0)
 						(type default)
 					)
 					(fill
@@ -272,53 +297,55 @@
 				)
 				(polyline
 					(pts
-						(xy 1.27 2.54) (xy 0.8636 2.54)
+						(xy 0.254 -0.254) (xy -0.254 -0.254)
 					)
 					(stroke
-						(width 0.1524)
+						(width 0)
 						(type default)
 					)
 					(fill
 						(type none)
 					)
 				)
-				(rectangle
-					(start 0.8636 -2.413)
-					(end 0 -2.667)
+				(polyline
+					(pts
+						(xy 1.27 -0.254) (xy 0.762 -0.254)
+					)
 					(stroke
-						(width 0.1524)
+						(width 0)
 						(type default)
 					)
 					(fill
-						(type outline)
+						(type none)
 					)
 				)
-				(rectangle
-					(start 0.8636 0.127)
-					(end 0 -0.127)
-					(stroke
-						(width 0.1524)
-						(type default)
-					)
-					(fill
-						(type outline)
+				(text "+"
+					(at 0 1.905 0)
+					(effects
+						(font
+							(size 1.27 1.27)
+						)
 					)
 				)
-				(rectangle
-					(start 0.8636 2.667)
-					(end 0 2.413)
+			)
+			(symbol "VDC_0_1"
+				(circle
+					(center 0 0)
+					(radius 2.54)
 					(stroke
-						(width 0.1524)
+						(width 0.254)
 						(type default)
 					)
 					(fill
-						(type outline)
+						(type background)
 					)
 				)
+			)
+			(symbol "VDC_1_1"
 				(pin passive line
-					(at 5.08 2.54 180)
-					(length 3.81)
-					(name "Pin_1"
+					(at 0 5.08 270)
+					(length 2.54)
+					(name "~"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -334,9 +361,9 @@
 					)
 				)
 				(pin passive line
-					(at 5.08 0 180)
-					(length 3.81)
-					(name "Pin_2"
+					(at 0 -5.08 90)
+					(length 2.54)
+					(name "~"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -351,69 +378,54 @@
 						)
 					)
 				)
-				(pin passive line
-					(at 5.08 -2.54 180)
-					(length 3.81)
-					(name "Pin_3"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "3"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
 			)
 		)
-		(symbol "Device:R_US"
-			(pin_numbers hide)
+		(symbol "Transistor_BJT:2N3904"
 			(pin_names
-				(offset 0)
-			)
+				(offset 0) hide)
 			(exclude_from_sim no)
 			(in_bom yes)
 			(on_board yes)
-			(property "Reference" "R"
-				(at 2.54 0 90)
+			(property "Reference" "Q"
+				(at 5.08 1.905 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
+					(justify left)
 				)
 			)
-			(property "Value" "R_US"
-				(at -2.54 0 90)
+			(property "Value" "2N3904"
+				(at 5.08 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
+					(justify left)
 				)
 			)
-			(property "Footprint" ""
-				(at 1.016 -0.254 90)
+			(property "Footprint" "Package_TO_SOT_THT:TO-92_Inline"
+				(at 5.08 -1.905 0)
 				(effects
 					(font
 						(size 1.27 1.27)
+						(italic yes)
 					)
+					(justify left)
 					(hide yes)
 				)
 			)
-			(property "Datasheet" "~"
+			(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
 				(at 0 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
+					(justify left)
 					(hide yes)
 				)
 			)
-			(property "Description" "Resistor, US symbol"
+			(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
 				(at 0 0 0)
 				(effects
 					(font
@@ -422,7 +434,7 @@
 					(hide yes)
 				)
 			)
-			(property "ki_keywords" "R res resistor"
+			(property "ki_keywords" "NPN Transistor"
 				(at 0 0 0)
 				(effects
 					(font
@@ -431,7 +443,7 @@
 					(hide yes)
 				)
 			)
-			(property "ki_fp_filters" "R_*"
+			(property "ki_fp_filters" "TO?92*"
 				(at 0 0 0)
 				(effects
 					(font
@@ -440,10 +452,10 @@
 					(hide yes)
 				)
 			)
-			(symbol "R_US_0_1"
+			(symbol "2N3904_0_1"
 				(polyline
 					(pts
-						(xy 0 -2.286) (xy 0 -2.54)
+						(xy 0.635 0.635) (xy 2.54 2.54)
 					)
 					(stroke
 						(width 0)
@@ -455,7 +467,7 @@
 				)
 				(polyline
 					(pts
-						(xy 0 2.286) (xy 0 2.54)
+						(xy 0.635 -0.635) (xy 2.54 -2.54) (xy 2.54 -2.54)
 					)
 					(stroke
 						(width 0)
@@ -467,10 +479,10 @@
 				)
 				(polyline
 					(pts
-						(xy 0 -0.762) (xy 1.016 -1.143) (xy 0 -1.524) (xy -1.016 -1.905) (xy 0 -2.286)
+						(xy 0.635 1.905) (xy 0.635 -1.905) (xy 0.635 -1.905)
 					)
 					(stroke
-						(width 0)
+						(width 0.508)
 						(type default)
 					)
 					(fill
@@ -479,22 +491,21 @@
 				)
 				(polyline
 					(pts
-						(xy 0 0.762) (xy 1.016 0.381) (xy 0 0) (xy -1.016 -0.381) (xy 0 -0.762)
+						(xy 1.27 -1.778) (xy 1.778 -1.27) (xy 2.286 -2.286) (xy 1.27 -1.778) (xy 1.27 -1.778)
 					)
 					(stroke
 						(width 0)
 						(type default)
 					)
 					(fill
-						(type none)
+						(type outline)
 					)
 				)
-				(polyline
-					(pts
-						(xy 0 2.286) (xy 1.016 1.905) (xy 0 1.524) (xy -1.016 1.143) (xy 0 0.762)
-					)
+				(circle
+					(center 1.27 0)
+					(radius 2.8194)
 					(stroke
-						(width 0)
+						(width 0.254)
 						(type default)
 					)
 					(fill
@@ -502,11 +513,11 @@
 					)
 				)
 			)
-			(symbol "R_US_1_1"
+			(symbol "2N3904_1_1"
 				(pin passive line
-					(at 0 3.81 270)
-					(length 1.27)
-					(name "~"
+					(at 2.54 -5.08 90)
+					(length 2.54)
+					(name "E"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -522,9 +533,9 @@
 					)
 				)
 				(pin passive line
-					(at 0 -3.81 90)
-					(length 1.27)
-					(name "~"
+					(at -5.08 0 0)
+					(length 5.715)
+					(name "B"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -539,54 +550,61 @@
 						)
 					)
 				)
+				(pin passive line
+					(at 2.54 5.08 270)
+					(length 2.54)
+					(name "C"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "3"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
 			)
 		)
-		(symbol "Transistor_BJT:2N3904"
+		(symbol "power:GND"
+			(power)
+			(pin_numbers hide)
 			(pin_names
 				(offset 0) hide)
 			(exclude_from_sim no)
 			(in_bom yes)
 			(on_board yes)
-			(property "Reference" "Q"
-				(at 5.08 1.905 0)
+			(property "Reference" "#PWR"
+				(at 0 -6.35 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
-					(justify left)
-				)
-			)
-			(property "Value" "2N3904"
-				(at 5.08 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(justify left)
+					(hide yes)
 				)
 			)
-			(property "Footprint" "Package_TO_SOT_THT:TO-92_Inline"
-				(at 5.08 -1.905 0)
+			(property "Value" "GND"
+				(at 0 -3.81 0)
 				(effects
 					(font
 						(size 1.27 1.27)
-						(italic yes)
 					)
-					(justify left)
-					(hide yes)
 				)
 			)
-			(property "Datasheet" "https://www.onsemi.com/pub/Collateral/2N3903-D.PDF"
+			(property "Footprint" ""
 				(at 0 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
-					(justify left)
 					(hide yes)
 				)
 			)
-			(property "Description" "0.2A Ic, 40V Vce, Small Signal NPN Transistor, TO-92"
+			(property "Datasheet" ""
 				(at 0 0 0)
 				(effects
 					(font
@@ -595,7 +613,7 @@
 					(hide yes)
 				)
 			)
-			(property "ki_keywords" "NPN Transistor"
+			(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
 				(at 0 0 0)
 				(effects
 					(font
@@ -604,7 +622,7 @@
 					(hide yes)
 				)
 			)
-			(property "ki_fp_filters" "TO?92*"
+			(property "ki_keywords" "global power"
 				(at 0 0 0)
 				(effects
 					(font
@@ -613,72 +631,25 @@
 					(hide yes)
 				)
 			)
-			(symbol "2N3904_0_1"
-				(polyline
-					(pts
-						(xy 0.635 0.635) (xy 2.54 2.54)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0.635 -0.635) (xy 2.54 -2.54) (xy 2.54 -2.54)
-					)
-					(stroke
-						(width 0)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-				(polyline
-					(pts
-						(xy 0.635 1.905) (xy 0.635 -1.905) (xy 0.635 -1.905)
-					)
-					(stroke
-						(width 0.508)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
+			(symbol "GND_0_1"
 				(polyline
 					(pts
-						(xy 1.27 -1.778) (xy 1.778 -1.27) (xy 2.286 -2.286) (xy 1.27 -1.778) (xy 1.27 -1.778)
+						(xy 0 0) (xy 0 -1.27) (xy 1.27 -1.27) (xy 0 -2.54) (xy -1.27 -1.27) (xy 0 -1.27)
 					)
 					(stroke
 						(width 0)
 						(type default)
 					)
-					(fill
-						(type outline)
-					)
-				)
-				(circle
-					(center 1.27 0)
-					(radius 2.8194)
-					(stroke
-						(width 0.254)
-						(type default)
-					)
 					(fill
 						(type none)
 					)
 				)
 			)
-			(symbol "2N3904_1_1"
-				(pin passive line
-					(at 2.54 -5.08 90)
-					(length 2.54)
-					(name "E"
+			(symbol "GND_1_1"
+				(pin power_in line
+					(at 0 0 270)
+					(length 0)
+					(name "~"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -693,42 +664,6 @@
 						)
 					)
 				)
-				(pin passive line
-					(at -5.08 0 0)
-					(length 5.715)
-					(name "B"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "2"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin passive line
-					(at 2.54 5.08 270)
-					(length 2.54)
-					(name "C"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "3"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
 			)
 		)
 	)
@@ -1538,6 +1473,16 @@
 		)
 		(uuid "45afd985-12a3-48e5-b24a-2d10ede7e150")
 	)
+	(wire
+		(pts
+			(xy -57.15 93.98) (xy -57.15 95.25)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "48f61ab5-8ac5-4246-b345-959c1b7b3658")
+	)
 	(wire
 		(pts
 			(xy 58.42 182.88) (xy 58.42 193.04)
@@ -2648,25 +2593,179 @@
 				(size 1.27 1.27)
 			)
 		)
-		(uuid "a089338a-0b63-4e48-afe1-504e8ab1d1a0")
-	)
-	(text_box "XOR\n"
-		(exclude_from_sim no)
-		(at 215.9 88.9 0)
-		(size 8.89 3.81)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(fill
-			(type none)
+		(uuid "a089338a-0b63-4e48-afe1-504e8ab1d1a0")
+	)
+	(text_box "XOR\n"
+		(exclude_from_sim no)
+		(at 215.9 88.9 0)
+		(size 8.89 3.81)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(fill
+			(type none)
+		)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+		)
+		(uuid "cc6d8b9f-d54b-4af2-83b1-6eeda0337a2d")
+	)
+	(label "Vin2"
+		(at -57.15 95.25 0)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "4688de66-959a-4588-9371-b6a3e982051a")
+	)
+	(label "Vcc"
+		(at -41.91 115.57 0)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "881a7173-6df2-4dd8-9fb9-3c107ff8693d")
+	)
+	(label "Vinc"
+		(at -41.91 95.25 0)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "9b99f968-189f-42e3-814c-93b6c283a4f2")
+	)
+	(label "Vin1"
+		(at -73.66 95.25 0)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "c0457db0-d82d-4123-8394-1472c09bf906")
+	)
+	(global_label "Vo2"
+		(shape input)
+		(at 270.51 115.57 0)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "21ac651b-b979-4731-bb3e-8c50130b0c5c")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 276.9423 115.57 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "Vo1"
+		(shape input)
+		(at 270.51 113.03 0)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "d21564c4-cd29-4cc3-a9e7-415fd2699224")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 276.9423 113.03 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "Vin2"
+		(shape input)
+		(at 22.86 105.41 0)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "d3cba83d-518c-4c87-9041-3d916515e716")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 29.8971 105.41 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+				(hide yes)
+			)
+		)
+	)
+	(global_label "Vin1"
+		(shape input)
+		(at 22.86 102.87 0)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "ececbfb8-8b73-41c5-85de-317bbad47d4b")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 29.8971 102.87 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+				(hide yes)
+			)
 		)
+	)
+	(global_label "Vinc"
+		(shape input)
+		(at 22.86 107.95 0)
+		(fields_autoplaced yes)
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
+			(justify left)
+		)
+		(uuid "f218a841-441f-4454-9ab6-a19ed18c5492")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 29.7762 107.95 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+				(hide yes)
+			)
 		)
-		(uuid "cc6d8b9f-d54b-4af2-83b1-6eeda0337a2d")
 	)
 	(symbol
 		(lib_id "Transistor_BJT:2N3904")
@@ -2857,34 +2956,35 @@
 		)
 	)
 	(symbol
-		(lib_id "Connector:Conn_01x02_Pin")
-		(at 275.59 115.57 180)
+		(lib_id "Simulation_SPICE:VDC")
+		(at -57.15 99.06 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "050b1104-1b19-4aaf-8206-57f35c1d3bc3")
-		(property "Reference" "Output_Pins1"
-			(at 270.51 110.49 0)
+		(fields_autoplaced yes)
+		(uuid "11574214-7a95-4d3e-a7d2-81432f43379f")
+		(property "Reference" "Vin2"
+			(at -52.07 97.6601 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify right)
+				(justify left)
 			)
 		)
-		(property "Value" "~"
-			(at 276.86 115.57 0)
+		(property "Value" "5"
+			(at -52.07 100.2001 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify right)
+				(justify left)
 			)
 		)
-		(property "Footprint" "Connector_Wire:SolderWire-0.5sqmm_1x02_P4.6mm_D0.9mm_OD2.1mm"
-			(at 275.59 115.57 0)
+		(property "Footprint" ""
+			(at -57.15 99.06 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2892,8 +2992,35 @@
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "~"
-			(at 275.59 115.57 0)
+		(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#sec_Independent_Sources_for"
+			(at -57.15 99.06 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Voltage source, DC"
+			(at -57.15 99.06 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=+ 2=-"
+			(at -57.15 99.06 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "DC"
+			(at -57.15 99.06 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2901,25 +3028,26 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Generic connector, single row, 01x02, script generated"
-			(at 275.59 115.57 0)
+		(property "Sim.Device" "V"
+			(at -57.15 99.06 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
 		(pin "1"
-			(uuid "06f5c843-833f-4ef5-b453-9885f186a4e7")
+			(uuid "d2830c55-5ed7-40f8-8ab9-fb919b8cc02a")
 		)
 		(pin "2"
-			(uuid "5604197c-3861-49ff-9444-6b170b9f3785")
+			(uuid "f810592a-3ba2-40cb-bf97-b7d1c643fcd7")
 		)
 		(instances
 			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Output_Pins1")
+					(reference "Vin2")
 					(unit 1)
 				)
 			)
@@ -3677,6 +3805,104 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Simulation_SPICE:VDC")
+		(at -41.91 120.65 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "31750d16-7829-49bd-8a9c-9ef5f980cd0f")
+		(property "Reference" "Vcc1"
+			(at -36.83 119.2501 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "5"
+			(at -36.83 121.7901 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" ""
+			(at -41.91 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#sec_Independent_Sources_for"
+			(at -41.91 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Voltage source, DC"
+			(at -41.91 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=+ 2=-"
+			(at -41.91 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "DC"
+			(at -41.91 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "V"
+			(at -41.91 120.65 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+				(hide yes)
+			)
+		)
+		(pin "2"
+			(uuid "327e9b41-c27a-4bce-b6ab-cab73ac41c1e")
+		)
+		(pin "1"
+			(uuid "1095182f-e0a5-46f4-a11a-ed75bfeddaaa")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "Vcc1")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Device:R_US")
 		(at 165.1 64.77 90)
@@ -4067,32 +4293,168 @@
 		)
 	)
 	(symbol
-		(lib_id "Device:R_US")
-		(at 68.58 50.8 90)
+		(lib_id "Device:R_US")
+		(at 68.58 50.8 90)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "4b2b4dd4-c32e-4c68-ace7-9d0ce2553c71")
+		(property "Reference" "R6"
+			(at 68.58 46.99 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "220K"
+			(at 68.58 48.768 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
+			(at 68.834 49.784 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 68.58 50.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Resistor, US symbol"
+			(at 68.58 50.8 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "ba16a147-2564-4086-8e0c-819f4494cb9f")
+		)
+		(pin "2"
+			(uuid "3ccc2ddb-4585-45b8-8b29-ab3120f2623a")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "R6")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "power:GND")
+		(at -41.91 105.41 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "51b7bf96-9890-430d-aac9-cedf848c81ef")
+		(property "Reference" "#PWR03"
+			(at -41.91 111.76 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at -41.91 110.49 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at -41.91 105.41 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at -41.91 105.41 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at -41.91 105.41 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "6fe00fd7-5b51-4e47-b9d9-952c6f50aba0")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "#PWR03")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Simulation_SPICE:VDC")
+		(at -73.66 100.33 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "4b2b4dd4-c32e-4c68-ace7-9d0ce2553c71")
-		(property "Reference" "R6"
-			(at 68.58 46.99 90)
+		(fields_autoplaced yes)
+		(uuid "5d0f0fa3-7083-497a-a873-24ebd1b28dc0")
+		(property "Reference" "Vin1"
+			(at -68.58 98.9301 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 			)
 		)
-		(property "Value" "220K"
-			(at 68.58 48.768 90)
+		(property "Value" "0"
+			(at -68.58 101.4701 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 			)
 		)
-		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 68.834 49.784 90)
+		(property "Footprint" ""
+			(at -73.66 100.33 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4100,8 +4462,8 @@
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "~"
-			(at 68.58 50.8 0)
+		(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#sec_Independent_Sources_for"
+			(at -73.66 100.33 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4109,25 +4471,53 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Resistor, US symbol"
-			(at 68.58 50.8 0)
+		(property "Description" "Voltage source, DC"
+			(at -73.66 100.33 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=+ 2=-"
+			(at -73.66 100.33 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "DC"
+			(at -73.66 100.33 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "V"
+			(at -73.66 100.33 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 				(hide yes)
 			)
 		)
 		(pin "1"
-			(uuid "ba16a147-2564-4086-8e0c-819f4494cb9f")
+			(uuid "a85b1053-99c1-4fd2-aabe-951090aeb286")
 		)
 		(pin "2"
-			(uuid "3ccc2ddb-4585-45b8-8b29-ab3120f2623a")
+			(uuid "b18238c1-42a3-4d04-8edc-64289bf22012")
 		)
 		(instances
 			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R6")
+					(reference "Vin1")
 					(unit 1)
 				)
 			)
@@ -4589,6 +4979,104 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Simulation_SPICE:VDC")
+		(at -41.91 100.33 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "79ab0521-c29b-442c-93a6-fc034f489f0e")
+		(property "Reference" "Vinc1"
+			(at -36.83 98.9301 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "0"
+			(at -36.83 101.4701 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" ""
+			(at -41.91 100.33 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "https://ngspice.sourceforge.io/docs/ngspice-html-manual/manual.xhtml#sec_Independent_Sources_for"
+			(at -41.91 100.33 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Voltage source, DC"
+			(at -41.91 100.33 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=+ 2=-"
+			(at -41.91 100.33 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Type" "DC"
+			(at -41.91 100.33 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "V"
+			(at -41.91 100.33 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "f1a4d227-3809-45e0-ba2f-9192160610d1")
+		)
+		(pin "2"
+			(uuid "267fe6e6-326d-4940-89a5-ae947231c6b4")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "Vinc1")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Device:R_US")
 		(at 157.48 64.77 90)
@@ -5221,32 +5709,33 @@
 		)
 	)
 	(symbol
-		(lib_id "Device:R_US")
-		(at 50.8 64.77 90)
+		(lib_id "power:GND")
+		(at -73.66 105.41 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "9205e93d-162b-4910-8a2d-4cc38851dfc7")
-		(property "Reference" "R3"
-			(at 50.8 60.96 90)
+		(uuid "8e502578-5f16-4cbb-82e1-5f974e94e386")
+		(property "Reference" "#PWR01"
+			(at -73.66 111.76 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(hide yes)
 			)
 		)
-		(property "Value" "220K"
-			(at 50.8 62.738 90)
+		(property "Value" "GND"
+			(at -73.914 109.982 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
-			(at 51.054 63.754 90)
+		(property "Footprint" ""
+			(at -73.66 105.41 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5254,8 +5743,8 @@
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "~"
-			(at 50.8 64.77 0)
+		(property "Datasheet" ""
+			(at -73.66 105.41 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5263,8 +5752,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Resistor, US symbol"
-			(at 50.8 64.77 0)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at -73.66 105.41 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5273,48 +5762,46 @@
 			)
 		)
 		(pin "1"
-			(uuid "5ca58340-b8a4-4b5f-ad29-8d9851b199c5")
-		)
-		(pin "2"
-			(uuid "62f576be-ed8e-4607-acfc-7cfc4d914dc4")
+			(uuid "0cb8a6fc-5ee3-4c75-a92e-31d180bec688")
 		)
 		(instances
 			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "R3")
+					(reference "#PWR01")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Connector:Conn_01x03_Pin")
-		(at 17.78 105.41 0)
+		(lib_id "power:GND")
+		(at -57.15 104.14 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
 		(fields_autoplaced yes)
-		(uuid "99b0d4a4-86d5-43e7-8ff2-a5e859c55766")
-		(property "Reference" "Input_Pins1"
-			(at 18.415 99.06 0)
+		(uuid "91999adb-4bef-430d-85c4-94866377486c")
+		(property "Reference" "#PWR02"
+			(at -57.15 110.49 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(hide yes)
 			)
 		)
-		(property "Value" "~"
-			(at 18.415 101.6 0)
+		(property "Value" "GND"
+			(at -57.15 109.22 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
 			)
 		)
-		(property "Footprint" "Connector_Wire:SolderWire-0.5sqmm_1x03_P4.6mm_D0.9mm_OD2.1mm"
-			(at 17.78 105.41 0)
+		(property "Footprint" ""
+			(at -57.15 104.14 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5322,8 +5809,8 @@
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "~"
-			(at 17.78 105.41 0)
+		(property "Datasheet" ""
+			(at -57.15 104.14 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5331,8 +5818,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Generic connector, single row, 01x03, script generated"
-			(at 17.78 105.41 0)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at -57.15 104.14 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5340,19 +5827,80 @@
 				(hide yes)
 			)
 		)
-		(pin "2"
-			(uuid "8fe8a347-f15e-47ee-b28d-a1ec540bd813")
+		(pin "1"
+			(uuid "2aafbd23-5312-4ed7-895d-7ab577577439")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "#PWR02")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Device:R_US")
+		(at 50.8 64.77 90)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(uuid "9205e93d-162b-4910-8a2d-4cc38851dfc7")
+		(property "Reference" "R3"
+			(at 50.8 60.96 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "220K"
+			(at 50.8 62.738 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P2.54mm_Vertical"
+			(at 51.054 63.754 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 50.8 64.77 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Resistor, US symbol"
+			(at 50.8 64.77 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
 		)
 		(pin "1"
-			(uuid "85dfe1b3-2879-4a13-961e-b4f641ec0f4f")
+			(uuid "5ca58340-b8a4-4b5f-ad29-8d9851b199c5")
 		)
-		(pin "3"
-			(uuid "9696a8a5-ad04-428c-a81a-97de50fc1ead")
+		(pin "2"
+			(uuid "62f576be-ed8e-4607-acfc-7cfc4d914dc4")
 		)
 		(instances
 			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Input_Pins1")
+					(reference "R3")
 					(unit 1)
 				)
 			)
@@ -5909,6 +6457,72 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "power:GND")
+		(at -41.91 125.73 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "bc9f0761-085c-4708-959d-1c51a33f5cb5")
+		(property "Reference" "#PWR04"
+			(at -41.91 132.08 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at -41.91 130.81 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at -41.91 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at -41.91 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at -41.91 125.73 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "9eb83a65-9276-4c4a-9a6e-17bbc1a32a2c")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "#PWR04")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Device:R_US")
 		(at 46.99 167.64 90)

From cedaa8de4d98ef22d817b97620808f0b6ce8a937 Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mark@hermeling.org>
Date: Tue, 14 May 2024 23:33:29 -0400
Subject: [PATCH 09/16] update transistors

---
 Transistor_Calculator_V2.kicad_sch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Transistor_Calculator_V2.kicad_sch b/Transistor_Calculator_V2.kicad_sch
index 9432e0c..18a02b4 100644
--- a/Transistor_Calculator_V2.kicad_sch
+++ b/Transistor_Calculator_V2.kicad_sch
@@ -5493,7 +5493,7 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=E 2=B 3=C"
+		(property "Sim.Pins" "1=C 2=B 3=E"
 			(at 69.85 80.01 0)
 			(effects
 				(font

From b697ce1b0e76208cacd3d3a2934ad9ee895158a7 Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mark@hermeling.org>
Date: Tue, 14 May 2024 23:53:09 -0400
Subject: [PATCH 10/16] update transistors

---
 Transistor_Calculator_V2.kicad_sch | 168 ++++++++++++++++++++++++++++-
 1 file changed, 164 insertions(+), 4 deletions(-)

diff --git a/Transistor_Calculator_V2.kicad_sch b/Transistor_Calculator_V2.kicad_sch
index 18a02b4..894f5c6 100644
--- a/Transistor_Calculator_V2.kicad_sch
+++ b/Transistor_Calculator_V2.kicad_sch
@@ -877,6 +877,12 @@
 		(color 0 0 0 0)
 		(uuid "c552e045-a0ac-4808-aa56-e9bff340fd1c")
 	)
+	(junction
+		(at 127 31.75)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "c6d5e955-6c4f-4cda-99e4-cd6ad6b5c1ed")
+	)
 	(junction
 		(at 236.22 133.35)
 		(diameter 0)
@@ -889,6 +895,12 @@
 		(color 0 0 0 0)
 		(uuid "ce78eb41-a17b-4cff-83c8-0f70670bb8a6")
 	)
+	(junction
+		(at 132.08 191.77)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "d50fb431-71fd-4669-9d11-d43fe092c9e8")
+	)
 	(junction
 		(at 72.39 85.09)
 		(diameter 0)
@@ -1243,6 +1255,16 @@
 		)
 		(uuid "29013841-d66e-4705-b45b-32f9b744f3e5")
 	)
+	(wire
+		(pts
+			(xy 127 20.32) (xy 127 31.75)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "29d1c763-ccf7-4e6a-88c4-af7cf379d7c0")
+	)
 	(wire
 		(pts
 			(xy 58.42 157.48) (xy 58.42 162.56)
@@ -1533,6 +1555,16 @@
 		)
 		(uuid "522738ca-d3e6-44c9-b2e4-c42a8e3a211d")
 	)
+	(wire
+		(pts
+			(xy 132.08 191.77) (xy 121.92 191.77)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "52ebac90-b1c7-46b9-9a9a-d713c2738806")
+	)
 	(wire
 		(pts
 			(xy 43.18 167.64) (xy 31.75 167.64)
@@ -1625,7 +1657,7 @@
 	)
 	(wire
 		(pts
-			(xy 175.26 191.77) (xy 121.92 191.77)
+			(xy 175.26 191.77) (xy 132.08 191.77)
 		)
 		(stroke
 			(width 0)
@@ -1725,7 +1757,7 @@
 	)
 	(wire
 		(pts
-			(xy 121.92 31.75) (xy 186.69 31.75)
+			(xy 121.92 31.75) (xy 127 31.75)
 		)
 		(stroke
 			(width 0)
@@ -1773,6 +1805,26 @@
 		)
 		(uuid "83c5185b-7177-4c24-96e5-74a9f9c488d1")
 	)
+	(wire
+		(pts
+			(xy 132.08 191.77) (xy 132.08 195.58)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "84780c08-2ffd-4272-becd-225e859641af")
+	)
+	(wire
+		(pts
+			(xy 135.89 20.32) (xy 127 20.32)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "84861ab1-cda1-4494-9210-42c243b9538a")
+	)
 	(wire
 		(pts
 			(xy 121.92 182.88) (xy 121.92 191.77)
@@ -2173,6 +2225,16 @@
 		)
 		(uuid "ce427c3a-0eb0-40cb-b5a5-82f5158f4e44")
 	)
+	(wire
+		(pts
+			(xy 127 31.75) (xy 186.69 31.75)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "ced4d260-578a-40e3-a8b5-9a0abe1f766f")
+	)
 	(wire
 		(pts
 			(xy 161.29 85.09) (xy 179.07 85.09)
@@ -2363,6 +2425,16 @@
 		)
 		(uuid "f0f7eb54-e91b-4ac5-9eab-f8bb3b8686b7")
 	)
+	(wire
+		(pts
+			(xy 143.51 195.58) (xy 132.08 195.58)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "f44d616e-d05c-43b4-9a96-5faf70bc04a3")
+	)
 	(wire
 		(pts
 			(xy 91.44 39.37) (xy 100.33 39.37)
@@ -2767,6 +2839,28 @@
 			)
 		)
 	)
+	(global_label "Vcc"
+		(shape input)
+		(at 135.89 20.32 0)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "fff12dbb-1c67-4586-93b3-985f65121eba")
+		(property "Intersheetrefs" "${INTERSHEET_REFS}"
+			(at 142.141 20.32 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+				(hide yes)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Transistor_BJT:2N3904")
 		(at 213.36 138.43 0)
@@ -3335,7 +3429,7 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=C 2=B 3=E"
+		(property "Sim.Pins" "1=E 2=B 3=C"
 			(at 69.85 41.91 0)
 			(effects
 				(font
@@ -3684,6 +3778,72 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "power:GND")
+		(at 143.51 195.58 90)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "22d9abf0-1152-4d88-ad2f-4a78ed2520b8")
+		(property "Reference" "#PWR05"
+			(at 149.86 195.58 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 148.59 195.58 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 143.51 195.58 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 143.51 195.58 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 143.51 195.58 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "8ac4cf16-78c4-4764-b048-c070482174bc")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "#PWR05")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Transistor_BJT:2N3904")
 		(at 55.88 167.64 0)
@@ -5493,7 +5653,7 @@
 				(hide yes)
 			)
 		)
-		(property "Sim.Pins" "1=C 2=B 3=E"
+		(property "Sim.Pins" "1=E 2=B 3=C"
 			(at 69.85 80.01 0)
 			(effects
 				(font

From b2f2ba43feb592845424ea48f7b2101476454861 Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mark@hermeling.org>
Date: Wed, 15 May 2024 08:09:16 -0400
Subject: [PATCH 11/16] add carry test

---
 runTest.cmd | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/runTest.cmd b/runTest.cmd
index cf09717..318d9e1 100644
--- a/runTest.cmd
+++ b/runTest.cmd
@@ -1,20 +1,43 @@
 .control
 alter vin1 0
 alter vin2 0
+alter vinc 0
 op
 print vin1 vin2 vo1 vo2 
 alter vin1 0
 alter vin2 1
+alter vinc 0
 op
 print vin1 vin2 vo1 vo2 
 alter vin1 1
 alter vin2 0
+alter vinc 0
 op
 print vin1 vin2 vo1 vo2 
 alter vin1 1
 alter vin2 1
+alter vinc 0
+op
+alter vin1 0
+alter vin2 0
+alter vinc 1
+op
+print vin1 vin2 vo1 vo2
+alter vin1 0
+alter vin2 1
+alter vinc 1
+op
+print vin1 vin2 vo1 vo2
+alter vin1 1
+alter vin2 0
+alter vinc 1
+op
+print vin1 vin2 vo1 vo2
+alter vin1 1
+alter vin2 1
+alter vinc 1
 op
 print vin1 vin2 vo1 vo2 
 quit
 .endc
-.end
\ No newline at end of file
+.end

From a80791add4713a1714e4c873d85301705bf11ec7 Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mark@hermeling.org>
Date: Wed, 15 May 2024 08:10:24 -0400
Subject: [PATCH 12/16] add carry test

---
 parseResults.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/parseResults.py b/parseResults.py
index 34a3da5..401b19a 100644
--- a/parseResults.py
+++ b/parseResults.py
@@ -8,8 +8,10 @@
         l = f.readline()
         vin2 = round(float(l.split("=")[1]))
         l = f.readline()
+        vinc = round(float(l.split("=")[1]))
+        l = f.readline()
         vo1 = round(float(l.split("=")[1])/5) 
         l = f.readline()
         vo2 = round(float(l.split("=")[1])/5)
         l = f.readline()
-        print (" Test: ", vin1, vin2, vo1, vo2)
\ No newline at end of file
+        print (" Test: ", vin1, vin2, vinc, vo1, vo2)

From 16fe9da74395c0387015fcb327da293c4651c76e Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mark@hermeling.org>
Date: Wed, 15 May 2024 08:13:53 -0400
Subject: [PATCH 13/16] renamed vinc

---
 Transistor_Calculator_V2.kicad_sch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Transistor_Calculator_V2.kicad_sch b/Transistor_Calculator_V2.kicad_sch
index 894f5c6..b3cde89 100644
--- a/Transistor_Calculator_V2.kicad_sch
+++ b/Transistor_Calculator_V2.kicad_sch
@@ -4604,7 +4604,7 @@
 				(justify left)
 			)
 		)
-		(property "Value" "0"
+		(property "Value" "5"
 			(at -68.58 101.4701 0)
 			(effects
 				(font
@@ -5149,7 +5149,7 @@
 		(dnp no)
 		(fields_autoplaced yes)
 		(uuid "79ab0521-c29b-442c-93a6-fc034f489f0e")
-		(property "Reference" "Vinc1"
+		(property "Reference" "Vinc"
 			(at -36.83 98.9301 0)
 			(effects
 				(font
@@ -5231,7 +5231,7 @@
 		(instances
 			(project "Transistor_Calculator_V2"
 				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
-					(reference "Vinc1")
+					(reference "Vinc")
 					(unit 1)
 				)
 			)

From ea14cdc71eb3ecb6cce4c78faea3e46ebf70c409 Mon Sep 17 00:00:00 2001
From: Mark Hermeling <mark@hermeling.org>
Date: Wed, 15 May 2024 12:19:19 +0000
Subject: [PATCH 14/16] Include vinc into the truth table

---
 .gitignore  |  3 ++-
 runTest.cmd | 15 ++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index f39a446..41c1499 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-*.cir
\ No newline at end of file
+*.cir
+results.output
\ No newline at end of file
diff --git a/runTest.cmd b/runTest.cmd
index 318d9e1..a943451 100644
--- a/runTest.cmd
+++ b/runTest.cmd
@@ -3,41 +3,42 @@ alter vin1 0
 alter vin2 0
 alter vinc 0
 op
-print vin1 vin2 vo1 vo2 
+print vin1 vin2 vinc vo1 vo2 
 alter vin1 0
 alter vin2 1
 alter vinc 0
 op
-print vin1 vin2 vo1 vo2 
+print vin1 vin2 vinc vo1 vo2 
 alter vin1 1
 alter vin2 0
 alter vinc 0
 op
-print vin1 vin2 vo1 vo2 
+print vin1 vin2 vinc vo1 vo2 
 alter vin1 1
 alter vin2 1
 alter vinc 0
 op
+print vin1 vin2 vinc vo1 vo2 
 alter vin1 0
 alter vin2 0
 alter vinc 1
 op
-print vin1 vin2 vo1 vo2
+print vin1 vin2 vinc vo1 vo2 
 alter vin1 0
 alter vin2 1
 alter vinc 1
 op
-print vin1 vin2 vo1 vo2
+print vin1 vin2 vinc vo1 vo2 
 alter vin1 1
 alter vin2 0
 alter vinc 1
 op
-print vin1 vin2 vo1 vo2
+print vin1 vin2 vinc vo1 vo2 
 alter vin1 1
 alter vin2 1
 alter vinc 1
 op
-print vin1 vin2 vo1 vo2 
+print vin1 vin2 vinc vo1 vo2 
 quit
 .endc
 .end

From 96da06c388f8e986efc0920ad8f713b2ced3a5a5 Mon Sep 17 00:00:00 2001
From: Canuck-Duck <alex@hermeling.org>
Date: Fri, 17 May 2024 22:59:43 -0400
Subject: [PATCH 15/16] Fixed the carry bit problem for the schematic

---
 Transistor_Calculator_V2.kicad_sch      | 150 +-----------------------
 ~Transistor_Calculator_V2.kicad_sch.lck |   1 +
 2 files changed, 4 insertions(+), 147 deletions(-)
 create mode 100644 ~Transistor_Calculator_V2.kicad_sch.lck

diff --git a/Transistor_Calculator_V2.kicad_sch b/Transistor_Calculator_V2.kicad_sch
index b3cde89..2abc198 100644
--- a/Transistor_Calculator_V2.kicad_sch
+++ b/Transistor_Calculator_V2.kicad_sch
@@ -757,12 +757,6 @@
 		(color 0 0 0 0)
 		(uuid "598a3eb2-2f2b-440d-9eb5-68ced9387982")
 	)
-	(junction
-		(at 165.1 135.89)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "5b74c8da-0d82-40e6-9c78-1b534e2d6f78")
-	)
 	(junction
 		(at 121.92 31.75)
 		(diameter 0)
@@ -805,12 +799,6 @@
 		(color 0 0 0 0)
 		(uuid "8103c5f9-6c5f-4798-b40d-348f77e08358")
 	)
-	(junction
-		(at 153.67 156.21)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "82dd5051-8d30-466d-bb3c-9e438f82fe35")
-	)
 	(junction
 		(at 100.33 85.09)
 		(diameter 0)
@@ -835,12 +823,6 @@
 		(color 0 0 0 0)
 		(uuid "9a224719-cd9a-4689-9464-52ac4009147a")
 	)
-	(junction
-		(at 152.4 144.78)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "a93e5554-4a48-4036-8e08-8015a7df198e")
-	)
 	(junction
 		(at 72.39 50.8)
 		(diameter 0)
@@ -883,12 +865,6 @@
 		(color 0 0 0 0)
 		(uuid "c6d5e955-6c4f-4cda-99e4-cd6ad6b5c1ed")
 	)
-	(junction
-		(at 236.22 133.35)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "c807948e-7a8f-4dd8-add8-8401ea806c48")
-	)
 	(junction
 		(at 58.42 162.56)
 		(diameter 0)
@@ -1007,7 +983,7 @@
 	)
 	(wire
 		(pts
-			(xy 152.4 144.78) (xy 175.26 144.78)
+			(xy 143.51 144.78) (xy 175.26 144.78)
 		)
 		(stroke
 			(width 0)
@@ -1045,16 +1021,6 @@
 		)
 		(uuid "0af03459-a014-4415-8db8-5b146cbc004d")
 	)
-	(wire
-		(pts
-			(xy 152.4 144.78) (xy 152.4 142.24)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "0d6552d5-b988-45b9-b629-37114c68ab40")
-	)
 	(wire
 		(pts
 			(xy 107.95 85.09) (xy 161.29 85.09)
@@ -1585,26 +1551,6 @@
 		)
 		(uuid "58f3fccb-3490-4769-9053-9d9dbc1dc5f0")
 	)
-	(wire
-		(pts
-			(xy 143.51 144.78) (xy 152.4 144.78)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "5bdc54a8-103d-44f2-8d8f-177816ba3bb7")
-	)
-	(wire
-		(pts
-			(xy 165.1 121.92) (xy 236.22 121.92)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "5c02b686-97e9-4a29-8aea-9e899a2c1fd4")
-	)
 	(wire
 		(pts
 			(xy 254 39.37) (xy 254 113.03)
@@ -1715,16 +1661,6 @@
 		)
 		(uuid "7090a8d2-d32a-4001-ad7a-6a44238c77bc")
 	)
-	(wire
-		(pts
-			(xy 170.18 142.24) (xy 170.18 135.89)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "73558ada-e8a7-4cda-9865-1d8c13788de1")
-	)
 	(wire
 		(pts
 			(xy 252.73 115.57) (xy 252.73 133.35)
@@ -1785,16 +1721,6 @@
 		)
 		(uuid "7e811838-8bf0-4bb5-85e7-cb5bf0ee8278")
 	)
-	(wire
-		(pts
-			(xy 236.22 121.92) (xy 236.22 133.35)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "833f0892-b6fc-4cbc-b5fc-3ac8729ff7a5")
-	)
 	(wire
 		(pts
 			(xy 190.5 134.62) (xy 190.5 138.43)
@@ -1835,16 +1761,6 @@
 		)
 		(uuid "85687ab6-5a35-43d5-8b27-38ea9b0243c2")
 	)
-	(wire
-		(pts
-			(xy 165.1 121.92) (xy 165.1 135.89)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "86189c9c-a0f6-496a-bde9-99eb2b2a3044")
-	)
 	(wire
 		(pts
 			(xy 190.5 161.29) (xy 201.93 161.29)
@@ -1865,16 +1781,6 @@
 		)
 		(uuid "86a6e99f-4b37-45ce-8d13-084d3ac91972")
 	)
-	(wire
-		(pts
-			(xy 151.13 156.21) (xy 151.13 135.89)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "8710254a-841d-42b3-b258-2b361fdd6f25")
-	)
 	(wire
 		(pts
 			(xy 198.12 39.37) (xy 198.12 54.61)
@@ -1947,7 +1853,7 @@
 	)
 	(wire
 		(pts
-			(xy 215.9 133.35) (xy 236.22 133.35)
+			(xy 215.9 133.35) (xy 252.73 133.35)
 		)
 		(stroke
 			(width 0)
@@ -1995,16 +1901,6 @@
 		)
 		(uuid "9e2e12b7-1013-4fe0-b809-b2b6ce61a345")
 	)
-	(wire
-		(pts
-			(xy 236.22 133.35) (xy 252.73 133.35)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "9ee2fe06-af7b-43df-b505-5aede8288146")
-	)
 	(wire
 		(pts
 			(xy 127 72.39) (xy 127 105.41)
@@ -2115,16 +2011,6 @@
 		)
 		(uuid "b2867d4b-7a54-4b4e-944c-16fc4f69b623")
 	)
-	(wire
-		(pts
-			(xy 153.67 156.21) (xy 151.13 156.21)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "b97e251d-c7f4-4f44-b0a0-e7eba8fd375d")
-	)
 	(wire
 		(pts
 			(xy 180.34 38.1) (xy 180.34 39.37)
@@ -2175,16 +2061,6 @@
 		)
 		(uuid "c26ca6b4-39d0-4c61-912a-7e36cdb6b986")
 	)
-	(wire
-		(pts
-			(xy 151.13 135.89) (xy 165.1 135.89)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "c8b4b99f-e48f-4d12-9e6d-d23ac628562f")
-	)
 	(wire
 		(pts
 			(xy 207.01 44.45) (xy 207.01 39.37)
@@ -2245,16 +2121,6 @@
 		)
 		(uuid "cfbd1948-6065-46b4-acaa-64f5876739e2")
 	)
-	(wire
-		(pts
-			(xy 165.1 135.89) (xy 170.18 135.89)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "d0768d43-b8bb-491b-84ac-31fd01dfadf8")
-	)
 	(wire
 		(pts
 			(xy 170.18 50.8) (xy 170.18 54.61)
@@ -2315,16 +2181,6 @@
 		)
 		(uuid "d86de55e-060d-4288-b464-38029a132a5e")
 	)
-	(wire
-		(pts
-			(xy 152.4 142.24) (xy 170.18 142.24)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "d9f4ac2d-ff2c-44c9-b3ad-6845005b86fb")
-	)
 	(wire
 		(pts
 			(xy 148.59 43.18) (xy 171.45 43.18)
@@ -7762,4 +7618,4 @@
 			(page "1")
 		)
 	)
-)
+)
\ No newline at end of file
diff --git a/~Transistor_Calculator_V2.kicad_sch.lck b/~Transistor_Calculator_V2.kicad_sch.lck
new file mode 100644
index 0000000..db813ef
--- /dev/null
+++ b/~Transistor_Calculator_V2.kicad_sch.lck
@@ -0,0 +1 @@
+{"hostname":"DESKTOP-US03IKH","username":"alex"}
\ No newline at end of file

From 09b005a2404cac6d609b11e08ea256c4f276085a Mon Sep 17 00:00:00 2001
From: Canuck-Duck <alex@hermeling.org>
Date: Fri, 17 May 2024 23:02:23 -0400
Subject: [PATCH 16/16] Added diode to replace OR gate

---
 Transistor_Calculator_V2.kicad_sch | 433 +++++++++++++++++++++++++----
 1 file changed, 386 insertions(+), 47 deletions(-)

diff --git a/Transistor_Calculator_V2.kicad_sch b/Transistor_Calculator_V2.kicad_sch
index 2abc198..d470441 100644
--- a/Transistor_Calculator_V2.kicad_sch
+++ b/Transistor_Calculator_V2.kicad_sch
@@ -10,6 +10,169 @@
 		(rev "1.0")
 	)
 	(lib_symbols
+		(symbol "Device:D"
+			(pin_numbers hide)
+			(pin_names
+				(offset 1.016) hide)
+			(exclude_from_sim no)
+			(in_bom yes)
+			(on_board yes)
+			(property "Reference" "D"
+				(at 0 2.54 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Value" "D"
+				(at 0 -2.54 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "Footprint" ""
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Datasheet" "~"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Description" "Diode"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Sim.Device" "D"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "Sim.Pins" "1=K 2=A"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_keywords" "diode"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(property "ki_fp_filters" "TO-???* *_Diode_* *SingleDiode* D_*"
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+					(hide yes)
+				)
+			)
+			(symbol "D_0_1"
+				(polyline
+					(pts
+						(xy -1.27 1.27) (xy -1.27 -1.27)
+					)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 1.27 0) (xy -1.27 0)
+					)
+					(stroke
+						(width 0)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(polyline
+					(pts
+						(xy 1.27 1.27) (xy 1.27 -1.27) (xy -1.27 0) (xy 1.27 1.27)
+					)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+			)
+			(symbol "D_1_1"
+				(pin passive line
+					(at -3.81 0 0)
+					(length 2.54)
+					(name "K"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "1"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 3.81 0 180)
+					(length 2.54)
+					(name "A"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+			)
+		)
 		(symbol "Device:R_US"
 			(pin_numbers hide)
 			(pin_names
@@ -817,6 +980,12 @@
 		(color 0 0 0 0)
 		(uuid "8fe2939c-efa9-42d6-a9ac-d002028bb069")
 	)
+	(junction
+		(at 156.21 115.57)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "957b96dd-b91e-46d9-9df9-fea1ca4ed85a")
+	)
 	(junction
 		(at 161.29 85.09)
 		(diameter 0)
@@ -913,12 +1082,6 @@
 		(color 0 0 0 0)
 		(uuid "e8002d23-7f45-4b59-b7a3-e8d16344e45c")
 	)
-	(junction
-		(at 215.9 133.35)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "e99f3e23-c710-49f3-a349-69c88c6bf34c")
-	)
 	(junction
 		(at 198.12 39.37)
 		(diameter 0)
@@ -981,16 +1144,6 @@
 		)
 		(uuid "05f1a048-c001-4e08-b7dd-86578e313a0c")
 	)
-	(wire
-		(pts
-			(xy 143.51 144.78) (xy 175.26 144.78)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "060537a8-cfbe-48b1-9bd9-9f21b0940c62")
-	)
 	(wire
 		(pts
 			(xy 72.39 85.09) (xy 100.33 85.09)
@@ -1091,6 +1244,16 @@
 		)
 		(uuid "1566765d-e694-42d9-ae61-ddfcbf440d64")
 	)
+	(wire
+		(pts
+			(xy 143.51 115.57) (xy 156.21 115.57)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "1654cec9-40fa-4c86-83d4-e8a566678349")
+	)
 	(wire
 		(pts
 			(xy 72.39 50.8) (xy 72.39 74.93)
@@ -1661,16 +1824,6 @@
 		)
 		(uuid "7090a8d2-d32a-4001-ad7a-6a44238c77bc")
 	)
-	(wire
-		(pts
-			(xy 252.73 115.57) (xy 252.73 133.35)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "747b8833-4ce1-4a4e-b0cf-095c684f9648")
-	)
 	(wire
 		(pts
 			(xy 127 72.39) (xy 146.05 72.39)
@@ -1851,16 +2004,6 @@
 		)
 		(uuid "93ba033d-8fa5-42c3-b402-81c2611a4a47")
 	)
-	(wire
-		(pts
-			(xy 215.9 133.35) (xy 252.73 133.35)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "947fb102-153e-45fb-9a35-c47a7376a080")
-	)
 	(wire
 		(pts
 			(xy 161.29 64.77) (xy 161.29 67.31)
@@ -1961,6 +2104,16 @@
 		)
 		(uuid "a95893a5-3543-40e8-9b8c-0d9128ace91f")
 	)
+	(wire
+		(pts
+			(xy 156.21 115.57) (xy 156.21 148.59)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "ac7452cd-17c6-4fec-8a0b-b6fe1821723f")
+	)
 	(wire
 		(pts
 			(xy 66.04 162.56) (xy 58.42 162.56)
@@ -2061,6 +2214,16 @@
 		)
 		(uuid "c26ca6b4-39d0-4c61-912a-7e36cdb6b986")
 	)
+	(wire
+		(pts
+			(xy 143.51 137.16) (xy 143.51 115.57)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "c762ff12-7d44-460b-9cbd-c593ca88e583")
+	)
 	(wire
 		(pts
 			(xy 207.01 44.45) (xy 207.01 39.37)
@@ -2181,6 +2344,16 @@
 		)
 		(uuid "d86de55e-060d-4288-b464-38029a132a5e")
 	)
+	(wire
+		(pts
+			(xy 156.21 115.57) (xy 270.51 115.57)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "d9eb6cc3-47c2-401c-b9be-8e264a134a3c")
+	)
 	(wire
 		(pts
 			(xy 148.59 43.18) (xy 171.45 43.18)
@@ -2193,7 +2366,7 @@
 	)
 	(wire
 		(pts
-			(xy 153.67 156.21) (xy 176.53 156.21)
+			(xy 153.67 156.21) (xy 156.21 156.21)
 		)
 		(stroke
 			(width 0)
@@ -2311,16 +2484,6 @@
 		)
 		(uuid "f621dc40-c312-4cf0-9707-9dfa5e0f694c")
 	)
-	(wire
-		(pts
-			(xy 270.51 115.57) (xy 252.73 115.57)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "f6e435f1-fea1-4e9e-a950-8b159fd94277")
-	)
 	(wire
 		(pts
 			(xy 80.01 50.8) (xy 80.01 64.77)
@@ -4441,6 +4604,94 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Device:D")
+		(at 143.51 140.97 270)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "572b3407-2a92-447e-99c6-23a04cbe0075")
+		(property "Reference" "D1"
+			(at 146.05 139.6999 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "D"
+			(at 146.05 142.2399 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" ""
+			(at 143.51 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 143.51 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Diode"
+			(at 143.51 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "D"
+			(at 143.51 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=K 2=A"
+			(at 143.51 140.97 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "2dde37f9-6a52-4788-b690-3edfa809d39d")
+		)
+		(pin "2"
+			(uuid "92b8112e-b20e-425c-a11b-5cf739b92384")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "D1")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Simulation_SPICE:VDC")
 		(at -73.66 100.33 0)
@@ -5160,6 +5411,94 @@
 			)
 		)
 	)
+	(symbol
+		(lib_id "Device:D")
+		(at 156.21 152.4 270)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "7e08b594-1efb-45ac-bc68-bf1dfad0e301")
+		(property "Reference" "D2"
+			(at 158.75 151.1299 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "D"
+			(at 158.75 153.6699 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" ""
+			(at 156.21 152.4 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 156.21 152.4 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Diode"
+			(at 156.21 152.4 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Device" "D"
+			(at 156.21 152.4 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Sim.Pins" "1=K 2=A"
+			(at 156.21 152.4 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "61c8d6b6-0e0e-4855-82e4-946d61314ab0")
+		)
+		(pin "2"
+			(uuid "2f9c987c-6813-4360-90a9-7a5bf22464cf")
+		)
+		(instances
+			(project "Transistor_Calculator_V2"
+				(path "/4e74c2aa-3410-4407-95d8-73d62854742b"
+					(reference "D2")
+					(unit 1)
+				)
+			)
+		)
+	)
 	(symbol
 		(lib_id "Device:R_US")
 		(at 58.42 153.67 180)