Dry-coded the auto-discovery pool. Unit tests are next.