Start splitting up ADC server implementation