Finished implementing autodiscovery