Maybe move this targeting logic to the agent?