Implemented #491 p1, p2 and p4, stepping needs some further work