Revert "Revert "Walk and Attack""

This reverts commit 6118a04da795db98c4fb3d364d62c79ddb4f01d1.