various
restructuring
starting reqdisp work
wrapper impl
resolved merge