Simple auto-discover

Initial commit for auto-discover