Merge "Create the DiscoveryExecutor Class" into main