adding code to hand review data for wizard
fixing some merge conflicts