disc brake swap turn full resto


A few more patches done today.