More work on the enemy movement, still not working