Did we want to move this into the TargetSelectWidget?