Pull qa code from dklawren