Dist Control overhaul

yea