diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp
index 16ce3fb2..2e3f86ee 100644
--- a/oscar/SleepLib/profiles.cpp
+++ b/oscar/SleepLib/profiles.cpp
@@ -877,27 +877,6 @@ Day *Profile::FindDay(QDate date, MachineType type)
 }
 
 
-int Profile::Import(QString path)
-{
-    int c = 0;
-    qDebug() << "Importing " << path;
-    path = path.replace("\\", "/");
-
-    if (path.endsWith("/")) {
-        path.chop(1);
-    }
-
-    QList<MachineLoader *>loaders = GetLoaders(MT_CPAP);
-
-    for(auto & loader : loaders) {
-        if (c += loader->Open(path)) {
-            break;
-        }
-    }
-
-    return c;
-}
-
 MachineLoader *GetLoader(QString name)
 {
     QList<MachineLoader *> loaders = GetLoaders();
diff --git a/oscar/SleepLib/profiles.h b/oscar/SleepLib/profiles.h
index c7a13252..08bed6b6 100644
--- a/oscar/SleepLib/profiles.h
+++ b/oscar/SleepLib/profiles.h
@@ -88,11 +88,6 @@ class Profile : public Preferences
 
     QString path() { return p_path; }
 
-        /*! \brief Import Machine Data
-        \param path containing import location
-     */
-    int Import(QString path);
-
     //! \brief Removes a given day from the date, destroying the daylist date record if empty
     bool unlinkDay(Day * day);
 
diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp
index 117dbac7..89c9071c 100644
--- a/oscar/mainwindow.cpp
+++ b/oscar/mainwindow.cpp
@@ -2432,7 +2432,20 @@ void MainWindow::importNonCPAP(MachineLoader &loader)
             QCoreApplication::processEvents();
         }
         QString name = loader.loaderName();
+        
+        ImportUI importui(p_profile);
+        ImportContext* ctx = new ProfileImportContext(p_profile);
+        loader.SetContext(ctx);
+        connect(ctx, &ImportContext::importEncounteredUnexpectedData, &importui, &ImportUI::onUnexpectedData);
+        connect(&loader, &MachineLoader::deviceReportsUsageOnly, &importui, &ImportUI::onDeviceReportsUsageOnly);
+        connect(&loader, &MachineLoader::deviceIsUntested, &importui, &ImportUI::onDeviceIsUntested);
+        connect(&loader, &MachineLoader::deviceIsUnsupported, &importui, &ImportUI::onDeviceIsUnsupported);
+
         int res = loader.Open(files);
+
+        loader.SetContext(nullptr);
+        delete ctx;
+
         if (size > 1) {
             disconnect(&loader, SIGNAL(setProgressValue(int)), &progress, SLOT(setProgressValue(int)));
             disconnect(&progress, SIGNAL(abortClicked()), &loader, SLOT(abortImport()));