Discovery endpoints

@awlayton or @aultac will you read over quickly and pull if no large issues. I would like to reference this in another spec I am working on