Even more design doc work.