Maybe move this up with `search` as well?