WIP client: min client for discovery

Good point.