diff --git a/hardware/goodpocketwatch31/BE-AAAA-PC.stp b/hardware/goodpocketwatch31/BE-AAAA-PC.stp
new file mode 100644
index 0000000..6c51f3f
--- /dev/null
+++ b/hardware/goodpocketwatch31/BE-AAAA-PC.stp
@@ -0,0 +1,417 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION (( 'STEP AP203' ),
+    '1' );
+FILE_NAME ('BEAAAAPC.STEP',
+    '2014-06-13T19:54:22',
+    ( 'Intern' ),
+    ( '' ),
+    'SwSTEP 2.0',
+    'SolidWorks 2012',
+    '' );
+FILE_SCHEMA (( 'CONFIG_CONTROL_DESIGN' ));
+ENDSEC;
+
+DATA;
+#1 = CALENDAR_DATE ( 2014, 13, 6 ) ;
+#2 = LOCAL_TIME ( 15, 54, 22.00000000000000000, #4 ) ;
+#3 = APPROVAL_DATE_TIME ( #8, #254 ) ;
+#4 = COORDINATED_UNIVERSAL_TIME_OFFSET ( 5, 0, .BEHIND. ) ;
+#5 = APPROVAL_PERSON_ORGANIZATION ( #6, #254, #247 ) ;
+#6 = PERSON_AND_ORGANIZATION ( #357, #21 ) ;
+#7 = DATE_AND_TIME ( #9, #10 ) ;
+#8 = DATE_AND_TIME ( #1, #2 ) ;
+#9 = CALENDAR_DATE ( 2014, 13, 6 ) ;
+#10 = LOCAL_TIME ( 15, 54, 22.00000000000000000, #11 ) ;
+#11 = COORDINATED_UNIVERSAL_TIME_OFFSET ( 5, 0, .BEHIND. ) ;
+#12 = PERSON_AND_ORGANIZATION ( #357, #21 ) ;
+#13 = APPROVAL_DATE_TIME ( #14, #259 ) ;
+#14 = DATE_AND_TIME ( #15, #16 ) ;
+#15 = CALENDAR_DATE ( 2014, 13, 6 ) ;
+#16 = LOCAL_TIME ( 15, 54, 22.00000000000000000, #17 ) ;
+#17 = COORDINATED_UNIVERSAL_TIME_OFFSET ( 5, 0, .BEHIND. ) ;
+#18 = APPROVAL_PERSON_ORGANIZATION ( #19, #259, #243 ) ;
+#19 = PERSON_AND_ORGANIZATION ( #357, #21 ) ;
+#20 = PERSON_AND_ORGANIZATION ( #357, #21 ) ;
+#21 = ORGANIZATION ( 'UNSPECIFIED', 'UNSPECIFIED', '' ) ;
+#22 = SHAPE_DEFINITION_REPRESENTATION ( #365, #349 ) ;
+#23 = LENGTH_MEASURE_WITH_UNIT ( LENGTH_MEASURE( 0.02539999999999999900 ), #386 );
+#24 = VECTOR ( 'NONE', #384, 39.37007874015748100 ) ;
+#25 = VECTOR ( 'NONE', #382, 39.37007874015748100 ) ;
+#26 = LINE ( 'NONE', #383, #24 ) ;
+#27 = LINE ( 'NONE', #364, #25 ) ;
+#28 = VECTOR ( 'NONE', #390, 39.37007874015748100 ) ;
+#29 = CIRCLE ( 'NONE', #264, 0.02000000000000007700 ) ;
+#30 = VECTOR ( 'NONE', #388, 39.37007874015748100 ) ;
+#31 = LINE ( 'NONE', #389, #28 ) ;
+#32 = VECTOR ( 'NONE', #232, 39.37007874015748100 ) ;
+#33 = LINE ( 'NONE', #233, #30 ) ;
+#34 = VECTOR ( 'NONE', #359, 39.37007874015748100 ) ;
+#35 = LINE ( 'NONE', #231, #32 ) ;
+#36 = LINE ( 'NONE', #362, #34 ) ;
+#37 = VECTOR ( 'NONE', #363, 39.37007874015748100 ) ;
+#38 = VECTOR ( 'NONE', #360, 39.37007874015748100 ) ;
+#39 = LINE ( 'NONE', #361, #37 ) ;
+#40 = VECTOR ( 'NONE', #372, 39.37007874015748100 ) ;
+#41 = CIRCLE ( 'NONE', #265, 0.01999999999999993100 ) ;
+#42 = VECTOR ( 'NONE', #375, 39.37007874015748100 ) ;
+#43 = LINE ( 'NONE', #367, #38 ) ;
+#44 = LINE ( 'NONE', #379, #42 ) ;
+#45 = VECTOR ( 'NONE', #320, 39.37007874015748100 ) ;
+#46 = LINE ( 'NONE', #368, #40 ) ;
+#47 = LINE ( 'NONE', #374, #45 ) ;
+#48 = VECTOR ( 'NONE', #319, 39.37007874015748100 ) ;
+#49 = CIRCLE ( 'NONE', #266, 0.02000000000000007700 ) ;
+#50 = CIRCLE ( 'NONE', #274, 0.02000000000000007700 ) ;
+#51 = VECTOR ( 'NONE', #222, 39.37007874015748100 ) ;
+#52 = LINE ( 'NONE', #321, #48 ) ;
+#53 = LINE ( 'NONE', #226, #51 ) ;
+#54 = VECTOR ( 'NONE', #393, 39.37007874015748100 ) ;
+#55 = CIRCLE ( 'NONE', #275, 0.02000000000000007700 ) ;
+#56 = LINE ( 'NONE', #398, #54 ) ;
+#57 = VECTOR ( 'NONE', #399, 39.37007874015748100 ) ;
+#58 = CIRCLE ( 'NONE', #276, 0.01999999999999993100 ) ;
+#59 = CIRCLE ( 'NONE', #278, 0.01999999999999993100 ) ;
+#60 = CIRCLE ( 'NONE', #280, 0.01999999999999993100 ) ;
+#61 = LINE ( 'NONE', #394, #57 ) ;
+#62 = VECTOR ( 'NONE', #342, 39.37007874015748100 ) ;
+#63 = FACE_OUTER_BOUND ( 'NONE', #84, .T. ) ;
+#64 = FACE_OUTER_BOUND ( 'NONE', #86, .T. ) ;
+#65 = LINE ( 'NONE', #356, #62 ) ;
+#66 = FACE_OUTER_BOUND ( 'NONE', #85, .T. ) ;
+#67 = FACE_OUTER_BOUND ( 'NONE', #182, .T. ) ;
+#68 = CYLINDRICAL_SURFACE ( 'NONE', #288, 0.02000000000000007700 ) ;
+#69 = FACE_OUTER_BOUND ( 'NONE', #190, .T. ) ;
+#70 = CYLINDRICAL_SURFACE ( 'NONE', #290, 0.01999999999999993100 ) ;
+#71 = FACE_BOUND ( 'NONE', #82, .T. ) ;
+#72 = CYLINDRICAL_SURFACE ( 'NONE', #291, 0.01999999999999993100 ) ;
+#73 = FACE_BOUND ( 'NONE', #81, .T. ) ;
+#74 = FACE_OUTER_BOUND ( 'NONE', #88, .T. ) ;
+#75 = FACE_OUTER_BOUND ( 'NONE', #185, .T. ) ;
+#76 = FACE_OUTER_BOUND ( 'NONE', #83, .T. ) ;
+#77 = FACE_OUTER_BOUND ( 'NONE', #199, .T. ) ;
+#78 = FACE_OUTER_BOUND ( 'NONE', #186, .T. ) ;
+#79 = CYLINDRICAL_SURFACE ( 'NONE', #293, 0.02000000000000007700 ) ;
+#80 = FACE_OUTER_BOUND ( 'NONE', #87, .T. ) ;
+#81 = EDGE_LOOP ( 'NONE', ( #145, #147 ) ) ;
+#82 = EDGE_LOOP ( 'NONE', ( #205, #179 ) ) ;
+#83 = EDGE_LOOP ( 'NONE', ( #193, #209, #188, #204 ) ) ;
+#84 = EDGE_LOOP ( 'NONE', ( #160, #162, #164, #163 ) ) ;
+#85 = EDGE_LOOP ( 'NONE', ( #175, #149, #146, #148 ) ) ;
+#86 = EDGE_LOOP ( 'NONE', ( #152, #154, #153, #155 ) ) ;
+#87 = EDGE_LOOP ( 'NONE', ( #198, #189, #195, #192 ) ) ;
+#88 = EDGE_LOOP ( 'NONE', ( #158, #157, #159, #161 ) ) ;
+#89 = VERTEX_POINT ( 'NONE', #144 ) ;
+#90 = VERTEX_POINT ( 'NONE', #108 ) ;
+#91 = VERTEX_POINT ( 'NONE', #98 ) ;
+#92 = VERTEX_POINT ( 'NONE', #99 ) ;
+#93 = VERTEX_POINT ( 'NONE', #97 ) ;
+#94 = VERTEX_POINT ( 'NONE', #210 ) ;
+#95 = VERTEX_POINT ( 'NONE', #96 ) ;
+#96 = CARTESIAN_POINT ( 'NONE',  ( 0.9049999999999999200, 0.0000000000000000000, 0.02000000000000007700 ) ) ;
+#97 = CARTESIAN_POINT ( 'NONE',  ( -0.9050000000000000300, 0.0000000000000000000, -0.01999999999999993100 ) ) ;
+#98 = CARTESIAN_POINT ( 'NONE',  ( 0.9649999999999998600, 0.3300000000000000200, 0.2050000000000000400 ) ) ;
+#99 = CARTESIAN_POINT ( 'NONE',  ( 0.9649999999999998600, 0.0000000000000000000, -0.2049999999999999600 ) ) ;
+#100 = DATE_AND_TIME ( #120, #106 ) ;
+#101 = COORDINATED_UNIVERSAL_TIME_OFFSET ( 5, 0, .BEHIND. ) ;
+#102 = PERSON_AND_ORGANIZATION ( #357, #21 ) ;
+#103 = PERSON_AND_ORGANIZATION ( #357, #21 ) ;
+#104 = CALENDAR_DATE ( 2014, 13, 6 ) ;
+#105 = COORDINATED_UNIVERSAL_TIME_OFFSET ( 5, 0, .BEHIND. ) ;
+#106 = LOCAL_TIME ( 15, 54, 22.00000000000000000, #105 ) ;
+#107 = PERSON_AND_ORGANIZATION ( #357, #21 ) ;
+#108 = CARTESIAN_POINT ( 'NONE',  ( 0.9049999999999999200, -0.1200000000000000000, 0.02000000000000007700 ) ) ;
+#109 = PLANE ( 'NONE',  #294 ) ;
+#110 = CARTESIAN_POINT ( 'NONE',  ( -0.9650000000000000800, 0.3300000000000000200, -0.2049999999999999600 ) ) ;
+#111 = CARTESIAN_POINT ( 'NONE',  ( -0.9650000000000000800, 0.3300000000000000200, 0.2050000000000000400 ) ) ;
+#112 = DIRECTION ( 'NONE',  ( 1.000000000000000000, -0.0000000000000000000, 0.0000000000000000000 ) ) ;
+#113 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, -1.000000000000000000 ) ) ;
+#114 = DIRECTION ( 'NONE',  ( -0.0000000000000000000, 1.000000000000000000, -0.0000000000000000000 ) ) ;
+#115 = CARTESIAN_POINT ( 'NONE',  ( 0.9049999999999999200, -0.1200000000000000000, 0.0000000000000000000 ) ) ;
+#116 = APPROVAL_PERSON_ORGANIZATION ( #118, #271, #221 ) ;
+#117 = APPROVAL_DATE_TIME ( #100, #271 ) ;
+#118 = PERSON_AND_ORGANIZATION ( #357, #21 ) ;
+#119 = DATE_AND_TIME ( #104, #121 ) ;
+#120 = CALENDAR_DATE ( 2014, 13, 6 ) ;
+#121 = LOCAL_TIME ( 15, 54, 22.00000000000000000, #101 ) ;
+#122 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, 1.000000000000000000 ) ) ;
+#123 = DIRECTION ( 'NONE',  ( 1.000000000000000000, 0.0000000000000000000, -0.0000000000000000000 ) ) ;
+#124 = PLANE ( 'NONE',  #279 ) ;
+#125 = CARTESIAN_POINT ( 'NONE',  ( -0.9650000000000000800, 0.0000000000000000000, -0.2049999999999999600 ) ) ;
+#126 = CARTESIAN_POINT ( 'NONE',  ( -0.9650000000000000800, 0.3300000000000000200, 0.2050000000000000400 ) ) ;
+#127 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, -1.000000000000000000 ) ) ;
+#128 = DIRECTION ( 'NONE',  ( -1.000000000000000000, 0.0000000000000000000, -0.0000000000000000000 ) ) ;
+#129 = CARTESIAN_POINT ( 'NONE',  ( -0.9650000000000000800, 0.0000000000000000000, 0.2050000000000000400 ) ) ;
+#130 = CARTESIAN_POINT ( 'NONE',  ( -0.9050000000000000300, -0.1200000000000000000, 0.01999999999999993100 ) ) ;
+#131 = ADVANCED_FACE ( 'NONE', ( #74 ), #109, .F. ) ;
+#132 = ADVANCED_FACE ( 'NONE', ( #183 ), #79, .T. ) ;
+#133 = ADVANCED_FACE ( 'NONE', ( #77 ), #324, .T. ) ;
+#134 = ADVANCED_FACE ( 'NONE', ( #75 ), #72, .T. ) ;
+#135 = DIMENSIONAL_EXPONENTS ( 1.000000000000000000, 0.0000000000000000000, 0.0000000000000000000, 0.0000000000000000000, 0.0000000000000000000, 0.0000000000000000000, 0.0000000000000000000 ) ;
+#136 = ADVANCED_FACE ( 'NONE', ( #80 ), #70, .T. ) ;
+#137 = ADVANCED_FACE ( 'NONE', ( #76 ), #68, .T. ) ;
+#138 = ADVANCED_FACE ( 'NONE', ( #78 ), #338, .F. ) ;
+#139 = ADVANCED_FACE ( 'NONE', ( #71, #66, #73 ), #343, .T. ) ;
+#140 = ADVANCED_FACE ( 'NONE', ( #67 ), #347, .F. ) ;
+#141 = ADVANCED_FACE ( 'NONE', ( #69 ), #213, .T. ) ;
+#142 = ADVANCED_FACE ( 'NONE', ( #64 ), #218, .F. ) ;
+#143 = ADVANCED_FACE ( 'NONE', ( #63 ), #124, .F. ) ;
+#144 = CARTESIAN_POINT ( 'NONE',  ( -0.9650000000000000800, 0.3300000000000000200, -0.2049999999999999600 ) ) ;
+#145 = ORIENTED_EDGE ( 'NONE', *, *, #308, .F. ) ;
+#146 = ORIENTED_EDGE ( 'NONE', *, *, #306, .F. ) ;
+#147 = ORIENTED_EDGE ( 'NONE', *, *, #297, .F. ) ;
+#148 = ORIENTED_EDGE ( 'NONE', *, *, #307, .F. ) ;
+#149 = ORIENTED_EDGE ( 'NONE', *, *, #305, .F. ) ;
+#150 = ORIENTED_EDGE ( 'NONE', *, *, #311, .T. ) ;
+#151 = ORIENTED_EDGE ( 'NONE', *, *, #302, .T. ) ;
+#152 = ORIENTED_EDGE ( 'NONE', *, *, #307, .T. ) ;
+#153 = ORIENTED_EDGE ( 'NONE', *, *, #284, .F. ) ;
+#154 = ORIENTED_EDGE ( 'NONE', *, *, #289, .F. ) ;
+#155 = ORIENTED_EDGE ( 'NONE', *, *, #309, .T. ) ;
+#156 = VERTEX_POINT ( 'NONE', #125 ) ;
+#157 = ORIENTED_EDGE ( 'NONE', *, *, #312, .F. ) ;
+#158 = ORIENTED_EDGE ( 'NONE', *, *, #306, .T. ) ;
+#159 = ORIENTED_EDGE ( 'NONE', *, *, #314, .F. ) ;
+#160 = ORIENTED_EDGE ( 'NONE', *, *, #305, .T. ) ;
+#161 = ORIENTED_EDGE ( 'NONE', *, *, #289, .T. ) ;
+#162 = ORIENTED_EDGE ( 'NONE', *, *, #311, .F. ) ;
+#163 = ORIENTED_EDGE ( 'NONE', *, *, #312, .T. ) ;
+#164 = ORIENTED_EDGE ( 'NONE', *, *, #315, .F. ) ;
+#165 = ORIENTED_EDGE ( 'NONE', *, *, #310, .T. ) ;
+#166 = ORIENTED_EDGE ( 'NONE', *, *, #308, .T. ) ;
+#167 = ORIENTED_EDGE ( 'NONE', *, *, #298, .T. ) ;
+#168 = ORIENTED_EDGE ( 'NONE', *, *, #286, .T. ) ;
+#169 = ORIENTED_EDGE ( 'NONE', *, *, #314, .T. ) ;
+#170 = EDGE_LOOP ( 'NONE', ( #208, #171, #151, #203 ) ) ;
+#171 = ORIENTED_EDGE ( 'NONE', *, *, #313, .F. ) ;
+#172 = ORIENTED_EDGE ( 'NONE', *, *, #304, .T. ) ;
+#173 = VERTEX_POINT ( 'NONE', #351 ) ;
+#174 = ORIENTED_EDGE ( 'NONE', *, *, #284, .T. ) ;
+#175 = ORIENTED_EDGE ( 'NONE', *, *, #304, .F. ) ;
+#176 = ORIENTED_EDGE ( 'NONE', *, *, #315, .T. ) ;
+#177 = VERTEX_POINT ( 'NONE', #130 ) ;
+#178 = ORIENTED_EDGE ( 'NONE', *, *, #309, .F. ) ;
+#179 = ORIENTED_EDGE ( 'NONE', *, *, #301, .F. ) ;
+#180 = ORIENTED_EDGE ( 'NONE', *, *, #295, .T. ) ;
+#181 = ORIENTED_EDGE ( 'NONE', *, *, #310, .F. ) ;
+#182 = EDGE_LOOP ( 'NONE', ( #172, #178, #181, #150 ) ) ;
+#183 = FACE_OUTER_BOUND ( 'NONE', #170, .T. ) ;
+#184 = ORIENTED_EDGE ( 'NONE', *, *, #286, .F. ) ;
+#185 = EDGE_LOOP ( 'NONE', ( #196, #184, #167, #166 ) ) ;
+#186 = EDGE_LOOP ( 'NONE', ( #165, #174, #169, #176 ) ) ;
+#187 = CLOSED_SHELL ( 'NONE', ( #136, #137, #139, #140, #142, #131, #143, #138, #132, #141, #134, #133 ) ) ;
+#188 = ORIENTED_EDGE ( 'NONE', *, *, #301, .T. ) ;
+#189 = ORIENTED_EDGE ( 'NONE', *, *, #296, .T. ) ;
+#190 = EDGE_LOOP ( 'NONE', ( #197, #201 ) ) ;
+#191 = VERTEX_POINT ( 'NONE', #352 ) ;
+#192 = ORIENTED_EDGE ( 'NONE', *, *, #298, .F. ) ;
+#193 = ORIENTED_EDGE ( 'NONE', *, *, #299, .F. ) ;
+#194 = VERTEX_POINT ( 'NONE', #129 ) ;
+#195 = ORIENTED_EDGE ( 'NONE', *, *, #297, .T. ) ;
+#196 = ORIENTED_EDGE ( 'NONE', *, *, #296, .F. ) ;
+#197 = ORIENTED_EDGE ( 'NONE', *, *, #313, .T. ) ;
+#198 = ORIENTED_EDGE ( 'NONE', *, *, #295, .F. ) ;
+#199 = EDGE_LOOP ( 'NONE', ( #168, #180 ) ) ;
+#200 = VERTEX_POINT ( 'NONE', #214 ) ;
+#201 = ORIENTED_EDGE ( 'NONE', *, *, #299, .T. ) ;
+#202 = VERTEX_POINT ( 'NONE', #353 ) ;
+#203 = ORIENTED_EDGE ( 'NONE', *, *, #303, .T. ) ;
+#204 = ORIENTED_EDGE ( 'NONE', *, *, #302, .F. ) ;
+#205 = ORIENTED_EDGE ( 'NONE', *, *, #303, .F. ) ;
+#206 = VERTEX_POINT ( 'NONE', #354 ) ;
+#207 = VERTEX_POINT ( 'NONE', #355 ) ;
+#208 = ORIENTED_EDGE ( 'NONE', *, *, #300, .F. ) ;
+#209 = ORIENTED_EDGE ( 'NONE', *, *, #300, .T. ) ;
+#210 = CARTESIAN_POINT ( 'NONE',  ( 0.9649999999999998600, 0.3300000000000000200, -0.2049999999999999600 ) ) ;
+#211 = DIRECTION ( 'NONE',  ( -1.000000000000000000, 0.0000000000000000000, 0.0000000000000000000 ) ) ;
+#212 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, 1.000000000000000000 ) ) ;
+#213 = PLANE ( 'NONE',  #282 ) ;
+#214 = CARTESIAN_POINT ( 'NONE',  ( -0.9650000000000000800, 0.3300000000000000200, 0.2050000000000000400 ) ) ;
+#215 = CARTESIAN_POINT ( 'NONE',  ( 0.9049999999999999200, -0.1200000000000000000, 0.0000000000000000000 ) ) ;
+#216 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -1.000000000000000000, 0.0000000000000000000 ) ) ;
+#217 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -0.0000000000000000000, -1.000000000000000000 ) ) ;
+#218 = PLANE ( 'NONE',  #281 ) ;
+#219 = DATE_TIME_ROLE ( 'classification_date' ) ;
+#220 = APPROVAL_STATUS ( 'not_yet_approved' ) ;
+#221 = APPROVAL_ROLE ( '' ) ;
+#222 = DIRECTION ( 'NONE',  ( -0.0000000000000000000, 1.000000000000000000, -0.0000000000000000000 ) ) ;
+#223 = CARTESIAN_POINT ( 'NONE',  ( -0.9050000000000000300, -0.1200000000000000000, 0.0000000000000000000 ) ) ;
+#224 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -1.000000000000000000, 0.0000000000000000000 ) ) ;
+#225 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, -1.000000000000000000 ) ) ;
+#226 = CARTESIAN_POINT ( 'NONE',  ( -0.9050000000000000300, -0.1200000000000000000, 0.01999999999999993100 ) ) ;
+#227 =( NAMED_UNIT ( * ) PLANE_ANGLE_UNIT ( ) SI_UNIT ( $, .RADIAN. ) );
+#228 = CARTESIAN_POINT ( 'NONE',  ( -0.9050000000000000300, 0.0000000000000000000, 0.0000000000000000000 ) ) ;
+#229 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -1.000000000000000000, 0.0000000000000000000 ) ) ;
+#230 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, -1.000000000000000000 ) ) ;
+#231 = CARTESIAN_POINT ( 'NONE',  ( 0.9649999999999998600, 0.3300000000000000200, 0.2050000000000000400 ) ) ;
+#232 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, -1.000000000000000000 ) ) ;
+#233 = CARTESIAN_POINT ( 'NONE',  ( 0.9649999999999998600, 0.3300000000000000200, 0.2050000000000000400 ) ) ;
+#234 =( NAMED_UNIT ( * ) SI_UNIT ( $, .STERADIAN. ) SOLID_ANGLE_UNIT ( ) );
+#235 = APPLICATION_PROTOCOL_DEFINITION ( 'international standard', 'config_control_design', 1994, #236 ) ;
+#236 = APPLICATION_CONTEXT ( 'configuration controlled 3d designs of mechanical parts and assemblies' ) ;
+#237 = DIRECTION ( 'NONE',  ( 1.000000000000000000, 0.0000000000000000000, 0.0000000000000000000 ) ) ;
+#238 = MECHANICAL_CONTEXT ( 'NONE', #236, 'mechanical' ) ;
+#239 = PERSON_AND_ORGANIZATION_ROLE ( 'design_owner' ) ;
+#240 = APPLICATION_CONTEXT ( 'configuration controlled 3d designs of mechanical parts and assemblies' ) ;
+#241 = APPLICATION_PROTOCOL_DEFINITION ( 'international standard', 'config_control_design', 1994, #240 ) ;
+#242 = APPROVAL_STATUS ( 'not_yet_approved' ) ;
+#243 = APPROVAL_ROLE ( '' ) ;
+#244 = PERSON_AND_ORGANIZATION_ROLE ( 'creator' ) ;
+#245 = DATE_TIME_ROLE ( 'creation_date' ) ;
+#246 = APPROVAL_STATUS ( 'not_yet_approved' ) ;
+#247 = APPROVAL_ROLE ( '' ) ;
+#248 = PERSON_AND_ORGANIZATION_ROLE ( 'creator' ) ;
+#249 = PERSON_AND_ORGANIZATION_ROLE ( 'design_supplier' ) ;
+#250 = SECURITY_CLASSIFICATION_LEVEL ( 'unclassified' ) ;
+#251 = PERSON_AND_ORGANIZATION_ROLE ( 'classification_officer' ) ;
+#252 = CC_DESIGN_PERSON_AND_ORGANIZATION_ASSIGNMENT ( #107, #248, ( #255 ) ) ;
+#253 = CC_DESIGN_APPROVAL ( #254, ( #255 ) ) ;
+#254 = APPROVAL ( #246, 'UNSPECIFIED' ) ;
+#255 = PRODUCT_DEFINITION_FORMATION_WITH_SPECIFIED_SOURCE ( 'ANY', '', #358, .NOT_KNOWN. ) ;
+#256 = CC_DESIGN_DATE_AND_TIME_ASSIGNMENT ( #7, #245, ( #260 ) ) ;
+#257 = CC_DESIGN_PERSON_AND_ORGANIZATION_ASSIGNMENT ( #12, #244, ( #260 ) ) ;
+#258 = CC_DESIGN_APPROVAL ( #259, ( #260 ) ) ;
+#259 = APPROVAL ( #242, 'UNSPECIFIED' ) ;
+#260 = PRODUCT_DEFINITION ( 'UNKNOWN', '', #255, #366 ) ;
+#261 = CC_DESIGN_PERSON_AND_ORGANIZATION_ASSIGNMENT ( #20, #239, ( #358 ) ) ;
+#262 = AXIS2_PLACEMENT_3D ( 'NONE', #381, #385, #237 ) ;
+#263 =( GEOMETRIC_REPRESENTATION_CONTEXT ( 3 ) GLOBAL_UNCERTAINTY_ASSIGNED_CONTEXT ( ( #350 ) ) GLOBAL_UNIT_ASSIGNED_CONTEXT ( ( #387, #227, #234 ) ) REPRESENTATION_CONTEXT ( 'NONE', 'WORKASPACE' ) );
+#264 = AXIS2_PLACEMENT_3D ( 'NONE', #391, #392, #380 ) ;
+#265 = AXIS2_PLACEMENT_3D ( 'NONE', #228, #229, #230 ) ;
+#266 = AXIS2_PLACEMENT_3D ( 'NONE', #369, #370, #371 ) ;
+#267 = PRODUCT_RELATED_PRODUCT_CATEGORY ( 'detail', '', ( #358 ) ) ;
+#268 = CC_DESIGN_SECURITY_CLASSIFICATION ( #277, ( #255 ) ) ;
+#269 = CC_DESIGN_APPROVAL ( #271, ( #277 ) ) ;
+#270 = CC_DESIGN_PERSON_AND_ORGANIZATION_ASSIGNMENT ( #103, #249, ( #255 ) ) ;
+#271 = APPROVAL ( #220, 'UNSPECIFIED' ) ;
+#272 = CC_DESIGN_DATE_AND_TIME_ASSIGNMENT ( #119, #219, ( #277 ) ) ;
+#273 = CC_DESIGN_PERSON_AND_ORGANIZATION_ASSIGNMENT ( #102, #251, ( #277 ) ) ;
+#274 = AXIS2_PLACEMENT_3D ( 'NONE', #376, #377, #378 ) ;
+#275 = AXIS2_PLACEMENT_3D ( 'NONE', #322, #323, #373 ) ;
+#276 = AXIS2_PLACEMENT_3D ( 'NONE', #316, #317, #318 ) ;
+#277 = SECURITY_CLASSIFICATION ( '', '', #250 ) ;
+#278 = AXIS2_PLACEMENT_3D ( 'NONE', #223, #224, #225 ) ;
+#279 = AXIS2_PLACEMENT_3D ( 'NONE', #126, #127, #128 ) ;
+#280 = AXIS2_PLACEMENT_3D ( 'NONE', #395, #396, #397 ) ;
+#281 = AXIS2_PLACEMENT_3D ( 'NONE', #110, #122, #123 ) ;
+#282 = AXIS2_PLACEMENT_3D ( 'NONE', #215, #216, #217 ) ;
+#283 = AXIS2_PLACEMENT_3D ( 'NONE', #344, #211, #212 ) ;
+#284 = EDGE_CURVE ( 'NONE', #94, #89, #65, .T. ) ;
+#285 = AXIS2_PLACEMENT_3D ( 'NONE', #341, #345, #346 ) ;
+#286 = EDGE_CURVE ( 'NONE', #177, #173, #60, .T. ) ;
+#287 = AXIS2_PLACEMENT_3D ( 'NONE', #336, #339, #340 ) ;
+#288 = AXIS2_PLACEMENT_3D ( 'NONE', #337, #335, #331 ) ;
+#289 = EDGE_CURVE ( 'NONE', #89, #156, #61, .T. ) ;
+#290 = AXIS2_PLACEMENT_3D ( 'NONE', #332, #333, #334 ) ;
+#291 = AXIS2_PLACEMENT_3D ( 'NONE', #330, #329, #325 ) ;
+#292 = AXIS2_PLACEMENT_3D ( 'NONE', #326, #327, #328 ) ;
+#293 = AXIS2_PLACEMENT_3D ( 'NONE', #115, #114, #400 ) ;
+#294 = AXIS2_PLACEMENT_3D ( 'NONE', #111, #112, #113 ) ;
+#295 = EDGE_CURVE ( 'NONE', #173, #177, #59, .T. ) ;
+#296 = EDGE_CURVE ( 'NONE', #173, #93, #56, .T. ) ;
+#297 = EDGE_CURVE ( 'NONE', #93, #207, #58, .T. ) ;
+#298 = EDGE_CURVE ( 'NONE', #177, #207, #53, .T. ) ;
+#299 = EDGE_CURVE ( 'NONE', #202, #90, #55, .T. ) ;
+#300 = EDGE_CURVE ( 'NONE', #202, #191, #52, .T. ) ;
+#301 = EDGE_CURVE ( 'NONE', #191, #95, #50, .T. ) ;
+#302 = EDGE_CURVE ( 'NONE', #90, #95, #47, .T. ) ;
+#303 = EDGE_CURVE ( 'NONE', #95, #191, #49, .T. ) ;
+#304 = EDGE_CURVE ( 'NONE', #206, #92, #44, .T. ) ;
+#305 = EDGE_CURVE ( 'NONE', #194, #206, #46, .T. ) ;
+#306 = EDGE_CURVE ( 'NONE', #156, #194, #43, .T. ) ;
+#307 = EDGE_CURVE ( 'NONE', #92, #156, #39, .T. ) ;
+#308 = EDGE_CURVE ( 'NONE', #207, #93, #41, .T. ) ;
+#309 = EDGE_CURVE ( 'NONE', #94, #92, #36, .T. ) ;
+#310 = EDGE_CURVE ( 'NONE', #91, #94, #35, .T. ) ;
+#311 = EDGE_CURVE ( 'NONE', #91, #206, #33, .T. ) ;
+#312 = EDGE_CURVE ( 'NONE', #200, #194, #31, .T. ) ;
+#313 = EDGE_CURVE ( 'NONE', #90, #202, #29, .T. ) ;
+#314 = EDGE_CURVE ( 'NONE', #89, #200, #27, .T. ) ;
+#315 = EDGE_CURVE ( 'NONE', #200, #91, #26, .T. ) ;
+#316 = CARTESIAN_POINT ( 'NONE',  ( -0.9050000000000000300, 0.0000000000000000000, 0.0000000000000000000 ) ) ;
+#317 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -1.000000000000000000, 0.0000000000000000000 ) ) ;
+#318 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, -1.000000000000000000 ) ) ;
+#319 = DIRECTION ( 'NONE',  ( -0.0000000000000000000, 1.000000000000000000, -0.0000000000000000000 ) ) ;
+#320 = DIRECTION ( 'NONE',  ( -0.0000000000000000000, 1.000000000000000000, -0.0000000000000000000 ) ) ;
+#321 = CARTESIAN_POINT ( 'NONE',  ( 0.9049999999999999200, -0.1200000000000000000, -0.02000000000000007700 ) ) ;
+#322 = CARTESIAN_POINT ( 'NONE',  ( 0.9049999999999999200, -0.1200000000000000000, 0.0000000000000000000 ) ) ;
+#323 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -1.000000000000000000, 0.0000000000000000000 ) ) ;
+#324 = PLANE ( 'NONE',  #292 ) ;
+#325 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, 1.000000000000000000 ) ) ;
+#326 = CARTESIAN_POINT ( 'NONE',  ( -0.9050000000000000300, -0.1200000000000000000, 0.0000000000000000000 ) ) ;
+#327 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -1.000000000000000000, 0.0000000000000000000 ) ) ;
+#328 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -0.0000000000000000000, -1.000000000000000000 ) ) ;
+#329 = DIRECTION ( 'NONE',  ( -0.0000000000000000000, 1.000000000000000000, -0.0000000000000000000 ) ) ;
+#330 = CARTESIAN_POINT ( 'NONE',  ( -0.9050000000000000300, -0.1200000000000000000, 0.0000000000000000000 ) ) ;
+#331 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, 1.000000000000000000 ) ) ;
+#332 = CARTESIAN_POINT ( 'NONE',  ( -0.9050000000000000300, -0.1200000000000000000, 0.0000000000000000000 ) ) ;
+#333 = DIRECTION ( 'NONE',  ( -0.0000000000000000000, 1.000000000000000000, -0.0000000000000000000 ) ) ;
+#334 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, 1.000000000000000000 ) ) ;
+#335 = DIRECTION ( 'NONE',  ( -0.0000000000000000000, 1.000000000000000000, -0.0000000000000000000 ) ) ;
+#336 = CARTESIAN_POINT ( 'NONE',  ( 0.0000000000000000000, 0.3300000000000000200, 0.0000000000000000000 ) ) ;
+#337 = CARTESIAN_POINT ( 'NONE',  ( 0.9049999999999999200, -0.1200000000000000000, 0.0000000000000000000 ) ) ;
+#338 = PLANE ( 'NONE',  #287 ) ;
+#339 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -1.000000000000000000, 0.0000000000000000000 ) ) ;
+#340 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -0.0000000000000000000, -1.000000000000000000 ) ) ;
+#341 = CARTESIAN_POINT ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, 0.0000000000000000000 ) ) ;
+#342 = DIRECTION ( 'NONE',  ( -1.000000000000000000, -0.0000000000000000000, -0.0000000000000000000 ) ) ;
+#343 = PLANE ( 'NONE',  #285 ) ;
+#344 = CARTESIAN_POINT ( 'NONE',  ( 0.9649999999999998600, 0.3300000000000000200, 0.2050000000000000400 ) ) ;
+#345 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -1.000000000000000000, 0.0000000000000000000 ) ) ;
+#346 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -0.0000000000000000000, -1.000000000000000000 ) ) ;
+#347 = PLANE ( 'NONE',  #283 ) ;
+#348 = MANIFOLD_SOLID_BREP ( 'Boss-Extrude2', #187 ) ;
+#349 = ADVANCED_BREP_SHAPE_REPRESENTATION ( 'BEAAAAPC', ( #348, #262 ), #263 ) ;
+#350 = UNCERTAINTY_MEASURE_WITH_UNIT (LENGTH_MEASURE( 1.000000000000000100E-005 ), #387, 'distance_accuracy_value', 'NONE');
+#351 = CARTESIAN_POINT ( 'NONE',  ( -0.9050000000000000300, -0.1200000000000000000, -0.01999999999999993100 ) ) ;
+#352 = CARTESIAN_POINT ( 'NONE',  ( 0.9049999999999999200, 0.0000000000000000000, -0.02000000000000007700 ) ) ;
+#353 = CARTESIAN_POINT ( 'NONE',  ( 0.9049999999999999200, -0.1200000000000000000, -0.02000000000000007700 ) ) ;
+#354 = CARTESIAN_POINT ( 'NONE',  ( 0.9649999999999998600, 0.0000000000000000000, 0.2050000000000000400 ) ) ;
+#355 = CARTESIAN_POINT ( 'NONE',  ( -0.9050000000000000300, 0.0000000000000000000, 0.01999999999999993100 ) ) ;
+#356 = CARTESIAN_POINT ( 'NONE',  ( -0.9650000000000000800, 0.3300000000000000200, -0.2049999999999999600 ) ) ;
+#357 = PERSON ( 'UNSPECIFIED', 'UNSPECIFIED', 'UNSPECIFIED', ('UNSPECIFIED'), ('UNSPECIFIED'), ('UNSPECIFIED') ) ;
+#358 = PRODUCT ( 'BEAAAAPC', 'BEAAAAPC', '', ( #238 ) ) ;
+#359 = DIRECTION ( 'NONE',  ( -0.0000000000000000000, -1.000000000000000000, -0.0000000000000000000 ) ) ;
+#360 = DIRECTION ( 'NONE',  ( -0.0000000000000000000, -0.0000000000000000000, 1.000000000000000000 ) ) ;
+#361 = CARTESIAN_POINT ( 'NONE',  ( -0.9650000000000000800, 0.0000000000000000000, -0.2049999999999999600 ) ) ;
+#362 = CARTESIAN_POINT ( 'NONE',  ( 0.9649999999999998600, 0.3300000000000000200, -0.2049999999999999600 ) ) ;
+#363 = DIRECTION ( 'NONE',  ( -1.000000000000000000, -0.0000000000000000000, -0.0000000000000000000 ) ) ;
+#364 = CARTESIAN_POINT ( 'NONE',  ( -0.9650000000000000800, 0.3300000000000000200, 0.2050000000000000400 ) ) ;
+#365 = PRODUCT_DEFINITION_SHAPE ( 'NONE', 'NONE',  #260 ) ;
+#366 = DESIGN_CONTEXT ( 'detailed design', #240, 'design' ) ;
+#367 = CARTESIAN_POINT ( 'NONE',  ( -0.9650000000000000800, 0.0000000000000000000, 0.2050000000000000400 ) ) ;
+#368 = CARTESIAN_POINT ( 'NONE',  ( -0.9650000000000000800, 0.0000000000000000000, 0.2050000000000000400 ) ) ;
+#369 = CARTESIAN_POINT ( 'NONE',  ( 0.9049999999999999200, 0.0000000000000000000, 0.0000000000000000000 ) ) ;
+#370 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -1.000000000000000000, 0.0000000000000000000 ) ) ;
+#371 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, -1.000000000000000000 ) ) ;
+#372 = DIRECTION ( 'NONE',  ( 1.000000000000000000, 0.0000000000000000000, 0.0000000000000000000 ) ) ;
+#373 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, -1.000000000000000000 ) ) ;
+#374 = CARTESIAN_POINT ( 'NONE',  ( 0.9049999999999999200, -0.1200000000000000000, 0.02000000000000007700 ) ) ;
+#375 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, -1.000000000000000000 ) ) ;
+#376 = CARTESIAN_POINT ( 'NONE',  ( 0.9049999999999999200, 0.0000000000000000000, 0.0000000000000000000 ) ) ;
+#377 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -1.000000000000000000, 0.0000000000000000000 ) ) ;
+#378 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, -1.000000000000000000 ) ) ;
+#379 = CARTESIAN_POINT ( 'NONE',  ( 0.9649999999999998600, 0.0000000000000000000, 0.2050000000000000400 ) ) ;
+#380 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, -1.000000000000000000 ) ) ;
+#381 = CARTESIAN_POINT ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, 0.0000000000000000000 ) ) ;
+#382 = DIRECTION ( 'NONE',  ( -0.0000000000000000000, -0.0000000000000000000, 1.000000000000000000 ) ) ;
+#383 = CARTESIAN_POINT ( 'NONE',  ( -0.9650000000000000800, 0.3300000000000000200, 0.2050000000000000400 ) ) ;
+#384 = DIRECTION ( 'NONE',  ( 1.000000000000000000, 0.0000000000000000000, 0.0000000000000000000 ) ) ;
+#385 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, 1.000000000000000000 ) ) ;
+#386 =( LENGTH_UNIT ( ) NAMED_UNIT ( * ) SI_UNIT ( $, .METRE. ) );
+#387 =( CONVERSION_BASED_UNIT ( 'INCH', #23 ) LENGTH_UNIT ( ) NAMED_UNIT ( #135 ) );
+#388 = DIRECTION ( 'NONE',  ( -0.0000000000000000000, -1.000000000000000000, -0.0000000000000000000 ) ) ;
+#389 = CARTESIAN_POINT ( 'NONE',  ( -0.9650000000000000800, 0.3300000000000000200, 0.2050000000000000400 ) ) ;
+#390 = DIRECTION ( 'NONE',  ( -0.0000000000000000000, -1.000000000000000000, -0.0000000000000000000 ) ) ;
+#391 = CARTESIAN_POINT ( 'NONE',  ( 0.9049999999999999200, -0.1200000000000000000, 0.0000000000000000000 ) ) ;
+#392 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -1.000000000000000000, 0.0000000000000000000 ) ) ;
+#393 = DIRECTION ( 'NONE',  ( -0.0000000000000000000, 1.000000000000000000, -0.0000000000000000000 ) ) ;
+#394 = CARTESIAN_POINT ( 'NONE',  ( -0.9650000000000000800, 0.3300000000000000200, -0.2049999999999999600 ) ) ;
+#395 = CARTESIAN_POINT ( 'NONE',  ( -0.9050000000000000300, -0.1200000000000000000, 0.0000000000000000000 ) ) ;
+#396 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, -1.000000000000000000, 0.0000000000000000000 ) ) ;
+#397 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, -1.000000000000000000 ) ) ;
+#398 = CARTESIAN_POINT ( 'NONE',  ( -0.9050000000000000300, -0.1200000000000000000, -0.01999999999999993100 ) ) ;
+#399 = DIRECTION ( 'NONE',  ( -0.0000000000000000000, -1.000000000000000000, -0.0000000000000000000 ) ) ;
+#400 = DIRECTION ( 'NONE',  ( 0.0000000000000000000, 0.0000000000000000000, 1.000000000000000000 ) ) ;
+ENDSEC;
+END-ISO-10303-21;
diff --git a/hardware/goodpocketwatch31/BOM.txt b/hardware/goodpocketwatch31/BOM.txt
index 75fcd86..070e601 100644
--- a/hardware/goodpocketwatch31/BOM.txt
+++ b/hardware/goodpocketwatch31/BOM.txt
@@ -24,6 +24,7 @@ B1-17   TODO
 BPGM    TODO
 
 BZ1     PT-1203-3               433-1201-2-ND       THP      1
+BT1,2   BE-AAAA-PC-ND           BE-AAAA-PC	    THP	     2     AAAA Battery Holder
 
 Radio parts, only required for the optional SubGHz radio.  Choose one
 of the two options for U2, but not the other.
@@ -48,6 +49,7 @@ U5      level converter from TI
 J2      USB C receptacle 
 R3,R4	5.1k 0402 resistors for USB C sensing.
 D1,D2   0402 LEDs
+C11-13  GRM152C80J104KE19D      490-9997-1-ND       0402     3     0.1uF (<0.3mm thickness) (Same as C2,C3.)
 
 Battery Holder
 
diff --git a/hardware/goodpocketwatch31/fp-info-cache b/hardware/goodpocketwatch31/fp-info-cache
index 92dad6e..9ff50fd 100644
--- a/hardware/goodpocketwatch31/fp-info-cache
+++ b/hardware/goodpocketwatch31/fp-info-cache
@@ -1,431 +1,1271 @@
-216390024328424
-LED_SMD
-R_0201_0603Metric
-Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator
-resistor
+408691387984665
+Capacitor_SMD
+CP_Elec_3x5.3
+SMT capacitor, aluminium electrolytic, 3x5.3, Cornell Dubilier Electronics 
+Capacitor Electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_3x5.4
+SMD capacitor, aluminum electrolytic, Nichicon, 3.0x5.4mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_4x3
+SMD capacitor, aluminum electrolytic, Nichicon, 4.0x3mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_4x3.9
+SMD capacitor, aluminum electrolytic, Nichicon, 4.0x3.9mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_4x4.5
+SMD capacitor, aluminum electrolytic, Nichicon, 4.0x4.5mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_4x5.3
+SMD capacitor, aluminum electrolytic, Vishay, 4.0x5.3mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_4x5.4
+SMD capacitor, aluminum electrolytic, Panasonic A5 / Nichicon, 4.0x5.4mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_4x5.7
+SMD capacitor, aluminum electrolytic, United Chemi-Con, 4.0x5.7mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_4x5.8
+SMD capacitor, aluminum electrolytic, Panasonic, 4.0x5.8mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_5x3
+SMD capacitor, aluminum electrolytic, Nichicon, 5.0x3.0mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_5x3.9
+SMD capacitor, aluminum electrolytic, Nichicon, 5.0x3.9mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_5x4.4
+SMD capacitor, aluminum electrolytic, Panasonic B45, 5.0x4.4mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_5x4.5
+SMD capacitor, aluminum electrolytic, Nichicon, 5.0x4.5mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_5x5.3
+SMD capacitor, aluminum electrolytic, Nichicon, 5.0x5.3mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_5x5.4
+SMD capacitor, aluminum electrolytic, Nichicon, 5.0x5.4mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_5x5.7
+SMD capacitor, aluminum electrolytic, United Chemi-Con, 5.0x5.7mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_5x5.8
+SMD capacitor, aluminum electrolytic, Panasonic, 5.0x5.8mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_5x5.9
+SMD capacitor, aluminum electrolytic, Panasonic B6, 5.0x5.9mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_6.3x3
+SMD capacitor, aluminum electrolytic, Nichicon, 6.3x3.0mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_6.3x3.9
+SMD capacitor, aluminum electrolytic, Nichicon, 6.3x3.9mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_6.3x4.5
+SMD capacitor, aluminum electrolytic, Nichicon, 6.3x4.5mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_6.3x4.9
+SMD capacitor, aluminum electrolytic, Panasonic C5, 6.3x4.9mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_6.3x5.2
+SMD capacitor, aluminum electrolytic, United Chemi-Con, 6.3x5.2mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_6.3x5.3
+SMD capacitor, aluminum electrolytic, Cornell Dubilier, 6.3x5.3mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_6.3x5.4
+SMD capacitor, aluminum electrolytic, Panasonic C55, 6.3x5.4mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_6.3x5.4_Nichicon
+SMD capacitor, aluminum electrolytic, Nichicon, 6.3x5.4mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_6.3x5.7
+SMD capacitor, aluminum electrolytic, United Chemi-Con, 6.3x5.7mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_6.3x5.8
+SMD capacitor, aluminum electrolytic, Nichicon, 6.3x5.8mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_6.3x5.9
+SMD capacitor, aluminum electrolytic, Panasonic C6, 6.3x5.9mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_6.3x7.7
+SMD capacitor, aluminum electrolytic, Nichicon, 6.3x7.7mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_6.3x9.9
+SMD capacitor, aluminum electrolytic, Panasonic C10, 6.3x9.9mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_8x5.4
+SMD capacitor, aluminum electrolytic, Nichicon, 8.0x5.4mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_8x6.2
+SMD capacitor, aluminum electrolytic, Nichicon, 8.0x6.2mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_8x6.5
+SMD capacitor, aluminum electrolytic, Rubycon, 8.0x6.5mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_8x6.7
+SMD capacitor, aluminum electrolytic, United Chemi-Con, 8.0x6.7mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_8x6.9
+SMD capacitor, aluminum electrolytic, Panasonic E7, 8.0x6.9mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_8x10
+SMD capacitor, aluminum electrolytic, Nichicon, 8.0x10mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_8x10.5
+SMD capacitor, aluminum electrolytic, Vishay 0810, 8.0x10.5mm, http://www.vishay.com/docs/28395/150crz.pdf
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_8x11.9
+SMD capacitor, aluminum electrolytic, Panasonic E12, 8.0x11.9mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_10x7.7
+SMD capacitor, aluminum electrolytic, Nichicon, 10.0x7.7mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_10x7.9
+SMD capacitor, aluminum electrolytic, Panasonic F8, 10.0x7.9mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_10x10
+SMD capacitor, aluminum electrolytic, Nichicon, 10.0x10.0mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_10x10.5
+SMD capacitor, aluminum electrolytic, Vishay 1010, 10.0x10.5mm, http://www.vishay.com/docs/28395/150crz.pdf
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_10x12.5
+SMD capacitor, aluminum electrolytic, Vishay 1012, 10.0x12.5mm, http://www.vishay.com/docs/28395/150crz.pdf
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_10x12.6
+SMD capacitor, aluminum electrolytic, Panasonic F12, 10.0x12.6mm
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_10x14.3
+SMD capacitor, aluminum electrolytic, Vishay 1014, 10.0x14.3mm, http://www.vishay.com/docs/28395/150crz.pdf
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_16x17.5
+SMD capacitor, aluminum electrolytic, Vishay 1616, 16.0x17.5mm, http://www.vishay.com/docs/28395/150crz.pdf
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_16x22
+SMD capacitor, aluminum electrolytic, Vishay 1621, 16.0x22.0mm, http://www.vishay.com/docs/28395/150crz.pdf
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_18x17.5
+SMD capacitor, aluminum electrolytic, Vishay 1816, 18.0x17.5mm, http://www.vishay.com/docs/28395/150crz.pdf
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+CP_Elec_18x22
+SMD capacitor, aluminum electrolytic, Vishay 1821, 18.0x22.0mm, http://www.vishay.com/docs/28395/150crz.pdf
+capacitor electrolytic
+0
+2
+2
+Capacitor_SMD
+C_0201_0603Metric
+Capacitor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator
+capacitor
 0
 4
 2
-LED_SMD
-R_0402_1005Metric
-Resistor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
-resistor
+Capacitor_SMD
+C_0402_1005Metric
+Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+capacitor
 0
 2
 2
-LED_SMD
-R_0603_1608Metric
-Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
-resistor
+Capacitor_SMD
+C_0603_1608Metric
+Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+capacitor
 0
 2
 2
-LED_SMD
-R_0603_1608Metric_Pad1.05x0.95mm_HandSolder
-Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
-resistor handsolder
+Capacitor_SMD
+C_0603_1608Metric_Pad1.05x0.95mm_HandSolder
+Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+capacitor handsolder
 0
 2
 2
-LED_SMD
-R_0612_1632Metric
-Resistor SMD 0612 (1632 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20019/rcwe.pdf), generated with kicad-footprint-generator
-resistor
+Capacitor_SMD
+C_0805_2012Metric
+Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator
+capacitor
 0
 2
 2
-LED_SMD
-R_0612_1632Metric_Pad1.18x3.40mm_HandSolder
-Resistor SMD 0612 (1632 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.vishay.com/docs/20019/rcwe.pdf), generated with kicad-footprint-generator
-resistor handsolder
+Capacitor_SMD
+C_0805_2012Metric_Pad1.15x1.40mm_HandSolder
+Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator
+capacitor handsolder
 0
 2
 2
-LED_SMD
-R_0805_2012Metric
-Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator
-resistor
-0
-2
-2
-LED_SMD
-R_0805_2012Metric_Pad1.15x1.40mm_HandSolder
-Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator
-resistor handsolder
-0
-2
-2
-LED_SMD
-R_0815_2038Metric
-Resistor SMD 0815 (2038 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.yageo.com/documents/recent/PYu-PRPFPH_521_RoHS_L_0.pdf), generated with kicad-footprint-generator
-resistor
-0
-2
-2
-LED_SMD
-R_0815_2038Metric_Pad1.53x4.00mm_HandSolder
-Resistor SMD 0815 (2038 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.yageo.com/documents/recent/PYu-PRPFPH_521_RoHS_L_0.pdf), generated with kicad-footprint-generator
-resistor handsolder
-0
-2
-2
-LED_SMD
-R_01005_0402Metric
-Resistor SMD 01005 (0402 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.vishay.com/docs/20056/crcw01005e3.pdf), generated with kicad-footprint-generator
-resistor
+Capacitor_SMD
+C_01005_0402Metric
+Capacitor SMD 01005 (0402 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.vishay.com/docs/20056/crcw01005e3.pdf), generated with kicad-footprint-generator
+capacitor
 0
 4
 2
-LED_SMD
-R_1020_2550Metric
-Resistor SMD 1020 (2550 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20019/rcwe.pdf), generated with kicad-footprint-generator
-resistor
+Capacitor_SMD
+C_1206_3216Metric
+Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+capacitor
+0
+2
+2
+Capacitor_SMD
+C_1206_3216Metric_Pad1.42x1.75mm_HandSolder
+Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+capacitor handsolder
+0
+2
+2
+Capacitor_SMD
+C_1210_3225Metric
+Capacitor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+capacitor
+0
+2
+2
+Capacitor_SMD
+C_1210_3225Metric_Pad1.42x2.65mm_HandSolder
+Capacitor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+capacitor handsolder
+0
+2
+2
+Capacitor_SMD
+C_1806_4516Metric
+Capacitor SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator
+capacitor
+0
+2
+2
+Capacitor_SMD
+C_1806_4516Metric_Pad1.57x1.80mm_HandSolder
+Capacitor SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator
+capacitor handsolder
+0
+2
+2
+Capacitor_SMD
+C_1812_4532Metric
+Capacitor SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator
+capacitor
+0
+2
+2
+Capacitor_SMD
+C_1812_4532Metric_Pad1.30x3.40mm_HandSolder
+Capacitor SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator
+capacitor handsolder
+0
+2
+2
+Capacitor_SMD
+C_1825_4564Metric
+Capacitor SMD 1825 (4564 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator
+capacitor
+0
+2
+2
+Capacitor_SMD
+C_1825_4564Metric_Pad1.88x6.70mm_HandSolder
+Capacitor SMD 1825 (4564 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator
+capacitor handsolder
+0
+2
+2
+Capacitor_SMD
+C_2010_5025Metric
+Capacitor SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+capacitor
+0
+2
+2
+Capacitor_SMD
+C_2010_5025Metric_Pad1.52x2.65mm_HandSolder
+Capacitor SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+capacitor handsolder
+0
+2
+2
+Capacitor_SMD
+C_2220_5650Metric
+Capacitor SMD 2220 (5650 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator
+capacitor
+0
+2
+2
+Capacitor_SMD
+C_2220_5650Metric_Pad1.97x5.40mm_HandSolder
+Capacitor SMD 2220 (5650 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator
+capacitor handsolder
+0
+2
+2
+Capacitor_SMD
+C_2225_5664Metric
+Capacitor SMD 2225 (5664 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator
+capacitor
+0
+2
+2
+Capacitor_SMD
+C_2225_5664Metric_Pad1.80x6.60mm_HandSolder
+Capacitor SMD 2225 (5664 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator
+capacitor handsolder
+0
+2
+2
+Capacitor_SMD
+C_2512_6332Metric
+Capacitor SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+capacitor
+0
+2
+2
+Capacitor_SMD
+C_2512_6332Metric_Pad1.52x3.35mm_HandSolder
+Capacitor SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+capacitor handsolder
+0
+2
+2
+Capacitor_SMD
+C_2816_7142Metric
+Capacitor SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator
+capacitor
+0
+2
+2
+Capacitor_SMD
+C_2816_7142Metric_Pad3.20x4.45mm_HandSolder
+Capacitor SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator
+capacitor handsolder
+0
+2
+2
+Capacitor_SMD
+C_3640_9110Metric
+Capacitor SMD 3640 (9110 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator
+capacitor
+0
+2
+2
+Capacitor_SMD
+C_3640_9110Metric_Pad2.10x10.45mm_HandSolder
+Capacitor SMD 3640 (9110 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: http://datasheets.avx.com/AVX-HV_MLCC.pdf), generated with kicad-footprint-generator
+capacitor handsolder
+0
+2
+2
+Capacitor_SMD
+C_Elec_3x5.4
+SMD capacitor, aluminum electrolytic nonpolar, 3.0x5.4mm
+capacitor electrolyic nonpolar
+0
+2
+2
+Capacitor_SMD
+C_Elec_4x5.4
+SMD capacitor, aluminum electrolytic nonpolar, 4.0x5.4mm
+capacitor electrolyic nonpolar
+0
+2
+2
+Capacitor_SMD
+C_Elec_4x5.8
+SMD capacitor, aluminum electrolytic nonpolar, 4.0x5.8mm
+capacitor electrolyic nonpolar
+0
+2
+2
+Capacitor_SMD
+C_Elec_5x5.4
+SMD capacitor, aluminum electrolytic nonpolar, 5.0x5.4mm
+capacitor electrolyic nonpolar
+0
+2
+2
+Capacitor_SMD
+C_Elec_5x5.8
+SMD capacitor, aluminum electrolytic nonpolar, 5.0x5.8mm
+capacitor electrolyic nonpolar
+0
+2
+2
+Capacitor_SMD
+C_Elec_6.3x5.4
+SMD capacitor, aluminum electrolytic nonpolar, 6.3x5.4mm
+capacitor electrolyic nonpolar
+0
+2
+2
+Capacitor_SMD
+C_Elec_6.3x5.8
+SMD capacitor, aluminum electrolytic nonpolar, 6.3x5.8mm
+capacitor electrolyic nonpolar
+0
+2
+2
+Capacitor_SMD
+C_Elec_6.3x7.7
+SMD capacitor, aluminum electrolytic nonpolar, 6.3x7.7mm
+capacitor electrolyic nonpolar
+0
+2
+2
+Capacitor_SMD
+C_Elec_8x5.4
+SMD capacitor, aluminum electrolytic nonpolar, 8.0x5.4mm
+capacitor electrolyic nonpolar
+0
+2
+2
+Capacitor_SMD
+C_Elec_8x6.2
+SMD capacitor, aluminum electrolytic nonpolar, 8.0x6.2mm
+capacitor electrolyic nonpolar
+0
+2
+2
+Capacitor_SMD
+C_Elec_8x10.2
+SMD capacitor, aluminum electrolytic nonpolar, 8.0x10.2mm
+capacitor electrolyic nonpolar
+0
+2
+2
+Capacitor_SMD
+C_Elec_10x10.2
+SMD capacitor, aluminum electrolytic nonpolar, 10.0x10.2mm
+capacitor electrolyic nonpolar
+0
+2
+2
+Capacitor_SMD
+C_Trimmer_Murata_TZB4-A
+trimmer capacitor SMD horizontal, http://www.murata.com/~/media/webrenewal/support/library/catalog/products/capacitor/trimmer/t13e.ashx?la=en-gb
+ Murata TZB4 TZB4-A
+0
+2
+2
+Capacitor_SMD
+C_Trimmer_Murata_TZB4-B
+trimmer capacitor SMD horizontal, http://www.murata.com/~/media/webrenewal/support/library/catalog/products/capacitor/trimmer/t13e.ashx?la=en-gb
+ Murata TZB4 TZB4-A
+0
+2
+2
+Capacitor_SMD
+C_Trimmer_Murata_TZC3
+trimmer capacitor SMD horizontal, http://www.murata.com/~/media/webrenewal/support/library/catalog/products/capacitor/trimmer/t13e.ashx?la=en-gb
+ Murata TZC3
+0
+2
+2
+Capacitor_SMD
+C_Trimmer_Murata_TZR1
+trimmer capacitor SMD horizontal, http://www.murata.com/~/media/webrenewal/support/library/catalog/products/capacitor/trimmer/t13e.ashx?la=en-gb
+ Murata TZR1
+0
+2
+2
+Capacitor_SMD
+C_Trimmer_Murata_TZW4
+trimmer capacitor SMD horizontal, http://www.murata.com/~/media/webrenewal/support/library/catalog/products/capacitor/trimmer/t13e.ashx?la=en-gb
+ Murata TZW4
+0
+2
+2
+Capacitor_SMD
+C_Trimmer_Murata_TZY2
+trimmer capacitor SMD horizontal, http://www.murata.com/~/media/webrenewal/support/library/catalog/products/capacitor/trimmer/t13e.ashx?la=en-gb
+ Murata TZY2
+0
+2
+2
+Capacitor_SMD
+C_Trimmer_Sprague-Goodman_SGC3
+trimmer capacitor SMD horizontal, http://media.wix.com/ugd/d86717_38d9821e12823a7aa9cef38c6c2a73cc.pdf
+ Sprague Goodman SGC3
+0
+2
+2
+Capacitor_SMD
+C_Trimmer_Voltronics_JN
+trimmer capacitor SMD horizontal, http://www.knowlescapacitors.com/File%20Library/Voltronics/English/GlobalNavigation/Products/Trimmer%20Capacitors/CerChipTrimCap.pdf
+ Voltronics JN
+0
+2
+2
+Capacitor_SMD
+C_Trimmer_Voltronics_JQ
+trimmer capacitor SMD horizontal, http://www.knowlescapacitors.com/File%20Library/Voltronics/English/GlobalNavigation/Products/Trimmer%20Capacitors/CerChipTrimCap.pdf
+ Voltronics JQ
+0
+2
+2
+Capacitor_SMD
+C_Trimmer_Voltronics_JR
+trimmer capacitor SMD horizontal, http://www.knowlescapacitors.com/File%20Library/Voltronics/English/GlobalNavigation/Products/Trimmer%20Capacitors/CerChipTrimCap.pdf
+ Voltronics JR
+0
+2
+2
+Capacitor_SMD
+C_Trimmer_Voltronics_JV
+trimmer capacitor SMD horizontal, http://www.knowlescapacitors.com/File%20Library/Voltronics/English/GlobalNavigation/Products/Trimmer%20Capacitors/CerChipTrimCap.pdf
+ Voltronics JV
+0
+2
+2
+Capacitor_SMD
+C_Trimmer_Voltronics_JZ
+trimmer capacitor SMD horizontal, http://www.knowlescapacitors.com/File%20Library/Voltronics/English/GlobalNavigation/Products/Trimmer%20Capacitors/CerChipTrimCap.pdf
+ Voltronics JR
 0
 2
 2
 LED_SMD
-R_1020_2550Metric_Pad1.33x5.20mm_HandSolder
-Resistor SMD 1020 (2550 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.vishay.com/docs/20019/rcwe.pdf), generated with kicad-footprint-generator
-resistor handsolder
-0
-2
-2
-LED_SMD
-R_1206_3216Metric
-Resistor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
-resistor
-0
-2
-2
-LED_SMD
-R_1206_3216Metric_Pad1.42x1.75mm_HandSolder
-Resistor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
-resistor handsolder
-0
-2
-2
-LED_SMD
-R_1210_3225Metric
-Resistor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
-resistor
-0
-2
-2
-LED_SMD
-R_1210_3225Metric_Pad1.42x2.65mm_HandSolder
-Resistor SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
-resistor handsolder
-0
-2
-2
-LED_SMD
-R_1218_3246Metric
-Resistor SMD 1218 (3246 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20035/dcrcwe3.pdf), generated with kicad-footprint-generator
-resistor
-0
-2
-2
-LED_SMD
-R_1218_3246Metric_Pad1.22x4.75mm_HandSolder
-Resistor SMD 1218 (3246 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.vishay.com/docs/20035/dcrcwe3.pdf), generated with kicad-footprint-generator
-resistor handsolder
-0
-2
-2
-LED_SMD
-R_1806_4516Metric
-Resistor SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator
-resistor
-0
-2
-2
-LED_SMD
-R_1806_4516Metric_Pad1.57x1.80mm_HandSolder
-Resistor SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator
-resistor handsolder
-0
-2
-2
-LED_SMD
-R_1812_4532Metric
-Resistor SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator
-resistor
-0
-2
-2
-LED_SMD
-R_1812_4532Metric_Pad1.30x3.40mm_HandSolder
-Resistor SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator
-resistor handsolder
-0
-2
-2
-LED_SMD
-R_2010_5025Metric
-Resistor SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
-resistor
-0
-2
-2
-LED_SMD
-R_2010_5025Metric_Pad1.52x2.65mm_HandSolder
-Resistor SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
-resistor handsolder
-0
-2
-2
-LED_SMD
-R_2512_6332Metric
-Resistor SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
-resistor
-0
-2
-2
-LED_SMD
-R_2512_6332Metric_Pad1.52x3.35mm_HandSolder
-Resistor SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
-resistor handsolder
-0
-2
-2
-LED_SMD
-R_2816_7142Metric
-Resistor SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator
-resistor
-0
-2
-2
-LED_SMD
-R_2816_7142Metric_Pad3.20x4.45mm_HandSolder
-Resistor SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator
-resistor handsolder
-0
-2
-2
-LED_SMD
-R_4020_10251Metric
-Resistor SMD 4020 (10251 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://datasheet.octopart.com/HVC0603T5004FET-Ohmite-datasheet-26699797.pdf), generated with kicad-footprint-generator
-resistor
-0
-2
-2
-LED_SMD
-R_4020_10251Metric_Pad1.65x5.30mm_HandSolder
-Resistor SMD 4020 (10251 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: http://datasheet.octopart.com/HVC0603T5004FET-Ohmite-datasheet-26699797.pdf), generated with kicad-footprint-generator
-resistor handsolder
-0
-2
-2
-LED_SMD
-R_Array_Concave_2x0603
-Thick Film Chip Resistor Array, Wave soldering, Vishay CRA06P (see cra06p.pdf)
-resistor array
-0
-4
-4
-LED_SMD
-R_Array_Concave_4x0402
-Thick Film Chip Resistor Array, Wave soldering, Vishay CRA04P (see cra04p.pdf)
-resistor array
+LED-APA102-2020
+http://www.led-color.com/upload/201604/APA102-2020%20SMD%20LED.pdf
+LED RGB SPI
 0
 8
-8
+6
 LED_SMD
-R_Array_Concave_4x0603
-Thick Film Chip Resistor Array, Wave soldering, Vishay CRA06P (see cra06p.pdf)
-resistor array
+LED-L1T2_LUMILEDS
+http://www.lumileds.com/uploads/438/DS133-pdf
+LUMILEDS LUXEON TX L1T2 LED
 0
-8
-8
+3
+3
 LED_SMD
-R_Array_Convex_2x0402
-Chip Resistor Network, ROHM MNR02 (see mnr_g.pdf)
-resistor array
+LED_1W_3W_R8
+https://www.gme.cz/data/attachments/dsh.518-234.1.pdf
+LED 1W 3W 5W
+0
+3
+3
+LED_SMD
+LED_0201_0603Metric
+LED SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator
+LED
 0
 4
-4
+2
 LED_SMD
-R_Array_Convex_2x0603
-Chip Resistor Network, ROHM MNR12 (see mnr_g.pdf)
-resistor array
-0
-4
-4
-LED_SMD
-R_Array_Convex_2x0606
-Precision Thin Film Chip Resistor Array, VISHAY (see http://www.vishay.com/docs/28770/acasat.pdf)
-resistor array
-0
-4
-4
-LED_SMD
-R_Array_Convex_2x1206
-Chip Resistor Network, ROHM MNR32 (see mnr_g.pdf)
-resistor array
-0
-4
-4
-LED_SMD
-R_Array_Convex_4x0402
-Chip Resistor Network, ROHM MNR04 (see mnr_g.pdf)
-resistor array
-0
-8
-8
-LED_SMD
-R_Array_Convex_4x0603
-Chip Resistor Network, ROHM MNR14 (see mnr_g.pdf)
-resistor array
-0
-8
-8
-LED_SMD
-R_Array_Convex_4x0612
-Precision Thin Film Chip Resistor Array, VISHAY (see http://www.vishay.com/docs/28770/acasat.pdf)
-resistor array
-0
-8
-8
-LED_SMD
-R_Array_Convex_4x1206
-Chip Resistor Network, ROHM MNR34 (see mnr_g.pdf)
-resistor array
-0
-8
-8
-LED_SMD
-R_Array_Convex_5x0603
-Chip Resistor Network, ROHM MNR15 (see mnr_g.pdf)
-resistor array
-0
-10
-10
-LED_SMD
-R_Array_Convex_5x1206
-Chip Resistor Network, ROHM MNR35 (see mnr_g.pdf)
-resistor array
-0
-10
-10
-LED_SMD
-R_Array_Convex_8x0602
-Chip Resistor Network, ROHM MNR18 (see mnr_g.pdf)
-resistor array
-0
-16
-16
-LED_SMD
-R_Cat16-2
-SMT resistor net, Bourns CAT16 series, 2 way
-SMT resistor net Bourns CAT16 series 2 way
-0
-4
-4
-LED_SMD
-R_Cat16-4
-SMT resistor net, Bourns CAT16 series, 4 way
-SMT resistor net Bourns CAT16 series 4 way
-0
-8
-8
-LED_SMD
-R_Cat16-8
-SMT resistor net, Bourns CAT16 series, 8 way
-SMT resistor net Bourns CAT16 series 8 way
-0
-16
-16
-LED_SMD
-R_MELF_MMB-0207
-Resistor, MELF, MMB-0207, http://www.vishay.com/docs/28713/melfprof.pdf
-MELF Resistor
+LED_0402_1005Metric
+LED SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+LED
 0
 2
 2
 LED_SMD
-R_MicroMELF_MMU-0102
-Resistor, MicroMELF, MMU-0102, http://www.vishay.com/docs/28713/melfprof.pdf
-MicroMELF Resistor
+LED_0603_1608Metric
+LED SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+diode
 0
 2
 2
 LED_SMD
-R_MiniMELF_MMA-0204
-Resistor, MiniMELF, MMA-0204, http://www.vishay.com/docs/28713/melfprof.pdf
-MiniMELF Resistor
+LED_0603_1608Metric_Castellated
+LED SMD 0603 (1608 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+LED castellated
 0
 2
 2
 LED_SMD
-R_Shunt_Ohmite_LVK12
-4 contact shunt resistor
-shunt resistor 4 contacts
-0
-4
-4
-LED_SMD
-R_Shunt_Ohmite_LVK20
-4 contacts shunt resistor, https://www.ohmite.com/assets/docs/res_lvk.pdf
-4 contacts resistor smd
-0
-4
-4
-LED_SMD
-R_Shunt_Ohmite_LVK24
-4 contacts shunt resistor,https://www.ohmite.com/assets/docs/res_lvk.pdf
-4 contacts resistor smd
-0
-4
-4
-LED_SMD
-R_Shunt_Ohmite_LVK25
-4 contacts shunt resistor,https://www.ohmite.com/assets/docs/res_lvk.pdf
-4 contacts resistor smd
-0
-4
-4
-LED_SMD
-R_Shunt_Vishay_WSK2512_6332Metric_T1.19mm
-Shunt Resistor SMD 2512 (6332 Metric), 2.6mm thick, Vishay WKS2512, Terminal length (T) 1.19mm, 5 to 200 milli Ohm (http://http://www.vishay.com/docs/30108/wsk.pdf)
-resistor shunt WSK2512
-0
-4
-4
-LED_SMD
-R_Shunt_Vishay_WSK2512_6332Metric_T2.21mm
-Shunt Resistor SMD 2512 (6332 Metric), 2.6mm thick, Vishay WKS2512, Terminal length (T) 2.21mm, 1 to 4.9 milli Ohm (http://http://www.vishay.com/docs/30108/wsk.pdf)
-resistor shunt WSK2512
-0
-4
-4
-LED_SMD
-R_Shunt_Vishay_WSK2512_6332Metric_T2.66mm
-Shunt Resistor SMD 2512 (6332 Metric), 2.6mm thick, Vishay WKS2512, Terminal length (T) 2.66mm, 0.5 to 0.99 milli Ohm (http://http://www.vishay.com/docs/30108/wsk.pdf)
-resistor shunt WSK2512
-0
-4
-4
-LED_SMD
-R_Shunt_Vishay_WSKW0612
-https://www.vishay.com/docs/30332/wskw0612.pdf
-4-Terminal SMD Shunt
-0
-4
-4
-LED_SMD
-R_Shunt_Vishay_WSR2_WSR3
-Power Metal Strip Resistors 0.005 to 0.2, https://www.vishay.com/docs/30101/wsr.pdf
-SMD Shunt Resistor
+LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder
+LED SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+LED handsolder
 0
 2
 2
 LED_SMD
-R_Shunt_Vishay_WSR2_WSR3_KelvinConnection
-Power Metal Strip Resistors 0.005 to 0.2, https://www.vishay.com/docs/30101/wsr.pdf
-SMD Shunt Resistor
+LED_0805_2012Metric
+LED SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator
+diode
+0
+2
+2
+LED_SMD
+LED_0805_2012Metric_Castellated
+LED SMD 0805 (2012 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator
+LED castellated
+0
+2
+2
+LED_SMD
+LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder
+LED SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator
+LED handsolder
+0
+2
+2
+LED_SMD
+LED_01005_0402Metric
+LED SMD 01005 (0402 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.vishay.com/docs/20056/crcw01005e3.pdf), generated with kicad-footprint-generator
+LED
 0
 4
 2
+LED_SMD
+LED_1206_3216Metric
+LED SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+diode
+0
+2
+2
+LED_SMD
+LED_1206_3216Metric_Castellated
+LED SMD 1206 (3216 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+LED castellated
+0
+2
+2
+LED_SMD
+LED_1206_3216Metric_Pad1.42x1.75mm_HandSolder
+LED SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+LED handsolder
+0
+2
+2
+LED_SMD
+LED_1206_3216Metric_ReverseMount_Hole1.8x2.4mm
+LED SMD 1206 (3216 Metric), reverse mount, square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+diode reverse
+0
+2
+2
+LED_SMD
+LED_1210_3225Metric
+LED SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+diode
+0
+2
+2
+LED_SMD
+LED_1210_3225Metric_Castellated
+LED SMD 1210 (3225 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+LED castellated
+0
+2
+2
+LED_SMD
+LED_1210_3225Metric_Pad1.42x2.65mm_HandSolder
+LED SMD 1210 (3225 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+LED handsolder
+0
+2
+2
+LED_SMD
+LED_1806_4516Metric
+LED SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator
+diode
+0
+2
+2
+LED_SMD
+LED_1806_4516Metric_Castellated
+LED SMD 1806 (4516 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator
+LED castellated
+0
+2
+2
+LED_SMD
+LED_1806_4516Metric_Pad1.57x1.80mm_HandSolder
+LED SMD 1806 (4516 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.modelithics.com/models/Vendor/MuRata/BLM41P.pdf), generated with kicad-footprint-generator
+LED handsolder
+0
+2
+2
+LED_SMD
+LED_1812_4532Metric
+LED SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator
+diode
+0
+2
+2
+LED_SMD
+LED_1812_4532Metric_Castellated
+LED SMD 1812 (4532 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator
+LED castellated
+0
+2
+2
+LED_SMD
+LED_1812_4532Metric_Pad1.30x3.40mm_HandSolder
+LED SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator
+LED handsolder
+0
+2
+2
+LED_SMD
+LED_2010_5025Metric
+LED SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+diode
+0
+2
+2
+LED_SMD
+LED_2010_5025Metric_Castellated
+LED SMD 2010 (5025 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+LED castellated
+0
+2
+2
+LED_SMD
+LED_2010_5025Metric_Pad1.52x2.65mm_HandSolder
+LED SMD 2010 (5025 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+LED handsolder
+0
+2
+2
+LED_SMD
+LED_2512_6332Metric
+LED SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+diode
+0
+2
+2
+LED_SMD
+LED_2512_6332Metric_Castellated
+LED SMD 2512 (6332 Metric), castellated end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+LED castellated
+0
+2
+2
+LED_SMD
+LED_2512_6332Metric_Pad1.52x3.35mm_HandSolder
+LED SMD 2512 (6332 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator
+LED handsolder
+0
+2
+2
+LED_SMD
+LED_2816_7142Metric
+LED SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator
+diode
+0
+2
+2
+LED_SMD
+LED_2816_7142Metric_Castellated
+LED SMD 2816 (7142 Metric), castellated end terminal, IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator
+LED castellated
+0
+2
+2
+LED_SMD
+LED_2816_7142Metric_Pad3.20x4.45mm_HandSolder
+LED SMD 2816 (7142 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: https://www.vishay.com/docs/30100/wsl.pdf), generated with kicad-footprint-generator
+LED handsolder
+0
+2
+2
+LED_SMD
+LED_ASMB-KTF0-0A306
+2220 Tricolor PLCC-4 LED, https://docs.broadcom.com/docs/ASMB-KTF0-0A306-DS100
+Tricolor LED
+0
+4
+4
+LED_SMD
+LED_Avago_PLCC4_3.2x2.8mm_CW
+https://docs.broadcom.com/docs/AV02-4186EN
+LED Avago PLCC-4 ASMB-MTB0-0A3A2
+0
+4
+4
+LED_SMD
+LED_Avago_PLCC6_3x2.8mm
+https://docs.broadcom.com/docs/AV02-3793EN
+LED Avago PLCC-6 ASMT-YTB7-0AA02
+0
+6
+6
+LED_SMD
+LED_Cree-PLCC4_2x2mm_CW
+2.0mm x 2.0mm PLCC4 LED, http://www.cree.com/~/media/Files/Cree/LED-Components-and-Modules/HB/Data-Sheets/CLMVBFKA.pdf
+LED Cree PLCC-4
+0
+4
+4
+LED_SMD
+LED_Cree-PLCC4_3.2x2.8mm_CCW
+3.2mm x 2.8mm PLCC4 LED, http://www.cree.com/led-components/media/documents/CLV1AFKB(874).pdf
+LED Cree PLCC-4
+0
+4
+4
+LED_SMD
+LED_Cree-PLCC4_5x5mm_CW
+5.0mm x 5.0mm PLCC4 LED
+LED Cree PLCC-4
+0
+4
+4
+LED_SMD
+LED_Cree-PLCC6_4.7x1.5mm
+4.7mm x 1.5mm PLCC6 LED, http://www.cree.com/led-components/media/documents/1381-QLS6AFKW.pdf
+LED Cree PLCC-6
+0
+6
+6
+LED_SMD
+LED_Cree-XB
+http://www.cree.com/~/media/Files/Cree/LED-Components-and-Modules/XLamp/Data-and-Binning/XLampXBD.pdf
+LED Cree XB
+0
+5
+3
+LED_SMD
+LED_Cree-XH
+http://www.cree.com/~/media/Files/Cree/LED-Components-and-Modules/XLamp/Data-and-Binning/ds-XHB.pdf
+LED Cree XH
+0
+8
+2
+LED_SMD
+LED_Cree-XHP35
+http://www.cree.com/~/media/Files/Cree/LED-Components-and-Modules/XLamp/Data-and-Binning/ds--XHP35.pdf
+LED Cree XHP35
+0
+6
+3
+LED_SMD
+LED_Cree-XHP50_6V
+Cree XHP50, 6V footprint, http://www.cree.com/~/media/Files/Cree/LED%20Components%20and%20Modules/XLamp/Data%20and%20Binning/ds%20XHP50.pdf
+LED Cree XHP50
+0
+15
+3
+LED_SMD
+LED_Cree-XHP50_12V
+Cree XHP50, 12V footprint, http://www.cree.com/~/media/Files/Cree/LED%20Components%20and%20Modules/XLamp/Data%20and%20Binning/ds%20XHP50.pdf
+LED XHP50 Cree
+0
+15
+3
+LED_SMD
+LED_Cree-XHP70_6V
+Cree XHP70 LED, 6V version, http://www.cree.com/~/media/Files/Cree/LED%20Components%20and%20Modules/XLamp/Data%20and%20Binning/ds%20XHP70.pdf
+LED Cree XHP70
+0
+15
+3
+LED_SMD
+LED_Cree-XHP70_12V
+Cree XHP70 LED, 12V version, http://www.cree.com/~/media/Files/Cree/LED%20Components%20and%20Modules/XLamp/Data%20and%20Binning/ds%20XHP70.pdf
+LED Cree XHP70
+0
+15
+3
+LED_SMD
+LED_Cree-XP
+LED Cree-XP http://www.cree.com/~/media/Files/Cree/LED-Components-and-Modules/XLamp/Data-and-Binning/XLampXPE2.pdf
+LED Cree XP
+0
+6
+3
+LED_SMD
+LED_Cree-XP-G
+LED Cree-XP-G http://www.cree.com/~/media/Files/Cree/LED%20Components%20and%20Modules/XLamp/Data%20and%20Binning/XLampXPG.pdf
+LED Cree XP-G
+0
+6
+3
+LED_SMD
+LED_Cree-XQ
+LED Cree-XQ http://www.cree.com/~/media/Files/Cree/LED-Components-and-Modules/XLamp/Data-and-Binning/ds-XQB.pdf
+LED Cree XQ
+0
+2
+2
+LED_SMD
+LED_Cree-XQ_HandSoldering
+LED Cree-XQ handsoldering pads http://www.cree.com/~/media/Files/Cree/LED-Components-and-Modules/XLamp/Data-and-Binning/ds-XQB.pdf
+LED Cree XQ
+0
+2
+2
+LED_SMD
+LED_Dialight_591
+LED SMD 3mm Right Angle series (http://www.dialightsignalsandcomponents.com/Assets/Drawings/2D_Drawings_DrawingDetailedSpec/C17354.pdf)
+LED Dialight 591
+0
+2
+2
+LED_SMD
+LED_Inolux_IN-PI554FCH_PLCC4_5.0x5.0mm_P3.2mm
+http://www.inolux-corp.com/datasheet/SMDLED/Addressable%20LED/IN-PI554FCH.pdf
+RGB LED NeoPixel addressable
+0
+4
+4
+LED_SMD
+LED_Kingbright_AAA3528ESGCT
+Kingbright, dual LED, 3.5 x 2.8 mm Surface Mount LED Lamp (http://www.kingbrightusa.com/images/catalog/SPEC/AAA3528ESGCT.pdf)
+dual led smd
+0
+4
+4
+LED_SMD
+LED_Kingbright_APFA3010_3x1.5mm_Horizontal
+LED RGB, APFA3010, http://www.kingbrightusa.com/images/catalog/SPEC/APFA3010LSEEZGKQBKC.pdf
+LED RGB APFA3010 KINGBRIGHT 3x1.5mm
+0
+4
+4
+LED_SMD
+LED_LiteOn_LTST-C19HE1WT
+LiteOn RGB LED; https://optoelectronics.liteon.com/upload/download/DS22-2008-0044/LTST-C19HE1WT.pdf
+LED RGB Chip SMD
+0
+4
+4
+LED_SMD
+LED_LiteOn_LTST-S326
+http://optoelectronics.liteon.com/upload/download/DS22-2000-287/LTST-S326KGJRKT.PDF
+LED SMD right angle  CCA
+0
+3
+3
+LED_SMD
+LED_Lumex_SML-LX0303SIUPGUSB
+Lumex RGB LED, clear, SMD, https://www.lumex.com/spec/SML-LX0303SIUPGUSB.pdf
+LED RGB
+0
+4
+4
+LED_SMD
+LED_Osram_Lx_P47F_D2mm_ReverseMount
+OSRAM, reverse-mount LED, SMD, 2mm diameter, http://www.farnell.com/datasheets/2711587.pdf
+LED ReverseMount Reverse
+0
+4
+2
+LED_SMD
+LED_PLCC-2
+LED PLCC-2 SMD package
+LED PLCC-2 SMD
+0
+2
+2
+LED_SMD
+LED_PLCC_2835
+https://www.luckylight.cn/media/component/data-sheet/R2835BC-B2M-M10.pdf
+LED
+0
+2
+2
+LED_SMD
+LED_PLCC_2835_Handsoldering
+https://www.luckylight.cn/media/component/data-sheet/R2835BC-B2M-M10.pdf
+LED
+0
+2
+2
+LED_SMD
+LED_RGB_1210
+RGB LED 3.2x2.7mm http://www.avagotech.com/docs/AV02-0610EN
+LED 3227
+0
+4
+4
+LED_SMD
+LED_RGB_5050-6
+http://cdn.sparkfun.com/datasheets/Components/LED/5060BRG4.pdf
+RGB LED 5050-6
+0
+6
+6
+LED_SMD
+LED_RGB_Cree-PLCC-6_6x5mm_P2.1mm
+http://www.farnell.com/datasheets/2003905.pdf
+LED RGB PLCC-6 CLP6C-FBK
+0
+6
+6
+LED_SMD
+LED_RGB_Getian_GT-P6PRGB4303
+https://www.gme.sk/img/cache/doc/518/177/vykonova-led-getian-gt-p6prgb4303-datasheet-1.pdf
+LED RGB 
+0
+7
+7
+LED_SMD
+LED_RGB_PLCC-6
+RGB LED PLCC-6
+RGB LED PLCC-6
+0
+6
+6
+LED_SMD
+LED_ROHM_SMLVN6
+https://www.rohm.com/datasheet/SMLVN6RGB1U
+LED ROHM SMLVN6
+0
+6
+6
+LED_SMD
+LED_SK6805_PLCC4_2.4x2.7mm_P1.3mm
+https://cdn-shop.adafruit.com/product-files/3484/3484_Datasheet.pdf
+LED RGB NeoPixel Nano
+0
+4
+4
+LED_SMD
+LED_SK6812MINI_PLCC4_3.5x3.5mm_P1.75mm
+https://cdn-shop.adafruit.com/product-files/2686/SK6812MINI_REV.01-1-2.pdf
+LED RGB NeoPixel Mini
+0
+4
+4
+LED_SMD
+LED_SK6812_EC15_1.5x1.5mm
+http://www.newstar-ledstrip.com/product/20181119172602110.pdf
+LED RGB NeoPixel
+0
+4
+4
+LED_SMD
+LED_SK6812_PLCC4_5.0x5.0mm_P3.2mm
+https://cdn-shop.adafruit.com/product-files/1138/SK6812+LED+datasheet+.pdf
+LED RGB NeoPixel
+0
+4
+4
+LED_SMD
+LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm
+https://cdn-shop.adafruit.com/datasheets/WS2812B.pdf
+LED RGB NeoPixel
+0
+4
+4
+LED_SMD
+LED_WS2812_PLCC6_5.0x5.0mm_P1.6mm
+https://cdn-shop.adafruit.com/datasheets/WS2812.pdf
+LED RGB NeoPixel
+0
+6
+6
+LED_SMD
+LED_Yuji_5730
+LED,Yuji,5730,https://cdn.shopify.com/s/files/1/0344/6401/files/YJWJ014-1.1_YJ-BC-5730L-G02.pdf
+LED Yuji 5730
+0
+3
+2
+LED_SMD
+LED_miniPLCC_2315
+https://docs.broadcom.com/cs/Satellite?blobcol=urldata&blobheader=application%2Fpdf&blobheadername1=Content-Disposition&blobheadername2=Content-Type&blobheadername3=MDT-Type&blobheadervalue1=attachment%3Bfilename%3DAV02-2205EN_DS_ASMT-TxBM_2014-05-09.pdf&blobheadervalue2=application%2Fx-download&blobheadervalue3=abinary%253B%2Bcharset%253DUTF-8&blobkey=id&blobnocache=true&blobtable=MungoBlobs&blobwhere=1430858274704&ssbinary=true
+LED
+0
+2
+2
+LED_SMD
+LED_miniPLCC_2315_Handsoldering
+https://docs.broadcom.com/cs/Satellite?blobcol=urldata&blobheader=application%2Fpdf&blobheadername1=Content-Disposition&blobheadername2=Content-Type&blobheadername3=MDT-Type&blobheadervalue1=attachment%3Bfilename%3DAV02-2205EN_DS_ASMT-TxBM_2014-05-09.pdf&blobheadervalue2=application%2Fx-download&blobheadervalue3=abinary%253B%2Bcharset%253DUTF-8&blobkey=id&blobnocache=true&blobtable=MungoBlobs&blobwhere=1430858274704&ssbinary=true
+LED
+0
+2
+2
 Resistor_SMD
 R_0201_0603Metric
 Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator
@@ -868,6 +1708,13 @@ B0310J50100AHF
 6
 6
 goodpocketwatch31
+BE-AAAA-PC
+
+
+0
+2
+2
+goodpocketwatch31
 CC430F613x
 
 
@@ -907,8 +1754,8 @@ PT-1203-3
 
 
 0
-0
-0
+2
+2
 goodpocketwatch31
 SN74AXC4T774RSVR
 
diff --git a/hardware/goodpocketwatch31/fp-lib-table b/hardware/goodpocketwatch31/fp-lib-table
index d12d7b3..108db66 100644
--- a/hardware/goodpocketwatch31/fp-lib-table
+++ b/hardware/goodpocketwatch31/fp-lib-table
@@ -1,5 +1,6 @@
 (fp_lib_table
   (lib (name goodpocketwatch31)(type KiCad)(uri ${KIPRJMOD}/goodpocketwatch31.pretty)(options "")(descr ""))
   (lib (name Resistor_SMD)(type KiCad)(uri ${KISYSMOD}/Resistor_SMD.pretty)(options "")(descr ""))
-  (lib (name LED_SMD)(type KiCad)(uri ${KISYSMOD}/Resistor_SMD.pretty)(options "")(descr ""))
+  (lib (name LED_SMD)(type KiCad)(uri ${KISYSMOD}/LED_SMD.pretty)(options "")(descr ""))
+  (lib (name Capacitor_SMD)(type KiCad)(uri ${KISYSMOD}/Capacitor_SMD.pretty)(options "")(descr ""))
 )
diff --git a/hardware/goodpocketwatch31/goodpocketwatch31-cache.lib b/hardware/goodpocketwatch31/goodpocketwatch31-cache.lib
index 09382d9..887f6d8 100644
--- a/hardware/goodpocketwatch31/goodpocketwatch31-cache.lib
+++ b/hardware/goodpocketwatch31/goodpocketwatch31-cache.lib
@@ -26,6 +26,25 @@ X Ext 2 0 -200 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Device_Battery_Cell
+#
+DEF Device_Battery_Cell BT 0 0 N N 1 F N
+F0 "BT" 100 100 50 H V L CNN
+F1 "Device_Battery_Cell" 100 0 50 H V L CNN
+F2 "" 0 60 50 V I C CNN
+F3 "" 0 60 50 V I C CNN
+DRAW
+S -90 70 90 60 0 1 0 F
+S -62 47 58 27 0 1 0 F
+P 2 0 1 0 0 30 0 0 N
+P 2 0 1 0 0 70 0 100 N
+P 2 0 1 10 20 135 60 135 N
+P 2 0 1 10 40 155 40 115 N
+X + 1 0 200 100 D 50 50 1 1 P
+X - 2 0 -100 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Device_Buzzer
 #
 DEF Device_Buzzer BZ 0 1 Y N 1 F N
diff --git a/hardware/goodpocketwatch31/goodpocketwatch31.kicad_pcb b/hardware/goodpocketwatch31/goodpocketwatch31.kicad_pcb
index cf4ba5c..fe3cdf3 100644
--- a/hardware/goodpocketwatch31/goodpocketwatch31.kicad_pcb
+++ b/hardware/goodpocketwatch31/goodpocketwatch31.kicad_pcb
@@ -3,10 +3,10 @@
   (general
     (thickness 1.6)
     (drawings 33)
-    (tracks 640)
+    (tracks 654)
     (zones 0)
-    (modules 48)
-    (nets 104)
+    (modules 53)
+    (nets 105)
   )
 
   (page A4)
@@ -25,7 +25,7 @@
     (33 F.Adhes user hide)
     (34 B.Paste user hide)
     (35 F.Paste user hide)
-    (36 B.SilkS user hide)
+    (36 B.SilkS user)
     (37 F.SilkS user)
     (38 B.Mask user hide)
     (39 F.Mask user hide)
@@ -202,6 +202,7 @@
   (net 101 TST)
   (net 102 PRGM)
   (net 103 RST)
+  (net 104 "Net-(BT1-Pad2)")
 
   (net_class Default "This is the default net class."
     (clearance 0.15)
@@ -234,6 +235,7 @@
     (add_net GND)
     (add_net MODE)
     (add_net "Net-(A1-Pad1)")
+    (add_net "Net-(BT1-Pad2)")
     (add_net "Net-(C10-Pad1)")
     (add_net "Net-(D1-Pad1)")
     (add_net "Net-(D2-Pad1)")
@@ -315,8 +317,160 @@
     (add_net VCC)
   )
 
+  (module goodpocketwatch31:BE-AAAA-PC (layer B.Cu) (tedit 5FE7A588) (tstamp 5FE7D5DB)
+    (at 139.62 122 180)
+    (path /5FF1D4A0)
+    (fp_text reference BT2 (at 0.5 1 270) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value AAAA (at -1 2 270) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user + (at 0 20.6) (layer B.SilkS)
+      (effects (font (size 5 5) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start 5.2 25) (end 5.2 -25) (layer B.SilkS) (width 0.12))
+    (fp_line (start -5.2 -25) (end -5.2 25) (layer B.SilkS) (width 0.12))
+    (pad 1 thru_hole circle (at 0 23.37 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 104 "Net-(BT1-Pad2)"))
+    (pad 2 thru_hole circle (at 0 -22.5 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 32 GND))
+    (model ${KIPRJMOD}/BE-AAAA-PC.stp
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz -90 0 -90))
+    )
+  )
+
+  (module goodpocketwatch31:BE-AAAA-PC (layer B.Cu) (tedit 5FE7A588) (tstamp 5FE7D5F3)
+    (at 78 122 180)
+    (path /5FF1D008)
+    (fp_text reference BT1 (at 0.5 1 270) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value AAAA (at -1 2 270) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text user + (at 0 20.6) (layer B.SilkS)
+      (effects (font (size 5 5) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start 5.2 25) (end 5.2 -25) (layer B.SilkS) (width 0.12))
+    (fp_line (start -5.2 -25) (end -5.2 25) (layer B.SilkS) (width 0.12))
+    (pad 1 thru_hole circle (at 0 23.37 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 33 VCC))
+    (pad 2 thru_hole circle (at 0 -22.5 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+      (net 104 "Net-(BT1-Pad2)"))
+    (model ${KIPRJMOD}/BE-AAAA-PC.stp
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz -90 0 -90))
+    )
+  )
+
+  (module Capacitor_SMD:C_0402_1005Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5FE80699)
+    (at 136.6 82.885 90)
+    (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags capacitor)
+    (path /5FEFBBB9/5FF06586)
+    (attr smd)
+    (fp_text reference C13 (at 0 -1.17 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 0.1uF (at 0 1.17 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.25 0.25) (thickness 0.04)))
+    )
+    (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
+    (pad 2 smd roundrect (at 0.485 0 90) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 32 GND))
+    (pad 1 smd roundrect (at -0.485 0 90) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 90 /USB/VBUS))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0402_1005Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5FE8253E)
+    (at 137.6 80.4 180)
+    (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags capacitor)
+    (path /5FEFBBB9/5FF062B5)
+    (attr smd)
+    (fp_text reference C12 (at 2.5 0.5 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 0.1uF (at 0 1.17) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.25 0.25) (thickness 0.04)))
+    )
+    (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
+    (pad 2 smd roundrect (at 0.485 0 180) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 32 GND))
+    (pad 1 smd roundrect (at -0.485 0 180) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 95 /USB/VCCB))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_SMD:C_0402_1005Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5FE8067B)
+    (at 138.6 89.415 270)
+    (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags capacitor)
+    (path /5FEFBBB9/5FF05C3F)
+    (attr smd)
+    (fp_text reference C11 (at 0 1.5 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 0.1uF (at 0 1.17 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.25 0.25) (thickness 0.04)))
+    )
+    (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
+    (pad 2 smd roundrect (at 0.485 0 270) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 32 GND))
+    (pad 1 smd roundrect (at -0.485 0 270) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 33 VCC))
+    (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (module goodpocketwatch31:PT-1203-3 (layer F.Cu) (tedit 5FE77A1F) (tstamp 5FE786AD)
-    (at 78.6 79.9 180)
+    (at 80.1 81.4 180)
     (path /5FEB8753)
     (fp_text reference BZ1 (at 0 2.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -630,81 +784,13 @@
     )
   )
 
-  (module LED_SMD:R_0402_1005Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5FE3492F)
-    (at 130.115 83.9 180)
-    (descr "Resistor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-    (tags resistor)
-    (path /5FEFBBB9/5FE78622)
-    (attr smd)
-    (fp_text reference D2 (at 0 -1.17) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value RED (at 0 1.17) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.25 0.25) (thickness 0.04)))
-    )
-    (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
-    (pad 2 smd roundrect (at 0.485 0 180) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 90 /USB/VBUS))
-    (pad 1 smd roundrect (at -0.485 0 180) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 94 "Net-(D2-Pad1)"))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0402_1005Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module LED_SMD:R_0402_1005Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5FE34920)
-    (at 130.115 80.9 180)
-    (descr "Resistor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
-    (tags resistor)
-    (path /5FEFBBB9/5FE77E47)
-    (attr smd)
-    (fp_text reference D1 (at 0 -1.17) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value GREEN (at 0 1.17) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.25 0.25) (thickness 0.04)))
-    )
-    (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
-    (pad 2 smd roundrect (at 0.485 0 180) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 90 /USB/VBUS))
-    (pad 1 smd roundrect (at -0.485 0 180) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 93 "Net-(D1-Pad1)"))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0402_1005Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Resistor_SMD:R_0402_1005Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5FE338A1)
     (at 131.6 74.915 90)
     (descr "Resistor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5FEFBBB9/5FE4B984)
     (attr smd)
-    (fp_text reference R4 (at -2.485 0 180) (layer F.SilkS)
+    (fp_text reference R4 (at 1.515 -0.5 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 5.1k (at 0 1.17 90) (layer F.Fab)
@@ -738,7 +824,7 @@
     (tags resistor)
     (path /5FEFBBB9/5FE4C6A6)
     (attr smd)
-    (fp_text reference R3 (at 2.515 0 180) (layer F.SilkS)
+    (fp_text reference R3 (at -1.485 0.5 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 5.1k (at 0 1.17 90) (layer F.Fab)
@@ -766,10 +852,10 @@
     )
   )
 
-  (module goodpocketwatch31:JAE_DX07S016JA1R1500 (layer F.Cu) (tedit 5FE268A3) (tstamp 5FE28A9B)
+  (module goodpocketwatch31:JAE_DX07S016JA1R1500 (layer F.Cu) (tedit 5FE7A377) (tstamp 5FE28A9B)
     (at 138.6 76.4 180)
     (path /5FEFBBB9/5FE3D31C)
-    (fp_text reference J2 (at -1.325 -3.385) (layer F.SilkS)
+    (fp_text reference J2 (at 3 1.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.015)))
     )
     (fp_text value DX07S016JA1R1500 (at 2.5 7.5) (layer F.Fab)
@@ -782,27 +868,27 @@
     (fp_text user PCB~EDGE (at 5.5 4.75) (layer F.Fab)
       (effects (font (size 0.48 0.48) (thickness 0.015)))
     )
-    (fp_line (start 3.125 0.315) (end 2.875 0.315) (layer Edge.Cuts) (width 0.1))
-    (fp_line (start 2.875 -0.315) (end 3.125 -0.315) (layer Edge.Cuts) (width 0.1))
-    (fp_circle (center -3.1 -2.5) (end -3 -2.5) (layer F.SilkS) (width 0.2))
-    (fp_circle (center -3.1 -2.5) (end -3 -2.5) (layer F.Fab) (width 0.2))
-    (fp_line (start 5.17 5.8) (end -5.17 5.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 5.17 -2.135) (end 5.17 5.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -5.17 -2.135) (end 5.17 -2.135) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -5.17 5.8) (end -5.17 -2.135) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.47 5.05) (end -4.47 5.05) (layer F.Fab) (width 0.127))
-    (fp_line (start 4.47 5.05) (end 9.75 5.05) (layer F.Fab) (width 0.127))
-    (fp_line (start -4.47 0.805) (end -4.47 1.57) (layer F.SilkS) (width 0.127))
-    (fp_line (start -4.47 5.05) (end -4.47 4.63) (layer F.SilkS) (width 0.127))
-    (fp_line (start 4.47 5.05) (end -4.47 5.05) (layer F.SilkS) (width 0.127))
-    (fp_line (start 4.47 4.63) (end 4.47 5.05) (layer F.SilkS) (width 0.127))
-    (fp_line (start 4.47 0.805) (end 4.47 1.57) (layer F.SilkS) (width 0.127))
-    (fp_line (start -4.47 -1.35) (end 4.47 -1.35) (layer F.Fab) (width 0.127))
-    (fp_line (start -4.47 5.05) (end -4.47 -1.35) (layer F.Fab) (width 0.127))
-    (fp_line (start -4.47 5.55) (end -4.47 5.05) (layer F.Fab) (width 0.127))
-    (fp_line (start 4.47 5.55) (end -4.47 5.55) (layer F.Fab) (width 0.127))
-    (fp_line (start 4.47 5.05) (end 4.47 5.55) (layer F.Fab) (width 0.127))
     (fp_line (start 4.47 -1.35) (end 4.47 5.05) (layer F.Fab) (width 0.127))
+    (fp_line (start 4.47 5.05) (end 4.47 5.55) (layer F.Fab) (width 0.127))
+    (fp_line (start 4.47 5.55) (end -4.47 5.55) (layer F.Fab) (width 0.127))
+    (fp_line (start -4.47 5.55) (end -4.47 5.05) (layer F.Fab) (width 0.127))
+    (fp_line (start -4.47 5.05) (end -4.47 -1.35) (layer F.Fab) (width 0.127))
+    (fp_line (start -4.47 -1.35) (end 4.47 -1.35) (layer F.Fab) (width 0.127))
+    (fp_line (start 4.47 0.805) (end 4.47 1.57) (layer F.SilkS) (width 0.127))
+    (fp_line (start 4.47 4.63) (end 4.47 5.05) (layer F.SilkS) (width 0.127))
+    (fp_line (start 4.47 5.05) (end -4.47 5.05) (layer F.SilkS) (width 0.127))
+    (fp_line (start -4.47 5.05) (end -4.47 4.63) (layer F.SilkS) (width 0.127))
+    (fp_line (start -4.47 0.805) (end -4.47 1.57) (layer F.SilkS) (width 0.127))
+    (fp_line (start 4.47 5.05) (end 9.75 5.05) (layer F.Fab) (width 0.127))
+    (fp_line (start 4.47 5.05) (end -4.47 5.05) (layer F.Fab) (width 0.127))
+    (fp_line (start -5.17 5.8) (end -5.17 -2.135) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -5.17 -2.135) (end 5.17 -2.135) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.17 -2.135) (end 5.17 5.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.17 5.8) (end -5.17 5.8) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center -3.1 -2.5) (end -3 -2.5) (layer F.Fab) (width 0.2))
+    (fp_circle (center -3.1 -2.5) (end -3 -2.5) (layer F.SilkS) (width 0.2))
+    (fp_line (start 2.875 -0.315) (end 3.125 -0.315) (layer Edge.Cuts) (width 0.1))
+    (fp_line (start 3.125 0.315) (end 2.875 0.315) (layer Edge.Cuts) (width 0.1))
     (pad S6 thru_hole oval (at 4.32 3.1 180) (size 1.2 2.4) (drill oval 0.65 1.95) (layers *.Cu *.Mask)
       (net 32 GND))
     (pad S5 thru_hole oval (at -4.32 3.1 180) (size 1.2 2.4) (drill oval 0.65 1.95) (layers *.Cu *.Mask)
@@ -843,7 +929,7 @@
     (pad 1 smd rect (at -3.1 -1.1 180) (size 0.52 1) (layers F.Cu F.Paste F.Mask)
       (net 32 GND))
     (model ${KIPRJMOD}/DX07S016JA1R1500.step
-      (at (xyz 0 0 0))
+      (offset (xyz 0 -2 0))
       (scale (xyz 1 1 1))
       (rotate (xyz -90 0 0))
     )
@@ -852,12 +938,11 @@
   (module goodpocketwatch31:FT232RQ-REEL (layer F.Cu) (tedit 5FDFB4BE) (tstamp 5FE2AADC)
     (at 140.6 84.4 180)
     (path /5FEFBBB9/5FF13552)
-    (clearance 0.1)
     (attr smd)
     (fp_text reference U5 (at -4 1) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value FT232RQ (at 0 4.5) (layer F.SilkS)
+    (fp_text value FT232RQ (at -5.5 0.5 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user * (at -3.135 -2) (layer F.SilkS)
@@ -1191,7 +1276,7 @@
     )
   )
 
-  (module goodpocketwatch31:TL6700 (layer F.Cu) (tedit 5FDF9930) (tstamp 5FDFA4A3)
+  (module goodpocketwatch31:TL6700 (layer F.Cu) (tedit 5FDF9930) (tstamp 5FE7CFAE)
     (at 130 99)
     (descr "ESwitch TL6700 series, patched so that Pin 1 and 2 are the switching ones.")
     (path /5FE19D15/5FDFABF5)
@@ -1871,7 +1956,7 @@
     )
   )
 
-  (module Capacitor_SMD:C_0402_1005Metric (layer F.Cu) (tedit 5B8CBF06) (tstamp 5B8D45BC)
+  (module Capacitor_SMD:C_0402_1005Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5B8D45BC)
     (at 114.253 75.224)
     (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
@@ -1883,6 +1968,9 @@
     (fp_text value 0.1uF (at 0 1.17) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.25 0.25) (thickness 0.04)))
+    )
     (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
     (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
     (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
@@ -1891,9 +1979,6 @@
     (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
     (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
     (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.25 0.25) (thickness 0.04)))
-    )
     (pad 2 smd roundrect (at 0.485 0) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 32 GND))
     (pad 1 smd roundrect (at -0.485 0) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
@@ -1905,7 +1990,7 @@
     )
   )
 
-  (module Capacitor_SMD:C_0402_1005Metric (layer B.Cu) (tedit 5B8CBF87) (tstamp 5B8D45AE)
+  (module Capacitor_SMD:C_0402_1005Metric (layer B.Cu) (tedit 5B301BBE) (tstamp 5B8D45AE)
     (at 105.4 77.5)
     (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
@@ -1917,21 +2002,21 @@
     (fp_text value 0.1uF (at 0 -1.17) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_line (start 0.93 -0.47) (end -0.93 -0.47) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.93 0.47) (end 0.93 -0.47) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.93 0.47) (end 0.93 0.47) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.93 -0.47) (end -0.93 0.47) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.5 -0.25) (end -0.5 -0.25) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.5 0.25) (end 0.5 -0.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.5 0.25) (end 0.5 0.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.5 -0.25) (end -0.5 0.25) (layer B.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer B.Fab)
       (effects (font (size 0.25 0.25) (thickness 0.04)) (justify mirror))
     )
-    (pad 1 smd roundrect (at -0.485 0) (size 0.59 0.64) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 52 /RFVCC))
+    (fp_line (start -0.5 -0.25) (end -0.5 0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.5 0.25) (end 0.5 0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.5 0.25) (end 0.5 -0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.25) (end -0.5 -0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.93 -0.47) (end -0.93 0.47) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.93 0.47) (end 0.93 0.47) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.93 0.47) (end 0.93 -0.47) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.93 -0.47) (end -0.93 -0.47) (layer B.CrtYd) (width 0.05))
     (pad 2 smd roundrect (at 0.485 0) (size 0.59 0.64) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 32 GND))
+    (pad 1 smd roundrect (at -0.485 0) (size 0.59 0.64) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 52 /RFVCC))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1939,7 +2024,7 @@
     )
   )
 
-  (module Capacitor_SMD:C_0402_1005Metric (layer B.Cu) (tedit 5B8CBF97) (tstamp 5B8D45A0)
+  (module Capacitor_SMD:C_0402_1005Metric (layer B.Cu) (tedit 5B301BBE) (tstamp 5B8D45A0)
     (at 105.4 75.5)
     (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
@@ -1951,6 +2036,9 @@
     (fp_text value 0.1uF (at 0 -1.17) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
+    (fp_text user %R (at 0 0) (layer B.Fab)
+      (effects (font (size 0.25 0.25) (thickness 0.04)) (justify mirror))
+    )
     (fp_line (start -0.5 -0.25) (end -0.5 0.25) (layer B.Fab) (width 0.1))
     (fp_line (start -0.5 0.25) (end 0.5 0.25) (layer B.Fab) (width 0.1))
     (fp_line (start 0.5 0.25) (end 0.5 -0.25) (layer B.Fab) (width 0.1))
@@ -1959,9 +2047,6 @@
     (fp_line (start -0.93 0.47) (end 0.93 0.47) (layer B.CrtYd) (width 0.05))
     (fp_line (start 0.93 0.47) (end 0.93 -0.47) (layer B.CrtYd) (width 0.05))
     (fp_line (start 0.93 -0.47) (end -0.93 -0.47) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0) (layer B.Fab)
-      (effects (font (size 0.25 0.25) (thickness 0.04)) (justify mirror))
-    )
     (pad 2 smd roundrect (at 0.485 0) (size 0.59 0.64) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 32 GND))
     (pad 1 smd roundrect (at -0.485 0) (size 0.59 0.64) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
@@ -1973,7 +2058,7 @@
     )
   )
 
-  (module Capacitor_SMD:C_0402_1005Metric (layer B.Cu) (tedit 5B8CBF1A) (tstamp 5B8D4576)
+  (module Capacitor_SMD:C_0402_1005Metric (layer B.Cu) (tedit 5B301BBE) (tstamp 5B8D4576)
     (at 108.3 79 90)
     (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
@@ -1985,21 +2070,21 @@
     (fp_text value 0.1uF (at 0 -1.17 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_line (start 0.93 -0.47) (end -0.93 -0.47) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.93 0.47) (end 0.93 -0.47) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.93 0.47) (end 0.93 0.47) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.93 -0.47) (end -0.93 0.47) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.5 -0.25) (end -0.5 -0.25) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.5 0.25) (end 0.5 -0.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.5 0.25) (end 0.5 0.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.5 -0.25) (end -0.5 0.25) (layer B.Fab) (width 0.1))
     (fp_text user %R (at 0 0 90) (layer B.Fab)
       (effects (font (size 0.25 0.25) (thickness 0.04)) (justify mirror))
     )
-    (pad 1 smd roundrect (at -0.485 0 90) (size 0.59 0.64) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 33 VCC))
+    (fp_line (start -0.5 -0.25) (end -0.5 0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.5 0.25) (end 0.5 0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.5 0.25) (end 0.5 -0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.25) (end -0.5 -0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.93 -0.47) (end -0.93 0.47) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.93 0.47) (end 0.93 0.47) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.93 0.47) (end 0.93 -0.47) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.93 -0.47) (end -0.93 -0.47) (layer B.CrtYd) (width 0.05))
     (pad 2 smd roundrect (at 0.485 0 90) (size 0.59 0.64) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 32 GND))
+    (pad 1 smd roundrect (at -0.485 0 90) (size 0.59 0.64) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 33 VCC))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2007,7 +2092,7 @@
     )
   )
 
-  (module Capacitor_SMD:C_0402_1005Metric (layer F.Cu) (tedit 5B8CBAB4) (tstamp 5B8D398E)
+  (module Capacitor_SMD:C_0402_1005Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5B8D398E)
     (at 114.253 76.24)
     (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
@@ -2019,21 +2104,21 @@
     (fp_text value 0.47uF (at 0 1.17) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.25 0.25) (thickness 0.04)))
     )
-    (pad 1 smd roundrect (at -0.485 0) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 43 /VCORE))
+    (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
     (pad 2 smd roundrect (at 0.485 0) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 32 GND))
+    (pad 1 smd roundrect (at -0.485 0) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 43 /VCORE))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2041,7 +2126,7 @@
     )
   )
 
-  (module Capacitor_SMD:C_0402_1005Metric (layer F.Cu) (tedit 5B8CBA11) (tstamp 5B8D281E)
+  (module Capacitor_SMD:C_0402_1005Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5B8D281E)
     (at 101 73.0396 180)
     (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
@@ -2053,6 +2138,9 @@
     (fp_text value 12pF (at 0 1.17 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_text user %R (at 0 0 180) (layer F.Fab)
+      (effects (font (size 0.25 0.25) (thickness 0.04)))
+    )
     (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
     (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
     (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
@@ -2061,9 +2149,6 @@
     (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
     (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
     (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0 180) (layer F.Fab)
-      (effects (font (size 0.25 0.25) (thickness 0.04)))
-    )
     (pad 2 smd roundrect (at 0.485 0 180) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 32 GND))
     (pad 1 smd roundrect (at -0.485 0 180) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
@@ -2075,7 +2160,7 @@
     )
   )
 
-  (module Capacitor_SMD:C_0402_1005Metric (layer F.Cu) (tedit 5B8CB9CA) (tstamp 5B8D2810)
+  (module Capacitor_SMD:C_0402_1005Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5B8D2810)
     (at 98.4796 75 90)
     (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
@@ -2087,21 +2172,21 @@
     (fp_text value 12pF (at 0 1.17 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.25 0.25) (thickness 0.04)))
     )
-    (pad 1 smd roundrect (at -0.485 0 90) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 51 /RF_XOUT))
+    (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
     (pad 2 smd roundrect (at 0.485 0 90) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 32 GND))
+    (pad 1 smd roundrect (at -0.485 0 90) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 51 /RF_XOUT))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2109,7 +2194,7 @@
     )
   )
 
-  (module Capacitor_SMD:C_0402_1005Metric (layer F.Cu) (tedit 5B8CB9A0) (tstamp 5B8D0BE0)
+  (module Capacitor_SMD:C_0402_1005Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5B8D0BE0)
     (at 100 81.8 180)
     (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
@@ -2121,21 +2206,21 @@
     (fp_text value 220pF (at 0 1.17 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0 180) (layer F.Fab)
       (effects (font (size 0.25 0.25) (thickness 0.04)))
     )
-    (pad 1 smd roundrect (at -0.485 0 180) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 54 "Net-(C10-Pad1)"))
+    (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
     (pad 2 smd roundrect (at 0.485 0 180) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 48 "Net-(A1-Pad1)"))
+    (pad 1 smd roundrect (at -0.485 0 180) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 54 "Net-(C10-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2143,62 +2228,7 @@
     )
   )
 
-  (module Connector_Coaxial:U.FL_Molex_MCRF_73412-0110_Vertical (layer B.Cu) (tedit 5A1B5B59) (tstamp 5B8C679D)
-    (at 99.8 67.05)
-    (descr "Molex Microcoaxial RF Connectors (MCRF), mates Hirose U.FL, (http://www.molex.com/pdm_docs/sd/734120110_sd.pdf)")
-    (tags "mcrf hirose ufl u.fl microcoaxial")
-    (path /5B8D41DD)
-    (attr smd)
-    (fp_text reference J1 (at 1.7 2.35 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value ANT_U.FL (at 0 3.302) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_circle (center 0 0) (end 0 -0.2) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 -1.3) (end 1.3 -1.3) (layer B.Fab) (width 0.1))
-    (fp_line (start 2.5 2.5) (end -2.5 2.5) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.5 -2.5) (end 2.5 2.5) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.5 -2.5) (end 2.5 -2.5) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.5 2.5) (end -2.5 -2.5) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.3 1.3) (end 1.3 -1.3) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.3 -1) (end -1 -1.3) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.3 1.3) (end -1.3 -1) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.3 1.3) (end 1.3 1.3) (layer B.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0.9 0) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.5 1.5) (end -0.7 1.5) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.5 1.3) (end -1.5 1.5) (layer B.SilkS) (width 0.12))
-    (fp_line (start 1.5 1.5) (end 1.5 1.3) (layer B.SilkS) (width 0.12))
-    (fp_line (start 0.7 1.5) (end 1.5 1.5) (layer B.SilkS) (width 0.12))
-    (fp_line (start 1.5 -1.5) (end 0.7 -1.5) (layer B.SilkS) (width 0.12))
-    (fp_line (start 1.5 -1.3) (end 1.5 -1.5) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.3 -1.5) (end -1.5 -1.3) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.7 -1.5) (end -1.3 -1.5) (layer B.SilkS) (width 0.12))
-    (fp_circle (center 0 0) (end 0 -0.125) (layer B.Fab) (width 0.1))
-    (fp_circle (center 0 0) (end 0 -0.05) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.7 -1.5) (end -0.7 -2) (layer B.SilkS) (width 0.12))
-    (fp_line (start 0.7 -1.5) (end 0.7 -2) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.3 -1.3) (end 0 -1) (layer B.Fab) (width 0.1))
-    (fp_line (start 0 -1) (end 0.3 -1.3) (layer B.Fab) (width 0.1))
-    (fp_text user %R (at 0 -3.5) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (pad 2 smd rect (at -1.475 0) (size 1.05 2.2) (layers B.Cu B.Paste B.Mask)
-      (net 32 GND))
-    (pad 2 smd rect (at 1.475 0) (size 1.05 2.2) (layers B.Cu B.Paste B.Mask)
-      (net 32 GND))
-    (pad 2 smd rect (at 0 1.5) (size 1 1) (layers B.Cu B.Paste B.Mask)
-      (net 32 GND))
-    (pad 1 smd rect (at 0 -1.5) (size 1 1) (layers B.Cu B.Paste B.Mask)
-      (net 48 "Net-(A1-Pad1)"))
-    (model ${KIPRJMOD}/FreeCad_3D_models/U.fl_molex_connector.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitor_SMD:C_0402_1005Metric (layer F.Cu) (tedit 5B772766) (tstamp 5B779769)
+  (module Capacitor_SMD:C_0402_1005Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5B779769)
     (at 115.523 79.669)
     (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
@@ -2210,21 +2240,21 @@
     (fp_text value 10uF (at 0 1.17) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.25 0.25) (thickness 0.04)))
     )
-    (pad 1 smd roundrect (at -0.485 0) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 45 /LCDCAP))
+    (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
     (pad 2 smd roundrect (at 0.485 0) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 32 GND))
+    (pad 1 smd roundrect (at -0.485 0) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 45 /LCDCAP))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2244,23 +2274,23 @@
     (fp_text value 47uF (at 0 -1.43) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_line (start 1.48 -0.73) (end -1.48 -0.73) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 1.48 0.73) (end 1.48 -0.73) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.48 0.73) (end 1.48 0.73) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.48 -0.73) (end -1.48 0.73) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer B.SilkS) (width 0.12))
-    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
     (fp_text user %R (at 0 0) (layer B.Fab)
       (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
     )
-    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
-      (net 33 VCC))
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.48 -0.73) (end -1.48 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end 1.48 0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.48 0.73) (end 1.48 -0.73) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end -1.48 -0.73) (layer B.CrtYd) (width 0.05))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
       (net 32 GND))
+    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
+      (net 33 VCC))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2268,6 +2298,129 @@
     )
   )
 
+  (module LED_SMD:R_0402_1005Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5FE3492F)
+    (at 130.115 83.9 180)
+    (descr "Resistor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags resistor)
+    (path /5FEFBBB9/5FE78622)
+    (attr smd)
+    (fp_text reference D2 (at 0 -1.17) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value RED (at 0 1.17) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.25 0.25) (thickness 0.04)))
+    )
+    (pad 2 smd roundrect (at 0.485 0 180) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 90 /USB/VBUS))
+    (pad 1 smd roundrect (at -0.485 0 180) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 94 "Net-(D2-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0402_1005Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module LED_SMD:R_0402_1005Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5FE34920)
+    (at 130.115 80.9 180)
+    (descr "Resistor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags resistor)
+    (path /5FEFBBB9/5FE77E47)
+    (attr smd)
+    (fp_text reference D1 (at 0 -1.17) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value GREEN (at 0 1.17) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 0.93 0.47) (end -0.93 0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.93 -0.47) (end 0.93 0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.93 -0.47) (end 0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.93 0.47) (end -0.93 -0.47) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.25 0.25) (thickness 0.04)))
+    )
+    (pad 2 smd roundrect (at 0.485 0 180) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 90 /USB/VBUS))
+    (pad 1 smd roundrect (at -0.485 0 180) (size 0.59 0.64) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 93 "Net-(D1-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0402_1005Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Connector_Coaxial:U.FL_Molex_MCRF_73412-0110_Vertical (layer B.Cu) (tedit 5A1B5B59) (tstamp 5B8C679D)
+    (at 99.8 67.05)
+    (descr "Molex Microcoaxial RF Connectors (MCRF), mates Hirose U.FL, (http://www.molex.com/pdm_docs/sd/734120110_sd.pdf)")
+    (tags "mcrf hirose ufl u.fl microcoaxial")
+    (path /5B8D41DD)
+    (attr smd)
+    (fp_text reference J1 (at 1.7 2.35 180) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value ANT_U.FL (at 0 3.302) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start 0 -1) (end 0.3 -1.3) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.3 -1.3) (end 0 -1) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.7 -1.5) (end 0.7 -2) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.7 -1.5) (end -0.7 -2) (layer B.SilkS) (width 0.12))
+    (fp_circle (center 0 0) (end 0 -0.05) (layer B.Fab) (width 0.1))
+    (fp_circle (center 0 0) (end 0 -0.125) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.7 -1.5) (end -1.3 -1.5) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.3 -1.5) (end -1.5 -1.3) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.5 -1.3) (end 1.5 -1.5) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.5 -1.5) (end 0.7 -1.5) (layer B.SilkS) (width 0.12))
+    (fp_line (start 0.7 1.5) (end 1.5 1.5) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.5 1.5) (end 1.5 1.3) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.5 1.3) (end -1.5 1.5) (layer B.SilkS) (width 0.12))
+    (fp_line (start -1.5 1.5) (end -0.7 1.5) (layer B.SilkS) (width 0.12))
+    (fp_circle (center 0 0) (end 0.9 0) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.3 1.3) (end 1.3 1.3) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.3 1.3) (end -1.3 -1) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.3 -1) (end -1 -1.3) (layer B.Fab) (width 0.1))
+    (fp_line (start 1.3 1.3) (end 1.3 -1.3) (layer B.Fab) (width 0.1))
+    (fp_line (start -2.5 2.5) (end -2.5 -2.5) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.5 -2.5) (end 2.5 -2.5) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 2.5 -2.5) (end 2.5 2.5) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 2.5 2.5) (end -2.5 2.5) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1 -1.3) (end 1.3 -1.3) (layer B.Fab) (width 0.1))
+    (fp_circle (center 0 0) (end 0 -0.2) (layer B.Fab) (width 0.1))
+    (fp_text user %R (at 0 -3.5) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (pad 2 smd rect (at -1.475 0) (size 1.05 2.2) (layers B.Cu B.Paste B.Mask)
+      (net 32 GND))
+    (pad 2 smd rect (at 1.475 0) (size 1.05 2.2) (layers B.Cu B.Paste B.Mask)
+      (net 32 GND))
+    (pad 2 smd rect (at 0 1.5) (size 1 1) (layers B.Cu B.Paste B.Mask)
+      (net 32 GND))
+    (pad 1 smd rect (at 0 -1.5) (size 1 1) (layers B.Cu B.Paste B.Mask)
+      (net 48 "Net-(A1-Pad1)"))
+    (model ${KIPRJMOD}/FreeCad_3D_models/U.fl_molex_connector.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (module Inductor_SMD:L_0402_1005Metric (layer B.Cu) (tedit 5B7733E9) (tstamp 5B778355)
     (at 105.4 76.494)
     (descr "Inductor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
@@ -2280,14 +2433,14 @@
     (fp_text value "Ferrite 1k" (at 0 -1.17) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_line (start 0.93 -0.47) (end -0.93 -0.47) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.93 0.47) (end 0.93 -0.47) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.93 0.47) (end 0.93 0.47) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -0.93 -0.47) (end -0.93 0.47) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.5 -0.25) (end -0.5 -0.25) (layer B.Fab) (width 0.1))
-    (fp_line (start 0.5 0.25) (end 0.5 -0.25) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.5 0.25) (end 0.5 0.25) (layer B.Fab) (width 0.1))
     (fp_line (start -0.5 -0.25) (end -0.5 0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.5 0.25) (end 0.5 0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.5 0.25) (end 0.5 -0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.5 -0.25) (end -0.5 -0.25) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.93 -0.47) (end -0.93 0.47) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.93 0.47) (end 0.93 0.47) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.93 0.47) (end 0.93 -0.47) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.93 -0.47) (end -0.93 -0.47) (layer B.CrtYd) (width 0.05))
     (fp_text user %R (at 0 0) (layer B.Fab)
       (effects (font (size 0.25 0.25) (thickness 0.04)) (justify mirror))
     )
@@ -2314,16 +2467,16 @@
     (fp_text value 32.768kHz (at 0 -2 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_line (start 2 1.15) (end 2 -1.15) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2 1.15) (end -2 -1.15) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2 -1.15) (end 2 -1.15) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -1.6 -0.75) (end 1.6 -0.75) (layer B.Fab) (width 0.1))
-    (fp_line (start -1.6 0.75) (end 1.6 0.75) (layer B.Fab) (width 0.1))
-    (fp_line (start 1.6 0.75) (end 1.6 -0.75) (layer B.Fab) (width 0.1))
-    (fp_line (start -0.675 0.875) (end 0.675 0.875) (layer B.SilkS) (width 0.12))
-    (fp_line (start -0.675 -0.875) (end 0.675 -0.875) (layer B.SilkS) (width 0.12))
-    (fp_line (start -1.6 0.75) (end -1.6 -0.75) (layer B.Fab) (width 0.1))
     (fp_line (start -2 1.15) (end 2 1.15) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.6 0.75) (end -1.6 -0.75) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.675 -0.875) (end 0.675 -0.875) (layer B.SilkS) (width 0.12))
+    (fp_line (start -0.675 0.875) (end 0.675 0.875) (layer B.SilkS) (width 0.12))
+    (fp_line (start 1.6 0.75) (end 1.6 -0.75) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.6 0.75) (end 1.6 0.75) (layer B.Fab) (width 0.1))
+    (fp_line (start -1.6 -0.75) (end 1.6 -0.75) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 -1.15) (end 2 -1.15) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 1.15) (end -2 -1.15) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 2 1.15) (end 2 -1.15) (layer B.CrtYd) (width 0.05))
     (fp_text user %R (at 0 2 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
@@ -2411,8 +2564,8 @@
   (gr_text Mode/P1.5 (at 119.968 75.732 90) (layer F.SilkS)
     (effects (font (size 0.5 0.5) (thickness 0.125)))
   )
-  (gr_text "GoodPocketWatch31\nT. Goodspeed\nKK4VCZ" (at 140.6 155.4 90) (layer F.SilkS)
-    (effects (font (size 1 1) (thickness 0.125)) (justify left))
+  (gr_text "GoodPocketWatch31\nT. Goodspeed\nKK4VCZ" (at 140.1 131.4 90) (layer F.SilkS)
+    (effects (font (size 1.5 1.5) (thickness 0.125)) (justify left))
   )
   (gr_text TST (at 99.568 85.725) (layer F.SilkS)
     (effects (font (size 0.5 0.5) (thickness 0.125)))
@@ -2624,6 +2777,11 @@
   (segment (start 145.6 74.4) (end 144.02 74.4) (width 0.15) (layer F.Cu) (net 32))
   (segment (start 133.15 74.43) (end 134.28 73.3) (width 0.15) (layer F.Cu) (net 32))
   (segment (start 131.6 74.43) (end 133.15 74.43) (width 0.15) (layer F.Cu) (net 32))
+  (segment (start 136.850001 82.650001) (end 136.6 82.4) (width 0.15) (layer F.Cu) (net 32))
+  (segment (start 138.354 82.650001) (end 136.850001 82.650001) (width 0.15) (layer F.Cu) (net 32))
+  (segment (start 136.6 80.915) (end 137.115 80.4) (width 0.15) (layer F.Cu) (net 32))
+  (segment (start 136.6 82.4) (end 136.6 80.915) (width 0.15) (layer F.Cu) (net 32))
+  (segment (start 139.6 90.9) (end 138.6 89.9) (width 0.15) (layer F.Cu) (net 32))
   (segment (start 99.762 62.651) (end 99.787 62.651) (width 0.15) (layer B.Cu) (net 33))
   (segment (start 99.812 62.651) (end 99.787 62.651) (width 0.15) (layer B.Cu) (net 33))
   (segment (start 107.35 81.475) (end 107.35 80.894292) (width 0.15) (layer F.Cu) (net 33))
@@ -2692,6 +2850,9 @@
   (segment (start 142.750001 90.4) (end 141.2 90.4) (width 0.15) (layer F.Cu) (net 33))
   (segment (start 143.150001 90.8) (end 142.750001 90.4) (width 0.15) (layer F.Cu) (net 33))
   (segment (start 143.6 90.8) (end 143.150001 90.8) (width 0.15) (layer F.Cu) (net 33))
+  (segment (start 139.280001 88.93) (end 138.6 88.93) (width 0.15) (layer F.Cu) (net 33))
+  (segment (start 140.750001 90.4) (end 139.280001 88.93) (width 0.15) (layer F.Cu) (net 33))
+  (segment (start 141.2 90.4) (end 140.750001 90.4) (width 0.15) (layer F.Cu) (net 33))
   (via (at 110.57 80.177) (size 0.5) (drill 0.3) (layers F.Cu B.Cu) (net 38))
   (segment (start 114.876 84.876) (end 115.376 84.876) (width 0.15) (layer B.Cu) (net 38))
   (segment (start 110.57 80.177) (end 110.57 80.57) (width 0.15) (layer B.Cu) (net 38))
@@ -2973,10 +3134,9 @@
   (segment (start 140.35 77.5) (end 140.35 78.065002) (width 0.15) (layer F.Cu) (net 87))
   (segment (start 134.850001 85.150001) (end 133.6 83.9) (width 0.15) (layer F.Cu) (net 88))
   (segment (start 138.354 85.150001) (end 134.850001 85.150001) (width 0.15) (layer F.Cu) (net 88))
-  (segment (start 137.35 84.65) (end 133.6 80.9) (width 0.15) (layer F.Cu) (net 89))
-  (segment (start 138.354 84.65) (end 137.35 84.65) (width 0.15) (layer F.Cu) (net 89))
-  (segment (start 137.95 83.649999) (end 136.25 81.949999) (width 0.15) (layer F.Cu) (net 90))
-  (segment (start 138.354 83.649999) (end 137.95 83.649999) (width 0.15) (layer F.Cu) (net 90))
+  (segment (start 133.6 83.05319) (end 133.6 80.9) (width 0.15) (layer F.Cu) (net 89))
+  (segment (start 135.19681 84.65) (end 133.6 83.05319) (width 0.15) (layer F.Cu) (net 89))
+  (segment (start 138.354 84.65) (end 135.19681 84.65) (width 0.15) (layer F.Cu) (net 89))
   (segment (start 140.95 77.059998) (end 140.95 77.5) (width 0.15) (layer F.Cu) (net 90))
   (segment (start 139.689984 75.799982) (end 140.95 77.059998) (width 0.15) (layer F.Cu) (net 90))
   (segment (start 137.300018 75.799982) (end 139.689984 75.799982) (width 0.15) (layer F.Cu) (net 90))
@@ -2987,27 +3147,29 @@
   (segment (start 129.63 80.9) (end 130.17501 80.35499) (width 0.15) (layer F.Cu) (net 90))
   (segment (start 130.17501 80.35499) (end 136.14501 80.35499) (width 0.15) (layer F.Cu) (net 90))
   (segment (start 136.25 80.25) (end 136.25 77.5) (width 0.15) (layer F.Cu) (net 90))
-  (segment (start 136.25 81.949999) (end 136.25 80.25) (width 0.15) (layer F.Cu) (net 90))
-  (segment (start 137.85 80.25) (end 137.85 77.5) (width 0.15) (layer F.Cu) (net 91))
-  (segment (start 139.35 81.75) (end 137.85 80.25) (width 0.15) (layer F.Cu) (net 91))
-  (segment (start 139.35 82.154) (end 139.35 81.75) (width 0.15) (layer F.Cu) (net 91))
+  (segment (start 136.879999 83.649999) (end 136.6 83.37) (width 0.15) (layer F.Cu) (net 90))
+  (segment (start 138.354 83.649999) (end 136.879999 83.649999) (width 0.15) (layer F.Cu) (net 90))
+  (segment (start 136.05499 82.82499) (end 136.05499 80.44501) (width 0.15) (layer F.Cu) (net 90))
+  (segment (start 136.6 83.37) (end 136.05499 82.82499) (width 0.15) (layer F.Cu) (net 90))
+  (segment (start 136.14501 80.35499) (end 136.05499 80.44501) (width 0.15) (layer F.Cu) (net 90))
   (segment (start 139.35 77.5) (end 139.35 76.15) (width 0.15) (layer F.Cu) (net 91))
   (segment (start 137.85 76.725722) (end 137.85 77.5) (width 0.15) (layer F.Cu) (net 91))
   (segment (start 138.475731 76.099991) (end 137.85 76.725722) (width 0.15) (layer F.Cu) (net 91))
   (segment (start 139.299991 76.099991) (end 138.475731 76.099991) (width 0.15) (layer F.Cu) (net 91))
   (segment (start 139.35 76.15) (end 139.299991 76.099991) (width 0.15) (layer F.Cu) (net 91))
-  (segment (start 138.35 80.250001) (end 138.35 77.5) (width 0.15) (layer F.Cu) (net 92))
-  (segment (start 139.849999 81.75) (end 138.35 80.250001) (width 0.15) (layer F.Cu) (net 92))
-  (segment (start 139.849999 82.154) (end 139.849999 81.75) (width 0.15) (layer F.Cu) (net 92))
+  (segment (start 139.35 82.154) (end 139.35 80.65) (width 0.15) (layer F.Cu) (net 91))
+  (segment (start 137.85 79.15) (end 137.85 77.5) (width 0.15) (layer F.Cu) (net 91))
+  (segment (start 139.35 80.65) (end 137.85 79.15) (width 0.15) (layer F.Cu) (net 91))
   (segment (start 138.85 77.5) (end 138.85 76.65) (width 0.15) (layer F.Cu) (net 92))
   (segment (start 138.85 76.65) (end 138.6 76.4) (width 0.15) (layer F.Cu) (net 92))
   (segment (start 138.35 76.65) (end 138.35 77.5) (width 0.15) (layer F.Cu) (net 92))
   (segment (start 138.6 76.4) (end 138.35 76.65) (width 0.15) (layer F.Cu) (net 92))
+  (segment (start 139.849999 82.154) (end 139.849999 80.149999) (width 0.15) (layer F.Cu) (net 92))
+  (segment (start 138.85 79.15) (end 138.85 77.5) (width 0.15) (layer F.Cu) (net 92))
+  (segment (start 139.849999 80.149999) (end 138.85 79.15) (width 0.15) (layer F.Cu) (net 92))
   (segment (start 132.63 80.9) (end 130.6 80.9) (width 0.15) (layer F.Cu) (net 93))
   (segment (start 132.63 83.9) (end 130.6 83.9) (width 0.15) (layer F.Cu) (net 94))
   (via (at 137.6 81.4) (size 0.5) (drill 0.3) (layers F.Cu B.Cu) (net 95))
-  (segment (start 138.354 82.154) (end 137.6 81.4) (width 0.15) (layer F.Cu) (net 95))
-  (segment (start 138.850001 82.154) (end 138.354 82.154) (width 0.15) (layer F.Cu) (net 95))
   (segment (start 137.6 81.4) (end 142.6 81.4) (width 0.15) (layer B.Cu) (net 95))
   (via (at 143.6 87.9) (size 0.5) (drill 0.3) (layers F.Cu B.Cu) (net 95))
   (segment (start 142.6 86.9) (end 143.6 87.9) (width 0.15) (layer B.Cu) (net 95))
@@ -3019,6 +3181,11 @@
   (segment (start 141.2 89.999999) (end 140.100001 88.9) (width 0.15) (layer F.Cu) (net 95))
   (segment (start 142.6 88.9) (end 143.6 87.9) (width 0.15) (layer B.Cu) (net 95))
   (segment (start 140.1 88.9) (end 142.6 88.9) (width 0.15) (layer B.Cu) (net 95))
+  (segment (start 138.085 81.393) (end 138.085 80.4) (width 0.15) (layer F.Cu) (net 95))
+  (segment (start 138.846 82.154) (end 138.085 81.393) (width 0.15) (layer F.Cu) (net 95))
+  (segment (start 138.850001 82.154) (end 138.846 82.154) (width 0.15) (layer F.Cu) (net 95))
+  (segment (start 138.078 81.4) (end 138.085 81.393) (width 0.15) (layer F.Cu) (net 95))
+  (segment (start 137.6 81.4) (end 138.078 81.4) (width 0.15) (layer F.Cu) (net 95))
   (segment (start 142.349999 88.225743) (end 142.349999 86.646) (width 0.15) (layer F.Cu) (net 96))
   (segment (start 142.175742 88.4) (end 142.349999 88.225743) (width 0.15) (layer F.Cu) (net 96))
   (segment (start 142.6 88.824258) (end 142.175742 88.4) (width 0.15) (layer F.Cu) (net 96))
diff --git a/hardware/goodpocketwatch31/goodpocketwatch31.pretty/BE-AAAA-PC.kicad_mod b/hardware/goodpocketwatch31/goodpocketwatch31.pretty/BE-AAAA-PC.kicad_mod
new file mode 100644
index 0000000..682a13e
--- /dev/null
+++ b/hardware/goodpocketwatch31/goodpocketwatch31.pretty/BE-AAAA-PC.kicad_mod
@@ -0,0 +1,20 @@
+(module BE-AAAA-PC (layer F.Cu) (tedit 5FE7A588)
+  (fp_text reference REF** (at 0.5 -1 90) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value BE-AAAA-PC (at -1 -2 90) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 5.2 -25) (end 5.2 25) (layer F.SilkS) (width 0.12))
+  (fp_line (start -5.2 25) (end -5.2 -25) (layer F.SilkS) (width 0.12))
+  (fp_text user + (at 0 -20.6) (layer F.SilkS)
+    (effects (font (size 5 5) (thickness 0.15)))
+  )
+  (pad 2 thru_hole circle (at 0 22.5) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 1 thru_hole circle (at 0 -23.37) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (model ${KIPRJMOD}/BE-AAAA-PC.stp
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz -90 0 -90))
+  )
+)
diff --git a/hardware/goodpocketwatch31/goodpocketwatch31.pretty/JAE_DX07S016JA1R1500.kicad_mod b/hardware/goodpocketwatch31/goodpocketwatch31.pretty/JAE_DX07S016JA1R1500.kicad_mod
index c110364..18cf036 100644
--- a/hardware/goodpocketwatch31/goodpocketwatch31.pretty/JAE_DX07S016JA1R1500.kicad_mod
+++ b/hardware/goodpocketwatch31/goodpocketwatch31.pretty/JAE_DX07S016JA1R1500.kicad_mod
@@ -1,31 +1,31 @@
-(module JAE_DX07S016JA1R1500 (layer F.Cu) (tedit 5FE268A3)
+(module JAE_DX07S016JA1R1500 (layer F.Cu) (tedit 5FE7A377)
   (fp_text reference REF** (at -1.325 -3.385) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.015)))
   )
   (fp_text value JAE_DX07S016JA1R1500 (at 2.5 7.5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.015)))
   )
-  (fp_line (start 3.125 0.315) (end 2.875 0.315) (layer Edge.Cuts) (width 0.1))
-  (fp_line (start 2.875 -0.315) (end 3.125 -0.315) (layer Edge.Cuts) (width 0.1))
-  (fp_circle (center -3.1 -2.5) (end -3 -2.5) (layer F.SilkS) (width 0.2))
-  (fp_circle (center -3.1 -2.5) (end -3 -2.5) (layer F.Fab) (width 0.2))
-  (fp_line (start 5.17 5.8) (end -5.17 5.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 5.17 -2.135) (end 5.17 5.8) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -5.17 -2.135) (end 5.17 -2.135) (layer F.CrtYd) (width 0.05))
-  (fp_line (start -5.17 5.8) (end -5.17 -2.135) (layer F.CrtYd) (width 0.05))
-  (fp_line (start 4.47 5.05) (end -4.47 5.05) (layer F.Fab) (width 0.127))
-  (fp_line (start 4.47 5.05) (end 9.75 5.05) (layer F.Fab) (width 0.127))
-  (fp_line (start -4.47 0.805) (end -4.47 1.57) (layer F.SilkS) (width 0.127))
-  (fp_line (start -4.47 5.05) (end -4.47 4.63) (layer F.SilkS) (width 0.127))
-  (fp_line (start 4.47 5.05) (end -4.47 5.05) (layer F.SilkS) (width 0.127))
-  (fp_line (start 4.47 4.63) (end 4.47 5.05) (layer F.SilkS) (width 0.127))
-  (fp_line (start 4.47 0.805) (end 4.47 1.57) (layer F.SilkS) (width 0.127))
-  (fp_line (start -4.47 -1.35) (end 4.47 -1.35) (layer F.Fab) (width 0.127))
-  (fp_line (start -4.47 5.05) (end -4.47 -1.35) (layer F.Fab) (width 0.127))
-  (fp_line (start -4.47 5.55) (end -4.47 5.05) (layer F.Fab) (width 0.127))
-  (fp_line (start 4.47 5.55) (end -4.47 5.55) (layer F.Fab) (width 0.127))
-  (fp_line (start 4.47 5.05) (end 4.47 5.55) (layer F.Fab) (width 0.127))
   (fp_line (start 4.47 -1.35) (end 4.47 5.05) (layer F.Fab) (width 0.127))
+  (fp_line (start 4.47 5.05) (end 4.47 5.55) (layer F.Fab) (width 0.127))
+  (fp_line (start 4.47 5.55) (end -4.47 5.55) (layer F.Fab) (width 0.127))
+  (fp_line (start -4.47 5.55) (end -4.47 5.05) (layer F.Fab) (width 0.127))
+  (fp_line (start -4.47 5.05) (end -4.47 -1.35) (layer F.Fab) (width 0.127))
+  (fp_line (start -4.47 -1.35) (end 4.47 -1.35) (layer F.Fab) (width 0.127))
+  (fp_line (start 4.47 0.805) (end 4.47 1.57) (layer F.SilkS) (width 0.127))
+  (fp_line (start 4.47 4.63) (end 4.47 5.05) (layer F.SilkS) (width 0.127))
+  (fp_line (start 4.47 5.05) (end -4.47 5.05) (layer F.SilkS) (width 0.127))
+  (fp_line (start -4.47 5.05) (end -4.47 4.63) (layer F.SilkS) (width 0.127))
+  (fp_line (start -4.47 0.805) (end -4.47 1.57) (layer F.SilkS) (width 0.127))
+  (fp_line (start 4.47 5.05) (end 9.75 5.05) (layer F.Fab) (width 0.127))
+  (fp_line (start 4.47 5.05) (end -4.47 5.05) (layer F.Fab) (width 0.127))
+  (fp_line (start -5.17 5.8) (end -5.17 -2.135) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -5.17 -2.135) (end 5.17 -2.135) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.17 -2.135) (end 5.17 5.8) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 5.17 5.8) (end -5.17 5.8) (layer F.CrtYd) (width 0.05))
+  (fp_circle (center -3.1 -2.5) (end -3 -2.5) (layer F.Fab) (width 0.2))
+  (fp_circle (center -3.1 -2.5) (end -3 -2.5) (layer F.SilkS) (width 0.2))
+  (fp_line (start 2.875 -0.315) (end 3.125 -0.315) (layer Edge.Cuts) (width 0.1))
+  (fp_line (start 3.125 0.315) (end 2.875 0.315) (layer Edge.Cuts) (width 0.1))
   (fp_text user PCB~EDGE (at 5.5 4.75) (layer F.Fab)
     (effects (font (size 0.48 0.48) (thickness 0.015)))
   )
@@ -55,7 +55,7 @@
   (pad S5 thru_hole oval (at -4.32 3.1) (size 1.2 2.4) (drill oval 0.65 1.95) (layers *.Cu *.Mask))
   (pad S6 thru_hole oval (at 4.32 3.1) (size 1.2 2.4) (drill oval 0.65 1.95) (layers *.Cu *.Mask))
   (model ${KIPRJMOD}/DX07S016JA1R1500.step
-    (at (xyz 0 0 0))
+    (offset (xyz 0 -2 0))
     (scale (xyz 1 1 1))
     (rotate (xyz -90 0 0))
   )
diff --git a/hardware/goodpocketwatch31/goodpocketwatch31.sch b/hardware/goodpocketwatch31/goodpocketwatch31.sch
index 7490b8b..40d7433 100644
--- a/hardware/goodpocketwatch31/goodpocketwatch31.sch
+++ b/hardware/goodpocketwatch31/goodpocketwatch31.sch
@@ -1052,17 +1052,6 @@ Wire Wire Line
 	5050 6400 5050 6500
 Wire Wire Line
 	5450 6400 5450 6500
-$Comp
-L Device:Buzzer BZ1
-U 1 1 5FEB8753
-P 10500 3150
-F 0 "BZ1" H 10652 3179 50  0000 L CNN
-F 1 "Buzzer" H 10652 3088 50  0000 L CNN
-F 2 "goodpocketwatch31:PT-1203-3" V 10475 3250 50  0001 C CNN
-F 3 "~" V 10475 3250 50  0001 C CNN
-	1    10500 3150
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	10400 3050 10100 3050
 Text Label 10100 3050 0    60   ~ 0
@@ -1075,4 +1064,65 @@ Text Notes 8450 6000 0    60   ~ 0
 FTDI chip and USB-C\nplug, current isolated\nfrom the watch.
 Text Notes 9750 5900 0    60   ~ 0
 Pushbutton rebuild of the\n4x4 watch keypad.
+$Comp
+L Device:Buzzer BZ1
+U 1 1 5FEB8753
+P 10500 3150
+F 0 "BZ1" H 10652 3179 50  0000 L CNN
+F 1 "Buzzer" H 10652 3088 50  0000 L CNN
+F 2 "goodpocketwatch31:PT-1203-3" V 10475 3250 50  0001 C CNN
+F 3 "~" V 10475 3250 50  0001 C CNN
+	1    10500 3150
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:Battery_Cell BT1
+U 1 1 5FF1D008
+P 7400 4750
+F 0 "BT1" H 7518 4846 50  0000 L CNN
+F 1 "AAAA" H 7518 4755 50  0000 L CNN
+F 2 "goodpocketwatch31:BE-AAAA-PC" V 7400 4810 50  0001 C CNN
+F 3 "~" V 7400 4810 50  0001 C CNN
+	1    7400 4750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:Battery_Cell BT2
+U 1 1 5FF1D4A0
+P 7400 5200
+F 0 "BT2" H 7518 5296 50  0000 L CNN
+F 1 "AAAA" H 7518 5205 50  0000 L CNN
+F 2 "goodpocketwatch31:BE-AAAA-PC" V 7400 5260 50  0001 C CNN
+F 3 "~" V 7400 5260 50  0001 C CNN
+	1    7400 5200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7400 5000 7400 4850
+$Comp
+L power:GND #PWR024
+U 1 1 5FF2712A
+P 7400 5400
+F 0 "#PWR024" H 7400 5150 50  0001 C CNN
+F 1 "GND" H 7400 5250 50  0000 C CNN
+F 2 "" H 7400 5400 50  0000 C CNN
+F 3 "" H 7400 5400 50  0000 C CNN
+	1    7400 5400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7400 5400 7400 5300
+$Comp
+L power:VCC #PWR023
+U 1 1 5FF30EE9
+P 7400 4450
+F 0 "#PWR023" H 7400 4300 50  0001 C CNN
+F 1 "VCC" H 7400 4600 50  0000 C CNN
+F 2 "" H 7400 4450 50  0000 C CNN
+F 3 "" H 7400 4450 50  0000 C CNN
+	1    7400 4450
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7400 4550 7400 4450
 $EndSCHEMATC
diff --git a/hardware/goodpocketwatch31/goodpocketwatch31.sch-bak b/hardware/goodpocketwatch31/goodpocketwatch31.sch-bak
index 7391658..af3bd03 100644
--- a/hardware/goodpocketwatch31/goodpocketwatch31.sch-bak
+++ b/hardware/goodpocketwatch31/goodpocketwatch31.sch-bak
@@ -5,7 +5,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 3
 Title "GoodPocketWatch"
-Date ""
+Date "2020-12-26"
 Rev "31"
 Comp ""
 Comment1 "by Travis Goodspeed"
@@ -1052,17 +1052,6 @@ Wire Wire Line
 	5050 6400 5050 6500
 Wire Wire Line
 	5450 6400 5450 6500
-$Comp
-L Device:Buzzer BZ1
-U 1 1 5FEB8753
-P 10500 3150
-F 0 "BZ1" H 10652 3179 50  0000 L CNN
-F 1 "Buzzer" H 10652 3088 50  0000 L CNN
-F 2 "goodpocketwatch31:PT-1203-3" V 10475 3250 50  0001 C CNN
-F 3 "~" V 10475 3250 50  0001 C CNN
-	1    10500 3150
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	10400 3050 10100 3050
 Text Label 10100 3050 0    60   ~ 0
@@ -1075,4 +1064,65 @@ Text Notes 8450 6000 0    60   ~ 0
 FTDI chip and USB-C\nplug, current isolated\nfrom the watch.
 Text Notes 9750 5900 0    60   ~ 0
 Pushbutton rebuild of the\n4x4 watch keypad.
+$Comp
+L Device:Buzzer BZ1
+U 1 1 5FEB8753
+P 10500 3150
+F 0 "BZ1" H 10652 3179 50  0000 L CNN
+F 1 "Buzzer" H 10652 3088 50  0000 L CNN
+F 2 "goodpocketwatch31:PT-1203-3" V 10475 3250 50  0001 C CNN
+F 3 "~" V 10475 3250 50  0001 C CNN
+	1    10500 3150
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:Battery_Cell BT1
+U 1 1 5FF1D008
+P 7400 4750
+F 0 "BT1" H 7518 4846 50  0000 L CNN
+F 1 "AAAA" H 7518 4755 50  0000 L CNN
+F 2 "" V 7400 4810 50  0001 C CNN
+F 3 "~" V 7400 4810 50  0001 C CNN
+	1    7400 4750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:Battery_Cell BT2
+U 1 1 5FF1D4A0
+P 7400 5200
+F 0 "BT2" H 7518 5296 50  0000 L CNN
+F 1 "AAAA" H 7518 5205 50  0000 L CNN
+F 2 "" V 7400 5260 50  0001 C CNN
+F 3 "~" V 7400 5260 50  0001 C CNN
+	1    7400 5200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7400 5000 7400 4850
+$Comp
+L power:GND #PWR024
+U 1 1 5FF2712A
+P 7400 5400
+F 0 "#PWR024" H 7400 5150 50  0001 C CNN
+F 1 "GND" H 7400 5250 50  0000 C CNN
+F 2 "" H 7400 5400 50  0000 C CNN
+F 3 "" H 7400 5400 50  0000 C CNN
+	1    7400 5400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7400 5400 7400 5300
+$Comp
+L power:VCC #PWR023
+U 1 1 5FF30EE9
+P 7400 4450
+F 0 "#PWR023" H 7400 4300 50  0001 C CNN
+F 1 "VCC" H 7400 4600 50  0000 C CNN
+F 2 "" H 7400 4450 50  0000 C CNN
+F 3 "" H 7400 4450 50  0000 C CNN
+	1    7400 4450
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7400 4550 7400 4450
 $EndSCHEMATC
diff --git a/hardware/goodpocketwatch31/usb.sch b/hardware/goodpocketwatch31/usb.sch
index 147fd71..eb9dbd3 100644
--- a/hardware/goodpocketwatch31/usb.sch
+++ b/hardware/goodpocketwatch31/usb.sch
@@ -374,4 +374,88 @@ NoConn ~ 4850 1750
 NoConn ~ 4850 1550
 NoConn ~ 8300 2050
 NoConn ~ 8300 1450
+$Comp
+L Device:C C11
+U 1 1 5FF05C3F
+P 2700 4750
+F 0 "C11" H 2815 4796 50  0000 L CNN
+F 1 "0.1uF" H 2750 4650 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 2738 4600 50  0001 C CNN
+F 3 "~" H 2700 4750 50  0001 C CNN
+	1    2700 4750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C12
+U 1 1 5FF062B5
+P 3100 4750
+F 0 "C12" H 3215 4796 50  0000 L CNN
+F 1 "0.1uF" H 3150 4650 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 3138 4600 50  0001 C CNN
+F 3 "~" H 3100 4750 50  0001 C CNN
+	1    3100 4750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C13
+U 1 1 5FF06586
+P 3450 4750
+F 0 "C13" H 3565 4796 50  0000 L CNN
+F 1 "0.1uF" H 3500 4650 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 3488 4600 50  0001 C CNN
+F 3 "~" H 3450 4750 50  0001 C CNN
+	1    3450 4750
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR020
+U 1 1 5FF09A74
+P 2700 5000
+F 0 "#PWR020" H 2700 4750 50  0001 C CNN
+F 1 "GND" H 2705 4827 50  0000 C CNN
+F 2 "" H 2700 5000 50  0001 C CNN
+F 3 "" H 2700 5000 50  0001 C CNN
+	1    2700 5000
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR021
+U 1 1 5FF0A1FE
+P 3100 5000
+F 0 "#PWR021" H 3100 4750 50  0001 C CNN
+F 1 "GND" H 3105 4827 50  0000 C CNN
+F 2 "" H 3100 5000 50  0001 C CNN
+F 3 "" H 3100 5000 50  0001 C CNN
+	1    3100 5000
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR022
+U 1 1 5FF0A398
+P 3450 5000
+F 0 "#PWR022" H 3450 4750 50  0001 C CNN
+F 1 "GND" H 3455 4827 50  0000 C CNN
+F 2 "" H 3450 5000 50  0001 C CNN
+F 3 "" H 3450 5000 50  0001 C CNN
+	1    3450 5000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2700 4900 2700 5000
+Wire Wire Line
+	3100 4900 3100 5000
+Wire Wire Line
+	3450 4900 3450 5000
+Wire Wire Line
+	2700 4600 2700 4400
+Wire Wire Line
+	3100 4600 3100 4400
+Wire Wire Line
+	3450 4600 3450 4400
+Text Label 2700 4600 1    60   ~ 0
+VCC
+Text Label 3100 4600 1    60   ~ 0
+VCCB
+Text Label 3450 4600 1    60   ~ 0
+VBUS
 $EndSCHEMATC
diff --git a/hardware/goodpocketwatch31/usb.sch-bak b/hardware/goodpocketwatch31/usb.sch-bak
index 147fd71..eb9dbd3 100644
--- a/hardware/goodpocketwatch31/usb.sch-bak
+++ b/hardware/goodpocketwatch31/usb.sch-bak
@@ -374,4 +374,88 @@ NoConn ~ 4850 1750
 NoConn ~ 4850 1550
 NoConn ~ 8300 2050
 NoConn ~ 8300 1450
+$Comp
+L Device:C C11
+U 1 1 5FF05C3F
+P 2700 4750
+F 0 "C11" H 2815 4796 50  0000 L CNN
+F 1 "0.1uF" H 2750 4650 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 2738 4600 50  0001 C CNN
+F 3 "~" H 2700 4750 50  0001 C CNN
+	1    2700 4750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C12
+U 1 1 5FF062B5
+P 3100 4750
+F 0 "C12" H 3215 4796 50  0000 L CNN
+F 1 "0.1uF" H 3150 4650 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 3138 4600 50  0001 C CNN
+F 3 "~" H 3100 4750 50  0001 C CNN
+	1    3100 4750
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C13
+U 1 1 5FF06586
+P 3450 4750
+F 0 "C13" H 3565 4796 50  0000 L CNN
+F 1 "0.1uF" H 3500 4650 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 3488 4600 50  0001 C CNN
+F 3 "~" H 3450 4750 50  0001 C CNN
+	1    3450 4750
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR020
+U 1 1 5FF09A74
+P 2700 5000
+F 0 "#PWR020" H 2700 4750 50  0001 C CNN
+F 1 "GND" H 2705 4827 50  0000 C CNN
+F 2 "" H 2700 5000 50  0001 C CNN
+F 3 "" H 2700 5000 50  0001 C CNN
+	1    2700 5000
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR021
+U 1 1 5FF0A1FE
+P 3100 5000
+F 0 "#PWR021" H 3100 4750 50  0001 C CNN
+F 1 "GND" H 3105 4827 50  0000 C CNN
+F 2 "" H 3100 5000 50  0001 C CNN
+F 3 "" H 3100 5000 50  0001 C CNN
+	1    3100 5000
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR022
+U 1 1 5FF0A398
+P 3450 5000
+F 0 "#PWR022" H 3450 4750 50  0001 C CNN
+F 1 "GND" H 3455 4827 50  0000 C CNN
+F 2 "" H 3450 5000 50  0001 C CNN
+F 3 "" H 3450 5000 50  0001 C CNN
+	1    3450 5000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2700 4900 2700 5000
+Wire Wire Line
+	3100 4900 3100 5000
+Wire Wire Line
+	3450 4900 3450 5000
+Wire Wire Line
+	2700 4600 2700 4400
+Wire Wire Line
+	3100 4600 3100 4400
+Wire Wire Line
+	3450 4600 3450 4400
+Text Label 2700 4600 1    60   ~ 0
+VCC
+Text Label 3100 4600 1    60   ~ 0
+VCCB
+Text Label 3450 4600 1    60   ~ 0
+VBUS
 $EndSCHEMATC