Formatting fun
Handled merge conflict
Added a bunch of ADC stuff