Refactor out WanderGoal