Clean-up the API, start implementing 'Remote.discover'