filled out section C in design doc
resolved merge conflicts