Some more changes with step-all probably working