continue re-work on endpoint discovery