Add walkOn and rework walkTo