think i finished, not tested