Moved stuff around, stepping working