Changes to ADC and SBC

I still have to master these two a bit more...