qa ready

handed off to matt for qa