Rejig discovery to allow feed discovery to be built on top of it.
Feed discovery.