diff --git a/Hardware/PSDR.pcb b/Hardware/PSDR.pcb
index c48f39e..010e511 100644
Binary files a/Hardware/PSDR.pcb and b/Hardware/PSDR.pcb differ
diff --git a/Hardware/PSDR.sch b/Hardware/PSDR.sch
index 4b16bda..d33e15e 100644
Binary files a/Hardware/PSDR.sch and b/Hardware/PSDR.sch differ
diff --git a/Hardware/STM32F429_Config.ioc b/Hardware/STM32F429_Config.ioc
index 30fb8f0..08249db 100644
--- a/Hardware/STM32F429_Config.ioc
+++ b/Hardware/STM32F429_Config.ioc
@@ -1,76 +1,252 @@
 #MicroXplorer Configuration settings - do not modify
-#Mon Sep 01 13:58:21 MDT 2014
+#Fri Sep 12 11:44:13 MDT 2014
 ADC1.Channel-0\#ChannelRegularConversion=ADC_CHANNEL_TEMPSENSOR
 ADC1.IPParameters=NbrOfConversionFlag,Channel-0\#ChannelRegularConversion,SamplingTime-0\#ChannelRegularConversion,Rank-0\#ChannelRegularConversion,master
 ADC1.NbrOfConversionFlag=1
 ADC1.Rank-0\#ChannelRegularConversion=1
 ADC1.SamplingTime-0\#ChannelRegularConversion=ADC_SAMPLETIME_3CYCLES
 ADC1.master=1
-File.Version=4
+File.Version=3
 KeepUserPlacement=false
 Mcu.Family=STM32F4
 Mcu.IP0=ADC1
 Mcu.IP1=DAC
+Mcu.IP10=USB_OTG_FS
 Mcu.IP2=NVIC
 Mcu.IP3=RCC
 Mcu.IP4=SDIO
-Mcu.IP5=SYS
-Mcu.IPNb=6
+Mcu.IP5=SPI1
+Mcu.IP6=SYS
+Mcu.IP7=TIM1
+Mcu.IP8=TIM2
+Mcu.IP9=USART1
+Mcu.IPNb=11
 Mcu.Name=STM32F429V(E-G-I)Tx
 Mcu.Package=LQFP100
-Mcu.Pin0=PC14/OSC32_IN
-Mcu.Pin1=PC15/OSC32_OUT
-Mcu.Pin10=PA14
-Mcu.Pin11=PC10
-Mcu.Pin12=PC11
-Mcu.Pin13=PC12
-Mcu.Pin14=PD2
-Mcu.Pin15=VP_ADC1_TempSens_Input
-Mcu.Pin16=VP_ADC1_Vbat_Input
-Mcu.Pin2=PH0/OSC_IN
-Mcu.Pin3=PH1/OSC_OUT
-Mcu.Pin4=PA4
-Mcu.Pin5=PA5
-Mcu.Pin6=PC8
-Mcu.Pin7=PC9
-Mcu.Pin8=PA8
-Mcu.Pin9=PA13
-Mcu.PinsNb=17
+Mcu.Pin0=PE2
+Mcu.Pin1=PE3
+Mcu.Pin10=PC0
+Mcu.Pin11=PC1
+Mcu.Pin12=PC2
+Mcu.Pin13=PC3
+Mcu.Pin14=PA0/WKUP
+Mcu.Pin15=PA4
+Mcu.Pin16=PA5
+Mcu.Pin17=PD11
+Mcu.Pin18=PD12
+Mcu.Pin19=PD13
+Mcu.Pin2=PE4
+Mcu.Pin20=PD14
+Mcu.Pin21=PD15
+Mcu.Pin22=PC6
+Mcu.Pin23=PC7
+Mcu.Pin24=PC8
+Mcu.Pin25=PC9
+Mcu.Pin26=PA8
+Mcu.Pin27=PA9
+Mcu.Pin28=PA10
+Mcu.Pin29=PA11
+Mcu.Pin3=PE5
+Mcu.Pin30=PA12
+Mcu.Pin31=PA13
+Mcu.Pin32=PA14
+Mcu.Pin33=PA15
+Mcu.Pin34=PC10
+Mcu.Pin35=PC11
+Mcu.Pin36=PC12
+Mcu.Pin37=PD0
+Mcu.Pin38=PD1
+Mcu.Pin39=PD2
+Mcu.Pin4=PE6
+Mcu.Pin40=PD3
+Mcu.Pin41=PD4
+Mcu.Pin42=PD5
+Mcu.Pin43=PD6
+Mcu.Pin44=PD7
+Mcu.Pin45=PB3
+Mcu.Pin46=PB4
+Mcu.Pin47=PB5
+Mcu.Pin48=PB6
+Mcu.Pin49=PB7
+Mcu.Pin5=PC13
+Mcu.Pin50=PB8
+Mcu.Pin51=PB9
+Mcu.Pin52=PE0
+Mcu.Pin53=PE1
+Mcu.Pin54=VP_ADC1_TempSens_Input
+Mcu.Pin55=VP_ADC1_Vbat_Input
+Mcu.Pin6=PC14/OSC32_IN
+Mcu.Pin7=PC15/OSC32_OUT
+Mcu.Pin8=PH0/OSC_IN
+Mcu.Pin9=PH1/OSC_OUT
+Mcu.PinsNb=56
 Mcu.UserName=STM32F429VITx
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_0
 NVIC.SysTick_IRQn=true\:0\:0
+PA0/WKUP.GPIOParameters=GPIO_Label
+PA0/WKUP.GPIO_Label=REF_CLOCK_ENABLE
+PA0/WKUP.Signal=GPIO_Output
+PA10.Mode=OTG/Dual_Role_Device
+PA10.Signal=USB_OTG_FS_ID
+PA11.Mode=OTG/Dual_Role_Device
+PA11.Signal=USB_OTG_FS_DM
+PA12.Mode=OTG/Dual_Role_Device
+PA12.Signal=USB_OTG_FS_DP
 PA13.Mode=Serial-Wire
 PA13.Signal=SYS_JTMS-SWDIO
 PA14.Mode=Serial-Wire
 PA14.Signal=SYS_JTCK-SWCLK
+PA15.GPIOParameters=GPIO_Label
+PA15.GPIO_Label=LCD_LED
+PA15.Signal=S_TIM2_CH1_ETR
 PA4.Signal=COMP_DAC1_group
 PA5.Signal=COMP_DAC2_group
-PA8.Mode=Clock-out-1
-PA8.Signal=RCC_MCO_1
+PA8.GPIOParameters=GPIO_Label
+PA8.GPIO_Label=LED_WHITE
+PA8.Signal=S_TIM1_CH1
+PA9.Mode=Activate_VBUS
+PA9.Signal=USB_OTG_FS_VBUS
+PB3.GPIOParameters=GPIO_Label
+PB3.GPIO_Label=LCD_SCK
+PB3.Mode=Full_Duplex_Master
+PB3.Signal=SPI1_SCK
+PB4.GPIOParameters=GPIO_Label
+PB4.GPIO_Label=LCD_MISO
+PB4.Mode=Full_Duplex_Master
+PB4.Signal=SPI1_MISO
+PB5.GPIOParameters=GPIO_Label
+PB5.GPIO_Label=LCD_MOSI
+PB5.Mode=Full_Duplex_Master
+PB5.Signal=SPI1_MOSI
+PB6.GPIOParameters=GPIO_Label
+PB6.GPIO_Label=RX_TO_GPS
+PB6.Mode=Asynchronous
+PB6.Signal=USART1_TX
+PB7.GPIOParameters=GPIO_Label
+PB7.GPIO_Label=TX_FROM_GPS
+PB7.Mode=Asynchronous
+PB7.Signal=USART1_RX
+PB8.GPIOParameters=GPIO_Label
+PB8.GPIO_Label=ENC_B
+PB8.Signal=GPIO_Input
+PB9.GPIOParameters=GPIO_Label
+PB9.GPIO_Label=ENC_A
+PB9.Signal=GPIO_Input
+PC0.GPIOParameters=GPIO_Label
+PC0.GPIO_Label=DDS_PSEL
+PC0.Signal=GPIO_Output
+PC1.GPIOParameters=GPIO_Label
+PC1.GPIO_Label=LOW_BAT
+PC1.Signal=GPIO_Input
 PC10.Mode=SD_4_bits_Wide_bus
 PC10.Signal=SDIO_D2
 PC11.Mode=SD_4_bits_Wide_bus
 PC11.Signal=SDIO_D3
 PC12.Mode=SD_4_bits_Wide_bus
 PC12.Signal=SDIO_CK
+PC13.GPIOParameters=GPIO_Label
+PC13.GPIO_Label=DDS_FSEL
+PC13.Signal=GPIO_Output
 PC14/OSC32_IN.Mode=LSE-External-Oscillator
 PC14/OSC32_IN.Signal=RCC_OSC32_IN
 PC15/OSC32_OUT.Mode=LSE-External-Oscillator
 PC15/OSC32_OUT.Signal=RCC_OSC32_OUT
+PC2.GPIOParameters=GPIO_Label
+PC2.GPIO_Label=CHARGE_STATUS2
+PC2.Signal=GPIO_Input
+PC3.GPIOParameters=GPIO_Label
+PC3.GPIO_Label=POWER_GOOD
+PC3.Signal=GPIO_Input
+PC6.GPIOParameters=GPIO_Label
+PC6.GPIO_Label=TOUCH1
+PC6.Signal=GPIO_Input
+PC7.GPIOParameters=GPIO_Label
+PC7.GPIO_Label=TOUCH2
+PC7.Signal=GPIO_Input
+PC8.GPIOParameters=GPIO_Label
+PC8.GPIO_Label=SDIO_DAT0
 PC8.Mode=SD_4_bits_Wide_bus
 PC8.Signal=SDIO_D0
+PC9.GPIOParameters=GPIO_Label
+PC9.GPIO_Label=SDIO_DAT1
 PC9.Mode=SD_4_bits_Wide_bus
 PC9.Signal=SDIO_D1
+PCC.Battery=LiPo_SparkFun_2000mAh
+PCC.Battery.Capacity=2000.0
+PCC.Battery.Compatibility=Yes
+PCC.Battery.InParallel=1
+PCC.Battery.InSeries=1
+PCC.Battery.MaxContinuous=4000.0
+PCC.Battery.MaxPulseCurrent=0.0
+PCC.Battery.NominalVoltage=3.7
+PCC.Battery.SelfDischarge=10.0
 PCC.Family=STM32F4
 PCC.MCU=STM32F429V(E-G-I)Tx
-PCC.MXVersion=4.3.0
+PCC.MXVersion=4.2.0
 PCC.PartNumber=STM32F429VITx
 PCC.Seq0=0
 PCC.SubFamily=STM32F429/439
 PCC.Temperature=25
-PCC.Vdd=null
+PCC.Vdd=3.3
+PD0.GPIOParameters=GPIO_Label
+PD0.GPIO_Label=GPS_POWER
+PD0.Signal=GPIO_Output
+PD1.GPIOParameters=GPIO_Label
+PD1.GPIO_Label=GPS_RESET
+PD1.Signal=GPIO_Output
+PD11.GPIOParameters=GPIO_Label
+PD11.GPIO_Label=KEY1
+PD11.Signal=GPIO_Input
+PD12.GPIOParameters=GPIO_Label
+PD12.GPIO_Label=KEY2
+PD12.Signal=GPIO_Input
+PD13.GPIOParameters=GPIO_Label
+PD13.GPIO_Label=PREAMP_SHTDWN
+PD13.Signal=GPIO_Output
+PD14.GPIOParameters=GPIO_Label
+PD14.GPIO_Label=MIC_SELECT
+PD14.Signal=GPIO_Output
+PD15.GPIOParameters=GPIO_Label
+PD15.GPIO_Label=SD_CARD_DETECT
+PD15.Signal=GPIO_Input
 PD2.Mode=SD_4_bits_Wide_bus
 PD2.Signal=SDIO_CMD
+PD3.GPIOParameters=GPIO_Label
+PD3.GPIO_Label=GPS_FIX_LED
+PD3.Signal=GPIO_Input
+PD4.GPIOParameters=GPIO_Label
+PD4.GPIO_Label=GPS_PPS
+PD4.Signal=GPIO_Input
+PD5.GPIOParameters=GPIO_Label
+PD5.GPIO_Label=LCD_CS
+PD5.Signal=GPIO_Output
+PD6.GPIOParameters=GPIO_Label
+PD6.GPIO_Label=LCD_RESET
+PD6.Signal=GPIO_Output
+PD7.GPIOParameters=GPIO_Label
+PD7.GPIO_Label=LCD_DC/RS
+PD7.Signal=GPIO_Output
+PE0.GPIOParameters=GPIO_Label
+PE0.GPIO_Label=ENC_SW
+PE0.Signal=GPIO_Input
+PE1.GPIOParameters=GPIO_Label
+PE1.GPIO_Label=DDS1_MOSI
+PE1.Signal=GPIO_Output
+PE2.GPIOParameters=GPIO_Label
+PE2.GPIO_Label=DDS1_SCK
+PE2.Signal=GPIO_Output
+PE3.GPIOParameters=GPIO_Label
+PE3.GPIO_Label=DDS1_NSS
+PE3.Signal=GPIO_Output
+PE4.GPIOParameters=GPIO_Label
+PE4.GPIO_Label=DDS2_MOSI
+PE4.Signal=GPIO_Output
+PE5.GPIOParameters=GPIO_Label
+PE5.GPIO_Label=DDS2_SCK
+PE5.Signal=GPIO_Output
+PE6.GPIOParameters=GPIO_Label
+PE6.GPIO_Label=DDS2_NSS
+PE6.Signal=GPIO_Output
 PH0/OSC_IN.Mode=HSE-External-Oscillator
 PH0/OSC_IN.Signal=RCC_OSC_IN
 PH1/OSC_OUT.Mode=HSE-External-Oscillator
@@ -78,13 +254,20 @@ PH1/OSC_OUT.Signal=RCC_OSC_OUT
 RCC.FamilyName=M
 RCC.HSE_VALUE=25000000
 RCC.HSI_VALUE=16000000
-RCC.IPParameters=,LSI_VALUE,FamilyName,LSE_VALUE,HSE_VALUE,HSI_VALUE
+RCC.IPParameters=SYSCLKFreq_VALUE,RTCFreq_Value,LSI_VALUE,FamilyName,LSE_VALUE,APB1Freq_Value,HSE_VALUE,APB2Freq_Value,HSI_VALUE,VCOI2SOutputFreq_Value,RTCHSEDivFreq_Value,PLLCLKFreq_Value,AHBFreq_Value,48MHZClocksFreq_Value,VCOInputFreq_Value,I2SClocksFreq_Value,VCOSAIOutputFreq_Value,VCOOutputFreq_Value
 RCC.LSE_VALUE=32768
 RCC.LSI_VALUE=32000
 SH.COMP_DAC1_group.0=DAC_OUT1,DAC_OUT1
 SH.COMP_DAC1_group.ConfNb=1
 SH.COMP_DAC2_group.0=DAC_OUT2,DAC_OUT2
 SH.COMP_DAC2_group.ConfNb=1
+SH.S_TIM1_CH1.0=TIM1_CH1,Output Compare1 CH1
+SH.S_TIM1_CH1.ConfNb=1
+SH.S_TIM2_CH1_ETR.0=TIM2_CH1,Output Compare1 CH1
+SH.S_TIM2_CH1_ETR.ConfNb=1
+SPI1.CalculateBaudRate-Full_Duplex_Master=8.0 MBits/s
+SPI1.IPParameters=Mode-Full_Duplex_Master,CalculateBaudRate-Full_Duplex_Master
+SPI1.Mode-Full_Duplex_Master=SPI_MODE_MASTER
 VP_ADC1_TempSens_Input.Mode=IN-TempSens
 VP_ADC1_TempSens_Input.Signal=ADC1_TempSens_Input
 VP_ADC1_Vbat_Input.Mode=IN-Vbat