Added new design doc with lots of answers... Merge fun was making me sad :/