diff --git a/Connector_out.SchDoc b/Connector_out.SchDoc
index 0b68965..bf45529 100644
Binary files a/Connector_out.SchDoc and b/Connector_out.SchDoc differ
diff --git a/Controller.ioc b/Controller.ioc
index 7bc4e05..af1b6dd 100644
--- a/Controller.ioc
+++ b/Controller.ioc
@@ -5,26 +5,25 @@ File.Version=6
 GPIO.groupedBy=Group By Peripherals
 KeepUserPlacement=false
 Mcu.Family=STM32F3
-Mcu.IP0=DAC1
-Mcu.IP1=FREERTOS
-Mcu.IP10=TIM6
-Mcu.IP11=TIM8
-Mcu.IP12=TIM15
-Mcu.IP13=TIM16
-Mcu.IP14=TIM17
-Mcu.IP15=TIM20
-Mcu.IP16=USART1
-Mcu.IP17=USB
-Mcu.IP18=USB_DEVICE
-Mcu.IP2=IWDG
-Mcu.IP3=NVIC
-Mcu.IP4=RCC
-Mcu.IP5=SYS
-Mcu.IP6=TIM1
-Mcu.IP7=TIM2
-Mcu.IP8=TIM3
-Mcu.IP9=TIM4
-Mcu.IPNb=19
+Mcu.IP0=FREERTOS
+Mcu.IP1=IWDG
+Mcu.IP10=TIM8
+Mcu.IP11=TIM15
+Mcu.IP12=TIM16
+Mcu.IP13=TIM17
+Mcu.IP14=TIM20
+Mcu.IP15=USART1
+Mcu.IP16=USB
+Mcu.IP17=USB_DEVICE
+Mcu.IP2=NVIC
+Mcu.IP3=RCC
+Mcu.IP4=SYS
+Mcu.IP5=TIM1
+Mcu.IP6=TIM2
+Mcu.IP7=TIM3
+Mcu.IP8=TIM4
+Mcu.IP9=TIM6
+Mcu.IPNb=18
 Mcu.Name=STM32F303V(D-E)Tx
 Mcu.Package=LQFP100
 Mcu.Pin0=PE2
@@ -37,60 +36,64 @@ Mcu.Pin14=PA0
 Mcu.Pin15=PA1
 Mcu.Pin16=PA2
 Mcu.Pin17=PA3
-Mcu.Pin18=PA4
-Mcu.Pin19=PE7
+Mcu.Pin18=PC4
+Mcu.Pin19=PC5
 Mcu.Pin2=PE4
-Mcu.Pin20=PE10
-Mcu.Pin21=PD10
-Mcu.Pin22=PD11
-Mcu.Pin23=PD12
-Mcu.Pin24=PD13
-Mcu.Pin25=PD14
-Mcu.Pin26=PD15
-Mcu.Pin27=PC6
-Mcu.Pin28=PC7
-Mcu.Pin29=PC8
+Mcu.Pin20=PE7
+Mcu.Pin21=PE10
+Mcu.Pin22=PE13
+Mcu.Pin23=PE14
+Mcu.Pin24=PE15
+Mcu.Pin25=PD10
+Mcu.Pin26=PD11
+Mcu.Pin27=PD12
+Mcu.Pin28=PD13
+Mcu.Pin29=PD14
 Mcu.Pin3=PE5
-Mcu.Pin30=PC9
-Mcu.Pin31=PA9
-Mcu.Pin32=PA10
-Mcu.Pin33=PA11
-Mcu.Pin34=PA12
-Mcu.Pin35=PA13
-Mcu.Pin36=PA14
-Mcu.Pin37=PD4
-Mcu.Pin38=PD5
-Mcu.Pin39=PD6
+Mcu.Pin30=PD15
+Mcu.Pin31=PC6
+Mcu.Pin32=PC7
+Mcu.Pin33=PC8
+Mcu.Pin34=PC9
+Mcu.Pin35=PA9
+Mcu.Pin36=PA10
+Mcu.Pin37=PA11
+Mcu.Pin38=PA12
+Mcu.Pin39=PA13
 Mcu.Pin4=PE6
-Mcu.Pin40=PD7
-Mcu.Pin41=PB3
-Mcu.Pin42=PB4
-Mcu.Pin43=PB5
-Mcu.Pin44=PB6
-Mcu.Pin45=PB7
-Mcu.Pin46=PB8
-Mcu.Pin47=PB9
-Mcu.Pin48=PE0
-Mcu.Pin49=PE1
+Mcu.Pin40=PA14
+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=PF9
-Mcu.Pin50=VP_FREERTOS_VS_CMSIS_V2
-Mcu.Pin51=VP_IWDG_VS_IWDG
-Mcu.Pin52=VP_SYS_VS_tim7
-Mcu.Pin53=VP_TIM1_VS_OPM
-Mcu.Pin54=VP_TIM6_VS_ClockSourceINT
-Mcu.Pin55=VP_TIM8_VS_OPM
-Mcu.Pin56=VP_TIM15_VS_OPM
-Mcu.Pin57=VP_TIM16_VS_ClockSourceINT
-Mcu.Pin58=VP_TIM16_VS_OPM
-Mcu.Pin59=VP_TIM17_VS_ClockSourceINT
+Mcu.Pin50=PB8
+Mcu.Pin51=PB9
+Mcu.Pin52=PE0
+Mcu.Pin53=PE1
+Mcu.Pin54=VP_FREERTOS_VS_CMSIS_V2
+Mcu.Pin55=VP_IWDG_VS_IWDG
+Mcu.Pin56=VP_SYS_VS_tim7
+Mcu.Pin57=VP_TIM1_VS_OPM
+Mcu.Pin58=VP_TIM6_VS_ClockSourceINT
+Mcu.Pin59=VP_TIM8_VS_OPM
 Mcu.Pin6=PF10
-Mcu.Pin60=VP_TIM17_VS_OPM
-Mcu.Pin61=VP_TIM20_VS_OPM
-Mcu.Pin62=VP_USB_DEVICE_VS_USB_DEVICE_CUSTOM_HID_FS
+Mcu.Pin60=VP_TIM15_VS_OPM
+Mcu.Pin61=VP_TIM16_VS_ClockSourceINT
+Mcu.Pin62=VP_TIM16_VS_OPM
+Mcu.Pin63=VP_TIM17_VS_ClockSourceINT
+Mcu.Pin64=VP_TIM17_VS_OPM
+Mcu.Pin65=VP_TIM20_VS_OPM
+Mcu.Pin66=VP_USB_DEVICE_VS_USB_DEVICE_CUSTOM_HID_FS
 Mcu.Pin7=PF0-OSC_IN
 Mcu.Pin8=PF1-OSC_OUT
 Mcu.Pin9=PC0
-Mcu.PinsNb=63
+Mcu.PinsNb=67
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F303VDTx
@@ -112,11 +115,11 @@ NVIC.TimeBaseIP=TIM7
 NVIC.USB_LP_CAN_RX0_IRQn=true\:5\:0\:false\:false\:true\:true\:false\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 PA0.GPIOParameters=GPIO_Label
-PA0.GPIO_Label=SPINDLE/EXT1_PWM
+PA0.GPIO_Label=SPINDLE_PWM
 PA0.Locked=true
 PA0.Signal=S_TIM2_CH1_ETR
 PA1.GPIOParameters=GPIO_Label
-PA1.GPIO_Label=EXT2_PWM
+PA1.GPIO_Label=POUT1
 PA1.Locked=true
 PA1.Signal=S_TIM2_CH2
 PA10.Locked=true
@@ -135,17 +138,13 @@ PA14.Locked=true
 PA14.Mode=Trace_Asynchronous_SW
 PA14.Signal=SYS_JTCK-SWCLK
 PA2.GPIOParameters=GPIO_Label
-PA2.GPIO_Label=EXT3_PWM
+PA2.GPIO_Label=POUT2
 PA2.Locked=true
 PA2.Signal=S_TIM2_CH3
 PA3.GPIOParameters=GPIO_Label
-PA3.GPIO_Label=HEAT_BED_PWM
+PA3.GPIO_Label=POUT3
 PA3.Locked=true
 PA3.Signal=S_TIM2_CH4
-PA4.GPIOParameters=GPIO_Label
-PA4.GPIO_Label=SPINDLE_AN_CTRL
-PA4.Locked=true
-PA4.Signal=COMP_DAC11_group
 PA9.Locked=true
 PA9.Mode=Asynchronous
 PA9.Signal=USART1_TX
@@ -153,11 +152,11 @@ PB3.Locked=true
 PB3.Mode=Trace_Asynchronous_SW
 PB3.Signal=SYS_JTDO-TRACESWO
 PB4.GPIOParameters=GPIO_Label
-PB4.GPIO_Label=FAN_PWM
+PB4.GPIO_Label=POUT5
 PB4.Locked=true
 PB4.Signal=S_TIM3_CH1
 PB5.GPIOParameters=GPIO_Label
-PB5.GPIO_Label=HEATER1_PWM
+PB5.GPIO_Label=POUT4
 PB5.Locked=true
 PB5.Signal=S_TIM3_CH2
 PB6.GPIOParameters=GPIO_Label
@@ -185,51 +184,59 @@ PC1.GPIO_Label=DIR_X
 PC1.Locked=true
 PC1.Signal=GPIO_Output
 PC2.GPIOParameters=GPIO_Label
-PC2.GPIO_Label=SPINDLE_EN
+PC2.GPIO_Label=OUT5
 PC2.Locked=true
 PC2.Signal=GPIO_Output
 PC3.GPIOParameters=GPIO_Label
-PC3.GPIO_Label=SPINDLE_nDIR
+PC3.GPIO_Label=OUT4
 PC3.Locked=true
 PC3.Signal=GPIO_Output
+PC4.GPIOParameters=GPIO_Label
+PC4.GPIO_Label=IN10
+PC4.Locked=true
+PC4.Signal=GPXTI4
+PC5.GPIOParameters=GPIO_Label
+PC5.GPIO_Label=IN9
+PC5.Locked=true
+PC5.Signal=GPXTI5
 PC6.GPIOParameters=GPIO_Label
-PC6.GPIO_Label=PROBE
+PC6.GPIO_Label=ESTOP
 PC6.Locked=true
 PC6.Signal=GPXTI6
 PC7.GPIOParameters=GPIO_Label
-PC7.GPIO_Label=SAFETY_DOOR
+PC7.GPIO_Label=IN1
 PC7.Locked=true
 PC7.Signal=GPXTI7
 PC8.GPIOParameters=GPIO_Label
-PC8.GPIO_Label=BT_STOP
+PC8.GPIO_Label=IN11
 PC8.Locked=true
 PC8.Signal=GPXTI8
 PC9.GPIOParameters=GPIO_Label
-PC9.GPIO_Label=BT_HOLD
+PC9.GPIO_Label=IN2
 PC9.Locked=true
 PC9.Signal=GPXTI9
 PD10.GPIOParameters=GPIO_Label
-PD10.GPIO_Label=ENDSTOP_C
+PD10.GPIO_Label=IN3
 PD10.Locked=true
 PD10.Signal=GPXTI10
 PD11.GPIOParameters=GPIO_Label
-PD11.GPIO_Label=ENDSTOP_B
+PD11.GPIO_Label=IN4
 PD11.Locked=true
 PD11.Signal=GPXTI11
 PD12.GPIOParameters=GPIO_Label
-PD12.GPIO_Label=ENDSTOP_A
+PD12.GPIO_Label=IN5
 PD12.Locked=true
 PD12.Signal=GPXTI12
 PD13.GPIOParameters=GPIO_Label
-PD13.GPIO_Label=ENDSTOP_Z
+PD13.GPIO_Label=IN6
 PD13.Locked=true
 PD13.Signal=GPXTI13
 PD14.GPIOParameters=GPIO_Label
-PD14.GPIO_Label=ENDSTOP_Y
+PD14.GPIO_Label=IN7
 PD14.Locked=true
 PD14.Signal=GPXTI14
 PD15.GPIOParameters=GPIO_Label
-PD15.GPIO_Label=ENDSTOP_X
+PD15.GPIO_Label=IN8
 PD15.Locked=true
 PD15.Signal=GPXTI15
 PD4.GPIOParameters=GPIO_Label
@@ -241,11 +248,11 @@ PD5.GPIO_Label=DIR_Y
 PD5.Locked=true
 PD5.Signal=GPIO_Output
 PD6.GPIOParameters=GPIO_Label
-PD6.GPIO_Label=COOLANT_FLOOD_CTRL
+PD6.GPIO_Label=OUT3
 PD6.Locked=true
 PD6.Signal=GPIO_Output
 PD7.GPIOParameters=GPIO_Label
-PD7.GPIO_Label=COOLANT_MIST_CTRL
+PD7.GPIO_Label=OUT2
 PD7.Locked=true
 PD7.Signal=GPIO_Output
 PE0.GPIOParameters=GPIO_Label
@@ -260,6 +267,18 @@ PE10.GPIOParameters=GPIO_Label
 PE10.GPIO_Label=LED2
 PE10.Locked=true
 PE10.Signal=GPIO_Output
+PE13.GPIOParameters=GPIO_Label
+PE13.GPIO_Label=OUT6
+PE13.Locked=true
+PE13.Signal=GPIO_Output
+PE14.GPIOParameters=GPIO_Label
+PE14.GPIO_Label=OUT7
+PE14.Locked=true
+PE14.Signal=GPIO_Output
+PE15.GPIOParameters=GPIO_Label
+PE15.GPIO_Label=OUT8
+PE15.Locked=true
+PE15.Signal=GPIO_Output
 PE2.GPIOParameters=GPIO_Label
 PE2.GPIO_Label=STEP_C
 PE2.Locked=true
@@ -270,11 +289,11 @@ PE3.GPIO_Label=DIR_C
 PE3.Locked=true
 PE3.Signal=GPIO_Output
 PE4.GPIOParameters=GPIO_Label
-PE4.GPIO_Label=HEATER2_PWM
+PE4.GPIO_Label=POUT7
 PE4.Locked=true
 PE4.Signal=S_TIM3_CH3
 PE5.GPIOParameters=GPIO_Label
-PE5.GPIO_Label=HEATER3_PWM
+PE5.GPIO_Label=POUT6
 PE5.Locked=true
 PE5.Signal=S_TIM3_CH4
 PE6.GPIOParameters=GPIO_Label
@@ -296,7 +315,7 @@ PF10.GPIO_Label=DIR_Z
 PF10.Locked=true
 PF10.Signal=GPIO_Output
 PF2.GPIOParameters=GPIO_Label
-PF2.GPIO_Label=SPINDLE_DIR
+PF2.GPIO_Label=OUT1
 PF2.Locked=true
 PF2.Signal=GPIO_Output
 PF9.GPIOParameters=GPIO_Label
@@ -324,8 +343,8 @@ ProjectManager.MainLocation=Core/Src
 ProjectManager.NoMain=false
 ProjectManager.PreviousToolchain=
 ProjectManager.ProjectBuild=false
-ProjectManager.ProjectFileName=cnc.ioc
-ProjectManager.ProjectName=cnc
+ProjectManager.ProjectFileName=Controller.ioc
+ProjectManager.ProjectName=Controller
 ProjectManager.StackSize=0x600
 ProjectManager.TargetToolchain=Makefile
 ProjectManager.ToolChainLocation=
@@ -377,8 +396,6 @@ RCC.USART2Freq_Value=36000000
 RCC.USART3Freq_Value=36000000
 RCC.USBFreq_Value=48000000
 RCC.VCOOutput2Freq_Value=8000000
-SH.COMP_DAC11_group.0=DAC1_OUT1,DAC_OUT1
-SH.COMP_DAC11_group.ConfNb=1
 SH.GPXTI10.0=GPIO_EXTI10
 SH.GPXTI10.ConfNb=1
 SH.GPXTI11.0=GPIO_EXTI11
@@ -391,6 +408,10 @@ SH.GPXTI14.0=GPIO_EXTI14
 SH.GPXTI14.ConfNb=1
 SH.GPXTI15.0=GPIO_EXTI15
 SH.GPXTI15.ConfNb=1
+SH.GPXTI4.0=GPIO_EXTI4
+SH.GPXTI4.ConfNb=1
+SH.GPXTI5.0=GPIO_EXTI5
+SH.GPXTI5.ConfNb=1
 SH.GPXTI6.0=GPIO_EXTI6
 SH.GPXTI6.ConfNb=1
 SH.GPXTI7.0=GPIO_EXTI7