More work on the design doc