diff --git a/hardware/main-solar-simple/Parts.md b/hardware/main-solar-simple/Parts.md
index de4656f..09737f6 100644
--- a/hardware/main-solar-simple/Parts.md
+++ b/hardware/main-solar-simple/Parts.md
@@ -10,15 +10,14 @@
 |ATSAMD20E17A-MU|ATMEL - MCU, 32BIT, CORTEX-M0+, 48MHZ, QFN-32|[2361006](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2361006) [556-ATSAMD20E17A-MU](http://uk.mouser.com/Search/Refine.aspx?N=1323043&Keyword=556-ATSAMD20E17A-MU)|1|U1
 |SI4468-A2A-IM|SILICON LABS - RF TRANSCEIVER, 0.142-1.05GHZ, HQFN-20|[2462639](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2462639) [634-SI4468-A2A-IM](http://uk.mouser.com/Search/Refine.aspx?N=1323043&Keyword=634-SI4468-A2A-IM)|1|U2
 | UBLOX MAX-8C | GPS | [HAB Supplies](http://ava.upuaut.net/store/index.php?route=product/product&path=59_64&product_id=108) | 1 | U3
-|SST25WF040BT-40I/NP|MICROCHIP - FLASH, 4MBIT, 40MHZ, USON-8|[2414758](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2414758) [579-25WF040BT-40I/NP](http://uk.mouser.com/Search/Refine.aspx?N=1323043&Keyword=579-25WF040BT-40I/NP)|1|U4 memory 4mbit
-|X1G0041310008 TG-5006CJ-17H 16.369MHZ|EPSON - CRYSTAL, TCXO, TG-5006CJ-17H, 16.369 MHZ|[2405790](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2405790)|2|U5, U6 TCXO Si4xxx, SE880
+|SST25WF040BT-40I/NP|MICROCHIP - FLASH, 4MBIT, 40MHZ, USON-8|[2414758](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2414758) [579-25WF040BT-40I/NP](http://uk.mouser.com/Search/Refine.aspx?N=1323043&Keyword=579-25WF040BT-40I/NP)|1|U4 memory 4Mbit
+|X1G0041310008 TG-5006CJ-17H 16.369MHZ|EPSON - CRYSTAL, TCXO, TG-5006CJ-17H, 16.369 MHZ|[2405790](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2405790)|1|U5 TCXO Si4xxx
 |TPS3123J18DBVT|TEXAS INSTRUMENTS - IC, 1.62V SUPPLY MONITOR SOT-23-5|[1755607](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1755607) [595-TPS3123J8DBVT](http://uk.mouser.com/Search/Refine.aspx?N=1323043&Keyword=595-TPS3123J8DBVT)|1|U7 watchdog
 |SN74LVC1G32DCKR|TEXAS INSTRUMENTS - IC, SINGLE 2 INPUT OR GATE, SMD|[1470880](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1470880) [595-SN74LVC1G32DCKR](http://uk.mouser.com/Search/Refine.aspx?N=1323043&Keyword=595-SN74LVC1G32DCKR)|1|U8 or-gate, watchdog subsystem
 |LTC3105EDD#PBF|LINEAR TECHNOLOGY - BOOST, 400MA, MPPC, 10DFN|[1898600](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1898600)|1|U9 Solar Energy Boost Converter
 |RB161M-20TR|ROHM - Small Signal Schottky Diode, Single, 25 V, 1 A, 350 mV, 30 A, 125 °C|[1525484](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1525484)|5|D1, D2, D3, D4, D5 Small signal schotty diode
 ----
 
-
 ### Passives
 
 | Part | Description | Supplier | Quantity Required | Notes
@@ -28,27 +27,22 @@
 |LQG15HN56NJ02D|MURATA - INDUCTOR, 0402 CASE, 56NH±5%|[1343091](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1343091)|1|L3 56nH rf filter
 |L-07C18NJV6T|JOHANSON TECHNOLOGY - Surface Mount High Frequency Inductor, L-07C Series, 18 nH, ± 5%, 0402 [1005 Metric]|[1865775](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1865775)|1|L4, L5 18nH rf filter
 | L6, L7 | DNP ||| si4xxx rx
-|SRN2512-2R2M|BOURNS - Surface Mount Power Inductor, SRN2512 Series, 2.2 µH, ± 20%, Semishielded, 0.102 ohm, 2.3 A|[2428203](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2428203)|2|L8, L9 inductor for buck regulators 2.2µH
-|MC00625W0402110K|MULTICOMP - Surface Mount Chip Resistor, Thick Film, MC Series, 10 kohm, 62.5 mW, ± 1%, 50 V|[1358069](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1358069)|7|R1, R2, R3, R4, R5, R6, R7 10k
-|CRG0402F22K|TE CONNECTIVITY - Surface Mount Chip Resistor, Thick Film, CRG Series, 22 kohm, 63 mW, ± 1%, 50 V|[2331489](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2331489)|1|R8 22k
-|CRG0402F100K|TE CONNECTIVITY - Surface Mount Chip Resistor, Thick Film, CRG Series, 100 kohm, 63 mW, ± 1%, 50 V|[2331442](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2331442)|2|R9, R10 100k
-|CRG0402F1K0|TE CONNECTIVITY - Surface Mount Chip Resistor, Thick Film, CRG Series, 1 kohm, 63 mW, ± 1%, 50 V|[2331474](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2331474)|1|R11 Mpp-set 1k
-|CRG0402F220K|TE CONNECTIVITY - Surface Mount Chip Resistor, Thick Film, CRG Series, 220 kohm, 63 mW, ± 1%, 50 V|[2331487](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2331487)|1|R12A Vctrl-up 4.6V 220k
-|CRG0402F180K|TE CONNECTIVITY - Surface Mount Chip Resistor, Thick Film, CRG Series, 180 kohm, 63 mW, ± 1%, 50 V|[2331468](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2331468)|1|R12B Vctrl-up 4.25V 180k
-|CRG0402F82K|TE CONNECTIVITY - Surface Mount Chip Resistor, Thick Film, CRG Series, 82 kohm, 63 mW, ± 1%, 50 V|[2331569](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2331569)|1|R13A Vctrl-down 4.6V 82k
-|MCWR04X7502FTL|MULTICOMP - Surface Mount Chip Resistor, Thick Film, MCWR Series, 75 kohm, 62.5 mW, ± 1%, 50 V|[2447215](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2447215)|1|R13B Vctrl-down 4.25V 75k
-|CRG0402F2K2|TE CONNECTIVITY - Surface Mount Chip Resistor, Thick Film, CRG Series, 2.2 kohm, 63 mW, ± 1%, 50 V|[2331502](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2331502)|1|R14 Rprog 2.2k
-|RC0402JR-070RL|YAGEO (PHYCOMP) - Surface Mount Chip Resistor, Thick Film, RC Series, 0 ohm, 62.5 mW, ± 5%, 50 V|[9232516](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=9232516)|1|R15 Bridge 0Ω
+|MC00625W0402110K|MULTICOMP - Surface Mount Chip Resistor, Thick Film, MC Series, 10 kohm, 62.5 mW, ± 1%, 50 V|[1358069](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1358069)|7|R1, R2, R3 10k
+|ERA2AED104X|PANASONIC ELECTRONIC COMPONENTS - Surface Mount Chip Resistor, Metal Film, AEC-Q200 ERA Series, 100 kohm, 63 mW, ± 0.5%, 25 V|[2324718](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2324718)|1|R4 100k precise
+|CRG0402F100K|TE CONNECTIVITY - Surface Mount Chip Resistor, Thick Film, CRG Series, 100 kohm, 63 mW, ± 1%, 50 V|[2331442](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2331442)|2|R5, R6 100k
+|RC0402JR-070RL|YAGEO (PHYCOMP) - Surface Mount Chip Resistor, Thick Film, RC Series, 0 ohm, 62.5 mW, ± 5%, 50 V|[9232516](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=9232516)|1|R7 Bridge 0Ω
+|CRG0402F82K|TE CONNECTIVITY - Surface Mount Chip Resistor, Thick Film, CRG Series, 82 kohm, 63 mW, ± 1%, 50 V|[2331569](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2331569)|3|R10, R12, R14 LTC3105 82k
+|CRG0402F68K|TE CONNECTIVITY - Surface Mount Chip Resistor, Thick Film, CRG Series, 68 kohm, 63 mW, ± 1%, 50 V|[2331557](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2331557)|1|R11 LTC3105 FB 68k
+|MC00625W0402156K|MULTICOMP - Surface Mount Chip Resistor, Thick Film, MC Series, 56 kohm, 62.5 mW, ± 1%, 50 V|[1358089](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1358089)|1|R13 LTC3105 LDOFB 56k
 |GRM1555C1H8R2CA01D|MURATA - SMD Multilayer Ceramic Capacitor, GRM Series, 8.2 pF, ± 0.25pF, C0G / NP0, 50 V|[1828874](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1828874)|2|C1, C3 8.2pF
 |MC0402N150J500CT|MULTICOMP - SMD Multilayer Ceramic Capacitor, MC Series, 15 pF, ± 5%, C0G / NP0, 50 V, 0402 [1005 Metric]|[1758945](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1758945)|3|C2, C4, C7 15pF
 | C5, C6 | DNP ||| si4xxx rx
 |MC0402N101J500CT|MULTICOMP - SMD Multilayer Ceramic Capacitor, MC Series, 100 pF, ± 5%, C0G / NP0, 50 V, 0402 [1005 Metric]|[1758969](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1758969)|3|C8, C9, C10 100pF
-|MC0402X104K100CT|MULTICOMP - SMD Multilayer Ceramic Capacitor, MC Series, 0.1 µF, ± 10%, X5R, 10 V, 0402 [1005 Metric]|[1759380](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1759380)|10|C11, C12, C13, C14, C15, C16, C17, C18, C19, C20 100nF
-|GRM155R60J225ME15D|MURATA - SMD Multilayer Ceramic Capacitor, GRM Series, 2.2 µF, ± 20%, X5R, 6.3 V, 0402 [1005 Metric]|[2362088](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2362088)|1|C21 2.2µF
-|MC0402N180J500CT|MULTICOMP - SMD Multilayer Ceramic Capacitor, MC Series, 18 pF, ± 5%, C0G / NP0, 50 V, 0402 [1005 Metric]|[1758947](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1758947)|2|C22, C23 18pF se880 y1 load
-|06036D106MAT2A|AVX - SMD Multilayer Ceramic Capacitor, 10 µF, ± 20%, X5R, 6.3 V, 0603 [1608 Metric]|[1833804](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1833804)|3|C24, C25, C26 Solar input, Buck Out 10µF 0603
-|C1005X5R0J475M050BC|TDK - SMD Multilayer Ceramic Capacitor, C Series, 4.7 µF, ± 20%, X5R, 6.3 V, 0402 [1005 Metric]|[2309027](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2309027)|6|C27, C28, C29, C30, C31, C32 Solar input, MPPT Output, Chg in, chg out, buck in 4.7µF
-|MC0402B102J500CT|MULTICOMP - SMD Multilayer Ceramic Capacitor, MC Series, 1000 pF, ± 5%, X7R, 50 V, 0402 [1005 Metric]|[2320765](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2320765)|3|C33, C34, C35 Mpp-set, vctrl, vcc-sup 1nF
+|MC0402X104K100CT|MULTICOMP - SMD Multilayer Ceramic Capacitor, MC Series, 0.1 µF, ± 10%, X5R, 10 V, 0402 [1005 Metric]|[1759380](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1759380)|9|C11, C12, C13, C14, C15, C16, C17, C18, C19 100nF
+|GRM155R61E105KA12D|MURATA - SMD Multilayer Ceramic Capacitor, GRM Series, 1 µF, ± 10%, X5R, 25 V, 0402 [1005 Metric]|[2218855](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2218855)|1|C20 LTC3015 AUX 1µF
+|GRM155R60J225ME15D|MURATA - SMD Multilayer Ceramic Capacitor, GRM Series, 2.2 µF, ± 20%, X5R, 6.3 V, 0402 [1005 Metric]|[2362088](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2362088)|1|C21 Radio Bypass 2.2µF
+|C1005X5R0J475M050BC|TDK - SMD Multilayer Ceramic Capacitor, C Series, 4.7 µF, ± 20%, X5R, 6.3 V, 0402 [1005 Metric]|[2309027](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2309027)|2|C22, C23 BMP180 Bypass, LTC3105 LDO 4.7µF
+|06036D106MAT2A|AVX - SMD Multilayer Ceramic Capacitor, 10 µF, ± 20%, X5R, 6.3 V, 0603 [1608 Metric]|[1833804](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1833804)|2|C24, C25 LTC3105 in, out 10µF 0603
 
 ----
 
@@ -56,14 +50,15 @@
 
 | Part | Description | Supplier | Quantity Required | Notes
 | ---  | ---         | ---       | ---               | ---
-|M52-040023V0545|HARWIN - Board-To-Board Connector, Vertical, Archer M52 Series, Through Hole, Header, 5, 1.27 mm, Gold|[1099560](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1099560) [855-M52-040023V0545](http://uk.mouser.com/Search/Refine.aspx?N=1323043&Keyword=855-M52-040023V0545)|1|JTAG1
+|20021121-00010C4LF.|FCI - Board-To-Board Connector, Minitek127 20021121 Series, Surface Mount, Header, 10, 1.27 mm, Gold|[1865279](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1865279) [649-202112100010C4LF](http://uk.mouser.com/Search/Refine.aspx?N=1323043&Keyword=649-202112100010C4LF)|1|JTAG1
 |742792731|WURTH ELEKTRONIK - FERRITE BEAD, 0.09OHM, 1.2A, 0402|[1961698](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1961698)|2|FB1, FB2
 |CG0603MLC-05LE|BOURNS - ESD Protection Device, 25 V, 5 V, 0603, 2|[1828732](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1828732)|0|ESD1, ESD2
 | | Antenna Wire | [ebay](http://www.ebay.co.uk/itm/Ernie-Ball-Custom-Gauge-Guitar-Single-Strings-Electric-or-Acoustic-Pack-6-13-/360959212478 ) | 1 | Ernie Ball .013
+| | Energizer Ultimate Lithium AAA | [datasheet](http://data.energizer.com/PDFs/l92.pdf) | 1 | ~1200mAh
 
 ----
 
-## Useful Hardware
+## AAA Hardware
 
 | ID | Part Number | Description | Supplier | Order Code | Quantity
 | --- | --- | --- | --- | --- | ---
diff --git a/hardware/main-solar-simple/bristol_longshot.brd b/hardware/main-solar-simple/bristol_longshot.brd
index e6460ee..09e2f01 100644
--- a/hardware/main-solar-simple/bristol_longshot.brd
+++ b/hardware/main-solar-simple/bristol_longshot.brd
@@ -5442,16 +5442,16 @@ Please make sure your boards conform to these design rules.</description>
 <attribute name="OC_FARNELL" value="1470880" x="11.75" y="29.25" size="1.778" layer="27" display="off"/>
 </element>
 <element name="R1" library="microbuilder_v3" package="_0402" value="10kΩ" x="11.5" y="37.875" rot="R180"/>
-<element name="R9" library="microbuilder_v3" package="_0402" value="100kΩ" x="2.25" y="14.125" rot="R180"/>
-<element name="R10" library="microbuilder_v3" package="_0402" value="100kΩ" x="1.75" y="15.5" rot="R90"/>
+<element name="R5" library="microbuilder_v3" package="_0402" value="100kΩ" x="2.25" y="14.125" rot="R180"/>
+<element name="R6" library="microbuilder_v3" package="_0402" value="100kΩ" x="1.75" y="15.5" rot="R90"/>
 <element name="C18" library="microbuilder_v3" package="_0402" value="100nF" x="2.75" y="15.5" rot="R270"/>
 <element name="LED1" library="led" package="CHIPLED_0603" value="GREEN" x="3.5" y="17" rot="R270"/>
 <element name="C17" library="microbuilder_v3" package="_0402" value="100nF" x="11.5" y="24.375"/>
 <element name="U4" library="fbri" package="USON-8" value="SST25WF040BT-40I/NP" x="3" y="20.125"/>
 <element name="R12" library="microbuilder_v3" package="_0402" value="82kΩ" x="2.25" y="33.875" rot="R270"/>
 <element name="R11" library="microbuilder_v3" package="_0402" value="68kΩ" x="2.25" y="32" rot="R270"/>
-<element name="C34" library="microbuilder_v3" package="_0402" value="1µF" x="2.25" y="35.875" rot="R270"/>
-<element name="C27" library="microbuilder_v3" package="_0402" value="4.7µF" x="3.5" y="31.25" rot="R270"/>
+<element name="C20" library="microbuilder_v3" package="_0402" value="1µF" x="2.25" y="35.875" rot="R270"/>
+<element name="C23" library="microbuilder_v3" package="_0402" value="4.7µF" x="3.5" y="31.25" rot="R270"/>
 <element name="C24" library="resistor" package="C0603K" value="10µF" x="8.75" y="38.25"/>
 <element name="U6" library="ltc3105" package="DFN300X300X80-11N" value="LTC3105EDDPBF" x="4.25" y="34.875" rot="R90">
 <attribute name="PACKAGE" value="DFN-10" x="4.25" y="34.875" size="1.778" layer="27" rot="R90" display="off"/>
@@ -5462,23 +5462,23 @@ Please make sure your boards conform to these design rules.</description>
 </element>
 <element name="JTAG1" library="microbuilder_v3" package="2X05_1.27MM_SMT" value="" x="10.375" y="34" rot="R90"/>
 <element name="U9" library="SparkFun-Sensors" package="BMP180" value="BMP180" x="6.25" y="28.375"/>
-<element name="C20" library="microbuilder_v3" package="_0402" value="4.7µF" x="5.875" y="31.625" rot="R180"/>
+<element name="C22" library="microbuilder_v3" package="_0402" value="4.7µF" x="5.875" y="31.625" rot="R180"/>
 <element name="R3" library="microbuilder_v3" package="_0402" value="10kΩ" x="7.375" y="26" rot="R180"/>
 <element name="R2" library="microbuilder_v3" package="_0402" value="10kΩ" x="5.5" y="26" rot="R180"/>
 <element name="D3" library="RB161M" package="RB161M" value="RB161M" x="8.875" y="41.75" rot="R90"/>
 <element name="D2" library="RB161M" package="RB161M" value="RB161M" x="8.875" y="43.5" rot="R90"/>
 <element name="D1" library="RB161M" package="RB161M" value="RB161M" x="8.875" y="45.25" rot="R90"/>
-<element name="L1B1" library="PecanFemto4" package="LPS3015" value="10uH LPS3015" x="5" y="39.375" rot="R180"/>
-<element name="R4" library="microbuilder_v3" package="_0402" value="82kΩ" x="6.25" y="33.875" rot="R270"/>
-<element name="C22" library="resistor" package="C0603K" value="10µF" x="2.5" y="39.375" rot="R90"/>
+<element name="L1" library="PecanFemto4" package="LPS3015" value="10uH LPS3015" x="5" y="39.375" rot="R180"/>
+<element name="R10" library="microbuilder_v3" package="_0402" value="82kΩ" x="6.25" y="33.875" rot="R270"/>
+<element name="C25" library="resistor" package="C0603K" value="10µF" x="2.5" y="39.375" rot="R90"/>
 <element name="D4" library="RB161M" package="RB161M" value="RB161M" x="8.875" y="40" rot="R90"/>
-<element name="R7" library="microbuilder_v3" package="_0402" value="100kΩ" x="4.125" y="25.5" rot="R270"/>
+<element name="R4" library="microbuilder_v3" package="_0402" value="100kΩ" x="4.125" y="25.5" rot="R270"/>
 <element name="D5" library="RB161M" package="RB161M" value="RB161M" x="1.25" y="53.75" rot="R180"/>
 <element name="R14" library="microbuilder_v3" package="_0402" value="82kΩ" x="4.5" y="31.25" rot="R90"/>
 <element name="R13" library="microbuilder_v3" package="_0402" value="56kΩ" x="4" y="32.52" rot="R180"/>
 <element name="C19" library="microbuilder_v3" package="_0402" value="100nF" x="5.875" y="30.75" rot="R180"/>
 <element name="SJ1" library="microbuilder_v3" package="SOLDERJUMPER_REFLOW" value="" x="1.25" y="57.5" rot="R270"/>
-<element name="R5" library="microbuilder_v3" package="_0402" value="0Ω" x="13.25" y="6.25" rot="R270"/>
+<element name="R7" library="microbuilder_v3" package="_0402" value="0Ω" x="13.25" y="6.25" rot="R270"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -5597,7 +5597,7 @@ Please make sure your boards conform to these design rules.</description>
 <contactref element="ESD2" pad="1"/>
 <contactref element="U8" pad="3"/>
 <contactref element="R1" pad="1"/>
-<contactref element="R9" pad="1"/>
+<contactref element="R5" pad="1"/>
 <wire x1="10" y1="55.5" x2="10" y2="56.875" width="0.2" layer="1"/>
 <via x="13.125" y="14" extent="1-16" drill="0.3302"/>
 <via x="11.125" y="17.125" extent="1-16" drill="0.3302"/>
@@ -5612,8 +5612,8 @@ Please make sure your boards conform to these design rules.</description>
 <via x="1.625" y="19.375" extent="1-16" drill="0.3302"/>
 <wire x1="2.25" y1="20.125" x2="1.5" y2="20.125" width="0.4" layer="1"/>
 <contactref element="R12" pad="1"/>
-<contactref element="C34" pad="2"/>
-<contactref element="C27" pad="2"/>
+<contactref element="C20" pad="2"/>
+<contactref element="C23" pad="2"/>
 <wire x1="1.5" y1="20.125" x2="1.383" y2="20.242" width="0.4" layer="1"/>
 <wire x1="1.383" y1="20.242" x2="1.375" y2="20.242" width="0.4" layer="1"/>
 <contactref element="C24" pad="2"/>
@@ -5627,12 +5627,12 @@ Please make sure your boards conform to these design rules.</description>
 <via x="12.5" y="32.75" extent="1-16" drill="0.3302"/>
 <via x="12.5" y="34" extent="1-16" drill="0.3302"/>
 <contactref element="U9" pad="7"/>
-<contactref element="C20" pad="2"/>
+<contactref element="C22" pad="2"/>
 <via x="13.125" y="16" extent="1-16" drill="0.3302"/>
 <via x="1.25" y="1.25" extent="1-16" drill="1"/>
 <via x="1.25" y="4" extent="1-16" drill="1"/>
-<contactref element="R4" pad="1"/>
-<contactref element="C22" pad="2"/>
+<contactref element="R10" pad="1"/>
+<contactref element="C25" pad="2"/>
 <via x="3.5" y="35.25" extent="1-16" drill="0.3302"/>
 <via x="5" y="34.5" extent="1-16" drill="0.3302"/>
 <via x="4.75" y="27.75" extent="1-16" drill="0.3302"/>
@@ -5647,7 +5647,7 @@ Please make sure your boards conform to these design rules.</description>
 <via x="7" y="51.75" extent="1-16" drill="0.3302"/>
 <via x="4" y="51.75" extent="1-16" drill="0.3302"/>
 <via x="4" y="54" extent="1-16" drill="0.3302"/>
-<contactref element="R7" pad="1"/>
+<contactref element="R4" pad="1"/>
 <contactref element="R14" pad="1"/>
 <via x="6.25" y="32.5" extent="1-16" drill="0.3302"/>
 <via x="2.5" y="41.5" extent="1-16" drill="0.3302"/>
@@ -5659,7 +5659,7 @@ Please make sure your boards conform to these design rules.</description>
 <via x="4" y="56.25" extent="1-16" drill="0.3302"/>
 <via x="3" y="44" extent="1-16" drill="0.3302"/>
 <via x="6" y="44" extent="1-16" drill="0.3302"/>
-<contactref element="R5" pad="1"/>
+<contactref element="R7" pad="1"/>
 </signal>
 <signal name="SWDIO">
 <contactref element="U1" pad="32"/>
@@ -5715,7 +5715,7 @@ Please make sure your boards conform to these design rules.</description>
 <contactref element="FB2" pad="2"/>
 <contactref element="U8" pad="5"/>
 <contactref element="U7" pad="3"/>
-<contactref element="R10" pad="2"/>
+<contactref element="R6" pad="2"/>
 <wire x1="9.9" y1="49.05" x2="9.875" y2="49.025" width="0.4" layer="1"/>
 <wire x1="9.875" y1="49.025" x2="9.875" y2="48.5" width="0.4" layer="1"/>
 <contactref element="LED1" pad="A"/>
@@ -5787,7 +5787,7 @@ Please make sure your boards conform to these design rules.</description>
 <contactref element="R2" pad="2"/>
 <contactref element="R3" pad="2"/>
 <contactref element="U9" pad="2"/>
-<contactref element="C20" pad="1"/>
+<contactref element="C22" pad="1"/>
 <contactref element="U9" pad="3"/>
 <wire x1="6.867" y1="26" x2="7" y2="26.258" width="0.2" layer="1"/>
 <wire x1="7" y1="26.258" x2="7" y2="27.375" width="0.4" layer="1"/>
@@ -5815,7 +5815,7 @@ Please make sure your boards conform to these design rules.</description>
 <wire x1="6.25" y1="28.75" x2="6.25" y2="29.825" width="0.4" layer="1"/>
 <wire x1="6.25" y1="28.125" x2="6.25" y2="28.75" width="0.4" layer="1"/>
 <wire x1="3" y1="27.25" x2="0.875" y2="27.25" width="0.4" layer="16"/>
-<contactref element="C22" pad="1"/>
+<contactref element="C25" pad="1"/>
 <contactref element="U6" pad="9"/>
 <contactref element="R11" pad="2"/>
 <wire x1="6.25" y1="29.825" x2="6.25" y2="30.75" width="0.4" layer="1"/>
@@ -6165,8 +6165,8 @@ Please make sure your boards conform to these design rules.</description>
 <wire x1="10.25" y1="37.133" x2="10.25" y2="36.5" width="0.1524" layer="1"/>
 </signal>
 <signal name="SAM_XOSC">
-<contactref element="R9" pad="2"/>
-<contactref element="R10" pad="1"/>
+<contactref element="R5" pad="2"/>
+<contactref element="R6" pad="1"/>
 <contactref element="U1" pad="15"/>
 <contactref element="C18" pad="1"/>
 <wire x1="5.125" y1="18.875" x2="4.625" y2="18.875" width="0.1524" layer="1"/>
@@ -6276,15 +6276,15 @@ Please make sure your boards conform to these design rules.</description>
 <contactref element="D1" pad="CATHODE"/>
 <contactref element="U6" pad="6"/>
 <contactref element="C24" pad="1"/>
-<contactref element="L1B1" pad="1_4"/>
-<contactref element="L1B1" pad="1_6"/>
-<contactref element="L1B1" pad="1_7"/>
-<contactref element="L1B1" pad="1_9"/>
-<contactref element="L1B1" pad="1_1"/>
-<contactref element="L1B1" pad="1_3"/>
-<contactref element="L1B1" pad="1_8"/>
-<contactref element="L1B1" pad="1_5"/>
-<contactref element="L1B1" pad="1_2"/>
+<contactref element="L1" pad="1_4"/>
+<contactref element="L1" pad="1_6"/>
+<contactref element="L1" pad="1_7"/>
+<contactref element="L1" pad="1_9"/>
+<contactref element="L1" pad="1_1"/>
+<contactref element="L1" pad="1_3"/>
+<contactref element="L1" pad="1_8"/>
+<contactref element="L1" pad="1_5"/>
+<contactref element="L1" pad="1_2"/>
 <contactref element="D4" pad="CATHODE"/>
 <wire x1="7.875" y1="38.25" x2="7.822959375" y2="38.197959375" width="0.4" layer="1"/>
 <wire x1="7.822959375" y1="38.197959375" x2="7.25" y2="38.197959375" width="0.4" layer="1"/>
@@ -6376,7 +6376,7 @@ Please make sure your boards conform to these design rules.</description>
 </signal>
 <signal name="MPPT_LDO">
 <contactref element="U6" pad="2"/>
-<contactref element="C27" pad="1"/>
+<contactref element="C23" pad="1"/>
 <contactref element="R13" pad="2"/>
 <wire x1="3.742" y1="33.4272" x2="3.742" y2="32.77" width="0.2" layer="1"/>
 <wire x1="3.742" y1="32.77" x2="3.492" y2="32.52" width="0.2" layer="1"/>
@@ -6385,15 +6385,15 @@ Please make sure your boards conform to these design rules.</description>
 </signal>
 <signal name="MPPT_SW">
 <contactref element="U6" pad="7"/>
-<contactref element="L1B1" pad="2_9"/>
-<contactref element="L1B1" pad="2_2"/>
-<contactref element="L1B1" pad="2_4"/>
-<contactref element="L1B1" pad="2_7"/>
-<contactref element="L1B1" pad="2_8"/>
-<contactref element="L1B1" pad="2_1"/>
-<contactref element="L1B1" pad="2_6"/>
-<contactref element="L1B1" pad="2_3"/>
-<contactref element="L1B1" pad="2_5"/>
+<contactref element="L1" pad="2_9"/>
+<contactref element="L1" pad="2_2"/>
+<contactref element="L1" pad="2_4"/>
+<contactref element="L1" pad="2_7"/>
+<contactref element="L1" pad="2_8"/>
+<contactref element="L1" pad="2_1"/>
+<contactref element="L1" pad="2_6"/>
+<contactref element="L1" pad="2_3"/>
+<contactref element="L1" pad="2_5"/>
 <wire x1="4.758" y1="36.3228" x2="4.758" y2="37.492" width="0.3" layer="1"/>
 <wire x1="4.397" y1="37.978" x2="4.0475" y2="37.978" width="0.2" layer="1"/>
 <wire x1="4.0475" y1="37.978" x2="4.3015" y2="38.232" width="0.2" layer="1"/>
@@ -6417,7 +6417,7 @@ Please make sure your boards conform to these design rules.</description>
 </signal>
 <signal name="MPPT_AUX">
 <contactref element="U6" pad="10"/>
-<contactref element="C34" pad="1"/>
+<contactref element="C20" pad="1"/>
 <wire x1="2.25" y1="36.383" x2="3.1992" y2="36.383" width="0.2" layer="1"/>
 <wire x1="3.1992" y1="36.383" x2="3.2594" y2="36.3228" width="0.2" layer="1"/>
 </signal>
@@ -6431,7 +6431,7 @@ Please make sure your boards conform to these design rules.</description>
 </signal>
 <signal name="MPPT_SET">
 <contactref element="U6" pad="5"/>
-<contactref element="R4" pad="2"/>
+<contactref element="R10" pad="2"/>
 <wire x1="5.2406" y1="33.4272" x2="6.1898" y2="33.4272" width="0.2" layer="1"/>
 <wire x1="6.1898" y1="33.4272" x2="6.25" y2="33.367" width="0.2" layer="1"/>
 </signal>
@@ -6445,7 +6445,7 @@ Please make sure your boards conform to these design rules.</description>
 <wire x1="11.5" y1="40" x2="12.5" y2="40" width="1" layer="16"/>
 </signal>
 <signal name="EXT_THERMISTOR_SENSE">
-<contactref element="R7" pad="2"/>
+<contactref element="R4" pad="2"/>
 <contactref element="U1" pad="4"/>
 <via x="3" y="25" extent="1-16" drill="0.8"/>
 <wire x1="7.875" y1="22.625" x2="7.875" y2="23" width="0.1524" layer="1"/>
@@ -6486,7 +6486,7 @@ Please make sure your boards conform to these design rules.</description>
 <via x="12.75" y="4.25" extent="1-16" drill="1"/>
 <via x="12.75" y="1.25" extent="1-16" drill="1"/>
 <wire x1="12.75" y1="4.25" x2="12.75" y2="1.25" width="1" layer="1"/>
-<contactref element="R5" pad="2"/>
+<contactref element="R7" pad="2"/>
 <wire x1="13.25" y1="5.742" x2="13.25" y2="4.75" width="0.4" layer="1"/>
 <wire x1="13.25" y1="4.75" x2="12.75" y2="4.25" width="0.4" layer="1"/>
 </signal>
diff --git a/hardware/main-solar-simple/bristol_longshot.brd.pdf b/hardware/main-solar-simple/bristol_longshot.brd.pdf
index 424b3b9..cbbd6c1 100644
Binary files a/hardware/main-solar-simple/bristol_longshot.brd.pdf and b/hardware/main-solar-simple/bristol_longshot.brd.pdf differ
diff --git a/hardware/main-solar-simple/bristol_longshot.brd.png b/hardware/main-solar-simple/bristol_longshot.brd.png
index 330afd1..6814afe 100644
Binary files a/hardware/main-solar-simple/bristol_longshot.brd.png and b/hardware/main-solar-simple/bristol_longshot.brd.png differ
diff --git a/hardware/main-solar-simple/bristol_longshot.sch b/hardware/main-solar-simple/bristol_longshot.sch
index a9ffd93..dd9b771 100644
--- a/hardware/main-solar-simple/bristol_longshot.sch
+++ b/hardware/main-solar-simple/bristol_longshot.sch
@@ -7666,8 +7666,8 @@ Typical applications:&lt;p&gt;
 <part name="U$26" library="microbuilder_v3" deviceset="1.8V" device=""/>
 <part name="R1" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="10kΩ"/>
 <part name="U$29" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="R9" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="100kΩ"/>
-<part name="R10" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="100kΩ"/>
+<part name="R5" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="100kΩ"/>
+<part name="R6" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="100kΩ"/>
 <part name="U$30" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$32" library="microbuilder_v3" deviceset="1.8V" device=""/>
 <part name="C18" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="100nF"/>
@@ -7680,9 +7680,9 @@ Typical applications:&lt;p&gt;
 <part name="R12" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="82kΩ"/>
 <part name="R11" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="68kΩ"/>
 <part name="U$33" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C34" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1µF"/>
+<part name="C20" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1µF"/>
 <part name="U$38" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C27" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
+<part name="C23" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
 <part name="U$104" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$105" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="C24" library="resistor" deviceset="C-EU" device="C0603K" value="10µF"/>
@@ -7693,7 +7693,7 @@ Typical applications:&lt;p&gt;
 <part name="U$4" library="microbuilder_v3" deviceset="1.8V" device=""/>
 <part name="U9" library="SparkFun-Sensors" deviceset="BMP180" device=""/>
 <part name="GND13" library="SparkFun" deviceset="GND" device=""/>
-<part name="C20" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
+<part name="C22" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
 <part name="GND20" library="SparkFun" deviceset="GND" device=""/>
 <part name="R3" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="10kΩ"/>
 <part name="R2" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="10kΩ"/>
@@ -7703,14 +7703,14 @@ Typical applications:&lt;p&gt;
 <part name="D3" library="RB161M" deviceset="RB161M" device=""/>
 <part name="D2" library="RB161M" deviceset="RB161M" device=""/>
 <part name="D1" library="RB161M" deviceset="RB161M" device=""/>
-<part name="L1B1" library="PecanFemto4" deviceset="IND-LPS3015" device="" value="10uH LPS3015"/>
-<part name="R4" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="82kΩ"/>
+<part name="L1" library="PecanFemto4" deviceset="IND-LPS3015" device="" value="10uH LPS3015"/>
+<part name="R10" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="82kΩ"/>
 <part name="U$48" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C22" library="resistor" deviceset="C-EU" device="C0603K" value="10µF"/>
+<part name="C25" library="resistor" deviceset="C-EU" device="C0603K" value="10µF"/>
 <part name="U$51" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$59" library="microbuilder_v3" deviceset="1.8V" device=""/>
 <part name="D4" library="RB161M" deviceset="RB161M" device=""/>
-<part name="R7" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="100kΩ"/>
+<part name="R4" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="100kΩ"/>
 <part name="U$36" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$47" library="microbuilder_v3" deviceset="1.8V" device=""/>
 <part name="D5" library="RB161M" deviceset="RB161M" device=""/>
@@ -7720,7 +7720,7 @@ Typical applications:&lt;p&gt;
 <part name="C19" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="100nF"/>
 <part name="GND1" library="SparkFun" deviceset="GND" device=""/>
 <part name="SJ1" library="microbuilder_v3" deviceset="SOLDERJUMPER" device="REFLOW"/>
-<part name="R5" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="0Ω"/>
+<part name="R7" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="0Ω"/>
 <part name="U$52" library="microbuilder_v3" deviceset="GND" device=""/>
 </parts>
 <sheets>
@@ -7766,7 +7766,7 @@ solar cells at 0ºC to -25ºC</text>
 <text x="147.32" y="-29.972" size="1.27" layer="97" font="vector" ratio="11">MPPT output set to 1.85V</text>
 <text x="99.06" y="-75.692" size="1.27" layer="97" font="vector" ratio="11">LDO output is set to 1.7V.
 Must be less that Vout.</text>
-<text x="142.24" y="-136.652" size="1.27" layer="97" font="vector" ratio="11">1.05V - 1.45V expected from primary
+<text x="142.24" y="-136.652" size="1.27" layer="97" font="vector" ratio="11">1.2V - 1.4V expected from primary
 lithium AAA at 0ºC to -25ºC</text>
 <text x="175.26" y="-83.312" size="1.27" layer="97" font="vector" ratio="11">This net is GND by default, but may
 be disconnected to form a solar midpoint connection</text>
@@ -7852,8 +7852,8 @@ be disconnected to form a solar midpoint connection</text>
 <instance part="U$26" gate="G$1" x="48.26" y="142.24" rot="MR0"/>
 <instance part="R1" gate="G$1" x="66.04" y="124.46" rot="R90"/>
 <instance part="U$29" gate="G$1" x="66.04" y="114.3"/>
-<instance part="R9" gate="G$1" x="218.44" y="86.36" rot="R90"/>
-<instance part="R10" gate="G$1" x="218.44" y="101.6" rot="R90"/>
+<instance part="R5" gate="G$1" x="218.44" y="86.36" rot="R90"/>
+<instance part="R6" gate="G$1" x="218.44" y="101.6" rot="R90"/>
 <instance part="U$30" gate="G$1" x="218.44" y="78.74"/>
 <instance part="U$32" gate="G$1" x="218.44" y="109.22" rot="MR0"/>
 <instance part="C18" gate="G$1" x="226.06" y="93.98" rot="R90"/>
@@ -7867,9 +7867,9 @@ be disconnected to form a solar midpoint connection</text>
 <instance part="R12" gate="G$1" x="160.02" y="-58.42" rot="R90"/>
 <instance part="R11" gate="G$1" x="160.02" y="-45.72" rot="R90"/>
 <instance part="U$33" gate="G$1" x="160.02" y="-66.04"/>
-<instance part="C34" gate="G$1" x="60.96" y="-60.96"/>
+<instance part="C20" gate="G$1" x="60.96" y="-60.96"/>
 <instance part="U$38" gate="G$1" x="60.96" y="-66.04"/>
-<instance part="C27" gate="G$1" x="134.62" y="-58.42"/>
+<instance part="C23" gate="G$1" x="134.62" y="-58.42"/>
 <instance part="U$104" gate="G$1" x="30.48" y="-66.04"/>
 <instance part="U$105" gate="G$1" x="134.62" y="-66.04"/>
 <instance part="C24" gate="G$1" x="30.48" y="-55.88"/>
@@ -7880,7 +7880,7 @@ be disconnected to form a solar midpoint connection</text>
 <instance part="U$4" gate="G$1" x="12.7" y="180.34" rot="MR0"/>
 <instance part="U9" gate="G$1" x="81.28" y="-167.64"/>
 <instance part="GND13" gate="1" x="101.6" y="-180.34"/>
-<instance part="C20" gate="G$1" x="124.46" y="-175.26"/>
+<instance part="C22" gate="G$1" x="124.46" y="-175.26"/>
 <instance part="GND20" gate="1" x="124.46" y="-180.34"/>
 <instance part="R3" gate="G$1" x="48.26" y="-154.94" rot="R90"/>
 <instance part="R2" gate="G$1" x="40.64" y="-154.94" rot="R90"/>
@@ -7890,14 +7890,14 @@ be disconnected to form a solar midpoint connection</text>
 <instance part="D3" gate="A" x="185.42" y="-121.92"/>
 <instance part="D2" gate="A" x="185.42" y="-114.3"/>
 <instance part="D1" gate="A" x="185.42" y="-106.68"/>
-<instance part="L1B1" gate="G$1" x="40.64" y="-48.26"/>
-<instance part="R4" gate="G$1" x="50.8" y="-58.42" rot="R90"/>
+<instance part="L1" gate="G$1" x="40.64" y="-48.26"/>
+<instance part="R10" gate="G$1" x="50.8" y="-58.42" rot="R90"/>
 <instance part="U$48" gate="G$1" x="50.8" y="-66.04"/>
-<instance part="C22" gate="G$1" x="172.72" y="-55.88"/>
+<instance part="C25" gate="G$1" x="172.72" y="-55.88"/>
 <instance part="U$51" gate="G$1" x="172.72" y="-66.04"/>
 <instance part="U$59" gate="G$1" x="195.58" y="-30.48" rot="MR0"/>
 <instance part="D4" gate="A" x="185.42" y="-129.54"/>
-<instance part="R7" gate="G$1" x="66.04" y="71.12" rot="R90"/>
+<instance part="R4" gate="G$1" x="66.04" y="71.12" rot="R90"/>
 <instance part="U$36" gate="G$1" x="66.04" y="63.5"/>
 <instance part="U$47" gate="G$1" x="66.04" y="91.44" rot="MR0"/>
 <instance part="D5" gate="A" x="185.42" y="-142.24"/>
@@ -7907,7 +7907,7 @@ be disconnected to form a solar midpoint connection</text>
 <instance part="C19" gate="G$1" x="111.76" y="-175.26"/>
 <instance part="GND1" gate="1" x="111.76" y="-180.34"/>
 <instance part="SJ1" gate="1" x="142.24" y="-142.24"/>
-<instance part="R5" gate="G$1" x="185.42" y="-88.9"/>
+<instance part="R7" gate="G$1" x="185.42" y="-88.9"/>
 <instance part="U$52" gate="G$1" x="175.26" y="-88.9" rot="R270"/>
 </instances>
 <busses>
@@ -8057,7 +8057,7 @@ be disconnected to form a solar midpoint connection</text>
 <wire x1="66.04" y1="116.84" x2="66.04" y2="119.38" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="R9" gate="G$1" pin="1"/>
+<pinref part="R5" gate="G$1" pin="1"/>
 <pinref part="U$30" gate="G$1" pin="GND"/>
 </segment>
 <segment>
@@ -8070,12 +8070,12 @@ be disconnected to form a solar midpoint connection</text>
 <pinref part="U$33" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="C34" gate="G$1" pin="P$2"/>
+<pinref part="C20" gate="G$1" pin="P$2"/>
 <pinref part="U$38" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="U$105" gate="G$1" pin="GND"/>
-<pinref part="C27" gate="G$1" pin="P$2"/>
+<pinref part="C23" gate="G$1" pin="P$2"/>
 <wire x1="134.62" y1="-63.5" x2="134.62" y2="-60.96" width="0.1524" layer="91"/>
 </segment>
 <segment>
@@ -8106,20 +8106,20 @@ be disconnected to form a solar midpoint connection</text>
 <wire x1="101.6" y1="-172.72" x2="101.6" y2="-177.8" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C20" gate="G$1" pin="P$2"/>
+<pinref part="C22" gate="G$1" pin="P$2"/>
 <pinref part="GND20" gate="1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="R4" gate="G$1" pin="1"/>
+<pinref part="R10" gate="G$1" pin="1"/>
 <pinref part="U$48" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="C22" gate="G$1" pin="2"/>
+<pinref part="C25" gate="G$1" pin="2"/>
 <pinref part="U$51" gate="G$1" pin="GND"/>
 <wire x1="172.72" y1="-60.96" x2="172.72" y2="-63.5" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="R7" gate="G$1" pin="1"/>
+<pinref part="R4" gate="G$1" pin="1"/>
 <pinref part="U$36" gate="G$1" pin="GND"/>
 </segment>
 <segment>
@@ -8132,7 +8132,7 @@ be disconnected to form a solar midpoint connection</text>
 </segment>
 <segment>
 <pinref part="U$52" gate="G$1" pin="GND"/>
-<pinref part="R5" gate="G$1" pin="1"/>
+<pinref part="R7" gate="G$1" pin="1"/>
 <wire x1="177.8" y1="-88.9" x2="180.34" y2="-88.9" width="0.1524" layer="91"/>
 </segment>
 </net>
@@ -8246,7 +8246,7 @@ be disconnected to form a solar midpoint connection</text>
 <pinref part="U$26" gate="G$1" pin="1.8V"/>
 </segment>
 <segment>
-<pinref part="R10" gate="G$1" pin="2"/>
+<pinref part="R6" gate="G$1" pin="2"/>
 <pinref part="U$32" gate="G$1" pin="1.8V"/>
 </segment>
 <segment>
@@ -8276,7 +8276,7 @@ be disconnected to form a solar midpoint connection</text>
 <wire x1="101.6" y1="-162.56" x2="101.6" y2="-152.4" width="0.1524" layer="91"/>
 <wire x1="101.6" y1="-167.64" x2="101.6" y2="-162.56" width="0.1524" layer="91"/>
 <junction x="101.6" y="-162.56"/>
-<pinref part="C20" gate="G$1" pin="P$1"/>
+<pinref part="C22" gate="G$1" pin="P$1"/>
 <wire x1="101.6" y1="-162.56" x2="124.46" y2="-162.56" width="0.1524" layer="91"/>
 <wire x1="124.46" y1="-162.56" x2="124.46" y2="-170.18" width="0.1524" layer="91"/>
 <pinref part="U9" gate="G$1" pin="VDDIO"/>
@@ -8294,7 +8294,7 @@ be disconnected to form a solar midpoint connection</text>
 <label x="33.02" y="83.82" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="C22" gate="G$1" pin="1"/>
+<pinref part="C25" gate="G$1" pin="1"/>
 <wire x1="172.72" y1="-38.1" x2="172.72" y2="-53.34" width="0.1524" layer="91"/>
 <label x="165.1" y="-38.1" size="1.778" layer="95"/>
 <wire x1="172.72" y1="-38.1" x2="195.58" y2="-38.1" width="0.1524" layer="91"/>
@@ -8720,8 +8720,8 @@ be disconnected to form a solar midpoint connection</text>
 </net>
 <net name="SAM_XOSC" class="0">
 <segment>
-<pinref part="R9" gate="G$1" pin="2"/>
-<pinref part="R10" gate="G$1" pin="1"/>
+<pinref part="R5" gate="G$1" pin="2"/>
+<pinref part="R6" gate="G$1" pin="1"/>
 <wire x1="218.44" y1="91.44" x2="218.44" y2="93.98" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="PA14"/>
 <wire x1="218.44" y1="93.98" x2="218.44" y2="96.52" width="0.1524" layer="91"/>
@@ -8814,7 +8814,7 @@ be disconnected to form a solar midpoint connection</text>
 <pinref part="C24" gate="G$1" pin="1"/>
 <wire x1="73.66" y1="-33.02" x2="30.48" y2="-33.02" width="0.1524" layer="91"/>
 <wire x1="30.48" y1="-33.02" x2="30.48" y2="-48.26" width="0.1524" layer="91"/>
-<pinref part="L1B1" gate="G$1" pin="1"/>
+<pinref part="L1" gate="G$1" pin="1"/>
 <wire x1="30.48" y1="-48.26" x2="30.48" y2="-53.34" width="0.1524" layer="91"/>
 <wire x1="35.56" y1="-48.26" x2="30.48" y2="-48.26" width="0.1524" layer="91"/>
 <junction x="30.48" y="-48.26"/>
@@ -8871,7 +8871,7 @@ be disconnected to form a solar midpoint connection</text>
 <net name="MPPT_LDO" class="0">
 <segment>
 <pinref part="U6" gate="A" pin="LDO"/>
-<pinref part="C27" gate="G$1" pin="P$1"/>
+<pinref part="C23" gate="G$1" pin="P$1"/>
 <wire x1="109.22" y1="-33.02" x2="124.46" y2="-33.02" width="0.1524" layer="91"/>
 <wire x1="124.46" y1="-33.02" x2="134.62" y2="-33.02" width="0.1524" layer="91"/>
 <wire x1="134.62" y1="-33.02" x2="134.62" y2="-53.34" width="0.1524" layer="91"/>
@@ -8883,7 +8883,7 @@ be disconnected to form a solar midpoint connection</text>
 <net name="MPPT_SW" class="0">
 <segment>
 <pinref part="U6" gate="A" pin="SW"/>
-<pinref part="L1B1" gate="G$1" pin="2"/>
+<pinref part="L1" gate="G$1" pin="2"/>
 <wire x1="73.66" y1="-48.26" x2="45.72" y2="-48.26" width="0.1524" layer="91"/>
 <label x="55.88" y="-48.26" size="1.778" layer="95"/>
 </segment>
@@ -8891,7 +8891,7 @@ be disconnected to form a solar midpoint connection</text>
 <net name="MPPT_AUX" class="0">
 <segment>
 <pinref part="U6" gate="A" pin="AUX"/>
-<pinref part="C34" gate="G$1" pin="P$1"/>
+<pinref part="C20" gate="G$1" pin="P$1"/>
 <wire x1="73.66" y1="-50.8" x2="60.96" y2="-50.8" width="0.1524" layer="91"/>
 <wire x1="60.96" y1="-50.8" x2="60.96" y2="-55.88" width="0.1524" layer="91"/>
 </segment>
@@ -8915,7 +8915,7 @@ be disconnected to form a solar midpoint connection</text>
 <segment>
 <pinref part="U6" gate="A" pin="MPPC"/>
 <wire x1="73.66" y1="-45.72" x2="50.8" y2="-45.72" width="0.1524" layer="91"/>
-<pinref part="R4" gate="G$1" pin="2"/>
+<pinref part="R10" gate="G$1" pin="2"/>
 <wire x1="50.8" y1="-45.72" x2="50.8" y2="-53.34" width="0.1524" layer="91"/>
 <label x="55.88" y="-45.72" size="1.778" layer="95"/>
 </segment>
@@ -8936,7 +8936,7 @@ be disconnected to form a solar midpoint connection</text>
 </net>
 <net name="EXT_THERMISTOR_SENSE" class="0">
 <segment>
-<pinref part="R7" gate="G$1" pin="2"/>
+<pinref part="R4" gate="G$1" pin="2"/>
 <wire x1="66.04" y1="76.2" x2="66.04" y2="78.74" width="0.1524" layer="91"/>
 <wire x1="66.04" y1="78.74" x2="66.04" y2="81.28" width="0.1524" layer="91"/>
 <wire x1="66.04" y1="81.28" x2="30.48" y2="81.28" width="0.1524" layer="91"/>
@@ -8979,7 +8979,7 @@ be disconnected to form a solar midpoint connection</text>
 </net>
 <net name="SOLAR_MID" class="0">
 <segment>
-<pinref part="R5" gate="G$1" pin="2"/>
+<pinref part="R7" gate="G$1" pin="2"/>
 <wire x1="190.5" y1="-88.9" x2="218.44" y2="-88.9" width="0.1524" layer="91"/>
 <label x="193.04" y="-88.9" size="1.778" layer="95"/>
 </segment>
diff --git a/hardware/main-solar-simple/bristol_longshot.sch.pdf b/hardware/main-solar-simple/bristol_longshot.sch.pdf
index f0b09b0..d3fc873 100644
Binary files a/hardware/main-solar-simple/bristol_longshot.sch.pdf and b/hardware/main-solar-simple/bristol_longshot.sch.pdf differ
diff --git a/hardware/main-solar-simple/bristol_longshot.sch.png b/hardware/main-solar-simple/bristol_longshot.sch.png
index 3b30c67..8a91bb0 100644
Binary files a/hardware/main-solar-simple/bristol_longshot.sch.png and b/hardware/main-solar-simple/bristol_longshot.sch.png differ
diff --git a/hardware/main-solar-simple/parts b/hardware/main-solar-simple/parts
index baafa4c..83547c5 100644
--- a/hardware/main-solar-simple/parts
+++ b/hardware/main-solar-simple/parts
@@ -10,15 +10,14 @@
 2361006 556-ATSAMD20E17A-MU 1 U1
 2462639 634-SI4468-A2A-IM 1 U2
 | UBLOX MAX-8C | GPS | [HAB Supplies](http://ava.upuaut.net/store/index.php?route=product/product&path=59_64&product_id=108) | 1 | U3
-2414758 579-25WF040BT-40I/NP 1 U4 memory 4mbit
-2405790 2 U5, U6 TCXO Si4xxx, SE880
+2414758 579-25WF040BT-40I/NP 1 U4 memory 4Mbit
+2405790 1 U5 TCXO Si4xxx
 1755607 595-TPS3123J8DBVT 1 U7 watchdog
 1470880 595-SN74LVC1G32DCKR 1 U8 or-gate, watchdog subsystem
 1898600 1 U9 Solar Energy Boost Converter
 1525484 5 D1, D2, D3, D4, D5 Small signal schotty diode
 ----
 
-
 ### Passives
 
 | Part | Description | Supplier | Quantity Required | Notes
@@ -28,27 +27,22 @@
 1343091 1 L3 56nH rf filter
 1865775 1 L4, L5 18nH rf filter
 | L6, L7 | DNP ||| si4xxx rx
-2428203 2 L8, L9 inductor for buck regulators 2.2µH
-1358069 7 R1, R2, R3, R4, R5, R6, R7 10k
-2331489 1 R8 22k
-2331442 2 R9, R10 100k
-2331474 1 R11 Mpp-set 1k
-2331487 1 R12A Vctrl-up 4.6V 220k
-2331468 1 R12B Vctrl-up 4.25V 180k
-2331569 1 R13A Vctrl-down 4.6V 82k
-2447215 1 R13B Vctrl-down 4.25V 75k
-2331502 1 R14 Rprog 2.2k
-9232516 1 R15 Bridge 0Ω
+1358069 7 R1, R2, R3 10k
+2324718 1 R4 100k precise
+2331442 2 R5, R6 100k
+9232516 1 R7 Bridge 0Ω
+2331569 3 R10, R12, R14 LTC3105 82k
+2331557 1 R11 LTC3105 FB 68k
+1358089 1 R13 LTC3105 LDOFB 56k
 1828874 2 C1, C3 8.2pF
 1758945 3 C2, C4, C7 15pF
 | C5, C6 | DNP ||| si4xxx rx
 1758969 3 C8, C9, C10 100pF
-1759380 10 C11, C12, C13, C14, C15, C16, C17, C18, C19, C20 100nF
-2362088 1 C21 2.2µF
-1758947 2 C22, C23 18pF se880 y1 load
-1833804 3 C24, C25, C26 Solar input, Buck Out 10µF 0603
-2309027 6 C27, C28, C29, C30, C31, C32 Solar input, MPPT Output, Chg in, chg out, buck in 4.7µF
-2320765 3 C33, C34, C35 Mpp-set, vctrl, vcc-sup 1nF
+1759380 9 C11, C12, C13, C14, C15, C16, C17, C18, C19 100nF
+2218855 1 C20 LTC3015 AUX 1µF
+2362088 1 C21 Radio Bypass 2.2µF
+2309027 2 C22, C23 BMP180 Bypass, LTC3105 LDO 4.7µF
+1833804 2 C24, C25 LTC3105 in, out 10µF 0603
 
 ----
 
@@ -56,14 +50,15 @@
 
 | Part | Description | Supplier | Quantity Required | Notes
 | ---  | ---         | ---       | ---               | ---
-1099560 855-M52-040023V0545 1 JTAG1
+1865279 649-202112100010C4LF 1 JTAG1
 1961698 2 FB1, FB2
 1828732 0 ESD1, ESD2
 | | Antenna Wire | [ebay](http://www.ebay.co.uk/itm/Ernie-Ball-Custom-Gauge-Guitar-Single-Strings-Electric-or-Acoustic-Pack-6-13-/360959212478 ) | 1 | Ernie Ball .013
+| | Energizer Ultimate Lithium AAA | [datasheet](http://data.energizer.com/PDFs/l92.pdf) | 1 | ~1200mAh
 
 ----
 
-## Useful Hardware
+## AAA Hardware
 
 | ID | Part Number | Description | Supplier | Order Code | Quantity
 | --- | --- | --- | --- | --- | ---