diff --git a/firmware/inc/hw_config.h b/firmware/inc/hw_config.h
index 05592f1..2703566 100644
--- a/firmware/inc/hw_config.h
+++ b/firmware/inc/hw_config.h
@@ -60,12 +60,12 @@
 /**
  * GPS
  */
-#define GPS_SERCOM		(SercomUsart*)SERCOM1
-#define GPS_SERCOM_MOGI_PIN	PIN_PA00
-#define GPS_SERCOM_MOGI_PINMUX	PINMUX_PA00D_SERCOM1_PAD0
-#define GPS_SERCOM_MIGO_PIN	PIN_PA01
-#define GPS_SERCOM_MIGO_PINMUX	PINMUX_PA01D_SERCOM1_PAD1
-#define GPS_SERCOM_MUX		USART_RX_1_TX_0_XCK_1
+#define GPS_SERCOM		(SercomUsart*)SERCOM0
+#define GPS_SERCOM_MOGI_PIN	PIN_PA06
+#define GPS_SERCOM_MOGI_PINMUX	PINMUX_PA06D_SERCOM0_PAD2
+#define GPS_SERCOM_MIGO_PIN	PIN_PA07
+#define GPS_SERCOM_MIGO_PINMUX	PINMUX_PA07D_SERCOM0_PAD3
+#define GPS_SERCOM_MUX		USART_RX_3_TX_2_XCK_3
 #define GPS_PLATFORM_MODEL	UBX_PLATFORM_MODEL_AIRBORNE_1G
 #define GPS_TIMEPULSE_PIN	PIN_PA05
 #define GPS_TIMEPULSE_PINMUX	PINMUX_PA05A_EIC_EXTINT5
@@ -80,16 +80,25 @@
 /**
  * Flash Memory
  */
-#define FLASH_SERCOM		(SercomSpi*)SERCOM0
+#define FLASH_SERCOM		(SercomSpi*)SERCOM2
 #define FLASH_SERCOM_MOSI_PIN	PIN_PA08
-#define FLASH_SERCOM_MOSI_PINMUX PINMUX_PA08C_SERCOM0_PAD0
+#define FLASH_SERCOM_MOSI_PINMUX PINMUX_PA08D_SERCOM2_PAD0
 #define FLASH_SERCOM_MISO_PIN	PIN_PA11
-#define FLASH_SERCOM_MISO_PINMUX PINMUX_PA11C_SERCOM0_PAD3
+#define FLASH_SERCOM_MISO_PINMUX PINMUX_PA11D_SERCOM2_PAD3
 #define FLASH_SERCOM_SCK_PIN	PIN_PA09
-#define FLASH_SERCOM_SCK_PINMUX PINMUX_PA09C_SERCOM0_PAD1
+#define FLASH_SERCOM_SCK_PINMUX PINMUX_PA09D_SERCOM2_PAD1
 #define FLASH_SERCOM_MUX	SPI_SIGNAL_MUX_SETTING_D
 #define FLASH_CSN_PIN		PIN_PA10
 
+/**
+ * I2C Bus
+ */
+#define I2C_SERCOM		(SercomI2cm*)SERCOM1
+#define I2C_SERCOM_SDA_PIN	PIN_PA00
+#define I2C_SERCOM_SDA_PINMUX	PINMUX_PA00D_SERCOM1_PAD0
+#define I2C_SERCOM_SCL_PIN	PIN_PA01
+#define I2C_SERCOM_SCL_PINMUX	PINMUX_PA01D_SERCOM1_PAD1
+
 /**
  * Battery ADC
  */
diff --git a/hardware/main-solar/bristol_longshot.sch b/hardware/main-solar/bristol_longshot.sch
index 4e7fea3..d8ef7b7 100644
--- a/hardware/main-solar/bristol_longshot.sch
+++ b/hardware/main-solar/bristol_longshot.sch
@@ -8044,6 +8044,8 @@ Will the boost then run in inefficient discontinous mode????</text>
 <text x="165.1" y="-45.72" size="1.778" layer="97">4.60V = 1.25(220/82 + 1)</text>
 <text x="353.06" y="-35.56" size="1.778" layer="97">Place</text>
 <text x="165.1" y="-43.18" size="1.778" layer="97">4.25V = 1.25(180/75 + 1)</text>
+<wire x1="110.236" y1="87.884" x2="110.236" y2="83.312" width="0.1524" layer="97"/>
+<text x="109.22" y="86.614" size="1.27" layer="97" font="vector" ratio="11" rot="MR0">(SERCOM1)</text>
 </plain>
 <instances>
 <instance part="FRAME1" gate="G$1" x="0" y="0"/>
diff --git a/hardware/main-solar/bristol_longshot.sch.pdf b/hardware/main-solar/bristol_longshot.sch.pdf
index 49634c4..c4d6ca3 100644
Binary files a/hardware/main-solar/bristol_longshot.sch.pdf and b/hardware/main-solar/bristol_longshot.sch.pdf differ
diff --git a/hardware/main-solar/bristol_longshot.sch.png b/hardware/main-solar/bristol_longshot.sch.png
index a2e210e..1d20422 100644
Binary files a/hardware/main-solar/bristol_longshot.sch.png and b/hardware/main-solar/bristol_longshot.sch.png differ