Still fixing small bugs in stepper, now tested