This is tied to `request`, yes? Any way to remove coupling here?