diff --git a/confluent_server/confluent/discovery/core.py b/confluent_server/confluent/discovery/core.py
index e8fd1fa9..4934f728 100644
--- a/confluent_server/confluent/discovery/core.py
+++ b/confluent_server/confluent/discovery/core.py
@@ -148,6 +148,8 @@ def send_discovery_datum(info):
     yield msg.KeyValueData({'ipaddrs': [x[0] for x in addresses]})
     yield msg.KeyValueData({'serialnumber': info.get('serialnumber', '')})
     yield msg.KeyValueData({'modelnumber': info.get('modelnumber', '')})
+    if 'enclosure.bay' in info:
+        yield msg.KeyValueData({'bay': int(info['enclosure.bay'])})
     yield msg.KeyValueData({'macs': [info.get('hwaddr', '')]})
     types = []
     for infotype in info.get('services', []):
@@ -488,6 +490,7 @@ def detected(info):
     known_info[info['hwaddr']] = info
     cfg = cfm.ConfigManager(None)
     handler = handler.NodeHandler(info, cfg)
+    handler.scan()
     if handler.https_supported and not handler.https_cert:
         if handler.cert_fail_reason == 'unreachable':
             log.log(
diff --git a/confluent_server/confluent/discovery/handlers/generic.py b/confluent_server/confluent/discovery/handlers/generic.py
index be5a2a57..d13108d4 100644
--- a/confluent_server/confluent/discovery/handlers/generic.py
+++ b/confluent_server/confluent/discovery/handlers/generic.py
@@ -36,6 +36,12 @@ class NodeHandler(object):
         self.ipaddr = targsa[0]
         return
 
+    def scan(self):
+        # Do completely passive things to enhance data.
+        # Probe is permitted to for example attempt a login
+        # scan *only* does what it can without a login attempt
+        return
+
     def probe(self):
         # Use appropriate direct strategy to gather data such as
         # serial number and uuid to flesh out data as needed
diff --git a/confluent_server/confluent/discovery/handlers/imm.py b/confluent_server/confluent/discovery/handlers/imm.py
index 23feded7..66cc4c82 100644
--- a/confluent_server/confluent/discovery/handlers/imm.py
+++ b/confluent_server/confluent/discovery/handlers/imm.py
@@ -15,13 +15,50 @@
 import confluent.discovery.handlers.bmc as bmchandler
 import pyghmi.exceptions as pygexc
 import pyghmi.ipmi.private.util as pygutil
-
+import string
+import struct
 
 class NodeHandler(bmchandler.NodeHandler):
     devname = 'IMM'
 
-    def probe(self):
+    def scan(self):
+        slpattrs = self.info.get('attributes', {})
+        self.isdense = False
         try:
+            ff = slpattrs.get('enclosure-form-factor', [''])[0]
+        except IndexError:
+            return
+        if ff not in ('dense-computing', 'BC2'):
+            # do not probe unless it's a dense platform
+            return
+        self.isdense = True
+        wronguuid = slpattrs.get('node-uuid', [''])[0]
+        if wronguuid:
+            # we need to fix the first three portions of the uuid
+            uuidprefix = wronguuid.split('-')[:3]
+            uuidprefix = struct.pack(
+                '<IHH', *[int(x, 16) for x in uuidprefix]).encode('hex')
+            uuidprefix = uuidprefix[:8] + '-' + uuidprefix[8:12] + '-' + \
+                         uuidprefix[12:16]
+            self.info['uuid'] = uuidprefix + '-' + '-'.join(
+                wronguuid.split('-')[3:])
+            self.info['uuid'] = string.lower(self.info['uuid'])
+        slot = int(slpattrs.get('slot', ['0'])[0])
+        if slot != 0:
+            self.info['enclosure.bay'] = slot
+
+    def probe(self):
+        if self.info.get('enclosure.bay', 0) == 0:
+            self.scan()
+        if self.info.get('enclosure.bay', 0) != 0:
+            # scan has already populated info
+            return
+        ff = self.info.get('attributes', {}).get('enclosure-form-factor', '')
+        if ff != 'dense-computing':
+            return
+        try:
+            # we are a dense platform, but the SLP data did not give us slot
+            # attempt to probe using IPMI
             ipmicmd = self._get_ipmicmd()
             guiddata = ipmicmd.xraw_command(netfn=6, command=8)
             self.info['uuid'] = pygutil.decode_wireformat_uuid(
@@ -31,16 +68,18 @@ class NodeHandler(bmchandler.NodeHandler):
                 '/v2/cmm/sp/7')
             if not bayid:
                 return
-            #
-            self.info['enclosure.bay'] = bayid
-            # enclosure.bay only happens for Flex, nextscale doesn't do it
-            # this way
+            self.info['enclosure.bay'] = int(bayid)
+            smmid = ipmicmd._oem.immhandler.get_property(
+                '/v2/ibmc/smm/chassis/uuid')
+            if not smmid:
+                return
+            smmid = smmid.lower().replace(' ', '')
+            smmid = '{0}-{1}-{2}-{3}-{4}'.format(smmid[:8], smmid[8:12],
+                                                 smmid[12:16], smmid[16:20],
+                                                 smmid[20:])
+            self.info['enclosure.uuid'] = smmid
+            self.info['enclosure.type'] = 'smm'
         except pygexc.IpmiException as ie:
             print(repr(ie))
             raise
 
-
-# TODO(jjohnson2): web based init config for future prevalidated cert scheme
-#    def config(self, nodename):
-#        return
-
diff --git a/confluent_server/confluent/discovery/handlers/xcc.py b/confluent_server/confluent/discovery/handlers/xcc.py
index de80b9f2..b47ea69e 100644
--- a/confluent_server/confluent/discovery/handlers/xcc.py
+++ b/confluent_server/confluent/discovery/handlers/xcc.py
@@ -12,68 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import confluent.discovery.handlers.bmc as bmchandler
+import confluent.discovery.handlers.imm as immhandler
 import pyghmi.exceptions as pygexc
-import pyghmi.ipmi.private.util as pygutil
-import string
-import struct
 
 
-class NodeHandler(bmchandler.NodeHandler):
+
+class NodeHandler(immhandler.NodeHandler):
     devname = 'XCC'
 
-    def probe(self):
-        try:
-            slpattrs = self.info.get('attributes', {})
-            try:
-                ff = slpattrs.get('enclosure-form-factor', [''])[0]
-            except IndexError:
-                return
-            if ff != 'dense-computing':
-                # do not probe unless it's a dense platform
-                return
-            wronguuid = slpattrs.get('node-uuid', [''])[0]
-            if wronguuid:
-                # we need to fix the first three portions of the uuid
-                uuidprefix = wronguuid.split('-')[:3]
-                uuidprefix = struct.pack(
-                    '<IHH', *[int(x, 16) for x in uuidprefix]).encode('hex')
-                uuidprefix = uuidprefix[:8] + '-' + uuidprefix[8:12] + '-' + \
-                             uuidprefix[12:16]
-                self.info['uuid'] = uuidprefix + '-' + '-'.join(
-                    wronguuid.split('-')[3:])
-                self.info['uuid'] = string.lower(self.info['uuid'])
-            slot = int(slpattrs.get('slot', ['0'])[0])
-            if slot != 0:
-                self.info['enclosure.bay'] = slot
-                return
-            # we are a dense platform, but the SLP data did not give us slot
-            # attempt to probe using IPMI
-            ipmicmd = self._get_ipmicmd()
-            guiddata = ipmicmd.xraw_command(netfn=6, command=8)
-            self.info['uuid'] = pygutil.decode_wireformat_uuid(
-                guiddata['data'])
-            ipmicmd.oem_init()
-            bayid = ipmicmd._oem.immhandler.get_property(
-                '/v2/cmm/sp/7')
-            if not bayid:
-                return
-            self.info['enclosure.bay'] = int(bayid)
-            smmid = ipmicmd._oem.immhandler.get_property(
-                '/v2/ibmc/smm/chassis/uuid')
-            if not smmid:
-                return
-            smmid = smmid.lower().replace(' ', '')
-            smmid = '{0}-{1}-{2}-{3}-{4}'.format(smmid[:8], smmid[8:12],
-                                                 smmid[12:16], smmid[16:20],
-                                                 smmid[20:])
-            self.info['enclosure.uuid'] = smmid
-            self.info['enclosure.type'] = 'smm'
-        except pygexc.IpmiException as ie:
-            print(repr(ie))
-            raise
-
     def preconfig(self):
+        ff = self.info.get('attributes', {}).get('enclosure-form-factor', '')
+        if ff != 'dense-computing':
+            return
         # attempt to enable SMM
         #it's normal to get a 'not supported' (193) for systems without an SMM
         ipmicmd = None