diff --git a/include/Utils.hpp b/include/Utils.hpp
index 657af92..0aff148 100644
--- a/include/Utils.hpp
+++ b/include/Utils.hpp
@@ -30,6 +30,8 @@
 constexpr const char* versionHashFile = "/var/configuration/version";
 constexpr const char* versionFile = "/etc/os-release";
 
+extern boost::asio::io_context io;
+
 using BasicVariantType =
     std::variant<std::string, int64_t, uint64_t, double, int32_t, uint32_t,
                  int16_t, uint16_t, uint8_t, bool, std::vector<uint8_t>>;
diff --git a/include/devices.hpp b/include/devices.hpp
index 50fbe63..812db3f 100644
--- a/include/devices.hpp
+++ b/include/devices.hpp
@@ -31,107 +31,122 @@
 
 struct ExportTemplate
 {
-    ExportTemplate(const char* params, const char* dev) :
-        parameters(params), device(dev){};
+    ExportTemplate(const char* params, const char* dev, const char* constructor,
+                   const char* destructor, bool createsHWMon) :
+        parameters(params),
+        devicePath(dev), add(constructor), remove(destructor),
+        createsHWMon(createsHWMon){};
     const char* parameters;
-    const char* device;
+    const char* devicePath;
+    const char* add;
+    const char* remove;
+    bool createsHWMon;
 };
 
 const boost::container::flat_map<const char*, ExportTemplate, CmpStr>
     exportTemplates{
         {{"EEPROM_24C02",
-          ExportTemplate("24c02 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("24c02 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", false)},
          {"EEPROM_24C64",
-          ExportTemplate("24c64 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("24c64 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", false)},
          {"ADM1266",
-          ExportTemplate("adm1266 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("adm1266 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", false)},
          {"ADM1272",
-          ExportTemplate("adm1272 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
-         {"EEPROM", ExportTemplate("eeprom $Address",
-                                   "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("adm1272 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", false)},
+         {"EEPROM",
+          ExportTemplate("eeprom $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", false)},
          {"EMC1412",
-          ExportTemplate("emc1412 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("emc1412 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"EMC1413",
-          ExportTemplate("emc1413 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("emc1413 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"EMC1414",
-          ExportTemplate("emc1414 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
-         {"Gpio", ExportTemplate("$Index", "/sys/class/gpio/export")},
-         {"INA230", ExportTemplate("ina230 $Address",
-                                   "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("emc1414 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
+         {"Gpio", ExportTemplate("$Index", "/sys/class/gpio", "export",
+                                 "unexport", false)},
+         {"INA230",
+          ExportTemplate("ina230 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"ISL68137",
-          ExportTemplate("isl68137 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("isl68137 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"ISL68223",
-          ExportTemplate("isl68223 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("isl68223 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"ISL69243",
-          ExportTemplate("isl69243 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("isl69243 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"MAX16601",
-          ExportTemplate("max16601 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("max16601 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"MAX20710",
-          ExportTemplate("max20710 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("max20710 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"MAX20730",
-          ExportTemplate("max20730 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("max20730 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"MAX20734",
-          ExportTemplate("max20734 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("max20734 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"MAX20796",
-          ExportTemplate("max20796 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("max20796 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"MAX31725",
-          ExportTemplate("max31725 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("max31725 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"MAX31730",
-          ExportTemplate("max31730 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("max31730 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"MAX34440",
-          ExportTemplate("max34440 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("max34440 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"MAX34451",
-          ExportTemplate("max34451 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("max34451 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"MAX6654",
-          ExportTemplate("max6654 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("max6654 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"PCA9543Mux",
-          ExportTemplate("pca9543 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("pca9543 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", false)},
          {"PCA9544Mux",
-          ExportTemplate("pca9544 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("pca9544 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", false)},
          {"PCA9545Mux",
-          ExportTemplate("pca9545 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("pca9545 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", false)},
          {"PCA9546Mux",
-          ExportTemplate("pca9546 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("pca9546 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", false)},
          {"PCA9547Mux",
-          ExportTemplate("pca9547 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
-         {"SBTSI", ExportTemplate("sbtsi $Address",
-                                  "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
-         {"pmbus", ExportTemplate("pmbus $Address",
-                                  "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
-         {"TMP112", ExportTemplate("tmp112 $Address",
-                                   "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
-         {"TMP175", ExportTemplate("tmp175 $Address",
-                                   "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
-         {"TMP421", ExportTemplate("tmp421 $Address",
-                                   "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
-         {"TMP441", ExportTemplate("tmp441 $Address",
-                                   "/sys/bus/i2c/devices/i2c-$Bus/new_device")},
+          ExportTemplate("pca9547 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", false)},
+         {"SBTSI",
+          ExportTemplate("sbtsi $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
+         {"pmbus",
+          ExportTemplate("pmbus $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
+         {"TMP112",
+          ExportTemplate("tmp112 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
+         {"TMP175",
+          ExportTemplate("tmp175 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
+         {"TMP421",
+          ExportTemplate("tmp421 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
+         {"TMP441",
+          ExportTemplate("tmp441 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)},
          {"TMP75",
-          ExportTemplate("tmp75 $Address",
-                         "/sys/bus/i2c/devices/i2c-$Bus/new_device")}}};
+          ExportTemplate("tmp75 $Address", "/sys/bus/i2c/devices/i2c-$Bus",
+                         "new_device", "delete_device", true)}}};
 } // namespace devices
diff --git a/src/Overlay.cpp b/src/Overlay.cpp
index cb6ed10..1ced2d8 100644
--- a/src/Overlay.cpp
+++ b/src/Overlay.cpp
@@ -21,6 +21,8 @@
 #include "devices.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/steady_timer.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
 #include <boost/process/child.hpp>
@@ -113,16 +115,170 @@
     }
 }
 
+static int deleteDevice(const std::string& devicePath,
+                        std::shared_ptr<uint64_t> address,
+                        const std::string& destructor)
+{
+    if (!address)
+    {
+        return -1;
+    }
+    std::filesystem::path deviceDestructor(devicePath);
+    deviceDestructor /= destructor;
+    std::ofstream deviceFile(deviceDestructor);
+    if (!deviceFile.good())
+    {
+        std::cerr << "Error writing " << deviceDestructor << "\n";
+        return -1;
+    }
+    deviceFile << std::to_string(*address);
+    deviceFile.close();
+    return 0;
+}
+
+static int createDevice(const std::string& devicePath,
+                        const std::string& parameters,
+                        const std::string& constructor)
+{
+    std::filesystem::path deviceConstructor(devicePath);
+    deviceConstructor /= constructor;
+    std::ofstream deviceFile(deviceConstructor);
+    if (!deviceFile.good())
+    {
+        std::cerr << "Error writing " << deviceConstructor << "\n";
+        return -1;
+    }
+    deviceFile << parameters;
+    deviceFile.close();
+
+    return 0;
+}
+
+static bool deviceIsCreated(const std::string& devicePath,
+                            std::shared_ptr<uint64_t> bus,
+                            std::shared_ptr<uint64_t> address,
+                            const bool retrying)
+{
+    if (!bus || !address)
+    {
+        return false;
+    }
+
+    std::ostringstream hex;
+    hex << std::hex << std::setw(4) << std::setfill('0') << *address;
+    std::string addressHex = hex.str();
+    std::string busStr = std::to_string(*bus);
+
+    for (auto path = std::filesystem::recursive_directory_iterator(devicePath);
+         path != std::filesystem::recursive_directory_iterator(); path++)
+    {
+        if (!std::filesystem::is_directory(*path))
+        {
+            continue;
+        }
+
+        const std::string directoryName = path->path().filename();
+        if (directoryName == busStr + "-" + addressHex)
+        {
+            // The first time the BMC boots the kernel has creates a
+            // filesystem enumerating the I2C devices. The I2C device has not
+            // been initialized for use. This requires a call to a device
+            // node, such as "new_device". The first pass through this
+            // function is only confirming the filesystem contains the device
+            // entry of interest (i.e. i2c4-0050).
+            //
+            // An upper level function performs the device creation
+            // action. This action may fail. The device driver (dd) used to
+            // create the I2C filesystem substructure eats any error codes,
+            // and always returns 0. This is by design. It is also possible
+            // for the new_device action to fail because the device is not
+            // actually in the system, i.e. optional equipment.
+            //
+            // The 'retrying' pass of this function is used to confirm the
+            // 'dd' device driver succeeded. Success is measured by finding
+            // the 'hwmon' subdirectory in the filesystem. The first attempt
+            // is delayed by an arbitrary amount, in order to permit the
+            // kernel time to create the filesystem entries. The upper level
+            // function determines the number of times to retry calling this
+            // function.
+            if (retrying)
+            {
+                std::error_code ec;
+                std::filesystem::path hwmonDir(devicePath);
+                hwmonDir /= directoryName;
+                hwmonDir /= "hwmon";
+                return std::filesystem::is_directory(hwmonDir, ec);
+            }
+            return true;
+        }
+        else
+        {
+            path.disable_recursion_pending();
+        }
+    }
+    return false;
+}
+
+static int buildDevice(const std::string& devicePath,
+                       const std::string& parameters,
+                       std::shared_ptr<uint64_t> bus,
+                       std::shared_ptr<uint64_t> address,
+                       const std::string& constructor,
+                       const std::string& destructor, const bool createsHWMon,
+                       const size_t retries = 5)
+{
+    bool tryAgain = false;
+    if (!retries)
+    {
+        return -1;
+    }
+
+    if (!deviceIsCreated(devicePath, bus, address, false))
+    {
+        createDevice(devicePath, parameters, constructor);
+        tryAgain = true;
+    }
+    else if (createsHWMon && !deviceIsCreated(devicePath, bus, address, true))
+    {
+        // device is present, hwmon subdir missing
+        deleteDevice(devicePath, address, destructor);
+        tryAgain = true;
+    }
+
+    if (tryAgain)
+    {
+        std::shared_ptr<boost::asio::steady_timer> createTimer =
+            std::make_shared<boost::asio::steady_timer>(io);
+        createTimer->expires_after(std::chrono::milliseconds(500));
+        createTimer->async_wait([createTimer, devicePath, parameters, bus,
+                                 address, constructor, destructor, createsHWMon,
+                                 retries](const boost::system::error_code& ec) {
+            if (ec)
+            {
+                std::cerr << "Timer error: " << ec << "\n";
+                return -2;
+            }
+            return buildDevice(devicePath, parameters, bus, address,
+                               constructor, destructor, createsHWMon,
+                               retries - 1);
+        });
+    }
+    return 0;
+}
+
 void exportDevice(const std::string& type,
                   const devices::ExportTemplate& exportTemplate,
                   const nlohmann::json& configuration)
 {
 
     std::string parameters = exportTemplate.parameters;
-    std::string device = exportTemplate.device;
+    std::string devicePath = exportTemplate.devicePath;
+    std::string constructor = exportTemplate.add;
+    std::string destructor = exportTemplate.remove;
+    bool createsHWMon = exportTemplate.createsHWMon;
     std::string name = "unknown";
-    const uint64_t* bus = nullptr;
-    const uint64_t* address = nullptr;
+    std::shared_ptr<uint64_t> bus = nullptr;
+    std::shared_ptr<uint64_t> address = nullptr;
     const nlohmann::json::array_t* channels = nullptr;
 
     for (auto keyPair = configuration.begin(); keyPair != configuration.end();
@@ -144,11 +300,13 @@
 
         if (keyPair.key() == "Bus")
         {
-            bus = keyPair.value().get_ptr<const uint64_t*>();
+            bus = std::make_shared<uint64_t>(
+                *keyPair.value().get_ptr<const uint64_t*>());
         }
         else if (keyPair.key() == "Address")
         {
-            address = keyPair.value().get_ptr<const uint64_t*>();
+            address = std::make_shared<uint64_t>(
+                *keyPair.value().get_ptr<const uint64_t*>());
         }
         else if (keyPair.key() == "ChannelNames")
         {
@@ -157,49 +315,14 @@
         }
         boost::replace_all(parameters, TEMPLATE_CHAR + keyPair.key(),
                            subsituteString);
-        boost::replace_all(device, TEMPLATE_CHAR + keyPair.key(),
+        boost::replace_all(devicePath, TEMPLATE_CHAR + keyPair.key(),
                            subsituteString);
     }
 
-    // if we found bus and address we can attempt to prevent errors
-    if (bus != nullptr && address != nullptr)
-    {
-        std::ostringstream hex;
-        hex << std::hex << *address;
-        const std::string& addressHex = hex.str();
-        std::string busStr = std::to_string(*bus);
+    int err = buildDevice(devicePath, parameters, bus, address, constructor,
+                          destructor, createsHWMon);
 
-        std::filesystem::path devicePath(device);
-        std::filesystem::path parentPath = devicePath.parent_path();
-        if (std::filesystem::is_directory(parentPath))
-        {
-            for (const auto& path :
-                 std::filesystem::directory_iterator(parentPath))
-            {
-                if (!std::filesystem::is_directory(path))
-                {
-                    continue;
-                }
-
-                const std::string& directoryName = path.path().filename();
-                if (boost::starts_with(directoryName, busStr) &&
-                    boost::ends_with(directoryName, addressHex))
-                {
-                    return; // already exported
-                }
-            }
-        }
-    }
-
-    std::ofstream deviceFile(device);
-    if (!deviceFile.good())
-    {
-        std::cerr << "Error writing " << device << "\n";
-        return;
-    }
-    deviceFile << parameters;
-    deviceFile.close();
-    if (boost::ends_with(type, "Mux") && bus && address && channels)
+    if (!err && boost::ends_with(type, "Mux") && bus && address && channels)
     {
         linkMux(name, static_cast<size_t>(*bus), static_cast<size_t>(*address),
                 *channels);