Implemented step and fixed stuff