Updated discovery, and discovery implementation work in progress.