First working version with agent stepping.