diff --git a/.gitignore b/.gitignore
index 826c701..0e58ad8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,10 +26,6 @@ fp-info-cache
 *.dsn
 *.ses
 
-# Exported BOM files
-*.xml
-*.csv
-
 # Backup files 
 *polygonus-Shortage-Version-backups/
 
diff --git a/export/V1.6 DRAFT/BOM-polygonus-Shortage-Version.csv b/export/V1.6 DRAFT/BOM-polygonus-Shortage-Version.csv
new file mode 100644
index 0000000..bd88079
--- /dev/null
+++ b/export/V1.6 DRAFT/BOM-polygonus-Shortage-Version.csv	
@@ -0,0 +1,62 @@
+Comment,Designator,Footprint,LCSC
+Ferrite_Bead,FB1,L_0805_2012Metric,C1015
+SN74LVC2G17DB,"U10,U14,U8,U9",SOT-23-6,C10429
+USBLC6-2SC6,U27,SOT-23-6,C111212
+8MHz,Y1,Crystal_SMD_5032-2Pin_5.0x3.2mm,C115962
+1k,"R1501,R1502,R1503,R1504,R1601,R1602,R1603,R1604,R87,R88",R_0402_1005Metric,C11702
+REF3333,U23,SOT-23,C130016
+2.7k,"R23,R24,R25,R26,R27,R28,R29,R30,R31,R32,R33,R34,R35,R36,R37,R38,R39,R40,R41,R42",R_0603_1608Metric,C13167
+330p,"C11,C20,C21",C_0402_1005Metric,C13533
+10u,"C12,C13",C_1206_3216Metric,C13585
+100n,"C10,C40,C41,C46,C51,C56,C61,C62,C63,C64,C67,C68,C69,C70,C71,C73,C79,C81,C83,C89,C91,C92,C97,C98",C_0603_1608Metric,C14663
+SM15T33CA,D1,D_SMC,C151281
+100n,"C42,C43,C44,C45,C47,C48,C49,C50,C52,C53,C54,C55,C57,C58,C59,C60",C_0402_1005Metric,C1525
+PESD1CAN-UX,"D4,D5",SOT-323_SC-70,C152727
+33p,"C74,C75",C_0402_1005Metric,C1562
+47p,"C22,C23",C_0402_1005Metric,C1567
+1u,"C2,C3,C5,C7,C84,C9",C_0603_1608Metric,C15849
+1n,"C24,C25,C26,C27,C28,C29,C30,C31,C32,C33,C34,C35,C36,C37,C38,C39",C_0603_1608Metric,C1588
+680p,"C18,C19",C_0603_1608Metric,C1630
+Micro_SD_Card,J10,microSD_HC_Wuerth_693072010801,C164170
+MIC4427,"U42,U43,U44,U45",SO-8_3.9x4.9mm_P1.27mm,C171845
+100,"R108,R109,R110,R111,R112,R113,R114,R115",R_0805_2012Metric,C17408
+4.7k,"R103,R104,R105,R106,R107",R_0805_2012Metric,C17673
+LMR14020,U3,SOIC-8-1EP_3.9x4.9mm_P1.27mm_EP2.29x3mm,C187824
+4.7u,"C14,C4,C65,C66,C72,C76,C80,C82",C_0603_1608Metric,C19666
+1k,"RN10,RN5,RN6,RN7,RN8,RN9",R_Array_Convex_4x0603,C20197
+Polyfuse,"F1,F2",R_1206_3216Metric,C207035
+VNLD5090,"U1001,U1002,U1101,U1102,U1201,U1202",SOIC-8_3.9x4.9mm_P1.27mm,C222209
+120,"R10,R101,R102,R7,R8,R9",R_0603_1608Metric,C22787
+RED,D10,LED_0603_1608Metric_Castellated,C2286
+82k,R96,R_0603_1608Metric,C23254
+2.2u,"C77,C78,C90",C_0603_1608Metric,C23630
+1,R2,R_0402_1005Metric,C25086
+330,"R91,R92,R93,R94,R95",R_0402_1005Metric,C25104
+100k,"R13,R14,R19,R20,R98",R_0402_1005Metric,C25741
+10k,"R1,R100,R3,R4,R47,R48,R49,R50,R59,R60,R61,R62,R71,R72,R73,R74,R83,R84,R85,R86,R89,R90,R97,R99",R_0402_1005Metric,C25744
+12k,"R17,R18,R5",R_0402_1005Metric,C25752
+33k,"R11,R12,R21,R22",R_0402_1005Metric,C25779
+470k,"R15,R16,R51,R52,R53,R54,R63,R64,R65,R66,R75,R76,R77,R78",R_0402_1005Metric,C25790
+5.6k,"R43,R44,R45,R46,R55,R56,R57,R58,R67,R68,R69,R70,R79,R80,R81,R82",R_0402_1005Metric,C25908
+10k,"RN1,RN11,RN2,RN3,RN4",R_Array_Convex_4x0603,C29718
+SW_Push,"SW1,SW2",SW_SPST_EVQQ2,C318887
+PSM712-LF-T7,IC1,SOT-23,C32677
+68k,R6,R_0402_1005Metric,C36871
+TLS115D0E,"U1,U2",Infineon_PG-DSO-8-43,C3747428
+10u,L2,MWSA0503,C408412
+MCP6004,"U15,U17,U19,U21,U7",TSSOP-14_4.4x5mm_P0.65mm,C50282
+3.3n,"C16,C17",C_0805_2012Metric,C53175
+MIC5205-3.3YM5,U41,SOT-23-5,C5370979
+10n,"C100,C101,C102,C15,C8,C85,C86,C87,C88,C93,C94,C95,C96,C99",C_0603_1608Metric,C57112
+AMS1117-3.3,U6,SOT-223-3_TabPin2,C6186
+ORANGE,D13,LED_0603_1608Metric_Castellated,C72038
+BLUE,D11,LED_0603_1608Metric_Castellated,C72041
+GREEN,"D12,D9",LED_0603_1608Metric_Castellated,C72043
+MCP2551-I-SN,"U4,U5",SOIC-8_3.9x4.9mm_P1.27mm,C7376
+2.2u,L1,L_1210_3225Metric,C75646
+BTS716G,U40,Infineon_PG-DSO-20-32,C85135
+SRV05-4,"D15,U11,U12,U13,U16,U18,U20,U22",SOT-23-6,C85364
+schottky,"D14,D16,D17,D6,D7,D8",D_SOD-123,C8598
+D_Schottky,"D2,D3",D_SMA,C8678
+STM32F767ZITx,U26,LQFP-144_20x20mm_P0.5mm,C90235
+LPS25HB,U24,ST_HLGA-10_2.5x2.5mm_P0.6mm_LayoutBorder3x2y,C94049
diff --git a/export/V1.6 DRAFT/CPL-polygonus-Shortage-Version.csv b/export/V1.6 DRAFT/CPL-polygonus-Shortage-Version.csv
new file mode 100644
index 0000000..f52aebf
--- /dev/null
+++ b/export/V1.6 DRAFT/CPL-polygonus-Shortage-Version.csv	
@@ -0,0 +1,300 @@
+Designator,Val,Package,Mid X,Mid Y,Rotation,Layer
+C2,1u,C_0603_1608Metric,140.279326,-81.364052,90.0,top
+C3,1u,C_0603_1608Metric,149.815912,-77.264231,-90.0,top
+C4,4.7u,C_0603_1608Metric,103.587,-79.912,90.0,top
+C5,1u,C_0603_1608Metric,149.970368,-81.337502,90.0,top
+C7,1u,C_0603_1608Metric,95.84,-92.104,180.0,top
+C8,10n,C_0603_1608Metric,96.918333,-95.620449,180.0,top
+C9,1u,C_0603_1608Metric,140.172736,-77.247402,-90.0,top
+C10,100n,C_0603_1608Metric,99.523,-88.421,90.0,top
+C11,330p,C_0402_1005Metric,104.73,-97.438,180.0,top
+C12,10u,C_1206_3216Metric,109.556,-91.85,0.0,top
+C13,10u,C_1206_3216Metric,111.842,-87.786,-90.0,top
+C14,4.7u,C_0603_1608Metric,124.288,-94.39,-90.0,top
+C15,10n,C_0603_1608Metric,147.823071,-132.660193,180.0,top
+C16,3.3n,C_0805_2012Metric,151.204535,-129.027511,0.0,top
+C17,3.3n,C_0805_2012Metric,151.289903,-136.261658,0.0,top
+C18,680p,C_0603_1608Metric,144.689658,-124.574584,-90.0,top
+C19,680p,C_0603_1608Metric,144.74661,-136.013208,-90.0,top
+C20,330p,C_0402_1005Metric,141.020875,-124.66434,-90.0,top
+C21,330p,C_0402_1005Metric,141.124942,-136.402551,90.0,top
+C22,47p,C_0402_1005Metric,139.678922,-128.503362,-90.0,top
+C23,47p,C_0402_1005Metric,138.498996,-129.805667,-90.0,top
+C24,1n,C_0603_1608Metric,141.844196,-86.4905,90.0,top
+C25,1n,C_0603_1608Metric,148.832828,-86.452287,90.0,top
+C26,1n,C_0603_1608Metric,145.356632,-86.468294,90.0,top
+C27,1n,C_0603_1608Metric,134.625131,-86.499915,90.0,top
+C28,1n,C_0603_1608Metric,138.445903,-86.446526,90.0,top
+C29,1n,C_0603_1608Metric,130.07194,-84.486373,90.0,top
+C30,1n,C_0603_1608Metric,143.368196,-89.5385,90.0,top
+C31,1n,C_0603_1608Metric,150.356828,-89.500287,90.0,top
+C32,1n,C_0603_1608Metric,146.880632,-89.516294,90.0,top
+C33,1n,C_0603_1608Metric,136.157702,-89.538175,90.0,top
+C34,1n,C_0603_1608Metric,139.969903,-89.494526,90.0,top
+C35,1n,C_0603_1608Metric,131.59594,-87.534373,90.0,top
+C36,1n,C_0603_1608Metric,132.036134,-67.628556,90.0,top
+C37,1n,C_0603_1608Metric,140.435558,-67.448089,90.0,top
+C38,1n,C_0603_1608Metric,132.917861,-65.274834,180.0,top
+C39,1n,C_0603_1608Metric,139.557492,-65.105165,0.0,top
+C40,100n,C_0603_1608Metric,130.384,-105.82,135.0,top
+C41,100n,C_0603_1608Metric,151.654537,-95.467754,0.0,top
+C42,100n,C_0402_1005Metric,144.608,-98.708,180.0,top
+C43,100n,C_0402_1005Metric,144.608,-97.692,180.0,top
+C44,100n,C_0402_1005Metric,144.608,-96.676,180.0,top
+C45,100n,C_0402_1005Metric,144.608,-95.66,180.0,top
+C46,100n,C_0603_1608Metric,136.988,-126.648,0.0,top
+C47,100n,C_0402_1005Metric,144.846731,-122.432877,180.0,top
+C48,100n,C_0402_1005Metric,144.809333,-121.165643,180.0,top
+C49,100n,C_0402_1005Metric,144.809333,-119.916537,180.0,top
+C50,100n,C_0402_1005Metric,144.744535,-118.648731,180.0,top
+C51,100n,C_0603_1608Metric,134.956,-112.678,90.0,top
+C52,100n,C_0402_1005Metric,147.247414,-115.087709,180.0,top
+C53,100n,C_0402_1005Metric,147.247414,-114.071709,180.0,top
+C54,100n,C_0402_1005Metric,147.247414,-113.055709,180.0,top
+C55,100n,C_0402_1005Metric,147.247414,-112.039709,180.0,top
+C56,100n,C_0603_1608Metric,147.245266,-107.582392,0.0,top
+C57,100n,C_0402_1005Metric,144.608,-103.026,180.0,top
+C58,100n,C_0402_1005Metric,144.608,-102.01,180.0,top
+C59,100n,C_0402_1005Metric,144.608,-100.994,180.0,top
+C60,100n,C_0402_1005Metric,144.608,-99.978,180.0,top
+C61,100n,C_0603_1608Metric,107.778,-101.248,0.0,top
+C62,100n,C_0603_1608Metric,115.652,-106.074,135.0,top
+C63,100n,C_0603_1608Metric,123.145,-98.2,0.0,top
+C64,100n,C_0603_1608Metric,123.018,-123.092,135.0,top
+C65,4.7u,C_0603_1608Metric,123.78,-114.202,135.0,top
+C66,4.7u,C_0603_1608Metric,100.412,-105.058,-45.0,top
+C67,100n,C_0603_1608Metric,96.602,-108.2584,-45.0,top
+C68,100n,C_0603_1608Metric,118.954,-109.122,135.0,top
+C69,100n,C_0603_1608Metric,96.094,-123.6,-90.0,top
+C70,100n,C_0603_1608Metric,124.0975,-122.076,-45.0,top
+C71,100n,C_0603_1608Metric,106.254,-132.744,180.0,top
+C72,4.7u,C_0603_1608Metric,100.158,-128.426,45.0,top
+C73,100n,C_0603_1608Metric,92.919,-116.869,90.0,top
+C74,33p,C_0402_1005Metric,119.462,-132.998,0.0,top
+C75,33p,C_0402_1005Metric,122.51,-132.998,180.0,top
+C76,4.7u,C_0603_1608Metric,116.922,-126.902,45.0,top
+C77,2.2u,C_0603_1608Metric,111.461,-101.375,45.0,top
+C78,2.2u,C_0603_1608Metric,93.046,-111.662,135.0,top
+C79,100n,C_0603_1608Metric,88.728,-112.932,90.0,top
+C80,4.7u,C_0603_1608Metric,111.588,-132.363,-45.0,top
+C81,100n,C_0603_1608Metric,125.304,-120.044,45.0,top
+C82,4.7u,C_0603_1608Metric,126.574,-121.06,45.0,top
+C83,100n,C_0603_1608Metric,81.713462,-90.384858,0.0,top
+C84,1u,C_0603_1608Metric,126.130133,-94.361905,-90.0,top
+C85,10n,C_0603_1608Metric,89.494413,-80.590297,-90.0,top
+C86,10n,C_0603_1608Metric,105.022164,-69.398713,0.0,top
+C87,10n,C_0603_1608Metric,101.19246,-65.566485,0.0,top
+C88,10n,C_0603_1608Metric,101.197161,-63.968098,0.0,top
+C89,100n,C_0603_1608Metric,106.5,-64.8,180.0,top
+C90,2.2u,C_0603_1608Metric,116.3,-61.0,180.0,top
+C91,100n,C_0603_1608Metric,71.8,-112.1,0.0,top
+C92,100n,C_0603_1608Metric,70.4,-104.5,180.0,top
+C93,10n,C_0603_1608Metric,64.862605,-113.499835,0.0,top
+C94,10n,C_0603_1608Metric,64.862605,-109.926207,0.0,top
+C95,10n,C_0603_1608Metric,64.84961,-106.378569,0.0,top
+C96,10n,C_0603_1608Metric,64.810625,-102.83093,0.0,top
+C97,100n,C_0603_1608Metric,70.4,-97.5,180.0,top
+C98,100n,C_0603_1608Metric,76.8,-89.3,-90.0,top
+C99,10n,C_0603_1608Metric,64.805925,-99.257302,0.0,top
+C100,10n,C_0603_1608Metric,64.779935,-95.722659,0.0,top
+C101,10n,C_0603_1608Metric,64.77164,-92.07211,0.0,top
+C102,10n,C_0603_1608Metric,64.753945,-90.512709,0.0,top
+D1,SM15T33CA,D_SMC,118.065,-84.484,0.0,top
+D2,D_Schottky,D_SMA,109.048,-81.182,0.0,top
+D3,D_Schottky,D_SMA,102.19,-86.516,90.0,top
+D4,PESD1CAN-UX,SOT-323_SC-70,124.923,-83.468,-90.0,top
+D5,PESD1CAN-UX,SOT-323_SC-70,92.919,-91.85,-90.0,top
+D6,schottky,D_SOD-123,126.4,-112.2,-135.0,top
+D7,schottky,D_SOD-123,127.336,-117.25,0.0,top
+D8,schottky,D_SOD-123,113.62,-131.601,-45.0,top
+D9,GREEN,LED_0603_1608Metric_Castellated,97.872,-136.046,180.0,top
+D10,RED,LED_0603_1608Metric_Castellated,103.46,-136.046,180.0,top
+D11,BLUE,LED_0603_1608Metric_Castellated,109.556,-136.046,180.0,top
+D12,GREEN,LED_0603_1608Metric_Castellated,115.652,-136.046,180.0,top
+D13,ORANGE,LED_0603_1608Metric_Castellated,121.748,-136.046,180.0,top
+D14,schottky,D_SOD-123,91.873462,-98.925405,90.0,top
+D15,SRV05-4,SOT-23-6,125.558,-88.802,180.0,top
+D16,schottky,D_SOD-123,107.1,-60.7,0.0,top
+D17,schottky,D_SOD-123,117.6,-64.2,90.0,top
+F1,Polyfuse,R_1206_3216Metric,150.647948,-62.483854,0.0,top
+F2,Polyfuse,R_1206_3216Metric,150.647948,-60.060439,180.0,top
+FB1,Ferrite_Bead,L_0805_2012Metric,130.384,-121.822,135.0,top
+IC1,PSM712-LF-T7,SOT-23,110.149291,-63.597863,180.0,top
+J10,Micro_SD_Card,microSD_HC_Wuerth_693072010801,87.204,-130.204,180.0,top
+L1,2.2u,L_1210_3225Metric,100.412,-80.928,180.0,top
+L2,10u,MWSA0503,107.524,-86.77,180.0,top
+R1,10k,R_0402_1005Metric,115.652,-129.442,-45.0,top
+R2,1,R_0402_1005Metric,104.857,-80.547,90.0,top
+R3,10k,R_0402_1005Metric,97.618,-94.136,180.0,top
+R4,10k,R_0402_1005Metric,116.4775,-133.4425,135.0,top
+R5,12k,R_0402_1005Metric,103.46,-96.422,180.0,top
+R6,68k,R_0402_1005Metric,105.492,-96.422,0.0,top
+R7,10,R_0603_1608Metric,116.606185,-96.986897,45.0,top
+R8,10,R_0603_1608Metric,98.360675,-97.187439,0.0,top
+R9,120,R_0603_1608Metric,124.923,-80.674,0.0,top
+R10,120,R_0603_1608Metric,93.808,-95.6345,90.0,top
+R11,33k,R_0402_1005Metric,147.402,-128.68,0.0,top
+R12,33k,R_0402_1005Metric,147.40356,-130.120193,0.0,top
+R13,100k,R_0402_1005Metric,147.649169,-127.433614,0.0,top
+R14,100k,R_0402_1005Metric,148.469986,-135.385315,0.0,top
+R15,470k,R_0402_1005Metric,147.656,-126.14,0.0,top
+R16,470k,R_0402_1005Metric,147.886571,-136.836373,0.0,top
+R17,12k,R_0402_1005Metric,146.132,-124.616,-90.0,top
+R18,12k,R_0402_1005Metric,146.244782,-136.406291,90.0,top
+R19,100k,R_0402_1005Metric,142.692584,-123.699462,0.0,top
+R20,100k,R_0402_1005Metric,142.79291,-136.843852,0.0,top
+R21,33k,R_0402_1005Metric,142.78234,-125.12434,0.0,top
+R22,33k,R_0402_1005Metric,142.815349,-135.482551,0.0,top
+R23,2.7k,R_0603_1608Metric,143.368196,-86.4905,-90.0,top
+R24,2.7k,R_0603_1608Metric,150.356828,-86.452287,-90.0,top
+R25,2.7k,R_0603_1608Metric,146.880632,-86.468294,-90.0,top
+R26,2.7k,R_0603_1608Metric,136.157702,-86.490175,-90.0,top
+R27,2.7k,R_0603_1608Metric,139.969903,-86.446526,-90.0,top
+R28,2.7k,R_0603_1608Metric,131.59594,-84.486373,-90.0,top
+R29,2.7k,R_0603_1608Metric,141.844196,-89.5385,90.0,top
+R30,2.7k,R_0603_1608Metric,148.832828,-89.500287,90.0,top
+R31,2.7k,R_0603_1608Metric,145.356632,-89.516294,90.0,top
+R32,2.7k,R_0603_1608Metric,134.633702,-89.538175,90.0,top
+R33,2.7k,R_0603_1608Metric,138.445903,-89.494526,90.0,top
+R34,2.7k,R_0603_1608Metric,130.07194,-87.534373,90.0,top
+R35,2.7k,R_0603_1608Metric,132.948171,-69.972839,0.0,top
+R36,2.7k,R_0603_1608Metric,139.584324,-69.845443,180.0,top
+R37,2.7k,R_0603_1608Metric,133.689382,-67.60751,-90.0,top
+R38,2.7k,R_0603_1608Metric,138.81995,-67.439579,-90.0,top
+R39,2.7k,R_0603_1608Metric,151.654537,-100.370684,180.0,top
+R40,2.7k,R_0603_1608Metric,151.620878,-98.788732,180.0,top
+R41,2.7k,R_0603_1608Metric,151.632098,-97.128243,180.0,top
+R42,2.7k,R_0603_1608Metric,148.037,-94.517,180.0,top
+R43,5.6k,R_0402_1005Metric,135.464,-99.724,-135.0,top
+R44,5.6k,R_0402_1005Metric,136.988,-100.74,-135.0,top
+R45,5.6k,R_0402_1005Metric,133.367217,-98.600442,-45.0,top
+R46,5.6k,R_0402_1005Metric,127.630141,-103.310453,45.0,top
+R47,10k,R_0402_1005Metric,137.496,-97.692,-135.0,top
+R48,10k,R_0402_1005Metric,137.496,-101.756,45.0,top
+R49,10k,R_0402_1005Metric,134.584656,-97.420128,-45.0,top
+R50,10k,R_0402_1005Metric,126.462226,-105.058001,45.0,top
+R51,470k,R_0402_1005Metric,148.748682,-124.920442,180.0,top
+R52,470k,R_0402_1005Metric,150.712097,-123.652636,-90.0,top
+R53,470k,R_0402_1005Metric,150.723317,-121.262879,90.0,top
+R54,470k,R_0402_1005Metric,148.872096,-119.568732,180.0,top
+R55,5.6k,R_0402_1005Metric,134.194,-126.394,0.0,top
+R56,5.6k,R_0402_1005Metric,139.782,-124.616,-90.0,top
+R57,5.6k,R_0402_1005Metric,131.4,-118.266,0.0,top
+R58,5.6k,R_0402_1005Metric,132.924,-118.901,90.0,top
+R59,10k,R_0402_1005Metric,132.924,-124.616,-90.0,top
+R60,10k,R_0402_1005Metric,140.29,-122.33,180.0,top
+R61,10k,R_0402_1005Metric,131.4,-119.282,180.0,top
+R62,10k,R_0402_1005Metric,132.924,-120.933,90.0,top
+R63,470k,R_0402_1005Metric,151.898198,-116.951416,0.0,top
+R64,470k,R_0402_1005Metric,149.845026,-116.934587,180.0,top
+R65,470k,R_0402_1005Metric,150.62673,-111.469383,90.0,top
+R66,470k,R_0402_1005Metric,151.681365,-111.477512,90.0,top
+R67,5.6k,R_0402_1005Metric,135.090634,-116.497026,-90.0,top
+R68,5.6k,R_0402_1005Metric,142.446249,-116.614831,-90.0,top
+R69,5.6k,R_0402_1005Metric,133.486083,-111.013977,90.0,top
+R70,5.6k,R_0402_1005Metric,134.946598,-109.440464,-90.0,top
+R71,10k,R_0402_1005Metric,134.656812,-114.858976,0.0,top
+R72,10k,R_0402_1005Metric,143.624298,-116.63166,90.0,top
+R73,10k,R_0402_1005Metric,133.467834,-113.094421,90.0,top
+R74,10k,R_0402_1005Metric,136.734,-109.122,180.0,top
+R75,470k,R_0402_1005Metric,147.988315,-109.819465,0.0,top
+R76,470k,R_0402_1005Metric,151.916975,-106.610683,0.0,top
+R77,470k,R_0402_1005Metric,151.928194,-105.421414,0.0,top
+R78,470k,R_0402_1005Metric,151.905755,-104.030194,0.0,top
+R79,5.6k,R_0402_1005Metric,146.264779,-110.474586,90.0,top
+R80,5.6k,R_0402_1005Metric,146.894,-104.042,180.0,top
+R81,5.6k,R_0402_1005Metric,130.384,-107.852,-45.0,top
+R82,5.6k,R_0402_1005Metric,136.743643,-107.994423,0.0,top
+R83,10k,R_0402_1005Metric,147.981366,-110.968245,180.0,top
+R84,10k,R_0402_1005Metric,148.008193,-105.125318,180.0,top
+R85,10k,R_0402_1005Metric,128.86,-106.328,-45.0,top
+R86,10k,R_0402_1005Metric,137.181853,-106.436157,-90.0,top
+R87,1k,R_0402_1005Metric,114.763,-100.105,-90.0,top
+R88,1k,R_0402_1005Metric,120.097,-102.899,180.0,top
+R89,10k,R_0402_1005Metric,125.304,-127.918,0.0,top
+R90,10k,R_0402_1005Metric,86.569,-119.79,90.0,top
+R91,330,R_0402_1005Metric,100.412,-135.538,-90.0,top
+R92,330,R_0402_1005Metric,106.254,-136.046,180.0,top
+R93,330,R_0402_1005Metric,112.35,-136.046,180.0,top
+R94,330,R_0402_1005Metric,118.446,-136.046,180.0,top
+R95,330,R_0402_1005Metric,124.542,-136.046,180.0,top
+R96,82k,R_0603_1608Metric,127.209,-83.849,-90.0,top
+R97,10k,R_0402_1005Metric,126.574,-86.008,180.0,top
+R98,100k,R_0402_1005Metric,82.18673,-92.033125,0.0,top
+R99,10k,R_0402_1005Metric,100.669511,-68.932193,0.0,top
+R100,10k,R_0402_1005Metric,100.675483,-69.959848,0.0,top
+R101,120,R_0603_1608Metric,88.429259,-76.326354,-90.0,top
+R102,120,R_0603_1608Metric,92.189378,-76.157782,-135.0,top
+R103,4.7k,R_0805_2012Metric,87.681609,-80.492834,-90.0,top
+R104,4.7k,R_0805_2012Metric,104.963687,-67.55667,0.0,top
+R105,4.7k,R_0805_2012Metric,101.406878,-67.359796,0.0,top
+R106,4.7k,R_0805_2012Metric,101.387385,-62.116309,0.0,top
+R107,4.7k,R_0805_2012Metric,106.391986,-62.845501,0.0,top
+R108,100,R_0805_2012Metric,65.057531,-115.280152,0.0,top
+R109,100,R_0805_2012Metric,65.057531,-111.719518,0.0,top
+R110,100,R_0805_2012Metric,65.044536,-108.158885,0.0,top
+R111,100,R_0805_2012Metric,65.03439,-104.598252,0.0,top
+R112,100,R_0805_2012Metric,64.995405,-101.050614,0.0,top
+R113,100,R_0805_2012Metric,64.992556,-97.476986,0.0,top
+R114,100,R_0805_2012Metric,64.98241,-93.943392,0.0,top
+R115,100,R_0805_2012Metric,64.960593,-88.696231,0.0,top
+R1501,1k,R_0402_1005Metric,70.7,-121.1,0.0,top
+R1502,1k,R_0402_1005Metric,74.4,-121.0,180.0,top
+R1503,1k,R_0402_1005Metric,76.3,-107.6,-90.0,top
+R1504,1k,R_0402_1005Metric,75.2,-105.6,-90.0,top
+R1601,1k,R_0402_1005Metric,75.2,-102.3,90.0,top
+R1602,1k,R_0402_1005Metric,75.2,-98.6,-90.0,top
+R1603,1k,R_0402_1005Metric,75.5,-95.3,90.0,top
+R1604,1k,R_0402_1005Metric,76.9,-92.1,180.0,top
+RN1,10k,R_Array_Convex_4x0603,147.91,-97.184,90.0,top
+RN2,10k,R_Array_Convex_4x0603,148.263074,-122.230926,90.0,top
+RN3,10k,R_Array_Convex_4x0603,150.677709,-114.405074,90.0,top
+RN4,10k,R_Array_Convex_4x0603,147.91,-101.502,90.0,top
+RN5,1k,R_Array_Convex_4x0603,88.268921,-84.321111,90.0,top
+RN6,1k,R_Array_Convex_4x0603,74.003547,-88.870414,0.0,top
+RN7,1k,R_Array_Convex_4x0603,84.000059,-84.321111,90.0,top
+RN8,1k,R_Array_Convex_4x0603,70.183013,-88.870414,0.0,top
+RN9,1k,R_Array_Convex_4x0603,98.108197,-133.143853,270.0,top
+RN10,1k,R_Array_Convex_4x0603,76.814751,-135.043729,90.0,top
+RN11,10k,R_Array_Convex_4x0603,94.826175,-78.153732,180.0,top
+SW1,SW_Push,SW_SPST_EVQQ2,80.694314,-111.896544,0.0,top
+SW2,SW_Push,SW_SPST_EVQQ2,80.694314,-118.451148,180.0,top
+U1,TLS115D0E,Infineon_PG-DSO-8-43,146.185671,-79.370877,180.0,top
+U2,TLS115D0E,Infineon_PG-DSO-8-43,136.454142,-79.333011,180.0,top
+U3,LMR14020,SOIC-8-1EP_3.9x4.9mm_P1.27mm_EP2.29x3mm,102.444,-92.866,270.0,top
+U4,MCP2551-I-SN,SOIC-8_3.9x4.9mm_P1.27mm,110.544271,-96.88218,270.0,top
+U5,MCP2551-I-SN,SOIC-8_3.9x4.9mm_P1.27mm,101.501722,-100.701272,90.0,top
+U6,AMS1117-3.3,SOT-223-3_TabPin2,118.7,-91.596,0.0,top
+U7,MCP6004,TSSOP-14_4.4x5mm_P0.65mm,143.366976,-130.20556,180.0,top
+U8,SN74LVC2G17DB,SOT-23-6,136.056015,-95.12034,135.0,top
+U9,SN74LVC2G17DB,SOT-23-6,126.283953,-99.79306,135.0,top
+U10,SN74LVC2G17DB,SOT-23-6,130.975512,-96.114097,135.0,top
+U11,SRV05-4,SOT-23-6,131.2785,-91.539066,270.0,top
+U12,SRV05-4,SOT-23-6,144.121124,-93.075814,270.0,top
+U13,SRV05-4,SOT-23-6,136.221469,-64.386925,180.0,top
+U14,SN74LVC2G17DB,SOT-23-6,136.245206,-68.679389,180.0,top
+U15,MCP6004,TSSOP-14_4.4x5mm_P0.65mm,132.924,-103.026,45.0,top
+U16,SRV05-4,SOT-23-6,141.052,-97.184,90.0,top
+U17,MCP6004,TSSOP-14_4.4x5mm_P0.65mm,136.226,-121.822,0.0,top
+U18,SRV05-4,SOT-23-6,141.052,-119.79,90.0,top
+U19,MCP6004,TSSOP-14_4.4x5mm_P0.65mm,138.766,-113.694,0.0,top
+U20,SRV05-4,SOT-23-6,143.876737,-113.568731,90.0,top
+U21,MCP6004,TSSOP-14_4.4x5mm_P0.65mm,141.814,-106.582,90.0,top
+U22,SRV05-4,SOT-23-6,141.106017,-101.519472,90.0,top
+U23,REF3333,SOT-23,128.733,-124.235,135.0,top
+U24,LPS25HB,ST_HLGA-10_2.5x2.5mm_P0.6mm_LayoutBorder3x2y,121.621,-100.613,-90.0,top
+U26,STM32F767ZITx,LQFP-144_20x20mm_P0.5mm,108.276,-116.918,45.0,top
+U27,USBLC6-2SC6,SOT-23-6,88.775201,-91.338417,0.0,top
+U40,BTS716G,Infineon_PG-DSO-20-32,92.905941,-68.572731,90.0,top
+U41,MIC5205-3.3YM5,SOT-23-5,114.219755,-63.592088,180.0,top
+U42,MIC4427,SO-8_3.9x4.9mm_P1.27mm,71.9,-116.7,0.0,top
+U43,MIC4427,SO-8_3.9x4.9mm_P1.27mm,70.775,-108.0,90.0,top
+U44,MIC4427,SO-8_3.9x4.9mm_P1.27mm,70.7,-101.0,90.0,top
+U45,MIC4427,SO-8_3.9x4.9mm_P1.27mm,71.2,-94.0,90.0,top
+U1001,VNLD5090,SOIC-8_3.9x4.9mm_P1.27mm,76.0,-66.5,90.0,top
+U1002,VNLD5090,SOIC-8_3.9x4.9mm_P1.27mm,67.4,-71.3,90.0,top
+U1101,VNLD5090,SOIC-8_3.9x4.9mm_P1.27mm,67.4,-76.8,90.0,top
+U1102,VNLD5090,SOIC-8_3.9x4.9mm_P1.27mm,67.4,-82.3,90.0,top
+U1201,VNLD5090,SOIC-8_3.9x4.9mm_P1.27mm,68.1,-126.9,90.0,top
+U1202,VNLD5090,SOIC-8_3.9x4.9mm_P1.27mm,68.1,-132.8,90.0,top
+Y1,8MHz,Crystal_SMD_5032-2Pin_5.0x3.2mm,120.708007,-130.183893,0.0,top
diff --git a/export/V1.6 DRAFT/GERBER-polygonus-Shortage-Version.zip b/export/V1.6 DRAFT/GERBER-polygonus-Shortage-Version.zip
new file mode 100644
index 0000000..886b50a
Binary files /dev/null and b/export/V1.6 DRAFT/GERBER-polygonus-Shortage-Version.zip differ
diff --git a/jlcpcb/project.db b/jlcpcb/project.db
index c5deac8..a119d3d 100644
Binary files a/jlcpcb/project.db and b/jlcpcb/project.db differ
diff --git a/mcu.kicad_sch b/mcu.kicad_sch
index ddd515f..b5ec01c 100644
--- a/mcu.kicad_sch
+++ b/mcu.kicad_sch
@@ -8842,7 +8842,7 @@
     (property "PN" "USBLC6-2" (at 281.94 111.125 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C7519" (at 281.94 111.125 0)
+    (property "LCSC" "C111212" (at 281.94 111.125 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "LCSC_ext" "1" (at 281.94 111.125 0)
diff --git a/polygonus-Shortage-Version.kicad_pcb b/polygonus-Shortage-Version.kicad_pcb
index 79cb76a..4964b6f 100644
--- a/polygonus-Shortage-Version.kicad_pcb
+++ b/polygonus-Shortage-Version.kicad_pcb
@@ -4416,7 +4416,7 @@
     (property "Sheetfile" "psu.kicad_sch")
     (property "Sheetname" "psu")
     (path "/00000000-0000-0000-0000-00005da72eff/00000000-0000-0000-0000-00005db0f6e7")
-    (attr through_hole exclude_from_pos_files)
+    (attr through_hole exclude_from_pos_files exclude_from_bom)
     (fp_text reference "C6" (at 1.75 -5.25) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 016b7c73-b994-4cd5-8292-9d8300bb7c82)
@@ -8408,7 +8408,7 @@
     (property "ki_description" "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
     (path "/00000000-0000-0000-0000-00005de887f5")
-    (attr exclude_from_pos_files)
+    (attr exclude_from_pos_files exclude_from_bom)
     (fp_text reference "J1" (at 0 -2.398) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp d6d2c6b1-d05a-466a-b620-1cff0dfcea7e)
@@ -8440,7 +8440,7 @@
     (property "ki_description" "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
     (path "/00000000-0000-0000-0000-00005de89191")
-    (attr exclude_from_pos_files)
+    (attr exclude_from_pos_files exclude_from_bom)
     (fp_text reference "J2" (at 0 -2.398) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 95ed67d6-8594-4fd6-86c6-b11cff37ad59)
@@ -8466,7 +8466,7 @@
     (at 88.775201 91.338417 90)
     (descr "SOT, 6 Pin (https://www.jedec.org/sites/default/files/docs/Mo-178c.PDF variant AB), generated with kicad-footprint-generator ipc_gullwing_generator.py")
     (tags "SOT TO_SOT_SMD")
-    (property "LCSC" "C7519")
+    (property "LCSC" "C111212")
     (property "LCSC_ext" "1")
     (property "PN" "USBLC6-2")
     (property "Sheetfile" "mcu.kicad_sch")
@@ -8719,7 +8719,7 @@
     (property "ki_description" "Generic connector, single row, 01x05, script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
     (path "/00000000-0000-0000-0000-00005d99e6ee/00000000-0000-0000-0000-00005e02f1fd")
-    (attr through_hole exclude_from_pos_files)
+    (attr through_hole exclude_from_pos_files exclude_from_bom)
     (fp_text reference "J13" (at 0 0.5) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 27cd8489-f4ac-435e-a4d2-363b33dabcf8)
@@ -14696,7 +14696,7 @@
     (property "ki_description" "Generic connector, single row, 01x06, script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
     (path "/00000000-0000-0000-0000-00005d99e6ee/00000000-0000-0000-0000-00005ee0ae3e")
-    (attr through_hole exclude_from_pos_files)
+    (attr through_hole exclude_from_pos_files exclude_from_bom)
     (fp_text reference "J11" (at 0 -2.33 90) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 54c5940d-286f-4186-975f-fb2d2bcf2644)
@@ -14768,7 +14768,7 @@
     (property "Sheetfile" "polygonus-Shortage-Version.kicad_sch")
     (property "Sheetname" "")
     (path "/00000000-0000-0000-0000-00005f1fca08")
-    (attr through_hole exclude_from_pos_files)
+    (attr through_hole exclude_from_pos_files exclude_from_bom)
     (fp_text reference "C1" (at 1.75 -5.25 90) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 0715fe2b-2a47-425f-a147-af0f8fab1d66)
@@ -15125,7 +15125,7 @@
     (property "Sheetfile" "knock.kicad_sch")
     (property "Sheetname" "knock")
     (path "/00000000-0000-0000-0000-00005e814213/00000000-0000-0000-0000-00005f21dc7e")
-    (attr exclude_from_pos_files)
+    (attr exclude_from_pos_files exclude_from_bom)
     (fp_text reference "JP1" (at 0 -1.8) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 20e2d7d7-f9d6-4731-9516-f2d5ecab4de2)
@@ -15189,7 +15189,7 @@
     (property "Sheetfile" "knock.kicad_sch")
     (property "Sheetname" "knock")
     (path "/00000000-0000-0000-0000-00005e814213/00000000-0000-0000-0000-00005f21f16a")
-    (attr exclude_from_pos_files)
+    (attr exclude_from_pos_files exclude_from_bom)
     (fp_text reference "JP2" (at 0 -1.8) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 13099974-7b71-4b08-ac33-a351fe388836)
@@ -15490,7 +15490,7 @@
     (property "ki_description" "Generic connector, single row, 01x02, script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
     (path "/00000000-0000-0000-0000-00005d99e6ee/00000000-0000-0000-0000-00005f3c8878")
-    (attr through_hole exclude_from_pos_files)
+    (attr through_hole exclude_from_pos_files exclude_from_bom)
     (fp_text reference "J12" (at 0 -2.33 90) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp cf2e4043-0945-41e2-8356-09de1e2cfeee)
@@ -15556,7 +15556,7 @@
     (property "ki_description" "Generic connector, single row, 01x05, script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
     (path "/00000000-0000-0000-0000-00005d99e6ee/00000000-0000-0000-0000-00005eabb1f3")
-    (attr through_hole exclude_from_pos_files)
+    (attr through_hole exclude_from_pos_files exclude_from_bom)
     (fp_text reference "J14" (at -5.8 -4.55 90) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 46c26f8e-fb9b-4d7b-a126-71505ab7b2cb)
@@ -16272,7 +16272,7 @@
     (property "ki_description" "Generic connector, single row, 01x06, script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
     (path "/00000000-0000-0000-0000-00005d99e6ee/00000000-0000-0000-0000-000060073159")
-    (attr exclude_from_pos_files)
+    (attr exclude_from_pos_files exclude_from_bom)
     (fp_text reference "J9" (at 0 2.7 90) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 262ae303-75cb-4f57-915f-a453a3078192)
@@ -16661,7 +16661,7 @@
     (property "ki_description" "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
     (path "/00000000-0000-0000-0000-00005d99e6ee/5ab17975-9467-4adf-91cc-9d11a545a2f9")
-    (attr through_hole exclude_from_pos_files)
+    (attr through_hole exclude_from_pos_files exclude_from_bom)
     (fp_text reference "J16" (at 0 -2.33) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 1c077ad5-8974-480a-87e5-bec86dfd3fe9)
@@ -19019,7 +19019,7 @@
     (property "ki_description" "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
     (path "/00000000-0000-0000-0000-00005d99e6ee/82a2654c-a4c5-4e24-aa50-d318ece3b5e4")
-    (attr through_hole exclude_from_pos_files)
+    (attr through_hole exclude_from_pos_files exclude_from_bom)
     (fp_text reference "J15" (at 0 -2.33) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 3a603adf-b1d7-44ec-98ea-b3224eff5a61)
@@ -19225,7 +19225,7 @@
     (property "ki_description" "Generic connector, single row, 01x01, script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
     (path "/00000000-0000-0000-0000-00005de896c2")
-    (attr exclude_from_pos_files)
+    (attr exclude_from_pos_files exclude_from_bom)
     (fp_text reference "J3" (at 0 -2.398) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp a47bddf5-4477-4152-9531-80b5044f4d6f)
@@ -20098,7 +20098,7 @@
     (property "ki_description" "Generic connector, double row, 02x05, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
     (path "/00000000-0000-0000-0000-00005d99e6ee/00000000-0000-0000-0000-00005dc81b40")
-    (attr smd exclude_from_pos_files)
+    (attr smd exclude_from_pos_files exclude_from_bom)
     (fp_text reference "J8" (at 0 4.235 90) (layer "B.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 43d49e5a-e32d-4705-aa7f-45ada0b3052d)
@@ -20240,7 +20240,7 @@
     (property "ki_description" "Single-cell battery")
     (property "ki_keywords" "battery cell")
     (path "/00000000-0000-0000-0000-00005d99e6ee/00000000-0000-0000-0000-0000624d42a0")
-    (attr smd exclude_from_pos_files)
+    (attr smd exclude_from_pos_files exclude_from_bom)
     (fp_text reference "BT1" (at -14.125 5.3 55) (layer "B.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 8fa10be2-0147-478b-9914-24befc677ae6)
@@ -20384,7 +20384,7 @@
     (property "ki_description" "Generic connector, single row, 01x32, script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
     (path "/80000a89-87b5-4e6a-92e9-64ba20dbcc58")
-    (attr through_hole exclude_from_pos_files)
+    (attr through_hole exclude_from_pos_files exclude_from_bom)
     (fp_text reference "J4" (at 2.965656 -0.595445) (layer "B.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 9874f2ba-d5d4-432e-9254-354a5ff7db03)
@@ -20508,7 +20508,7 @@
     (property "ki_description" "Generic connector, single row, 01x16, script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
     (path "/f0131d10-9594-40d0-8ec0-d502eb74fb21")
-    (attr through_hole exclude_from_pos_files)
+    (attr through_hole exclude_from_pos_files exclude_from_bom)
     (fp_text reference "J6" (at 0 2.33 90) (layer "B.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 6e5279f3-f48e-4dd8-93c8-80cd2bee1295)
@@ -20600,7 +20600,7 @@
     (property "ki_description" "Generic connector, single row, 01x32, script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
     (path "/942a8486-fbcf-4ef2-b335-e812292683e0")
-    (attr through_hole exclude_from_pos_files)
+    (attr through_hole exclude_from_pos_files exclude_from_bom)
     (fp_text reference "J5" (at 2.476957 0) (layer "B.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 36ad9cef-4588-4531-989c-935983f900c8)
@@ -20724,7 +20724,7 @@
     (property "ki_description" "Generic connector, single row, 01x16, script generated (kicad-library-utils/schlib/autogen/connector/)")
     (property "ki_keywords" "connector")
     (path "/979e7dc1-d53c-45eb-90c5-e82606942ae8")
-    (attr through_hole exclude_from_pos_files)
+    (attr through_hole exclude_from_pos_files exclude_from_bom)
     (fp_text reference "J7" (at 0 2.33 90) (layer "B.SilkS") hide
         (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp f84c88be-c646-4538-adea-fb133588fe23)