diff --git a/app/build.gradle b/app/build.gradle
index 4b4aaa1876..dde53c2b49 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -127,6 +127,7 @@ android {
         multiDexEnabled true
         versionCode 1500
         version "2.7-omnipod-0.4.1-SNAPSHOT"
+        version "2.7.0-rc3"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
@@ -134,11 +135,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         // if you change minSdkVersion to less than 11, you need to change executeTask for wear
 
-        // OMNIPOD: Keep track of what commit from the main repository we're on, these fields aren't actually used anywhere
-        buildConfigField "String", "DEV_VERSION", '"2.6.7-dev"'
-        buildConfigField "String", "DEV_VERSION_COMMIT", '"65c8cc98804cfc366239ad2bedb2dd98e3e4f3c2"'
-        buildConfigField "String", "DEV_VERSION_COMMIT_DATE", '"16.8.2020"' // 16th of August
-
         ndk {
             moduleName "BleCommandUtil"
         }
@@ -250,6 +246,7 @@ dependencies {
     implementation project(':danar')
     implementation project(':rileylink')
     implementation project(':medtronic')
+    implementation project(':omnipod')
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.google.android.gms:play-services-wearable:17.0.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8f3db8e179..531e88e83a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -263,17 +263,6 @@
 
         <uses-library android:name="org.apache.http.legacy" android:required="false"/>
 
-        <!-- Omnipod service and activities -->
-        <service
-            android:name=".plugins.pump.omnipod.service.RileyLinkOmnipodService"
-            android:enabled="true"
-            android:exported="true" />
-
-        <activity android:name=".plugins.pump.omnipod.dialogs.PodManagementActivity" />
-        <activity android:name=".plugins.pump.omnipod.dialogs.PodHistoryActivity" />
-        <activity android:name="com.atech.android.library.wizardpager.WizardPagerActivity"
-                  android:theme="@style/AppTheme.NoActionBar"/>
-
     </application>
 
 </manifest>
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index 7ba9957ed8..d96fda8d3b 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -57,7 +57,6 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHi
 import info.nightscout.androidaps.plugins.pump.insight.database.InsightBolusID;
 import info.nightscout.androidaps.plugins.pump.insight.database.InsightHistoryOffset;
 import info.nightscout.androidaps.plugins.pump.insight.database.InsightPumpID;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.db.PodHistory;
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.utils.JsonHelper;
 import info.nightscout.androidaps.utils.PercentageSplitter;
@@ -88,7 +87,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     public static final String DATABASE_INSIGHT_HISTORY_OFFSETS = "InsightHistoryOffsets";
     public static final String DATABASE_INSIGHT_BOLUS_IDS = "InsightBolusIDs";
     public static final String DATABASE_INSIGHT_PUMP_IDS = "InsightPumpIDs";
-    public static final String DATABASE_POD_HISTORY = "PodHistory";
 
     private static final int DATABASE_VERSION = 12;
 
@@ -142,7 +140,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.createTableIfNotExists(connectionSource, InsightHistoryOffset.class);
             TableUtils.createTableIfNotExists(connectionSource, InsightBolusID.class);
             TableUtils.createTableIfNotExists(connectionSource, InsightPumpID.class);
-            TableUtils.createTableIfNotExists(connectionSource, PodHistory.class);
+            TableUtils.createTableIfNotExists(connectionSource, OmnipodHistoryRecord.class);
             database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DATABASE_INSIGHT_BOLUS_IDS + "\", " + System.currentTimeMillis() + " " +
                     "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DATABASE_INSIGHT_BOLUS_IDS + "\")");
             database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DATABASE_INSIGHT_PUMP_IDS + "\", " + System.currentTimeMillis() + " " +
@@ -219,7 +217,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.dropTable(connectionSource, CareportalEvent.class, true);
             TableUtils.dropTable(connectionSource, ProfileSwitch.class, true);
             TableUtils.dropTable(connectionSource, TDD.class, true);
-            TableUtils.dropTable(connectionSource, PodHistory.class, true);
+            TableUtils.dropTable(connectionSource, OmnipodHistoryRecord.class, true);
             TableUtils.createTableIfNotExists(connectionSource, TempTarget.class);
             TableUtils.createTableIfNotExists(connectionSource, BgReading.class);
             TableUtils.createTableIfNotExists(connectionSource, DanaRHistoryRecord.class);
@@ -229,7 +227,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.createTableIfNotExists(connectionSource, CareportalEvent.class);
             TableUtils.createTableIfNotExists(connectionSource, ProfileSwitch.class);
             TableUtils.createTableIfNotExists(connectionSource, TDD.class);
-            TableUtils.createTableIfNotExists(connectionSource, PodHistory.class);
+            TableUtils.createTableIfNotExists(connectionSource, OmnipodHistoryRecord.class);
             updateEarliestDataChange(0);
         } catch (SQLException e) {
             aapsLogger.error("Unhandled exception", e);
@@ -364,8 +362,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         return getDao(InsightHistoryOffset.class);
     }
 
-    private Dao<PodHistory, Long> getDaoPodHistory() throws SQLException {
-        return getDao(PodHistory.class);
+    private Dao<OmnipodHistoryRecord, Long> getDaoPodHistory() throws SQLException {
+        return getDao(OmnipodHistoryRecord.class);
     }
 
     public long roundDateToSec(long date) {
@@ -1865,25 +1863,25 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 
     // ---------------- PodHistory handling ---------------
 
-    public void createOrUpdate(PodHistory podHistory) {
+    public void createOrUpdate(OmnipodHistoryRecord omnipodHistoryRecord) {
         try {
-            getDaoPodHistory().createOrUpdate(podHistory);
+            getDaoPodHistory().createOrUpdate(omnipodHistoryRecord);
         } catch (SQLException e) {
             aapsLogger.error("Unhandled exception", e);
         }
     }
 
 
-    public List<PodHistory> getPodHistoryFromTime(long from, boolean ascending) {
+    public List<OmnipodHistoryRecord> getAllOmnipodHistoryRecordsFromTimeStamp(long from, boolean ascending) {
         try {
-            Dao<PodHistory, Long> daoPodHistory = getDaoPodHistory();
-            List<PodHistory> podHistories;
-            QueryBuilder<PodHistory, Long> queryBuilder = daoPodHistory.queryBuilder();
+            Dao<OmnipodHistoryRecord, Long> daoPodHistory = getDaoPodHistory();
+            List<OmnipodHistoryRecord> podHistories;
+            QueryBuilder<OmnipodHistoryRecord, Long> queryBuilder = daoPodHistory.queryBuilder();
             queryBuilder.orderBy("date", ascending);
             //queryBuilder.limit(100L);
             Where where = queryBuilder.where();
             where.ge("date", from);
-            PreparedQuery<PodHistory> preparedQuery = queryBuilder.prepare();
+            PreparedQuery<OmnipodHistoryRecord> preparedQuery = queryBuilder.prepare();
             podHistories = daoPodHistory.query(preparedQuery);
             return podHistories;
         } catch (SQLException e) {
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
index 0e9f9d82b2..4468692189 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
@@ -16,7 +16,8 @@ import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 @Singleton
 public class DatabaseHelperProvider implements DatabaseHelperInterface {
 
-    @Inject DatabaseHelperProvider() {}
+    @Inject DatabaseHelperProvider() {
+    }
 
     @NotNull @Override public List<BgReading> getAllBgreadingsDataFromTime(long mills, boolean ascending) {
         return MainApp.getDbHelper().getAllBgreadingsDataFromTime(mills, ascending);
@@ -30,6 +31,10 @@ public class DatabaseHelperProvider implements DatabaseHelperInterface {
         MainApp.getDbHelper().createOrUpdate(record);
     }
 
+    @Override public void createOrUpdate(@NotNull OmnipodHistoryRecord record) {
+        MainApp.getDbHelper().createOrUpdate(record);
+    }
+
     @NotNull @Override public List<DanaRHistoryRecord> getDanaRHistoryRecordsByType(byte type) {
         return MainApp.getDbHelper().getDanaRHistoryRecordsByType(type);
     }
@@ -86,10 +91,14 @@ public class DatabaseHelperProvider implements DatabaseHelperInterface {
         return MainApp.getDbHelper().getTemporaryBasalsDataFromTime(mills, ascending);
     }
 
-    @NotNull @Override public CareportalEvent getCareportalEventFromTimestamp(long timestamp) {
+    @Override public CareportalEvent getCareportalEventFromTimestamp(long timestamp) {
         return MainApp.getDbHelper().getCareportalEventFromTimestamp(timestamp);
     }
 
+    @NotNull @Override public List<OmnipodHistoryRecord> getAllOmnipodHistoryRecordsFromTimestamp(long timestamp, boolean ascending) {
+        return MainApp.getDbHelper().getAllOmnipodHistoryRecordsFromTimeStamp(timestamp, ascending);
+    }
+
     @NotNull @Override public List<TDD> getTDDsForLastXDays(int days) {
         return MainApp.getDbHelper().getTDDsForLastXDays(days);
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
index e45db6c006..345ab5a615 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -26,6 +26,7 @@ import javax.inject.Singleton
         CommandQueueModule::class,
         ObjectivesModule::class,
         WizardModule::class,
+        RileyLinkModule::class,
         MedtronicModule::class,
         OmnipodModule::class,
         APSModule::class,
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt
index f813a6d49d..cadac7d13c 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt
@@ -2,33 +2,12 @@ package info.nightscout.androidaps.dependencyInjection
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SendAndListen
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SetPreamble
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioPacket
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioResponse
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.*
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUITask
 
 @Module
 @Suppress("unused")
 abstract class MedtronicModule {
-    @ContributesAndroidInjector abstract fun rileyLinkCommunicationManagerProvider(): RileyLinkCommunicationManager
     @ContributesAndroidInjector abstract fun medtronicCommunicationManagerProvider(): MedtronicCommunicationManager
     @ContributesAndroidInjector abstract fun medtronicUITaskProvider(): MedtronicUITask
-    @ContributesAndroidInjector abstract fun serviceTaskProvider(): ServiceTask
-    @ContributesAndroidInjector abstract fun pumpTaskProvider(): PumpTask
-    @ContributesAndroidInjector abstract fun discoverGattServicesTaskProvider(): DiscoverGattServicesTask
-    @ContributesAndroidInjector abstract fun initializePumpManagerTaskProvider(): InitializePumpManagerTask
-    @ContributesAndroidInjector abstract fun resetRileyLinkConfigurationTaskProvider(): ResetRileyLinkConfigurationTask
-    @ContributesAndroidInjector abstract fun wakeAndTuneTaskProvider(): WakeAndTuneTask
-    @ContributesAndroidInjector abstract fun radioResponseProvider(): RadioResponse
-    @ContributesAndroidInjector abstract fun rileyLinkBLEProvider(): RileyLinkBLE
-    @ContributesAndroidInjector abstract fun rfSpyProvider(): RFSpy
-    @ContributesAndroidInjector abstract fun sendAndListenProvider(): SendAndListen
-    @ContributesAndroidInjector abstract fun setPreambleProvider(): SetPreamble
-    @ContributesAndroidInjector abstract fun radioPacketProvider(): RadioPacket
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/OmnipodModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/OmnipodModule.kt
index 0e73cea942..e7a8f31cfa 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/OmnipodModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/OmnipodModule.kt
@@ -3,8 +3,6 @@ package info.nightscout.androidaps.dependencyInjection
 import dagger.Module
 import dagger.Provides
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.OmnipodCommunicationManager
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodStateManager
@@ -15,14 +13,9 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.initpod.In
 import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.pages.InitPodRefreshAction
 import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.pages.PodInfoFragment
 import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.removepod.RemoveActionFragment
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.comm.AapsOmnipodManager
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.comm.AapsPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.ui.OmnipodUITask
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
-import info.nightscout.androidaps.utils.sharedPreferences.SP
-import javax.inject.Singleton
 
 @Module
 @Suppress("unused")
@@ -52,9 +45,6 @@ abstract class OmnipodModule {
 
     companion object {
         @Provides
-        @Singleton
-        fun podStateManagerProvider(aapsLogger: AAPSLogger, sp: SP, omnipodPumpStatus: OmnipodPumpStatus,
-                                    rxBus: RxBusWrapper, resourceHelper: ResourceHelper, dateUtil: DateUtil): PodStateManager =
-            AapsPodStateManager(aapsLogger, sp, omnipodPumpStatus, rxBus, resourceHelper, dateUtil)
+        fun podStateManagerProvider(aapsPodStateManager: AapsPodStateManager) : PodStateManager = aapsPodStateManager
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index 41c1615fe0..efb59be7c3 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -148,6 +148,12 @@ abstract class PluginsModule {
     @IntKey(150)
     abstract fun bindMedtronicPumpPlugin(plugin: MedtronicPumpPlugin): PluginBase
 
+    @Binds
+    @PumpDriver
+    @IntoMap
+    @IntKey(155)
+    abstract fun bindOmnipodPumpPlugin(plugin: OmnipodPumpPlugin): PluginBase
+
     @Binds
     @NotNSClient
     @IntoMap
@@ -340,12 +346,6 @@ abstract class PluginsModule {
     @IntKey(480)
     abstract fun bindConfigBuilderPlugin(plugin: ConfigBuilderPlugin): PluginBase
 
-    @Binds
-    @PumpDriver
-    @IntoMap
-    @IntKey(490)
-    abstract fun bindOmnipodPumpPlugin(plugin: OmnipodPumpPlugin): PluginBase
-
     @Qualifier
     annotation class AllConfigs
 
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/RileyLinkModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/RileyLinkModule.kt
new file mode 100644
index 0000000000..b74b2e4263
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/RileyLinkModule.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.dependencyInjection
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SendAndListen
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SetPreamble
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioPacket
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioResponse
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.*
+
+@Module
+@Suppress("unused")
+abstract class RileyLinkModule {
+    @ContributesAndroidInjector abstract fun rileyLinkCommunicationManagerProvider(): RileyLinkCommunicationManager
+    @ContributesAndroidInjector abstract fun serviceTaskProvider(): ServiceTask
+    @ContributesAndroidInjector abstract fun pumpTaskProvider(): PumpTask
+    @ContributesAndroidInjector abstract fun discoverGattServicesTaskProvider(): DiscoverGattServicesTask
+    @ContributesAndroidInjector abstract fun initializePumpManagerTaskProvider(): InitializePumpManagerTask
+    @ContributesAndroidInjector abstract fun resetRileyLinkConfigurationTaskProvider(): ResetRileyLinkConfigurationTask
+    @ContributesAndroidInjector abstract fun wakeAndTuneTaskProvider(): WakeAndTuneTask
+    @ContributesAndroidInjector abstract fun radioResponseProvider(): RadioResponse
+    @ContributesAndroidInjector abstract fun rileyLinkBLEProvider(): RileyLinkBLE
+    @ContributesAndroidInjector abstract fun rfSpyProvider(): RFSpy
+    @ContributesAndroidInjector abstract fun sendAndListenProvider(): SendAndListen
+    @ContributesAndroidInjector abstract fun setPreambleProvider(): SetPreamble
+    @ContributesAndroidInjector abstract fun radioPacketProvider(): RadioPacket
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
index 22973b3caf..20a6493ea8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
@@ -25,7 +25,7 @@ import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
 import info.nightscout.androidaps.plugins.general.overview.StatusLightHandler
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.SingleClickButton
+import info.nightscout.androidaps.utils.ui.SingleClickButton
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.extensions.plusAssign
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/DeviceCommandExecutor.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/DeviceCommandExecutor.java
deleted file mode 100644
index 8145d7f13b..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/DeviceCommandExecutor.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.common.defs;
-
-public interface DeviceCommandExecutor {
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodDriverState.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodDriverState.java
deleted file mode 100644
index daa51b3685..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodDriverState.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.driver;
-
-// TODO replace with method calls on PodStateManager
-public enum OmnipodDriverState {
-
-    NotInitalized, // when we start
-    Initalized_NoPod, // driver is initalized, but there is no pod
-    Initalized_PodInitializing, // driver is initalized, pod is initalizing
-    Initalized_PodAttached, // driver is initalized, pod is there
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIPostprocessor.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIPostprocessor.java
deleted file mode 100644
index cf14405dcc..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIPostprocessor.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.driver.ui;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Date;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodPumpPluginInterface;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
-
-/**
- * Created by andy on 4.8.2019
- */
-// TODO remove once OmnipodPumpStatus has been removed
-@Singleton
-public class OmnipodUIPostprocessor {
-
-
-    private static final Logger LOG = LoggerFactory.getLogger(LTag.PUMP.name());
-
-    private OmnipodPumpStatus pumpStatus;
-    private OmnipodPumpPluginInterface omnipodPumpPlugin;
-    private RxBusWrapper rxBus;
-
-    @Inject
-    public OmnipodUIPostprocessor(OmnipodPumpPlugin plugin, OmnipodPumpStatus pumpStatus) {
-        this.pumpStatus = pumpStatus;
-        this.omnipodPumpPlugin = plugin;
-        this.rxBus = plugin.getRxBus();
-    }
-
-    // this is mostly intended for command that return certain statuses (Remaining Insulin, ...), and
-    // where responses won't be directly used
-    public void postProcessData(OmnipodUITask uiTask) {
-
-        switch (uiTask.commandType) {
-
-            case SetBolus: {
-                if (uiTask.returnData != null) {
-
-                    PumpEnactResult result = uiTask.returnData;
-
-                    DetailedBolusInfo detailedBolusInfo = (DetailedBolusInfo) uiTask.getObjectFromParameters(0);
-
-                    if (result.success) {
-                        boolean isSmb = detailedBolusInfo.isSMB;
-
-                        if (!isSmb) {
-                            pumpStatus.lastBolusAmount = detailedBolusInfo.insulin;
-                            pumpStatus.lastBolusTime = new Date();
-                        }
-                    }
-                }
-            }
-            break;
-
-            case CancelTemporaryBasal: {
-                pumpStatus.tempBasalStart = 0;
-                pumpStatus.tempBasalEnd = 0;
-                pumpStatus.tempBasalAmount = null;
-                pumpStatus.tempBasalLength = null;
-            }
-            break;
-
-//            case PairAndPrimePod: {
-//                if (uiTask.returnData.success) {
-//                    omnipodPumpPlugin.setEnableCustomAction(OmnipodCustomActionType.PairAndPrime, false);
-//                    omnipodPumpPlugin.setEnableCustomAction(OmnipodCustomActionType.FillCanulaSetBasalProfile, true);
-//                }
-//                omnipodPumpPlugin.setEnableCustomAction(OmnipodCustomActionType.DeactivatePod, true);
-//            }
-//            break;
-//
-//            case FillCanulaAndSetBasalProfile: {
-//                if (uiTask.returnData.success) {
-//                    omnipodPumpPlugin.setEnableCustomAction(OmnipodCustomActionType.FillCanulaSetBasalProfile, false);
-//                }
-//                omnipodPumpPlugin.setEnableCustomAction(OmnipodCustomActionType.DeactivatePod, true);
-//            }
-//            break;
-//
-//            case DeactivatePod:
-//            case ResetPodStatus: {
-//                omnipodPumpPlugin.setEnableCustomAction(OmnipodCustomActionType.PairAndPrime, true);
-//                omnipodPumpPlugin.setEnableCustomAction(OmnipodCustomActionType.DeactivatePod, false);
-//            }
-//            break;
-
-
-            default:
-                if (isLogEnabled())
-                    LOG.trace("Post-processing not implemented for {}.", uiTask.commandType.name());
-
-        }
-
-
-    }
-
-
-    private boolean isLogEnabled() {
-        return true; //L.isEnabled(LTag.PUMP);
-    }
-
-    public RxBusWrapper getRxBus() {
-        return this.rxBus;
-    }
-}
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index ebb517dcb7..427000813d 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -25,7 +25,7 @@
             android:padding="10dip"
             app:columnCount="2">
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_profileswitch"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
@@ -40,7 +40,7 @@
                 app:layout_gravity="fill"
                 app:layout_row="0" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_temptarget"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
@@ -55,7 +55,7 @@
                 app:layout_gravity="fill"
                 app:layout_row="0" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_settempbasal"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
@@ -70,7 +70,7 @@
                 app:layout_gravity="fill"
                 app:layout_row="1" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_canceltempbasal"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
@@ -86,7 +86,7 @@
                 app:layout_gravity="fill"
                 app:layout_row="1" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_extendedbolus"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
@@ -101,7 +101,7 @@
                 app:layout_gravity="fill"
                 app:layout_row="1" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_extendedbolus_cancel"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
@@ -139,7 +139,7 @@
             android:padding="10dip"
             app:columnCount="2">
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_bgcheck"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
@@ -154,7 +154,7 @@
                 app:layout_gravity="fill"
                 app:layout_row="2" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_fill"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
@@ -169,7 +169,7 @@
                 app:layout_gravity="fill"
                 app:layout_row="2" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_cgmsensorinsert"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
@@ -183,7 +183,7 @@
                 app:layout_gravity="fill"
                 app:layout_row="3" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_pumpbatterychange"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
@@ -197,7 +197,7 @@
                 app:layout_gravity="fill"
                 app:layout_row="3" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_note"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
@@ -211,7 +211,7 @@
                 app:layout_gravity="fill"
                 app:layout_row="4" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_exercise"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
@@ -225,7 +225,7 @@
                 app:layout_gravity="fill"
                 app:layout_row="4" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_announcement"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
@@ -239,7 +239,7 @@
                 app:layout_gravity="fill"
                 app:layout_row="5" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_question"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
@@ -268,7 +268,7 @@
             android:padding="10dip"
             app:columnCount="2">
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_historybrowser"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
@@ -282,7 +282,7 @@
                 app:layout_gravity="fill"
                 app:layout_row="6" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_tddstats"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
diff --git a/app/src/main/res/layout/activity_smscommunicator_otp.xml b/app/src/main/res/layout/activity_smscommunicator_otp.xml
index 6c52185bfb..570b01c4c7 100644
--- a/app/src/main/res/layout/activity_smscommunicator_otp.xml
+++ b/app/src/main/res/layout/activity_smscommunicator_otp.xml
@@ -86,7 +86,7 @@
                 style="@style/warning_label"
                 android:text="@string/smscommunicator_otp_reset_warning" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/actions_smscommunicator_otp_reset"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml
index 6d6da91bc3..ec0bd04bc7 100644
--- a/app/src/main/res/layout/careportal_fragment.xml
+++ b/app/src/main/res/layout/careportal_fragment.xml
@@ -45,7 +45,7 @@
                     android:padding="10dip"
                     app:columnCount="3">
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_bgcheck"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0px"
@@ -60,7 +60,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="0" />
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_exercise"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -74,7 +74,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="0" />
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_temporarytarget"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -105,7 +105,7 @@
                     android:padding="10dip"
                     app:columnCount="3">
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_snackbolus"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -119,7 +119,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="1" />
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_mealbolus"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -133,7 +133,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="1" />
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_correctionbolus"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -147,7 +147,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="1" />
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_carbscorrection"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -161,7 +161,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="2" />
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_combobolus"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -175,7 +175,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="2" />
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_tempbasalstart"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -189,7 +189,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="2" />
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_tempbasalend"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -219,7 +219,7 @@
                     android:padding="10dip"
                     app:columnCount="3">
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_cgmsensorstart"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -234,7 +234,7 @@
                         app:layout_row="1" />
 
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_cgmsensorinsert"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -249,7 +249,7 @@
                         app:layout_row="1" />
 
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_openapsoffline"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -264,7 +264,7 @@
                         app:layout_row="1" />
 
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_announcement"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -278,7 +278,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="4" />
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_question"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -292,7 +292,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="4" />
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_note"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -321,7 +321,7 @@
                     android:padding="10dip"
                     app:columnCount="3">
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_pumpsitechange"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -335,7 +335,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="0" />
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_insulincartridgechange"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -349,7 +349,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="0" />
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_profileswitch"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -364,7 +364,7 @@
                         app:layout_row="0" />
 
 
-                    <info.nightscout.androidaps.utils.SingleClickButton
+                    <info.nightscout.androidaps.utils.ui.SingleClickButton
                         android:id="@+id/careportal_pumpbatterychange"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/combopump_fragment.xml b/app/src/main/res/layout/combopump_fragment.xml
index 1a60481875..aae34c4db0 100644
--- a/app/src/main/res/layout/combopump_fragment.xml
+++ b/app/src/main/res/layout/combopump_fragment.xml
@@ -487,7 +487,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/combo_refresh_button"
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/overview_buttons_layout.xml b/app/src/main/res/layout/overview_buttons_layout.xml
index f16ab04176..99a60a047b 100644
--- a/app/src/main/res/layout/overview_buttons_layout.xml
+++ b/app/src/main/res/layout/overview_buttons_layout.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <info.nightscout.androidaps.utils.SingleClickButton
+    <info.nightscout.androidaps.utils.ui.SingleClickButton
         android:id="@+id/overview_accepttempbutton"
         style="?android:attr/buttonStyle"
         android:layout_width="match_parent"
@@ -25,7 +25,7 @@
         android:paddingStart="0dp"
         android:paddingEnd="5dp" >
 
-        <info.nightscout.androidaps.utils.SingleClickButton
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
             android:id="@+id/overview_treatmentbutton"
             style="?android:attr/buttonStyle"
             android:layout_width="0px"
@@ -38,7 +38,7 @@
             android:textSize="10sp"
             android:visibility="gone" />
 
-        <info.nightscout.androidaps.utils.SingleClickButton
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
             android:id="@+id/overview_insulinbutton"
             style="?android:attr/buttonStyle"
             android:layout_width="0px"
@@ -50,7 +50,7 @@
             android:textColor="@color/colorInsulinButton"
             android:textSize="10sp" />
 
-        <info.nightscout.androidaps.utils.SingleClickButton
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
             android:id="@+id/overview_carbsbutton"
             style="?android:attr/buttonStyle"
             android:layout_width="0px"
@@ -62,7 +62,7 @@
             android:textColor="@color/colorCarbsButton"
             android:textSize="10sp" />
 
-        <info.nightscout.androidaps.utils.SingleClickButton
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
             android:id="@+id/overview_wizardbutton"
             style="?android:attr/buttonStyle"
             android:layout_width="0px"
@@ -74,7 +74,7 @@
             android:textColor="@color/colorCalculatorButton"
             android:textSize="10sp" />
 
-        <info.nightscout.androidaps.utils.SingleClickButton
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
             android:id="@+id/overview_calibrationbutton"
             style="?android:attr/buttonStyle"
             android:layout_width="0px"
@@ -87,7 +87,7 @@
             android:textSize="10sp"
             android:visibility="gone" />
 
-        <info.nightscout.androidaps.utils.SingleClickButton
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
             android:id="@+id/overview_cgmbutton"
             style="?android:attr/buttonStyle"
             android:layout_width="0px"
@@ -100,7 +100,7 @@
             android:textSize="10sp"
             android:visibility="gone" />
 
-        <info.nightscout.androidaps.utils.SingleClickButton
+        <info.nightscout.androidaps.utils.ui.SingleClickButton
             android:id="@+id/overview_quickwizardbutton"
             style="?android:attr/buttonStyle"
             android:layout_width="0px"
diff --git a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
index 5f56623663..d546bddceb 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
@@ -476,7 +476,7 @@
                 android:orientation="horizontal"
                 android:paddingRight="5dp">
 
-                <info.nightscout.androidaps.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
                     android:id="@+id/overview_treatmentbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -490,7 +490,7 @@
                     android:textColor="@color/colorTreatmentButton"
                     android:textSize="10sp" />
 
-                <info.nightscout.androidaps.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
                     android:id="@+id/overview_insulinbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -505,7 +505,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.androidaps.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
                     android:id="@+id/overview_carbsbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -520,7 +520,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.androidaps.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
                     android:id="@+id/overview_wizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -535,7 +535,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <info.nightscout.androidaps.utils.SingleClickButton
+                <info.nightscout.androidaps.utils.ui.SingleClickButton
                     android:id="@+id/overview_quickwizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1daa8393b2..0fbcb9fda8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -744,7 +744,7 @@
     <string name="extendedbolusdeliveryerror">Extended bolus delivery error</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">ago</string>
-     <string name="key_enableSMB_always" translatable="false">enableSMB_always</string>
+    <string name="key_enableSMB_always" translatable="false">enableSMB_always</string>
     <string name="key_enableSMB_with_COB" translatable="false">enableSMB_with_COB</string>
     <string name="key_enableSMB_with_temptarget" translatable="false">enableSMB_with_temptarget</string>
     <string name="key_enableSMB_after_carbs" translatable="false">enableSMB_after_carbs</string>
@@ -915,18 +915,18 @@
     <string name="openapsama_max_daily_safety_multiplier">Max daily safety multiplier</string>
     <string name="openapsama_current_basal_safety_multiplier">Current basal safety multiplier</string>
     <string name="value_unavailable_short">n/a</string>
-    <string translatable="false" name="key_virtualpump_type">virtualpump_type</string>
+    <string name="key_virtualpump_type" translatable="false">virtualpump_type</string>
     <string name="virtualpump_type">Virtual Pump Type</string>
     <string name="virtualpump_definition">Pump Definition</string>
     <string name="virtualpump_pump_def">Bolus: Step=%1$s\nExtended Bolus: [Step=%2$s, Duration=%3$smin-%4$sh]\nBasal: Step=%5$s\nTBR: %6$s (by %7$s), Duration=%8$smin-%9$sh\n%10$s</string>
     <string name="ns_autobackfill_title">Autobackfill BG</string>
     <string name="wear_wizard_settings">Wizard Settings</string>
-    <string translatable="false" name="key_wearwizard_bg">wearwizard_bg</string>
-    <string translatable="false" name="key_wearwizard_tt">wearwizard_tt</string>
-    <string translatable="false" name="key_wearwizard_trend">wearwizard_trend</string>
-    <string translatable="false" name="key_wearwizard_cob">wearwizard_cob</string>
-    <string translatable="false" name="key_wearwizard_bolusiob">wearwizard_bolusiob</string>
-    <string translatable="false" name="key_wearwizard_basaliob">wearwizard_basaliob</string>
+    <string name="key_wearwizard_bg" translatable="false">wearwizard_bg</string>
+    <string name="key_wearwizard_tt" translatable="false">wearwizard_tt</string>
+    <string name="key_wearwizard_trend" translatable="false">wearwizard_trend</string>
+    <string name="key_wearwizard_cob" translatable="false">wearwizard_cob</string>
+    <string name="key_wearwizard_bolusiob" translatable="false">wearwizard_bolusiob</string>
+    <string name="key_wearwizard_basaliob" translatable="false">wearwizard_basaliob</string>
     <string name="wear_wizard_settings_summary">Calculations included in the Wizard result:</string>
     <string name="wear_display_settings">Display Settings</string>
     <string name="wear_general_settings">General Settings</string>
@@ -965,8 +965,8 @@
     <string name="poctech">Poctech</string>
     <string name="description_source_poctech">Receive BG values from Poctech app</string>
     <string name="description_source_tomato">Receive BG values from Tomato app (MiaoMiao device)</string>
-    <string translatable="false" name="key_high_temptarget_raises_sensitivity">high_temptarget_raises_sensitivity</string>
-    <string translatable="false" name="key_low_temptarget_lowers_sensitivity">low_temptarget_lowers_sensitivity</string>
+    <string name="key_high_temptarget_raises_sensitivity" translatable="false">high_temptarget_raises_sensitivity</string>
+    <string name="key_low_temptarget_lowers_sensitivity" translatable="false">low_temptarget_lowers_sensitivity</string>
     <string name="high_temptarget_raises_sensitivity_title">High temptarget raises sensitivity</string>
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Raise sensitivity for temptargets >= 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Low temptarget lowers sensitivity</string>
@@ -1284,7 +1284,6 @@
     <string name="objectives_button_unfinish">Clear finished</string>
     <string name="objectives_button_unstart">Clear started</string>
     <string name="doyouwantresetstart">Do you want reset objective start? You may lose your progress.</string>
-    <string name="time_or_timezone_change">Time and/or Timezone change on pump</string>
     <string name="nopumpselected">No pump selected</string>
     <string name="setupwizard_units_prompt">Select units you want to display values in</string>
     <string name="ns_ploadlocalprofile">Upload local profile changes to NS</string>
@@ -1384,7 +1383,6 @@
     <string name="authorizationfailed">Authorization failed</string>
     <string name="overview_show_absinsulin">Absolute insulin</string>
     <string name="master_password_summary">Master password is used for backup encryption and to override security in application. Remember it or store on a safe place.</string>
-    <string name="passwords_dont_match">Passwords don\'t match</string>
     <string name="current_master_password">Current master password</string>
     <string name="statuslights">Status lights</string>
     <string name="statuslights_copy_ns">Copy settings from NS</string>
@@ -1397,174 +1395,6 @@
     <string name="key_skin" translatable="false">skin</string>
     <string name="skin">Skin</string>
 
-
-    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
-    <string name="medtronic_pump_status_never_contacted">Never contacted</string>
-    <string name="medtronic_pump_status_waking_up">Waking up</string>
-    <string name="medtronic_pump_status_error_comm">Error with communication</string>
-    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>
-    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>
-    <string name="medtronic_pump_status_active">Active</string>
-    <string name="medtronic_pump_status_sleeping">Sleeping</string>
-
-
-    <!-- Omnipod -->
-
-    <!-- Omnipod - Base -->
-    <string name="omnipod_name" translatable="false">Omnipod</string>
-    <string name="omnipod_name_short" translatable="false">POD</string>
-    <string name="description_pump_omnipod">Pump integration for Omnipod, requires RileyLink (with at least 2.0 firmware) device.</string>
-
-    <!-- Omnipod Configuration -->
-    <string name="key_omnipod_beep_bolus_enabled" translatable="false">pref_omnipod_beep_bolus_enabled</string>
-    <string name="key_omnipod_beep_basal_enabled" translatable="false">pref_omnipod_beep_basal_enabled</string>
-    <string name="key_omnipod_beep_smb_enabled" translatable="false">pref_omnipod_beep_smb_enabled</string>
-    <string name="key_omnipod_beep_tbr_enabled" translatable="false">pref_omnipod_beep_tbr_enabled</string>
-    <string name="key_omnipod_pod_debugging_options_enabled" translatable="false">pref_omnipod_pod_debugging_options_enabled</string>
-    <string name="key_omnipod_timechange_enabled" translatable="false">pref_omnipod_timechange_enabled</string>
-    <string name="omnipod_config_beep_bolus_enabled">Bolus Beep Enabled</string>
-    <string name="omnipod_config_beep_basal_enabled">Basal Beep Enabled</string>
-    <string name="omnipod_config_beep_smb_enabled">SMB Beep Enabled</string>
-    <string name="omnipod_config_beep_tbr_enabled">TBR Beep Enabled</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Pod Debugging Options Enabled</string>
-    <string name="omnipod_config_timechange_enabled">DST/Timezone Detection Enabled</string>
-
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_connected_now">Now</string>
-    <string name="omnipod_pod_mgmt">Pod Mgmt</string>
-    <string name="omnipod_pod_status">Pod Status</string>
-    <string name="omnipod_reservoir_left">%1$.2f U left</string>
-    <string name="omnipod_reservoir_over50">Over 50 U</string>
-    <string name="omnipod_pod_address">Pod Address</string>
-    <string name="omnipod_pod_expiry">Pod Expires</string>
-    <string name="omnipod_warning">Warning</string>
-    <string name="omnipod_pod_status_no_pod_connected">No Pod connected</string>
-    <string name="omnipod_pod_setup_in_progress">Pod setup in progress (Pod progress status: %1$s)</string>
-    <string name="omnipod_pod_status_not_initalized">Pod not initialized</string>
-    <string name="omnipod_pod_status_pod_fault">Pod Fault</string>
-    <string name="omnipod_pod_status_pod_fault_description">Pod Fault: %1$s %2$s</string>
-    <string name="omnipod_pod_status_pod_running">Pod running (last delivery status: %1$s)</string>
-    <string name="omnipod_pod_active_alerts">Active Pod Alerts</string>
-    <string name="omnipod_ack_short">Ack Alerts</string>
-    <string name="omnipod_last_bolus" translatable="false">%1$.2f %2$s (%3$s)</string>
-    <string name="omnipod_pod_status_initalizing">Initializing</string>
-    <string name="omnipod_pod_status_active">Active</string>
-    <string name="omnipod_pod_status_unknown">Unknown</string>
-
-
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
-
-
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_rileylink_address_invalid">RileyLink Address invalid.</string>
-    <string name="omnipod_error_operation_not_possible_no_configuration">Operation is not possible.\n\nYou need to configure Omnipod first, before you can use this operation.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Operation is not possible.\n\n You need to wait few minutes, until AAPS tries to set profile for first time.</string>
-    <string name="omnipod_error_illegal_init_action_type">Illegal PodInitActionType: %1$s</string>
-    <string name="omnipod_error_pod_not_attached">No active pod.</string>
-
-    <string name="omnipod_driver_error_setup_action_verification_failed">Command verification failed.</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">An unexpected error occurred. Please report! (type: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Communication failed: received invalid input parameters.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Communication failed: timeout.</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Communication failed: an unexpected error occurred. Please report!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Communication failed: message integrity verification failed.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Communication failed: received an invalid packet from the Pod.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Communication failed: the Pod is in a wrong state.</string>
-    <string name="omnipod_driver_error_invalid_response">Communication failed: received an invalid response from the Pod.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Communication failed: received a message with an invalid sequence number from the Pod.</string>
-    <string name="omnipod_driver_error_invalid_message_address">Communication failed: received a message with an invalid address from the Pod.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Communication failed: failed to decode message from the Pod.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Communication failed: nonce resync failed.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Communication failed: nonce out of sync.</string>
-    <string name="omnipod_driver_error_not_enough_data">Communication failed: not enough data received from the Pod.</string>
-    <string name="omnipod_driver_error_pod_fault">A Pod fault (%1$03d %2$s) has been detected. Please deactivate your Pod and start a new one.</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Communication failed: the Pod returned an error response.</string>
-
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Pod Management</string>
-    <string name="omnipod_cmd_init_pod">Init Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Deactivate Pod</string>
-    <string name="omnipod_cmd_reset_pod">Reset Pod</string>
-    <string name="omnipod_cmd_pod_history">Pod History</string>
-
-    <string name="omnipod_cmd_set_bolus">Set Bolus</string>
-    <string name="omnipod_cmd_cancel_bolus">Cancel Bolus</string>
-    <string name="omnipod_cmd_set_tbr">Set Temporary Basal</string>
-    <string name="omnipod_cmd_cancel_tbr">Cancel Temporary Basal (Internally by driver)</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Cancel Temporary Basal (Forced by user)</string>
-    <string name="omnipod_cmd_set_basal_schedule">Set Basal Schedule</string>
-    <string name="omnipod_cmd_get_pod_status">Get Pod Status</string>
-    <string name="omnipod_cmd_get_pod_info">Get Pod Info</string>
-    <string name="omnipod_cmd_set_time">Set Time</string>
-    <string name="omnipod_cmd_configure_alerts">Configure Alerts</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Acknowledge Alerts</string>
-    <string name="omnipod_cmd_suspend_delivery">Suspend Delivery</string>
-    <string name="omnipod_cmd_resume_delivery">Resume Delivery</string>
-    <string name="omnipod_cmd_unknown_entry">Unknown Entry</string>
-
-    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, CH=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Rate: %1$.1f U, Duration: %2$d min</string>
-
-    <string name="omnipod_cmd_reset_pod_desc">If you press <b>OK</b>, the Pod state will be forcibly reset and you will not be able to communicate with the Pod anymore. Do this only if you can not communicate with the Pod anymore. If you can still communicate with the Pod, please use the <b>Deactivate Pod</b> option.</string>
-    <string name="omnipod_cmd_pod_history_na">Pod History not available at the moment.</string>
-
-    <string name="omnipod_namex" translatable="false">Omnipod</string>
-    <string name="omnipod_namex2" translatable="false">Omnipod</string>
-    <string name="omnipod_namexxx" translatable="false">Omnipod</string>
-
-
-    <string name="omnipod_init_pod_wizard_step1_title">Fill the Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nFill the new Pod with enough insulin for 3 days.\n\nListen for two beeps from the Pod during the filling process. These indicate that the minimum amount of 85U has been inserted. Be sure to completely empty the fill syringe, even after hearing the two beeps.\n\nAfter filling the Pod, please press <b>Next</b>.\n\n<b>Note:</b> do not remove the Pod\'s needle cap at this time.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Priming</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Trying to pair with the new Pod and prime it.\n\nWhen all items are checked, you can press <b>Next</b>.\n\n<b>Note:</b> please keep the Pod and the RileyLink a few inches apart at this time.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Attach the Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPrepare the infusion site. Remove the Pod\'s needle cap and adhesive backing and attach the Pod to the infusion site.\n\nIf the cannula sticks out, please press <b>Cancel</b> and discard your Pod.\n\nPress <b>Next</b> to insert the cannula and begin basal delivery.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Inserting cannula</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Trying to set initial basal schedule and insert the cannula.\n\nWhen all items are checked, you can press <b>Next</b>.</string>
-
-    <string name="omnipod_init_pod_wizard_pod_info_title">Pod Info</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nThe Pod is now active.\n\nYour basal schedule has been programmed and the cannula has been inserted.\n\nPlease verify that the cannula has been inserted correctly and replace your Pod if you feel hasn\'t.</string>
-
-    <string name="omnipod_remove_pod_wizard_step1_title">Deactivate Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nPress <b>Next</b> to deactivate the Pod.\n\n<b>Note:</b> This will suspend all insulin delivery and deactivate the Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Deactivating the Pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Deactivating the Pod.\n\nWhen all items are checked, you can press <b>Next</b>.\n\n<b>Note:</b> If deactivating continuously fails, please press <b>Cancel</b> and use the <b>Reset Pod</b> option to forcibly reset the Pod state.</string>
-
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod deactivated.\n\nPlease remove the Pod from your body and discard it.</string>
-
-    <string name="omnipod_init_pod_pair_pod">Pair Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Prime Pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Fill Cannula</string>
-    <string name="omnipod_init_pod_set_basal_profile">Set Basal Profile</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Cancel Delivery</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Deactivate Pod</string>
-
-
-    <!-- Omnipod - Base -->
-    <string name="omnipod_dash_name" translatable="false">Omnipod Dash</string>
-    <string name="omnipod_dash_name_short" translatable="false">DASH</string>
-    <string name="description_pump_omnipod_dash">Pump integration for Omnipod Dash.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Finish pairing reminder</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Finish setup reminder</string>
-    <string name="omnipod_alert_expiration">Pod will expire soon</string>
-    <string name="omnipod_alert_expiration_advisory">Pod will expire soon</string>
-    <string name="omnipod_alert_shutdown_imminent">Shutdown is imminent</string>
-    <string name="omnipod_alert_low_reservoir">Low reservoir</string>
-    <string name="omnipod_alert_unknown_alert">Unknown alert</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">Setting basal profile might have failed. Delivery might be suspended! Please refresh Pod status.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">Setting temp basal might have failed. If there was a temp basal already running, that may have been cancelled! Please refresh pod status.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">Setting time might have failed. Delivery might be suspended! Please refresh Pod status.</string>
-    <string name="omnipod_bolus_failed_uncertain">Unable to verify whether the bolus succeeded. Please verify that your Pod is bolusing or cancel the bolus.</string>
-    <string name="omnipod_rl_stats">RL Stats</string>
-    <string name="omnipod_read_pulse_log_short">Pulse Log</string>
-    <string name="omnipod_pod_lot">LOT</string>
-    <string name="omnipod_pod_tid">TID</string>
-    <string name="omnipod_pod_fw_version">PM / PI version</string>
-    <string name="omnipod_errors">Errors</string>
-
     <string name="comapareprofile">Compare profiles</string>
     <string name="nav_profilehelper">Profile helper</string>
     <string name="motoldefaultprofile">Default profile</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 29f4ef5bc7..7425a772b4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -52,36 +52,5 @@
         <item name="android:textColor">#ff0000</item>
     </style>
 
-     <style name="WizardPagePodContent">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginBottom">8dp</item>
-        <item name="android:paddingLeft">20px</item>
-        <item name="android:paddingRight">20px</item>
-        <item name="android:textSize">18sp</item>
-
-<!--        <item name="android:textColor">?android:textColorPrimary</item> -->
-    </style>
-
-    <style name="WizardPagePodListItem">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginBottom">20dp</item>
-        <item name="android:layout_marginTop">20dp</item>
-        <item name="android:paddingTop">20px</item>
-        <item name="android:paddingBottom">20px</item>
-        <item name="android:paddingLeft">60px</item>
-        <item name="android:paddingRight">60px</item>
-        <item name="android:textSize">18sp</item>
-       <!-- <item name="android:textColor">#000000</item> -->
-    </style>
-
-    <style name="PodInfoListView" parent="@android:style/Widget.ListView">
-        <item name="android:background">@color/colorLightGray</item>
-        <item name="android:cacheColorHint">@android:color/transparent</item>
-        <item name="android:divider">@android:color/black</item>
-        <item name="android:dividerHeight">1dp</item>
-    </style>
-
     <style name="ProfileHelperAppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar"/>
 </resources>
diff --git a/core/build.gradle b/core/build.gradle
index b79909271a..6c0c4ee32a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -44,6 +44,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation 'androidx.biometric:biometric:1.0.1'
     implementation "androidx.activity:activity:${activityVersion}"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
     implementation 'com.google.android.material:material:1.1.0'
@@ -65,6 +66,9 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
     implementation 'org.apache.commons:commons-lang3:3.10'
 
+    //CryptoUtil
+    implementation 'com.madgag.spongycastle:core:1.58.0.0'
+
     // Graphview cannot be upgraded
     implementation "com.jjoe64:graphview:4.0.1"
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/db/PodHistory.java b/core/src/main/java/info/nightscout/androidaps/db/OmnipodHistoryRecord.java
similarity index 62%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/db/PodHistory.java
rename to core/src/main/java/info/nightscout/androidaps/db/OmnipodHistoryRecord.java
index e064fb5c24..0f4b56b096 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/db/PodHistory.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/OmnipodHistoryRecord.java
@@ -1,23 +1,19 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.driver.db;
+package info.nightscout.androidaps.db;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
-import info.nightscout.androidaps.db.DatabaseHelper;
-import info.nightscout.androidaps.db.DbObjectBase;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 
 /**
  * Created by andy on 30.11.2019.
  */
-@DatabaseTable(tableName = DatabaseHelper.DATABASE_POD_HISTORY)
-public class PodHistory implements DbObjectBase, Comparable<PodHistory> {
+@DatabaseTable(tableName = "PodHistory")
+public class OmnipodHistoryRecord implements DbObjectBase, Comparable<OmnipodHistoryRecord> {
 
     @DatabaseField(id = true)
     public long date;
 
-    private PodHistoryEntryType podHistoryEntryType;
-
     @DatabaseField
     private long podEntryTypeCode;
 
@@ -36,27 +32,16 @@ public class PodHistory implements DbObjectBase, Comparable<PodHistory> {
     @DatabaseField
     private Boolean successConfirmed;
 
-    public PodHistory() {
+    public OmnipodHistoryRecord() {
         generatePumpId();
     }
 
-
-    public PodHistory(PodHistoryEntryType podDbEntryType) {
-        this.date = System.currentTimeMillis();
-        this.podHistoryEntryType = podDbEntryType;
-        this.podEntryTypeCode = podDbEntryType.getCode();
-        generatePumpId();
-    }
-
-
-    public PodHistory(long dateTimeInMillis, PodHistoryEntryType podDbEntryType) {
+    public OmnipodHistoryRecord(long dateTimeInMillis, long podEntryTypeCode) {
         this.date = dateTimeInMillis;
-        this.podHistoryEntryType = podDbEntryType;
-        this.podEntryTypeCode = podDbEntryType.getCode();
+        this.podEntryTypeCode = podEntryTypeCode;
         generatePumpId();
     }
 
-
     @Override
     public long getDate() {
         return this.date;
@@ -70,19 +55,14 @@ public class PodHistory implements DbObjectBase, Comparable<PodHistory> {
         return DateTimeUtil.toStringFromTimeInMillis(this.date);
     }
 
-    public PodHistoryEntryType getPodDbEntryType() {
-        return PodHistoryEntryType.getByCode((int) this.podEntryTypeCode);
-    }
-
-    public void setPodDbEntryType(PodHistoryEntryType podDbEntryType) {
-        //this.podHistoryEntryType = podDbEntryType;
-        this.podEntryTypeCode = podDbEntryType.getCode();
-    }
-
     public long getPodEntryTypeCode() {
         return podEntryTypeCode;
     }
 
+    public void setPodEntryTypeCode(long podEntryTypeCode) {
+        this.podEntryTypeCode = podEntryTypeCode;
+    }
+
     public String getData() {
         return data;
     }
@@ -130,7 +110,7 @@ public class PodHistory implements DbObjectBase, Comparable<PodHistory> {
     }
 
     @Override
-    public int compareTo(PodHistory otherOne) {
+    public int compareTo(OmnipodHistoryRecord otherOne) {
         return (int) (otherOne.date - this.date);
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventAppInitialized.kt b/core/src/main/java/info/nightscout/androidaps/events/EventAppInitialized.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/EventAppInitialized.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventAppInitialized.kt
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
index df90e03586..007ff88b90 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
@@ -8,6 +8,7 @@ interface DatabaseHelperInterface {
     fun getAllBgreadingsDataFromTime(mills: Long, ascending: Boolean): List<BgReading>
     fun createOrUpdate(careportalEvent: CareportalEvent)
     fun createOrUpdate(record: DanaRHistoryRecord)
+    fun createOrUpdate(record: OmnipodHistoryRecord)
     fun create(record: DbRequest)
     fun getDanaRHistoryRecordsByType(type: Byte): List<DanaRHistoryRecord>
     fun getTDDs(): List<TDD>
@@ -19,9 +20,10 @@ interface DatabaseHelperInterface {
     fun roundDateToSec(date: Long): Long
     fun createOrUpdateTDD(record: TDD)
     fun createOrUpdate(tempBasal: TemporaryBasal)
-    fun findTempBasalByPumpId(id: Long) : TemporaryBasal
-    fun getTemporaryBasalsDataFromTime(mills: Long, ascending: Boolean) : List<TemporaryBasal>
-    fun getCareportalEventFromTimestamp(timestamp: Long): CareportalEvent
+    fun findTempBasalByPumpId(id: Long): TemporaryBasal
+    fun getTemporaryBasalsDataFromTime(mills: Long, ascending: Boolean): List<TemporaryBasal>
+    fun getCareportalEventFromTimestamp(timestamp: Long): CareportalEvent?
+    fun getAllOmnipodHistoryRecordsFromTimestamp(timestamp: Long, ascending: Boolean): List<OmnipodHistoryRecord>
     fun getTDDsForLastXDays(days: Int): List<TDD>
     fun getProfileSwitchData(from: Long, ascending: Boolean): List<ProfileSwitch>
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
index ed44321d7d..c45036df73 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
@@ -64,17 +64,9 @@ public abstract class PumpPluginAbstract extends PumpPluginBase implements PumpI
     protected CommandQueueProvider commandQueue;
     protected SP sp;
     protected DateUtil dateUtil;
-
-    /*
-        protected static final PumpEnactResult OPERATION_NOT_SUPPORTED = new PumpEnactResult().success(false)
-                .enacted(false).comment(MainApp.gs(R.string.pump_operation_not_supported_by_pump_driver));
-        protected static final PumpEnactResult OPERATION_NOT_YET_SUPPORTED = new PumpEnactResult().success(false)
-                .enacted(false).comment(MainApp.gs(R.string.pump_operation_not_yet_supported_by_pump));
-    */
     protected PumpDescription pumpDescription = new PumpDescription();
-    protected ServiceConnection serviceConnection = null;
+    protected ServiceConnection serviceConnection;
     protected boolean serviceRunning = false;
-    // protected boolean isInitialized = false;
     protected PumpDriverState pumpState = PumpDriverState.NotInitialized;
     protected boolean displayConnectionMessages = false;
     protected PumpType pumpType;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt b/core/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt b/core/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt
index c58b5628d1..22ef6a1b4a 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/protection/BiometricCheck.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.utils.protection
 import androidx.biometric.BiometricConstants
 import androidx.biometric.BiometricPrompt
 import androidx.fragment.app.FragmentActivity
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.extensions.runOnUiThread
 import java.util.concurrent.Executors
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt b/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
index 5f80c54480..04399eb95f 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
@@ -7,7 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.EditText
 import androidx.annotation.StringRes
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.CryptoUtil
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.AlertDialogHelper
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt b/core/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt
similarity index 79%
rename from app/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt
index e8dd73d7fb..ca0a3402a6 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.utils.protection
 
 import androidx.fragment.app.FragmentActivity
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -42,10 +42,10 @@ class ProtectionCheck @Inject constructor(
 
     fun isLocked(protection: Protection): Boolean {
         return when (ProtectionType.values()[sp.getInt(protectionTypeResourceIDs[protection.ordinal], ProtectionType.NONE.ordinal)]) {
-            ProtectionType.NONE      -> false
-            ProtectionType.BIOMETRIC -> true
-            ProtectionType.MASTER_PASSWORD  -> sp.getString(R.string.key_master_password, "") != ""
-            ProtectionType.CUSTOM_PASSWORD  -> sp.getString(passwordsResourceIDs[protection.ordinal], "") != ""
+            ProtectionType.NONE            -> false
+            ProtectionType.BIOMETRIC       -> true
+            ProtectionType.MASTER_PASSWORD -> sp.getString(R.string.key_master_password, "") != ""
+            ProtectionType.CUSTOM_PASSWORD -> sp.getString(passwordsResourceIDs[protection.ordinal], "") != ""
         }
     }
 
@@ -53,13 +53,13 @@ class ProtectionCheck @Inject constructor(
     fun queryProtection(activity: FragmentActivity, protection: Protection,
                         ok: Runnable?, cancel: Runnable? = null, fail: Runnable? = null) {
         when (ProtectionType.values()[sp.getInt(protectionTypeResourceIDs[protection.ordinal], ProtectionType.NONE.ordinal)]) {
-            ProtectionType.NONE      ->
+            ProtectionType.NONE            ->
                 ok?.run()
-            ProtectionType.BIOMETRIC ->
+            ProtectionType.BIOMETRIC       ->
                 BiometricCheck.biometricPrompt(activity, titleResourceIDs[protection.ordinal], ok, cancel, fail, passwordCheck)
-            ProtectionType.MASTER_PASSWORD  ->
+            ProtectionType.MASTER_PASSWORD ->
                 passwordCheck.queryPassword(activity, R.string.master_password, R.string.key_master_password, { ok?.run() }, { cancel?.run() }, { fail?.run() })
-            ProtectionType.CUSTOM_PASSWORD  ->
+            ProtectionType.CUSTOM_PASSWORD ->
                 passwordCheck.queryPassword(activity, titleResourceIDs[protection.ordinal], passwordsResourceIDs[protection.ordinal], { ok?.run() }, { cancel?.run() }, { fail?.run() })
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java b/core/src/main/java/info/nightscout/androidaps/utils/ui/SingleClickButton.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java
rename to core/src/main/java/info/nightscout/androidaps/utils/ui/SingleClickButton.java
index 4ca57f3ad4..28638629a2 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/SingleClickButton.java
+++ b/core/src/main/java/info/nightscout/androidaps/utils/ui/SingleClickButton.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.utils;
+package info.nightscout.androidaps.utils.ui;
 
 import android.app.Activity;
 import android.content.Context;
@@ -8,7 +8,6 @@ import android.util.AttributeSet;
 import android.view.View;
 
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
diff --git a/app/src/main/res/drawable/ic_header_key.xml b/core/src/main/res/drawable/ic_header_key.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_header_key.xml
rename to core/src/main/res/drawable/ic_header_key.xml
diff --git a/app/src/main/res/layout/passwordprompt.xml b/core/src/main/res/layout/passwordprompt.xml
similarity index 100%
rename from app/src/main/res/layout/passwordprompt.xml
rename to core/src/main/res/layout/passwordprompt.xml
diff --git a/app/src/main/res/values-af-rZA/protection.xml b/core/src/main/res/values-af-rZA/protection.xml
similarity index 100%
rename from app/src/main/res/values-af-rZA/protection.xml
rename to core/src/main/res/values-af-rZA/protection.xml
diff --git a/app/src/main/res/values-ar-rSA/protection.xml b/core/src/main/res/values-ar-rSA/protection.xml
similarity index 100%
rename from app/src/main/res/values-ar-rSA/protection.xml
rename to core/src/main/res/values-ar-rSA/protection.xml
diff --git a/app/src/main/res/values-bg-rBG/protection.xml b/core/src/main/res/values-bg-rBG/protection.xml
similarity index 100%
rename from app/src/main/res/values-bg-rBG/protection.xml
rename to core/src/main/res/values-bg-rBG/protection.xml
diff --git a/app/src/main/res/values-cs-rCZ/protection.xml b/core/src/main/res/values-cs-rCZ/protection.xml
similarity index 100%
rename from app/src/main/res/values-cs-rCZ/protection.xml
rename to core/src/main/res/values-cs-rCZ/protection.xml
diff --git a/app/src/main/res/values-cy-rGB/protection.xml b/core/src/main/res/values-cy-rGB/protection.xml
similarity index 100%
rename from app/src/main/res/values-cy-rGB/protection.xml
rename to core/src/main/res/values-cy-rGB/protection.xml
diff --git a/app/src/main/res/values-de-rDE/protection.xml b/core/src/main/res/values-de-rDE/protection.xml
similarity index 100%
rename from app/src/main/res/values-de-rDE/protection.xml
rename to core/src/main/res/values-de-rDE/protection.xml
diff --git a/app/src/main/res/values-el-rGR/protection.xml b/core/src/main/res/values-el-rGR/protection.xml
similarity index 100%
rename from app/src/main/res/values-el-rGR/protection.xml
rename to core/src/main/res/values-el-rGR/protection.xml
diff --git a/app/src/main/res/values-es-rES/protection.xml b/core/src/main/res/values-es-rES/protection.xml
similarity index 100%
rename from app/src/main/res/values-es-rES/protection.xml
rename to core/src/main/res/values-es-rES/protection.xml
diff --git a/app/src/main/res/values-fi-rFI/protection.xml b/core/src/main/res/values-fi-rFI/protection.xml
similarity index 100%
rename from app/src/main/res/values-fi-rFI/protection.xml
rename to core/src/main/res/values-fi-rFI/protection.xml
diff --git a/app/src/main/res/values-fr-rFR/protection.xml b/core/src/main/res/values-fr-rFR/protection.xml
similarity index 100%
rename from app/src/main/res/values-fr-rFR/protection.xml
rename to core/src/main/res/values-fr-rFR/protection.xml
diff --git a/app/src/main/res/values-ga-rIE/protection.xml b/core/src/main/res/values-ga-rIE/protection.xml
similarity index 100%
rename from app/src/main/res/values-ga-rIE/protection.xml
rename to core/src/main/res/values-ga-rIE/protection.xml
diff --git a/app/src/main/res/values-hr-rHR/protection.xml b/core/src/main/res/values-hr-rHR/protection.xml
similarity index 100%
rename from app/src/main/res/values-hr-rHR/protection.xml
rename to core/src/main/res/values-hr-rHR/protection.xml
diff --git a/app/src/main/res/values-it-rIT/protection.xml b/core/src/main/res/values-it-rIT/protection.xml
similarity index 100%
rename from app/src/main/res/values-it-rIT/protection.xml
rename to core/src/main/res/values-it-rIT/protection.xml
diff --git a/app/src/main/res/values-iw-rIL/protection.xml b/core/src/main/res/values-iw-rIL/protection.xml
similarity index 100%
rename from app/src/main/res/values-iw-rIL/protection.xml
rename to core/src/main/res/values-iw-rIL/protection.xml
diff --git a/app/src/main/res/values-ja-rJP/protection.xml b/core/src/main/res/values-ja-rJP/protection.xml
similarity index 100%
rename from app/src/main/res/values-ja-rJP/protection.xml
rename to core/src/main/res/values-ja-rJP/protection.xml
diff --git a/app/src/main/res/values-ko-rKR/protection.xml b/core/src/main/res/values-ko-rKR/protection.xml
similarity index 100%
rename from app/src/main/res/values-ko-rKR/protection.xml
rename to core/src/main/res/values-ko-rKR/protection.xml
diff --git a/app/src/main/res/values-lt-rLT/protection.xml b/core/src/main/res/values-lt-rLT/protection.xml
similarity index 100%
rename from app/src/main/res/values-lt-rLT/protection.xml
rename to core/src/main/res/values-lt-rLT/protection.xml
diff --git a/app/src/main/res/values-nl-rNL/protection.xml b/core/src/main/res/values-nl-rNL/protection.xml
similarity index 100%
rename from app/src/main/res/values-nl-rNL/protection.xml
rename to core/src/main/res/values-nl-rNL/protection.xml
diff --git a/app/src/main/res/values-pl-rPL/protection.xml b/core/src/main/res/values-pl-rPL/protection.xml
similarity index 100%
rename from app/src/main/res/values-pl-rPL/protection.xml
rename to core/src/main/res/values-pl-rPL/protection.xml
diff --git a/app/src/main/res/values-pt-rBR/protection.xml b/core/src/main/res/values-pt-rBR/protection.xml
similarity index 100%
rename from app/src/main/res/values-pt-rBR/protection.xml
rename to core/src/main/res/values-pt-rBR/protection.xml
diff --git a/app/src/main/res/values-pt-rPT/protection.xml b/core/src/main/res/values-pt-rPT/protection.xml
similarity index 100%
rename from app/src/main/res/values-pt-rPT/protection.xml
rename to core/src/main/res/values-pt-rPT/protection.xml
diff --git a/app/src/main/res/values-ro-rRO/protection.xml b/core/src/main/res/values-ro-rRO/protection.xml
similarity index 100%
rename from app/src/main/res/values-ro-rRO/protection.xml
rename to core/src/main/res/values-ro-rRO/protection.xml
diff --git a/app/src/main/res/values-ru-rRU/protection.xml b/core/src/main/res/values-ru-rRU/protection.xml
similarity index 100%
rename from app/src/main/res/values-ru-rRU/protection.xml
rename to core/src/main/res/values-ru-rRU/protection.xml
diff --git a/app/src/main/res/values-sk-rSK/protection.xml b/core/src/main/res/values-sk-rSK/protection.xml
similarity index 100%
rename from app/src/main/res/values-sk-rSK/protection.xml
rename to core/src/main/res/values-sk-rSK/protection.xml
diff --git a/app/src/main/res/values-sl-rSI/protection.xml b/core/src/main/res/values-sl-rSI/protection.xml
similarity index 100%
rename from app/src/main/res/values-sl-rSI/protection.xml
rename to core/src/main/res/values-sl-rSI/protection.xml
diff --git a/app/src/main/res/values-sv-rSE/protection.xml b/core/src/main/res/values-sv-rSE/protection.xml
similarity index 100%
rename from app/src/main/res/values-sv-rSE/protection.xml
rename to core/src/main/res/values-sv-rSE/protection.xml
diff --git a/app/src/main/res/values-tr-rTR/protection.xml b/core/src/main/res/values-tr-rTR/protection.xml
similarity index 100%
rename from app/src/main/res/values-tr-rTR/protection.xml
rename to core/src/main/res/values-tr-rTR/protection.xml
diff --git a/app/src/main/res/values-zh-rCN/protection.xml b/core/src/main/res/values-zh-rCN/protection.xml
similarity index 100%
rename from app/src/main/res/values-zh-rCN/protection.xml
rename to core/src/main/res/values-zh-rCN/protection.xml
diff --git a/app/src/main/res/values/protection.xml b/core/src/main/res/values/protection.xml
similarity index 100%
rename from app/src/main/res/values/protection.xml
rename to core/src/main/res/values/protection.xml
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index af37bbf430..7ee787c54d 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -127,6 +127,10 @@
     <string name="shortminute">m</string>
     <string name="shortday">d</string>
 
+    <!--    Protection-->
+    <string name="wrongpassword">Wrong password</string>
+    <string name="passwords_dont_match">Passwords don\'t match</string>
+
     <!--    Profile-->
     <string name="basalprofilenotaligned">Basal values not aligned to hours: %1$s</string>
     <string name="minimalbasalvaluereplaced">Basal value replaced by minimal supported value: %1$s</string>
diff --git a/dana/src/main/res/values/strings.xml b/dana/src/main/res/values/strings.xml
index bf26707ffc..d086aab28f 100644
--- a/dana/src/main/res/values/strings.xml
+++ b/dana/src/main/res/values/strings.xml
@@ -67,7 +67,6 @@
     <string name="updatingbasalrates">Updating basal rates</string>
     <string name="settingtempbasal">Setting temp basal</string>
     <string name="waitingfortimesynchronization">Waiting for time synchronization (%1$d sec)</string>
-    <string name="wrongpassword">Wrong password</string>
     <string name="wrongpumppassword">Wrong pump password!</string>
     <string name="danar_history_alarm">Alarms</string>
     <string name="danar_history_basalhours">Basal Hours</string>
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
index cb1e246e0e..056581a801 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
@@ -80,7 +80,7 @@ class MedtronicFragment : DaggerFragment() {
 
         medtronic_pumpstatus.setBackgroundColor(resourceHelper.gc(R.color.colorInitializingBorder))
 
-        medtronic_rl_status.text = resourceHelper.gs(RileyLinkServiceState.NotStarted.getResourceId(RileyLinkTargetDevice.MedtronicPump))
+        medtronic_rl_status.text = resourceHelper.gs(RileyLinkServiceState.NotStarted.getResourceId())
 
         medtronic_pump_status.setTextColor(Color.WHITE)
         medtronic_pump_status.text = "{fa-bed}"
@@ -172,7 +172,7 @@ class MedtronicFragment : DaggerFragment() {
 
     @Synchronized
     private fun setDeviceStatus() {
-        val resourceId = rileyLinkServiceData.rileyLinkServiceState.getResourceId(RileyLinkTargetDevice.MedtronicPump)
+        val resourceId = rileyLinkServiceData.rileyLinkServiceState.getResourceId()
         val rileyLinkError = medtronicPumpPlugin.rileyLinkService?.error
         medtronic_rl_status.text =
             when {
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
index b71dec4621..0a0fb98e22 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
@@ -10,14 +10,13 @@ import java.util.List;
 import java.util.Map;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 
-import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RFSpyResponse;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMessage;
@@ -56,6 +55,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
  * This was mostly rewritten from Original version, and lots of commands and
  * functionality added.
  */
+@Singleton
 public class MedtronicCommunicationManager extends RileyLinkCommunicationManager {
 
     @Inject MedtronicPumpStatus medtronicPumpStatus;
@@ -73,9 +73,13 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
 
     private boolean doWakeUpBeforeCommand = true;
 
+    // This empty constructor must be kept, otherwise dagger injection might break!
+    @Inject
+    public MedtronicCommunicationManager() {}
 
-    public MedtronicCommunicationManager(HasAndroidInjector injector, RFSpy rfspy) {
-        super(injector, rfspy);
+    @Inject
+    public void onInit() {
+        // we can't do this in the constructor, as sp only gets injected after the constructor has returned
         medtronicPumpStatus.previousConnection = sp.getLong(
                 RileyLinkConst.Prefs.LastGoodDeviceCommunicationTime, 0L);
     }
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.java
index 399f58e8ac..b19335964f 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.java
@@ -3,8 +3,6 @@ package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
 import org.joda.time.LocalDateTime;
 
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
@@ -18,24 +16,13 @@ public class RLHistoryItemMedtronic extends RLHistoryItem {
         this.medtronicCommandType = medtronicCommandType;
     }
 
+    @Override
     public String getDescription(ResourceHelper resourceHelper) {
-
-        switch (this.source) {
-            case RileyLink:
-                return "State: " + resourceHelper.gs(serviceState.getResourceId(targetDevice))
-                        + (this.errorCode == null ? "" : ", Error Code: " + errorCode);
-
-            case MedtronicPump:
-                return resourceHelper.gs(pumpDeviceState.getResourceId());
-
-            case MedtronicCommand:
-                return medtronicCommandType.name();
-
-            default:
-                return "Unknown Description";
+        if (RLHistoryItemSource.MedtronicCommand.equals(source)) {
+            return medtronicCommandType.name();
         }
+
+        return super.getDescription(resourceHelper);
     }
 
-
-
 }
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
index 2342e0aaa5..636d138a6f 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
@@ -7,6 +7,7 @@ import android.os.Binder;
 import android.os.IBinder;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
@@ -34,15 +35,17 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
 /**
  * RileyLinkMedtronicService is intended to stay running when the gui-app is closed.
  */
+@Singleton
 public class RileyLinkMedtronicService extends RileyLinkService {
 
     @Inject MedtronicPumpPlugin medtronicPumpPlugin;
     @Inject MedtronicUtil medtronicUtil;
     @Inject MedtronicUIPostprocessor medtronicUIPostprocessor;
     @Inject MedtronicPumpStatus medtronicPumpStatus;
+    @Inject RFSpy rfSpy;
+    @Inject MedtronicCommunicationManager medtronicCommunicationManager;
 
     private MedtronicUIComm medtronicUIComm;
-    private MedtronicCommunicationManager medtronicCommunicationManager;
     private IBinder mBinder = new LocalBinder();
 
     private boolean serialChanged = false;
@@ -54,8 +57,9 @@ public class RileyLinkMedtronicService extends RileyLinkService {
     private boolean inPreInit = true;
 
 
+    // This empty constructor must be kept, otherwise dagger injection might break!
+    @Inject
     public RileyLinkMedtronicService() {
-        super();
     }
 
 
@@ -99,12 +103,8 @@ public class RileyLinkMedtronicService extends RileyLinkService {
         // get most recently used RileyLink address
         rileyLinkServiceData.rileylinkAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
 
-        rileyLinkBLE = new RileyLinkBLE(injector, this); // or this
-        rfspy = new RFSpy(injector, rileyLinkBLE);
         rfspy.startReader();
 
-        // init rileyLinkCommunicationManager
-        medtronicCommunicationManager = new MedtronicCommunicationManager(injector, rfspy);
         medtronicUIComm = new MedtronicUIComm(injector, aapsLogger, medtronicUtil, medtronicUIPostprocessor, medtronicCommunicationManager);
 
         aapsLogger.debug(LTag.PUMPCOMM, "RileyLinkMedtronicService newly constructed");
diff --git a/omnipod/.gitignore b/omnipod/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/omnipod/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/omnipod/build.gradle b/omnipod/build.gradle
new file mode 100644
index 0000000000..96198d34ec
--- /dev/null
+++ b/omnipod/build.gradle
@@ -0,0 +1,104 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        minSdkVersion 24
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+
+        // OMNIPOD: for usage in Firebase event during testing phase
+        buildConfigField "String", "VERSION", '"2.7-omnipod-0.4.1-SNAPSHOT"'
+        // OMNIPOD: Keep track of what commit from the main repository we're on, these fields aren't actually used anywhere
+        buildConfigField "String", "DEV_VERSION", '"2.7.0-rc3"'
+        buildConfigField "String", "DEV_VERSION_COMMIT", '"a4b2ce32a59a617eed9ad006e85efdeec51cd899"'
+        buildConfigField "String", "DEV_VERSION_COMMIT_DATE", '"16.8.2020"' // 16th of August
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            testCoverageEnabled(project.hasProperty('coverage'))
+        }
+        firebaseDisable {
+            System.setProperty("disableFirebase", "true")
+            ext.enableCrashlytics = false
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+        flatDir {
+            dirs 'libs'
+        }
+        maven { url 'https://jitpack.io' }
+    }
+}
+
+dependencies {
+    implementation project(':core')
+    implementation project(':rileylink')
+
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.activity:activity-ktx:${activityVersion}"
+    implementation 'com.google.android.material:material:1.1.0'
+
+    implementation 'com.google.firebase:firebase-analytics-ktx:17.4.3'
+
+    implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
+
+    // Graphview cannot be upgraded
+    implementation "com.jjoe64:graphview:4.0.1"
+
+    implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2"
+
+    // Omnipod - start
+    implementation 'org.apache.commons:commons-lang3:3.10'
+    implementation 'net.danlew:android.joda:2.10.6'
+    implementation "com.google.code.gson:gson:2.8.6"
+    implementation(name: "com.atech-software.android.library.wizardpager-1.1.4", ext: "aar")
+    // Omnipod - end
+
+    implementation "com.google.dagger:dagger-android:$dagger_version"
+    implementation "com.google.dagger:dagger-android-support:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
+
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
+
+}
diff --git a/omnipod/consumer-rules.pro b/omnipod/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/omnipod/libs/com.atech-software.android.library.wizardpager-1.1.4.aar b/omnipod/libs/com.atech-software.android.library.wizardpager-1.1.4.aar
new file mode 100644
index 0000000000..af0c6511cf
Binary files /dev/null and b/omnipod/libs/com.atech-software.android.library.wizardpager-1.1.4.aar differ
diff --git a/omnipod/proguard-rules.pro b/omnipod/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/omnipod/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/omnipod/src/main/AndroidManifest.xml b/omnipod/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..d520b7916a
--- /dev/null
+++ b/omnipod/src/main/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="info.nightscout.androidaps.plugins.pump.omnipod">
+
+    <application>
+        <service
+            android:name=".service.RileyLinkOmnipodService"
+            android:enabled="true"
+            android:exported="true" />
+
+        <activity android:name=".dialogs.PodManagementActivity" />
+        <activity android:name=".dialogs.PodHistoryActivity" />
+        <activity
+            android:name="com.atech.android.library.wizardpager.WizardPagerActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
index e80f95d292..3b39f1ab2e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
@@ -9,8 +9,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.MainApp
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
@@ -34,17 +32,16 @@ import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodConst
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodUtil
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.LocalAlertUtils
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.WarnColors
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.androidaps.utils.extensions.plusAssign
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import info.nightscout.androidaps.utils.ui.UIRunnable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.omnipod_fragment.*
 import org.apache.commons.lang3.StringUtils
@@ -55,7 +52,6 @@ import javax.inject.Inject
 class OmnipodFragment : DaggerFragment() {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var mainApp: MainApp
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var rxBus: RxBusWrapper
@@ -68,18 +64,16 @@ class OmnipodFragment : DaggerFragment() {
     @Inject lateinit var sp: SP
     @Inject lateinit var omnipodUtil: OmnipodUtil
     @Inject lateinit var rileyLinkServiceData: RileyLinkServiceData
-    @Inject lateinit var localAlertUtils: LocalAlertUtils
+
+    // TODO somehow obtain the pumpUnreachableThreshold in order to display last connection time red or white
+    // @Inject lateinit var localAlertUtils: LocalAlertUtils
     @Inject lateinit var protectionCheck: ProtectionCheck
 
-    private var disposable: CompositeDisposable = CompositeDisposable()
+    private var disposables: CompositeDisposable = CompositeDisposable()
 
     private val loopHandler = Handler()
     private lateinit var refreshLoop: Runnable
 
-    operator fun CompositeDisposable.plusAssign(disposable: Disposable) {
-        add(disposable)
-    }
-
     init {
         refreshLoop = Runnable {
             activity?.runOnUiThread { updateUi() }
@@ -98,8 +92,8 @@ class OmnipodFragment : DaggerFragment() {
             if (omnipodPumpPlugin.rileyLinkService?.verifyConfiguration() == true) {
                 activity?.let { activity ->
                     protectionCheck.queryProtection(
-                        activity,ProtectionCheck.Protection.PREFERENCES,
-                        UIRunnable(Runnable{startActivity(Intent(context, PodManagementActivity::class.java))})
+                        activity, ProtectionCheck.Protection.PREFERENCES,
+                        UIRunnable(Runnable { startActivity(Intent(context, PodManagementActivity::class.java)) })
                     )
                 }
             } else {
@@ -159,23 +153,23 @@ class OmnipodFragment : DaggerFragment() {
     override fun onResume() {
         super.onResume()
         loopHandler.postDelayed(refreshLoop, T.mins(1).msecs())
-        disposable += rxBus
+        disposables += rxBus
             .toObservable(EventOmnipodRefreshButtonState::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({ omnipod_refresh.isEnabled = it.newState }, { fabricPrivacy.logException(it) })
-        disposable += rxBus
+        disposables += rxBus
             .toObservable(EventRileyLinkDeviceStatusChange::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({ updateRileyLinkUiElements() }, { fabricPrivacy.logException(it) })
-        disposable += rxBus
+        disposables += rxBus
             .toObservable(EventOmnipodPumpValuesChanged::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({ updateOmipodUiElements() }, { fabricPrivacy.logException(it) })
-        disposable += rxBus
+        disposables += rxBus
             .toObservable(EventOmnipodAcknowledgeAlertsChanged::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({ updateAcknowledgeAlertsUiElements() }, { fabricPrivacy.logException(it) })
-        disposable += rxBus
+        disposables += rxBus
             .toObservable(EventPreferenceChange::class.java)
             .observeOn(Schedulers.io())
             .subscribe({
@@ -202,7 +196,7 @@ class OmnipodFragment : DaggerFragment() {
 
     override fun onPause() {
         super.onPause()
-        disposable.clear()
+        disposables.clear()
         loopHandler.removeCallbacks(refreshLoop)
     }
 
@@ -217,7 +211,7 @@ class OmnipodFragment : DaggerFragment() {
 
         val rileyLinkServiceState = rileyLinkServiceData.rileyLinkServiceState
 
-        val resourceId = rileyLinkServiceState.getResourceId(RileyLinkTargetDevice.Omnipod)
+        val resourceId = rileyLinkServiceState.getResourceId()
         val rileyLinkError = rileyLinkServiceData.rileyLinkError
 
         omnipod_rl_status.text =
@@ -250,7 +244,7 @@ class OmnipodFragment : DaggerFragment() {
             }
             omnipod_pod_lot.text = "-"
             omnipod_pod_tid.text = "-"
-            omnipod_pod_fw_version.text = "-"
+            omnipod_pod_firmware_version.text = "-"
             omnipod_pod_expiry.text = "-"
             omnipod_basabasalrate.text = "-"
             omnipod_reservoir.text = "-"
@@ -266,7 +260,7 @@ class OmnipodFragment : DaggerFragment() {
             omnipod_pod_address.text = podStateManager.address.toString()
             omnipod_pod_lot.text = podStateManager.lot.toString()
             omnipod_pod_tid.text = podStateManager.tid.toString()
-            omnipod_pod_fw_version.text = podStateManager.pmVersion.toString() + " / " + podStateManager.piVersion.toString()
+            omnipod_pod_firmware_version.text = resourceHelper.gs(R.string.omnipod_pod_firmware_version_value, podStateManager.pmVersion.toString(), podStateManager.piVersion.toString())
             omnipod_pod_expiry.text = podStateManager.expiryDateAsString
 
             val stateText: String
@@ -330,11 +324,15 @@ class OmnipodFragment : DaggerFragment() {
     private fun updateLastConnectionUiElements() {
         if (podStateManager.isPodInitialized && podStateManager.lastSuccessfulCommunication != null) { // Null check for backwards compatibility
             omnipod_lastconnection.text = readableDuration(podStateManager.lastSuccessfulCommunication)
+            omnipod_lastconnection.setTextColor(Color.WHITE)
+            /*
+            // TODO
             if (omnipodPumpPlugin.isUnreachableAlertTimeoutExceeded(localAlertUtils.pumpUnreachableThreshold())) {
                 omnipod_lastconnection.setTextColor(Color.RED)
             } else {
                 omnipod_lastconnection.setTextColor(Color.WHITE)
             }
+             */
         } else {
             omnipod_lastconnection.setTextColor(Color.WHITE)
             if (podStateManager.hasPodState() && podStateManager.lastSuccessfulCommunication != null) {
@@ -356,25 +354,33 @@ class OmnipodFragment : DaggerFragment() {
     }
 
     private fun readableDuration(dateTime: DateTime): String {
-        val min = Duration(dateTime, DateTime.now()).standardMinutes
+        val minutes = Duration(dateTime, DateTime.now()).standardMinutes.toInt()
         when {
-            min == 0L  -> {
-                return resourceHelper.gs(R.string.omnipod_connected_now)
+            minutes == 0   -> {
+                return resourceHelper.gs(R.string.omnipod_moments_ago)
             }
 
-            min < 60   -> {
-                return resourceHelper.gs(R.string.minago, min)
+            minutes < 60   -> {
+                return resourceHelper.gs(R.string.omnipod_time_ago, resourceHelper.gq(R.plurals.omnipod_minutes, minutes, minutes))
             }
 
-            min < 1440 -> {
-                val h = (min / 60).toInt()
-                return resourceHelper.gq(R.plurals.objective_hours, h, h) + " " + resourceHelper.gs(R.string.ago)
+            minutes < 1440 -> {
+                val hours = minutes / 60
+                val minutesLeft = minutes % 60
+                if (minutesLeft > 0)
+                    return resourceHelper.gs(R.string.omnipod_time_ago,
+                        resourceHelper.gs(R.string.omnipod_composite_time, resourceHelper.gq(R.plurals.omnipod_hours, hours, hours), resourceHelper.gq(R.plurals.omnipod_minutes, minutesLeft, minutesLeft)))
+                return resourceHelper.gs(R.string.omnipod_time_ago, resourceHelper.gq(R.plurals.omnipod_hours, hours, hours))
             }
 
-            else       -> {
-                val h = (min / 60).toInt()
-                val d = h / 24
-                return resourceHelper.gq(R.plurals.objective_days, d, d) + " " + resourceHelper.gs(R.string.ago)
+            else           -> {
+                val hours = minutes / 60
+                val days = hours / 24
+                val hoursLeft = hours % 24
+                if (hoursLeft > 0)
+                    return resourceHelper.gs(R.string.omnipod_time_ago,
+                        resourceHelper.gs(R.string.omnipod_composite_time, resourceHelper.gq(R.plurals.omnipod_days, days, days), resourceHelper.gq(R.plurals.omnipod_hours, hoursLeft, hoursLeft)))
+                return resourceHelper.gs(R.string.omnipod_time_ago, resourceHelper.gq(R.plurals.omnipod_days, days, days))
             }
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
similarity index 81%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
index c1e0eea476..e82d8aeffc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
@@ -24,14 +24,13 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.BuildConfig;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.events.EventAppInitialized;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
@@ -49,7 +48,6 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Notific
 import info.nightscout.androidaps.plugins.pump.common.PumpPluginAbstract;
 import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
 import info.nightscout.androidaps.plugins.pump.common.data.TempBasalPair;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpDriverState;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice;
@@ -59,13 +57,12 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.podinfo.PodInfoRecentPulseLog;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCommandType;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.IOmnipodManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCustomActionType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodPumpPluginInterface;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodStatusRequest;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodStateManager;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodDriverState;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.comm.AapsOmnipodManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.ui.OmnipodUIComm;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.ui.OmnipodUITask;
 import info.nightscout.androidaps.plugins.pump.omnipod.events.EventOmnipodPumpValuesChanged;
@@ -89,41 +86,31 @@ import io.reactivex.schedulers.Schedulers;
  */
 @Singleton
 public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPumpPluginInterface, RileyLinkPumpDevice {
-    protected PodStateManager podStateManager;
-    private static OmnipodPumpPlugin plugin = null;
-    private RileyLinkServiceData rileyLinkServiceData;
-    private ServiceTaskExecutor serviceTaskExecutor;
-    private RileyLinkOmnipodService rileyLinkOmnipodService;
-    private OmnipodUtil omnipodUtil;
-    protected OmnipodPumpStatus omnipodPumpStatus = null;
-    //protected OmnipodUIComm omnipodUIComm;
+    private final PodStateManager podStateManager;
+    private final RileyLinkServiceData rileyLinkServiceData;
+    private final ServiceTaskExecutor serviceTaskExecutor;
+    private final OmnipodPumpStatus omnipodPumpStatus;
+    private final AapsOmnipodManager aapsOmnipodManager;
+    private final OmnipodUtil omnipodUtil;
 
     private CompositeDisposable disposable = new CompositeDisposable();
 
-
     // variables for handling statuses and history
     protected boolean firstRun = true;
     protected boolean isRefresh = false;
-    private boolean isBasalProfileInvalid = false;
-    private boolean basalProfileChanged = false;
     private boolean isInitialized = false;
-    protected IOmnipodManager omnipodCommunicationManager;
 
-    // TODO make non-static just inject the Singleton and use a getter)
-    public static boolean isBusy = false;
+    private RileyLinkOmnipodService rileyLinkOmnipodService;
+
+    private boolean isBusy = false;
     // TODO it seems that we never add anything to this list?
     //  I Wouldn't know why we need it anyway
     protected List<Long> busyTimestamps = new ArrayList<>();
-    protected boolean sentIdToFirebase = false;
     protected boolean hasTimeDateOrTimeZoneChanged = false;
     private int timeChangeRetries = 0;
-
     private Profile currentProfile;
-
-    boolean omnipodServiceRunning = false;
-
     private long nextPodCheck = 0L;
-    //OmnipodDriverState driverState = OmnipodDriverState.NotInitalized;
+    private boolean sentIdToFirebase;
 
     @Inject
     public OmnipodPumpPlugin(
@@ -134,16 +121,16 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
             ResourceHelper resourceHelper,
             ActivePluginProvider activePlugin,
             SP sp,
-            OmnipodUtil omnipodUtil,
             OmnipodPumpStatus omnipodPumpStatus,
             PodStateManager podStateManager,
+            AapsOmnipodManager aapsOmnipodManager,
             CommandQueueProvider commandQueue,
             FabricPrivacy fabricPrivacy,
             RileyLinkServiceData rileyLinkServiceData,
             ServiceTaskExecutor serviceTaskExecutor,
-            DateUtil dateUtil
+            DateUtil dateUtil,
+            OmnipodUtil omnipodUtil
     ) {
-
         super(new PluginDescription() //
                         .mainType(PluginType.PUMP) //
                         .fragmentClass(OmnipodFragment.class.getName()) //
@@ -152,39 +139,25 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
                         .preferencesId(R.xml.pref_omnipod) //
                         .description(R.string.description_pump_omnipod), //
                 PumpType.Insulet_Omnipod,
-                injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy, dateUtil
-        );
+                injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy, dateUtil);
         this.podStateManager = podStateManager;
         this.rileyLinkServiceData = rileyLinkServiceData;
         this.serviceTaskExecutor = serviceTaskExecutor;
+        this.omnipodPumpStatus = omnipodPumpStatus;
+        this.aapsOmnipodManager = aapsOmnipodManager;
+        this.omnipodUtil = omnipodUtil;
 
         displayConnectionMessages = false;
-        this.omnipodUtil = omnipodUtil;
-        this.omnipodPumpStatus = omnipodPumpStatus;
-
-        //OmnipodUtil.setDriverState();
-
-// TODO loop
-//        if (OmnipodUtil.isOmnipodEros()) {
-//            OmnipodUtil.setPlugin(this);
-//            OmnipodUtil.setOmnipodPodType(OmnipodPodType.Eros);
-//            OmnipodUtil.setPumpType(PumpType.Insulet_Omnipod);
-//        }
-
-//        // TODO ccc
-
-        serviceConnection = new ServiceConnection() {
+        this.serviceConnection = new ServiceConnection() {
 
             @Override
             public void onServiceDisconnected(ComponentName name) {
-
                 aapsLogger.debug(LTag.PUMP, "RileyLinkOmnipodService is disconnected");
                 rileyLinkOmnipodService = null;
             }
 
             @Override
             public void onServiceConnected(ComponentName name, IBinder service) {
-
                 aapsLogger.debug(LTag.PUMP, "RileyLinkOmnipodService is connected");
                 RileyLinkOmnipodService.LocalBinder mLocalBinder = (RileyLinkOmnipodService.LocalBinder) service;
                 rileyLinkOmnipodService = mLocalBinder.getServiceInstance();
@@ -200,56 +173,9 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
                             break;
                         }
                     }
-
-
-//                        if (OmnipodPumpPlugin.this.omnipodPumpStatus != null) {
-//
-//                            aapsLogger.debug(LTag.PUMP, "Starting OmniPod-RileyLink service");
-//                            if (omnipodService.setNotInPreInit()) {
-//                                if (omnipodCommunicationManager == null) {
-//                                    omnipodCommunicationManager = AapsOmnipodManager.getInstance();
-//                                    omnipodCommunicationManager.setPumpStatus(OmnipodPumpPlugin.this.omnipodPumpStatus);
-//                                    omnipodServiceRunning = true;
-//                                } else {
-//                                    omnipodCommunicationManager.setPumpStatus(OmnipodPumpPlugin.this.omnipodPumpStatus);
-//                                }
-//
-//                                omnipodUtil.setOmnipodPodType(OmnipodPodType.Eros);
-//                                //omnipodUtil.setPlugin(OmnipodPumpPlugin.this);
-//
-//                                omnipodUIComm = new OmnipodUIComm(omnipodCommunicationManager, plugin, OmnipodPumpPlugin.this.omnipodPumpStatus);
-//                                break;
-//                            }
-//                        }
-//
-//                        SystemClock.sleep(5000);
-                    //}
                 }).start();
             }
         };
-
-    }
-
-    protected OmnipodPumpPlugin(PluginDescription pluginDescription, PumpType pumpType,
-                                HasAndroidInjector injector,
-                                AAPSLogger aapsLogger,
-                                RxBusWrapper rxBus,
-                                Context context,
-                                ResourceHelper resourceHelper,
-                                ActivePluginProvider activePlugin,
-                                info.nightscout.androidaps.utils.sharedPreferences.SP sp,
-                                CommandQueueProvider commandQueue,
-                                FabricPrivacy fabricPrivacy,
-                                DateUtil dateUtil) {
-        super(pluginDescription, pumpType, injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy, dateUtil);
-
-//        this.rileyLinkUtil = rileyLinkUtil;
-//        this.medtronicUtil = medtronicUtil;
-//        this.sp = sp;
-//        this.medtronicPumpStatus = medtronicPumpStatus;
-//        this.medtronicHistoryData = medtronicHistoryData;
-//        this.rileyLinkServiceData = rileyLinkServiceData;
-//        this.serviceTaskExecutor = serviceTaskExecutor;
     }
 
     public PodStateManager getPodStateManager() {
@@ -276,26 +202,31 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
                         rileyLinkOmnipodService.verifyConfiguration();
                 }, fabricPrivacy::logException)
         );
+        disposable.add(rxBus
+                .toObservable(EventAppInitialized.class)
+                .observeOn(Schedulers.io())
+                .subscribe(event -> {
+                    // See if a bolus was active before the app previously exited
+                    // If so, add it to history
+                    // Needs to be done after EventAppInitialized because otherwise, TreatmentsPlugin.onStart() hasn't been called yet
+                    // so it didn't initialize a TreatmentService yet, resulting in a NullPointerException
+                    if (sp.contains(OmnipodConst.Prefs.CurrentBolus)) {
+                        String currentBolusString = sp.getString(OmnipodConst.Prefs.CurrentBolus, "");
+                        aapsLogger.warn(LTag.PUMP, "Found active bolus in SP. Adding Treatment: {}", currentBolusString);
+                        try {
+                            DetailedBolusInfo detailedBolusInfo = omnipodUtil.getGsonInstance().fromJson(currentBolusString, DetailedBolusInfo.class);
+                            aapsOmnipodManager.addBolusToHistory(detailedBolusInfo);
+                        } catch (Exception ex) {
+                            aapsLogger.error(LTag.PUMP, "Failed to add active bolus to history", ex);
+                        }
+                        sp.remove(OmnipodConst.Prefs.CurrentBolus);
+                    }
+                }, fabricPrivacy::logException)
+        );
 
         super.onStart();
-
-
-        //rileyLinkOmnipodService.verifyConfiguration();
-        //initPumpStatusData();
     }
 
-//    @Override
-//    protected void onResume() {
-//
-//    }
-
-//    private void refreshConfiguration() {
-//        if (pumpStatusLocal != null) {
-//            pumpStatusLocal.refreshConfiguration();
-//        }
-//        verifyConfiguration()
-//    }
-
     @Override
     protected void onStop() {
         disposable.clear();
@@ -306,10 +237,8 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         return "OmnipodPlugin::";
     }
 
-
     @Override
     public void initPumpStatusData() {
-
         omnipodPumpStatus.lastConnection = sp.getLong(RileyLinkConst.Prefs.LastGoodDeviceCommunicationTime, 0L);
         omnipodPumpStatus.lastDataTime = omnipodPumpStatus.lastConnection;
         omnipodPumpStatus.previousConnection = omnipodPumpStatus.lastConnection;
@@ -322,16 +251,12 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         if (!sp.contains(OmnipodConst.Statistics.FirstPumpStart)) {
             sp.putLong(OmnipodConst.Statistics.FirstPumpStart, System.currentTimeMillis());
         }
-
     }
 
-
     @Override
     public void onStartCustomActions() {
-
         // check status every minute (if any status needs refresh we send readStatus command)
         new Thread(() -> {
-
             do {
                 SystemClock.sleep(60000);
 
@@ -365,7 +290,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         }
     }
 
-
     @Override
     public Class getServiceClass() {
         return RileyLinkOmnipodService.class;
@@ -376,20 +300,17 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         return this.omnipodPumpStatus;
     }
 
-
     @Override
     public String deviceID() {
         return "Omnipod";
     }
 
-
     // Pump Plugin
 
     private boolean isServiceSet() {
         return rileyLinkOmnipodService != null;
     }
 
-
     @Override
     public boolean isInitialized() {
         if (displayConnectionMessages)
@@ -397,7 +318,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         return isServiceSet() && isInitialized;
     }
 
-
     @Override
     public boolean isBusy() {
         if (displayConnectionMessages)
@@ -419,19 +339,16 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         return false;
     }
 
-
     @Override
     public void resetRileyLinkConfiguration() {
         rileyLinkOmnipodService.resetRileyLinkConfiguration();
     }
 
-
     @Override
     public boolean hasTuneUp() {
         return false;
     }
 
-
     @Override
     public void doTuneUpDevice() {
         //rileyLinkOmnipodService.doTuneUpDevice();
@@ -442,7 +359,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         rxBus.send(new EventOmnipodPumpValuesChanged());
     }
 
-
     @Override
     public RileyLinkOmnipodService getRileyLinkService() {
         return rileyLinkOmnipodService;
@@ -452,7 +368,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         return rileyLinkOmnipodService.getDeviceCommandExecutor();
     }
 
-
     private synchronized void clearBusyQueue() {
 
         if (busyTimestamps.size() == 0) {
@@ -479,7 +394,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
 
     }
 
-
     @Override
     public boolean isConnected() {
         if (displayConnectionMessages)
@@ -487,7 +401,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         return isServiceSet() && rileyLinkOmnipodService.isInitialized();
     }
 
-
     @Override
     public boolean isConnecting() {
         if (displayConnectionMessages)
@@ -495,7 +408,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         return !isServiceSet() || !rileyLinkOmnipodService.isInitialized();
     }
 
-
     @Override
     public boolean isSuspended() {
         return !podStateManager.isPodRunning() || podStateManager.isSuspended();
@@ -503,10 +415,10 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
 
     @Override
     public void getPumpStatus() {
-
         if (firstRun) {
             initializePump(!isRefresh);
             triggerUIChange();
+
         } else if (!omnipodStatusRequestList.isEmpty()) {
 
             List<OmnipodStatusRequest> removeList = new ArrayList<>();
@@ -525,7 +437,7 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
                         Intent i = new Intent(context, ErrorHelperActivity.class);
                         i.putExtra("soundid", 0);
                         i.putExtra("status", "Pulse Log (copied to clipboard):\n" + result.toString());
-                        i.putExtra("title", resourceHelper.gs(R.string.combo_warning));
+                        i.putExtra("title", resourceHelper.gs(R.string.omnipod_warning));
                         i.putExtra("clipboardContent", result.toString());
                         i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         context.startActivity(i);
@@ -551,7 +463,7 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
 
                 Notification notification = new Notification(
                         Notification.TIME_OR_TIMEZONE_CHANGE,
-                        resourceHelper.gs(R.string.time_or_timezone_change),
+                        resourceHelper.gs(R.string.omnipod_time_or_timezone_change),
                         Notification.INFO, 60);
                 rxBus.send(new EventNewNotification(notification));
 
@@ -566,26 +478,15 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         }
     }
 
-
-    public void setIsBusy(boolean isBusy_) {
-        isBusy = isBusy_;
+    public void setIsBusy(boolean isBusy) {
+        this.isBusy = isBusy;
     }
 
-
     private void getPodPumpStatus() {
         // TODO read pod status
         aapsLogger.error(LTag.PUMP, "getPodPumpStatus() NOT IMPLEMENTED");
-
-        //addPodStatusRequest(OmnipodStatusRequest.GetPodState);
-
-        //getPodPumpStatusObject().driverState = OmnipodDriverState.Initalized_PodAvailable;
-        //driverState = OmnipodDriverState.Initalized_PodAvailable;
-        // FIXME this does not seem to make sense
-        omnipodUtil.setDriverState(OmnipodDriverState.Initalized_PodAttached);
-        // we would probably need to read Basal Profile here too
     }
 
-
     List<OmnipodStatusRequest> omnipodStatusRequestList = new ArrayList<>();
 
     public void addPodStatusRequest(OmnipodStatusRequest pumpStatusRequest) {
@@ -596,25 +497,17 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         }
     }
 
-    @Override
-    public void setDriverState(OmnipodDriverState state) {
-        //this.driverState = state;
-    }
-
-
     public void resetStatusState() {
         firstRun = true;
         isRefresh = true;
     }
 
-
     // FIXME do we actually need this? If a user presses refresh during an action,
     //  I suppose the GetStatusCommand would just be queued?
     private void setRefreshButtonEnabled(boolean enabled) {
         rxBus.send(new EventOmnipodRefreshButtonState(enabled));
     }
 
-
     private void initializePump(boolean realInit) {
         aapsLogger.info(LTag.PUMP, getLogPrefix() + "initializePump - start");
 
@@ -625,16 +518,10 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
 
         if (podStateManager.isPodInitialized()) {
             aapsLogger.debug(LTag.PUMP, "PodStateManager (saved): " + podStateManager);
-
-            if (!isRefresh) {
-                pumpState = PumpDriverState.Initialized;
-            }
-
             // TODO handle if session state too old
             getPodPumpStatus();
         } else {
             aapsLogger.debug(LTag.PUMP, "No Pod running");
-            omnipodUtil.setDriverState(OmnipodDriverState.Initalized_NoPod);
         }
 
         finishAction("Omnipod Pump");
@@ -653,7 +540,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         this.firstRun = false;
     }
 
-
     @Override
     public boolean isThisProfileSet(Profile profile) {
 
@@ -667,7 +553,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         return (currentProfile.areProfileBasalPatternsSame(profile));
     }
 
-
     @Override
     public long lastDataTime() {
         if (omnipodPumpStatus.lastConnection != 0) {
@@ -677,7 +562,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         return System.currentTimeMillis();
     }
 
-
     @Override
     public double getBaseBasalRate() {
 
@@ -689,35 +573,29 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         }
     }
 
-
     @Override
     public double getReservoirLevel() {
         return omnipodPumpStatus.reservoirRemainingUnits;
     }
 
-
     @Override
     public int getBatteryLevel() {
         return 75;
     }
 
-
     @Override
     protected void triggerUIChange() {
         rxBus.send(new EventOmnipodPumpValuesChanged());
     }
 
-
     @Override
     public boolean isFakingTempsByExtendedBoluses() {
         return false;
     }
 
-
     @Override
     @NonNull
     protected PumpEnactResult deliverBolus(final DetailedBolusInfo detailedBolusInfo) {
-
         aapsLogger.info(LTag.PUMP, getLogPrefix() + "deliverBolus - {}", detailedBolusInfo);
 
         setRefreshButtonEnabled(false);
@@ -768,20 +646,17 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         //finishAction("Bolus");
     }
 
-
     private void incrementStatistics(String statsKey) {
         long currentCount = sp.getLong(statsKey, 0L);
         currentCount++;
         sp.putLong(statsKey, currentCount);
     }
 
-
     // if enforceNew===true current temp basal is canceled and new TBR set (duration is prolonged),
     // if false and the same rate is requested enacted=false and success=true is returned and TBR is not changed
     @Override
     public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, Profile profile,
                                                 boolean enforceNew) {
-
         setRefreshButtonEnabled(false);
 
         aapsLogger.info(LTag.PUMP, getLogPrefix() + "setTempBasalAbsolute: rate: {}, duration={}", absoluteRate, durationInMinutes);
@@ -802,29 +677,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
             }
         }
 
-        // if TBR is running we will cancel it.
-//        if (tbrCurrent != null) {
-//            
-//                aapsLogger.info(LTag.PUMP,getLogPrefix() + "setTempBasalAbsolute - TBR running - so canceling it.");
-//
-//            // CANCEL
-//            OmnipodUITask responseTask2 = omnipodUIComm.executeCommand(OmnipodCommandType.CancelTemporaryBasal);
-//
-//            PumpEnactResult result = responseTask2.getResult();
-//
-//            if (result.success) {
-//                
-//                    aapsLogger.info(LTag.PUMP,getLogPrefix() + "setTempBasalAbsolute - Current TBR cancelled.");
-//            } else {
-//                
-//                    aapsLogger.error(LTag.PUMP,getLogPrefix() + "setTempBasalAbsolute - Cancel TBR failed.");
-//
-//                finishAction("TBR");
-//
-//                return result;
-//            }
-//        }
-
         // now start new TBR
         OmnipodUITask responseTask = getDeviceCommandExecutor().executeCommand(OmnipodCommandType.SetTemporaryBasal,
                 absoluteRate, durationInMinutes);
@@ -853,7 +705,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         return omnipodPumpStatus.getTemporaryBasal();
     }
 
-
     protected void finishAction(String overviewKey) {
         if (overviewKey != null)
             rxBus.send(new EventRefreshOverview(overviewKey, false));
@@ -863,7 +714,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         setRefreshButtonEnabled(true);
     }
 
-
     @Override
     public PumpEnactResult cancelTempBasal(boolean enforceNew) {
 
@@ -917,7 +767,7 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
             return new PumpEnactResult(getInjector()) //
                     .success(true) //
                     .enacted(false) //
-                    .comment(resourceHelper.gs(R.string.medtronic_cmd_basal_profile_not_set_is_same));
+                    .comment(resourceHelper.gs(R.string.omnipod_cmd_basal_profile_not_set_is_same));
         }
 
         setRefreshButtonEnabled(false);
@@ -946,18 +796,16 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         return result;
     }
 
-
     // OPERATIONS not supported by Pump or Plugin
 
     protected List<CustomAction> customActions = null;
 
     private CustomAction customActionResetRLConfig = new CustomAction(
-            R.string.medtronic_custom_action_reset_rileylink, OmnipodCustomActionType.ResetRileyLinkConfiguration, true);
+            R.string.omnipod_custom_action_reset_rileylink, OmnipodCustomActionType.ResetRileyLinkConfiguration, true);
 
 
     @Override
     public List<CustomAction> getCustomActions() {
-
         if (customActions == null) {
             this.customActions = Arrays.asList(
                     customActionResetRLConfig //,
@@ -973,7 +821,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         OmnipodCustomActionType mcat = (OmnipodCustomActionType) customActionType;
 
         switch (mcat) {
-
             case ResetRileyLinkConfiguration: {
                 serviceTaskExecutor.startTask(new ResetRileyLinkConfigurationTask(getInjector()));
             }
@@ -988,11 +835,9 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
     public void timezoneOrDSTChanged(TimeChangeType timeChangeType) {
         aapsLogger.warn(LTag.PUMP, getLogPrefix() + "Time, Date and/or TimeZone changed. [changeType=" + timeChangeType.name() + ", eventHandlingEnabled=" + omnipodPumpStatus.timeChangeEventEnabled + "]");
 
-        if (omnipodUtil.getDriverState() == OmnipodDriverState.Initalized_PodAttached) {
-            if (omnipodPumpStatus.timeChangeEventEnabled) {
-                aapsLogger.info(LTag.PUMP, getLogPrefix() + "Time,and/or TimeZone changed event received and will be consumed by driver.");
-                this.hasTimeDateOrTimeZoneChanged = true;
-            }
+        if (omnipodPumpStatus.timeChangeEventEnabled && podStateManager.isPodRunning()) {
+            aapsLogger.info(LTag.PUMP, getLogPrefix() + "Time,and/or TimeZone changed event received and will be consumed by driver.");
+            this.hasTimeDateOrTimeZoneChanged = true;
         }
     }
 
@@ -1018,11 +863,4 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         return false;
     }
 
-
-    @Override
-    public RxBusWrapper getRxBus() {
-        return this.rxBus;
-    }
-
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationManager.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationManager.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationManager.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationManager.java
index 625ce5433f..48cd74016c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationManager.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationManager.java
@@ -6,15 +6,13 @@ import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMessage;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RLMessageType;
@@ -50,18 +48,20 @@ import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodConst;
 /**
  * Created by andy on 6/29/18.
  */
-// TODO make singleton and rename to OmnipodRileyLinkCommunicationManager
+// TODO rename to OmnipodRileyLinkCommunicationManager
+@Singleton
 public class OmnipodCommunicationManager extends RileyLinkCommunicationManager {
 
-    @Inject public AAPSLogger aapsLogger;
     @Inject OmnipodPumpStatus omnipodPumpStatus;
-    //@Inject OmnipodPumpPlugin omnipodPumpPlugin;
-    //@Inject RileyLinkServiceData rileyLinkServiceData;
-    //@Inject ServiceTaskExecutor serviceTaskExecutor;
+
+    // This empty constructor must be kept, otherwise dagger injection might break!
+    @Inject
+    public OmnipodCommunicationManager() {
+    }
 
     @Inject
-    public OmnipodCommunicationManager(HasAndroidInjector injector, RFSpy rfspy) {
-        super(injector, rfspy);
+    public void onInit() {
+        // this cannot be done in the constructor, as sp is not populated at that time
         omnipodPumpStatus.previousConnection = sp.getLong(
                 RileyLinkConst.Prefs.LastGoodDeviceCommunicationTime, 0L);
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodManager.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodManager.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodManager.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodManager.java
index 876472fd1f..a6576583ae 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodManager.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodManager.java
@@ -61,6 +61,8 @@ public class OmnipodManager {
     private PodStateManager podStateManager;
 
     private ActiveBolusData activeBolusData;
+    private SingleSubject<Boolean> bolusCommandExecutionSubject;
+
     private final Object bolusDataMutex = new Object();
 
     private AAPSLogger aapsLogger;
@@ -277,12 +279,16 @@ public class OmnipodManager {
 
         logStartingCommandExecution("bolus [units=" + units + ", acknowledgementBeep=" + acknowledgementBeep + ", completionBeep=" + completionBeep + "]");
 
+        bolusCommandExecutionSubject = SingleSubject.create();
+
         CommandDeliveryStatus commandDeliveryStatus = CommandDeliveryStatus.SUCCESS;
 
         try {
             executeAndVerify(() -> communicationService.executeAction(new BolusAction(podStateManager, units, acknowledgementBeep, completionBeep)));
         } catch (OmnipodException ex) {
             if (ex.isCertainFailure()) {
+                bolusCommandExecutionSubject.onSuccess(false);
+                bolusCommandExecutionSubject = null;
                 throw ex;
             }
 
@@ -319,6 +325,11 @@ public class OmnipodManager {
             activeBolusData = new ActiveBolusData(units, startDate, bolusCompletionSubject, disposables);
         }
 
+        // Return successful command execution AFTER storing activeBolusData
+        //  Otherwise, hasActiveBolus() would return false and the caller would not cancel the bolus.
+        bolusCommandExecutionSubject.onSuccess(true);
+        bolusCommandExecutionSubject = null;
+
         disposables.add(Completable.complete() //
                 .delay(estimatedRemainingBolusDuration.getMillis() + 250, TimeUnit.MILLISECONDS) //
                 .observeOn(Schedulers.io()) //
@@ -486,6 +497,10 @@ public class OmnipodManager {
         }
     }
 
+    public SingleSubject<Boolean> getBolusCommandExecutionSubject() {
+        return bolusCommandExecutionSubject;
+    }
+
     // Only works for commands with nonce resyncable message blocks
     // FIXME method is too big, needs refactoring
     private StatusResponse executeAndVerify(Supplier<StatusResponse> supplier) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/SetupActionResult.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/SetupActionResult.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/SetupActionResult.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/SetupActionResult.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/AcknowledgeAlertsAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/AcknowledgeAlertsAction.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/AcknowledgeAlertsAction.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/AcknowledgeAlertsAction.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/AssignAddressAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/AssignAddressAction.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/AssignAddressAction.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/AssignAddressAction.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/BolusAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/BolusAction.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/BolusAction.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/BolusAction.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/CancelDeliveryAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/CancelDeliveryAction.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/CancelDeliveryAction.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/CancelDeliveryAction.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/ConfigureAlertsAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/ConfigureAlertsAction.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/ConfigureAlertsAction.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/ConfigureAlertsAction.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/DeactivatePodAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/DeactivatePodAction.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/DeactivatePodAction.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/DeactivatePodAction.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/GetPodInfoAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/GetPodInfoAction.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/GetPodInfoAction.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/GetPodInfoAction.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/GetStatusAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/GetStatusAction.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/GetStatusAction.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/GetStatusAction.java
index 35431cea8b..6cad5798a2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/GetStatusAction.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/GetStatusAction.java
@@ -1,10 +1,10 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.comm.action;
 
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.OmnipodCommunicationManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.ActionInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.command.GetStatusCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInfoType;
-import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.ActionInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodStateManager;
 
 public class GetStatusAction implements OmnipodAction<StatusResponse> {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/InsertCannulaAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/InsertCannulaAction.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/InsertCannulaAction.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/InsertCannulaAction.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/OmnipodAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/OmnipodAction.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/OmnipodAction.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/OmnipodAction.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/PrimeAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/PrimeAction.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/PrimeAction.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/PrimeAction.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/SetBasalScheduleAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/SetBasalScheduleAction.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/SetBasalScheduleAction.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/SetBasalScheduleAction.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/SetTempBasalAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/SetTempBasalAction.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/SetTempBasalAction.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/SetTempBasalAction.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/SetupPodAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/SetupPodAction.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/SetupPodAction.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/SetupPodAction.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/service/InsertCannulaService.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/service/InsertCannulaService.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/service/InsertCannulaService.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/service/InsertCannulaService.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/service/PrimeService.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/service/PrimeService.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/service/PrimeService.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/service/PrimeService.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/ActionInitializationException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/ActionInitializationException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/ActionInitializationException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/ActionInitializationException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/CommandInitializationException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/CommandInitializationException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/CommandInitializationException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/CommandInitializationException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/CommunicationException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/CommunicationException.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/CommunicationException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/CommunicationException.java
index c7392fd42e..8b1215b1aa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/CommunicationException.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/CommunicationException.java
@@ -11,7 +11,7 @@ public class CommunicationException extends OmnipodException {
     }
 
     public CommunicationException(Type type, Throwable cause) {
-        super(type.getDescription() + ": "+ cause, cause, false);
+        super(type.getDescription() + ": " + cause, cause, false);
         this.type = type;
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/CrcMismatchException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/CrcMismatchException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/CrcMismatchException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/CrcMismatchException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalDeliveryStatusException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalDeliveryStatusException.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalDeliveryStatusException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalDeliveryStatusException.java
index 01bf4db04f..6d43eae501 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalDeliveryStatusException.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalDeliveryStatusException.java
@@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.comm.exception;
 import java.util.Locale;
 
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.DeliveryStatus;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodProgressStatus;
 import info.nightscout.androidaps.plugins.pump.omnipod.exception.OmnipodException;
 
 public class IllegalDeliveryStatusException extends OmnipodException {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalMessageAddressException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalMessageAddressException.java
similarity index 85%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalMessageAddressException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalMessageAddressException.java
index 9c674cd8ca..cd8385d442 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalMessageAddressException.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalMessageAddressException.java
@@ -7,7 +7,7 @@ public class IllegalMessageAddressException extends OmnipodException {
     private final int actual;
 
     public IllegalMessageAddressException(int expected, int actual) {
-        super("Invalid message address. Expected="+ expected +", actual="+ actual, false);
+        super("Invalid message address. Expected=" + expected + ", actual=" + actual, false);
         this.expected = expected;
         this.actual = actual;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalMessageSequenceNumberException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalMessageSequenceNumberException.java
similarity index 84%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalMessageSequenceNumberException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalMessageSequenceNumberException.java
index b26d2b6ff8..4080ef9764 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalMessageSequenceNumberException.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalMessageSequenceNumberException.java
@@ -7,7 +7,7 @@ public class IllegalMessageSequenceNumberException extends OmnipodException {
     private final int actual;
 
     public IllegalMessageSequenceNumberException(int expected, int actual) {
-        super("Invalid message sequence number. Expected="+ expected +", actual="+ actual, false);
+        super("Invalid message sequence number. Expected=" + expected + ", actual=" + actual, false);
         this.expected = expected;
         this.actual = actual;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalPacketTypeException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalPacketTypeException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalPacketTypeException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalPacketTypeException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalPodProgressException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalPodProgressException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalPodProgressException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalPodProgressException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalResponseException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalResponseException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalResponseException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalResponseException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalVersionResponseTypeException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalVersionResponseTypeException.java
similarity index 76%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalVersionResponseTypeException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalVersionResponseTypeException.java
index 0dbe0805d5..79c42a948d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalVersionResponseTypeException.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalVersionResponseTypeException.java
@@ -4,6 +4,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.exception.OmnipodExceptio
 
 public class IllegalVersionResponseTypeException extends OmnipodException {
     public IllegalVersionResponseTypeException(String expected, String actual) {
-        super("Invalid Version Response type. Expected="+ expected +", actual="+ actual, false);
+        super("Invalid Version Response type. Expected=" + expected + ", actual=" + actual, false);
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/MessageDecodingException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/MessageDecodingException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/MessageDecodingException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/MessageDecodingException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/NonceOutOfSyncException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/NonceOutOfSyncException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/NonceOutOfSyncException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/NonceOutOfSyncException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/NonceResyncException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/NonceResyncException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/NonceResyncException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/NonceResyncException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/NotEnoughDataException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/NotEnoughDataException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/NotEnoughDataException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/NotEnoughDataException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/PodFaultException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/PodFaultException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/PodFaultException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/PodFaultException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/PodReturnedErrorResponseException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/PodReturnedErrorResponseException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/PodReturnedErrorResponseException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/PodReturnedErrorResponseException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/IRawRepresentable.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/IRawRepresentable.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/IRawRepresentable.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/IRawRepresentable.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/MessageBlock.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/MessageBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/MessageBlock.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/MessageBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/NonceResyncableMessageBlock.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/NonceResyncableMessageBlock.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/NonceResyncableMessageBlock.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/NonceResyncableMessageBlock.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodMessage.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodMessage.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodMessage.java
index 78cfa72e19..e302d90461 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodMessage.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodMessage.java
@@ -4,12 +4,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.command.GetStatusCommand;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.MessageBlockType;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInfoType;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.CrcMismatchException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.MessageDecodingException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.NotEnoughDataException;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.command.GetStatusCommand;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.MessageBlockType;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInfoType;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmniCRC;
 
 public class OmnipodMessage {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodPacket.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodPacket.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodPacket.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodPacket.java
index 3764cf7b60..4bbe035519 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodPacket.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodPacket.java
@@ -2,9 +2,9 @@ package info.nightscout.androidaps.plugins.pump.omnipod.comm.message;
 
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMessage;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.PacketType;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.CrcMismatchException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalPacketTypeException;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.PacketType;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmniCRC;
 
 /**
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AcknowledgeAlertsCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AcknowledgeAlertsCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AcknowledgeAlertsCommand.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AcknowledgeAlertsCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AssignAddressCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AssignAddressCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AssignAddressCommand.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AssignAddressCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BasalScheduleExtraCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BasalScheduleExtraCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BasalScheduleExtraCommand.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BasalScheduleExtraCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BeepConfigCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BeepConfigCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BeepConfigCommand.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BeepConfigCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BolusExtraCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BolusExtraCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BolusExtraCommand.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BolusExtraCommand.java
index 3554f85e0a..a19b8b7651 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BolusExtraCommand.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BolusExtraCommand.java
@@ -3,9 +3,9 @@ package info.nightscout.androidaps.plugins.pump.omnipod.comm.message.command;
 import org.joda.time.Duration;
 
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.CommandInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.MessageBlock;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.MessageBlockType;
-import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.CommandInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodConst;
 
 public class BolusExtraCommand extends MessageBlock {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/CancelDeliveryCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/CancelDeliveryCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/CancelDeliveryCommand.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/CancelDeliveryCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/ConfigureAlertsCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/ConfigureAlertsCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/ConfigureAlertsCommand.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/ConfigureAlertsCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/DeactivatePodCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/DeactivatePodCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/DeactivatePodCommand.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/DeactivatePodCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/FaultConfigCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/FaultConfigCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/FaultConfigCommand.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/FaultConfigCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/GetStatusCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/GetStatusCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/GetStatusCommand.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/GetStatusCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetInsulinScheduleCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetInsulinScheduleCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetInsulinScheduleCommand.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetInsulinScheduleCommand.java
index 301435e6a2..bebca2e7d7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetInsulinScheduleCommand.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetInsulinScheduleCommand.java
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.comm.message.command;
 import org.joda.time.Duration;
 
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.CommandInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.NonceResyncableMessageBlock;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.MessageBlockType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.schedule.BasalDeliverySchedule;
@@ -11,7 +12,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.defs.schedule.BasalSchedu
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.schedule.BolusDeliverySchedule;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.schedule.DeliverySchedule;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.schedule.TempBasalDeliverySchedule;
-import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.CommandInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodConst;
 
 public class SetInsulinScheduleCommand extends NonceResyncableMessageBlock {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetupPodCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetupPodCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetupPodCommand.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetupPodCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/TempBasalExtraCommand.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/TempBasalExtraCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/TempBasalExtraCommand.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/TempBasalExtraCommand.java
index 212f748bf1..e076750399 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/TempBasalExtraCommand.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/TempBasalExtraCommand.java
@@ -6,10 +6,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.CommandInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.MessageBlock;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.MessageBlockType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.schedule.RateEntry;
-import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.CommandInitializationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodConst;
 
 public class TempBasalExtraCommand extends MessageBlock {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/ErrorResponse.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/ErrorResponse.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/ErrorResponse.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/ErrorResponse.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/StatusResponse.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/StatusResponse.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/StatusResponse.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/StatusResponse.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/VersionResponse.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/VersionResponse.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/VersionResponse.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/VersionResponse.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfo.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfo.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfo.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfo.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoActiveAlerts.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoActiveAlerts.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoActiveAlerts.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoActiveAlerts.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoDataLog.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoDataLog.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoDataLog.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoDataLog.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultAndInitializationTime.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultAndInitializationTime.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultAndInitializationTime.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultAndInitializationTime.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultEvent.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultEvent.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultEvent.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultEvent.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoOlderPulseLog.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoOlderPulseLog.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoOlderPulseLog.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoOlderPulseLog.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoRecentPulseLog.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoRecentPulseLog.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoRecentPulseLog.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoRecentPulseLog.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoResponse.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoResponse.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoResponse.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoResponse.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java
similarity index 59%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java
index ed4dcb6255..ace31f26d8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java
@@ -4,7 +4,6 @@ import org.joda.time.LocalDateTime;
 
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCommandType;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
@@ -17,24 +16,12 @@ public class RLHistoryItemOmnipod extends RLHistoryItem {
         this.omnipodCommandType = omnipodCommandType;
     }
 
+    @Override
     public String getDescription(ResourceHelper resourceHelper) {
-
-        switch (this.source) {
-            case RileyLink:
-                return "State: " + resourceHelper.gs(serviceState.getResourceId(targetDevice))
-                        + (this.errorCode == null ? "" : ", Error Code: " + errorCode);
-
-            case MedtronicPump:
-                return resourceHelper.gs(pumpDeviceState.getResourceId());
-
-            case OmnipodCommand:
-                return omnipodCommandType.name();
-
-            default:
-                return "Unknown Description";
+        if (RLHistoryItemSource.OmnipodCommand.equals(source)) {
+            return omnipodCommandType.name();
         }
+        return super.getDescription(resourceHelper);
     }
 
-
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertConfiguration.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertConfiguration.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertConfiguration.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertConfiguration.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertConfigurationFactory.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertConfigurationFactory.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertConfigurationFactory.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertConfigurationFactory.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertSet.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertSet.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertSet.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertSet.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertSlot.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertSlot.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertSlot.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertSlot.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertTrigger.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertTrigger.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertTrigger.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertTrigger.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertType.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/AlertType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/BeepConfigType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/BeepConfigType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/BeepConfigType.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/BeepConfigType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/BeepRepeat.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/BeepRepeat.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/BeepRepeat.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/BeepRepeat.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/BeepType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/BeepType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/BeepType.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/BeepType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/DeliveryStatus.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/DeliveryStatus.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/DeliveryStatus.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/DeliveryStatus.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/DeliveryType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/DeliveryType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/DeliveryType.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/DeliveryType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/FaultEventCode.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/FaultEventCode.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/FaultEventCode.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/FaultEventCode.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/FirmwareVersion.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/FirmwareVersion.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/FirmwareVersion.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/FirmwareVersion.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/IOmnipodManager.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/IOmnipodManager.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/IOmnipodManager.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/IOmnipodManager.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/LogEventErrorCode.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/LogEventErrorCode.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/LogEventErrorCode.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/LogEventErrorCode.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/MessageBlockType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/MessageBlockType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/MessageBlockType.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/MessageBlockType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/NonceState.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/NonceState.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/NonceState.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/NonceState.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCommandType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCommandType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCommandType.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCommandType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCustomActionType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCustomActionType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCustomActionType.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCustomActionType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodPumpPluginInterface.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodPumpPluginInterface.java
similarity index 52%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodPumpPluginInterface.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodPumpPluginInterface.java
index 0026d41f97..50cfec2d88 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodPumpPluginInterface.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodPumpPluginInterface.java
@@ -1,16 +1,9 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.defs;
 
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodDriverState;
 
 public interface OmnipodPumpPluginInterface extends PumpInterface {
 
     void addPodStatusRequest(OmnipodStatusRequest pumpStatusRequest);
 
-    void setDriverState(OmnipodDriverState state);
-
-    @Deprecated
-    RxBusWrapper getRxBus();
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodStatusRequest.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodStatusRequest.java
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodStatusRequest.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodStatusRequest.java
index 80f7e4ecfc..2ab1ca024f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodStatusRequest.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodStatusRequest.java
@@ -4,8 +4,7 @@ public enum OmnipodStatusRequest {
     ResetState(OmnipodCommandType.ResetPodStatus), //
     AcknowledgeAlerts(OmnipodCommandType.AcknowledgeAlerts), //
     GetPodState(OmnipodCommandType.GetPodStatus), //
-    GetPodPulseLog(OmnipodCommandType.GetPodPulseLog)
-    ;
+    GetPodPulseLog(OmnipodCommandType.GetPodPulseLog);
 
     private OmnipodCommandType commandType;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodUIResponseType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodUIResponseType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodUIResponseType.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodUIResponseType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PacketType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PacketType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PacketType.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PacketType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodInfoType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodInfoType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodInfoType.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodInfoType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodInitActionType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodInitActionType.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodInitActionType.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodInitActionType.java
index 6543bcc84f..1e614ee779 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodInitActionType.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodInitActionType.java
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.defs;
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.plugins.pump.omnipod.R;
 
 public enum PodInitActionType {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodInitReceiver.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodInitReceiver.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodInitReceiver.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodInitReceiver.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodProgressStatus.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodProgressStatus.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodProgressStatus.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodProgressStatus.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodResponseType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodResponseType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodResponseType.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodResponseType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/TimerAlertTrigger.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/TimerAlertTrigger.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/TimerAlertTrigger.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/TimerAlertTrigger.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/UnitsRemainingAlertTrigger.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/UnitsRemainingAlertTrigger.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/UnitsRemainingAlertTrigger.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/UnitsRemainingAlertTrigger.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalDeliverySchedule.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalDeliverySchedule.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalDeliverySchedule.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalDeliverySchedule.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalDeliveryTable.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalDeliveryTable.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalDeliveryTable.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalDeliveryTable.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalSchedule.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalSchedule.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalSchedule.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalSchedule.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalScheduleEntry.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalScheduleEntry.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalScheduleEntry.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalScheduleEntry.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalTableEntry.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalTableEntry.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalTableEntry.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BasalTableEntry.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BolusDeliverySchedule.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BolusDeliverySchedule.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BolusDeliverySchedule.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/BolusDeliverySchedule.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/DeliverySchedule.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/DeliverySchedule.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/DeliverySchedule.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/DeliverySchedule.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/InsulinScheduleType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/InsulinScheduleType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/InsulinScheduleType.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/InsulinScheduleType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/RateEntry.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/RateEntry.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/RateEntry.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/RateEntry.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/TempBasalDeliverySchedule.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/TempBasalDeliverySchedule.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/TempBasalDeliverySchedule.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/schedule/TempBasalDeliverySchedule.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodStateManager.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodStateManager.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodStateManager.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodStateManager.java
index 70ce06498a..dce7c36936 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodStateManager.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodStateManager.java
@@ -78,6 +78,13 @@ public abstract class PodStateManager {
                 && podState.getPodProgressStatus() != null;
     }
 
+    /**
+     * @return true if we have a Pod state and the Pod activation has been completed. The pod could also be dead at this point
+     */
+    public final boolean isPodActivationCompleted() {
+        return isPodInitialized() && podState.getPodProgressStatus().isAtLeast(PodProgressStatus.ABOVE_FIFTY_UNITS);
+    }
+
     /**
      * @return true if we have a Pod state and the Pod is running, meaning the activation process has completed and the Pod is not deactivated or in a fault state
      */
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodHistoryActivity.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodHistoryActivity.java
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodHistoryActivity.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodHistoryActivity.java
index bfbdbfc9d6..51052e72eb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodHistoryActivity.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodHistoryActivity.java
@@ -23,17 +23,18 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
 import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.db.OmnipodHistoryRecord;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.data.TempBasalPair;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.utils.ProfileUtil;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.db.PodHistory;
+import info.nightscout.androidaps.plugins.pump.omnipod.R;
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.db.PodHistoryEntryType;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
@@ -42,6 +43,7 @@ public class PodHistoryActivity extends NoSplashAppCompatActivity {
     @Inject AAPSLogger aapsLogger;
     @Inject OmnipodUtil omnipodUtil;
     @Inject ResourceHelper resourceHelper;
+    @Inject DatabaseHelperInterface databaseHelper;
 
     private Spinner historyTypeSpinner;
     private TextView statusView;
@@ -50,8 +52,8 @@ public class PodHistoryActivity extends NoSplashAppCompatActivity {
 
     static TypeList showingType = null;
     static PumpHistoryEntryGroup selectedGroup = PumpHistoryEntryGroup.All;
-    List<PodHistory> fullHistoryList = new ArrayList<>();
-    List<PodHistory> filteredHistoryList = new ArrayList<>();
+    List<OmnipodHistoryRecord> fullHistoryList = new ArrayList<>();
+    List<OmnipodHistoryRecord> filteredHistoryList = new ArrayList<>();
 
     RecyclerViewAdapter recyclerViewAdapter;
     boolean manualChange = false;
@@ -68,9 +70,9 @@ public class PodHistoryActivity extends NoSplashAppCompatActivity {
         GregorianCalendar gc = new GregorianCalendar();
         gc.add(Calendar.HOUR_OF_DAY, -24);
 
-        MainApp.getDbHelper().getPodHistoryFromTime(gc.getTimeInMillis(), false);
+        databaseHelper.getAllOmnipodHistoryRecordsFromTimestamp(gc.getTimeInMillis(), false);
 
-        fullHistoryList.addAll(MainApp.getDbHelper().getPodHistoryFromTime(gc.getTimeInMillis(), true));
+        fullHistoryList.addAll(databaseHelper.getAllOmnipodHistoryRecordsFromTimestamp(gc.getTimeInMillis(), true));
     }
 
 
@@ -83,8 +85,8 @@ public class PodHistoryActivity extends NoSplashAppCompatActivity {
         if (group == PumpHistoryEntryGroup.All) {
             this.filteredHistoryList.addAll(fullHistoryList);
         } else {
-            for (PodHistory pumpHistoryEntry : fullHistoryList) {
-                if (pumpHistoryEntry.getPodDbEntryType().getGroup() == group) {
+            for (OmnipodHistoryRecord pumpHistoryEntry : fullHistoryList) {
+                if (PodHistoryEntryType.getByCode(pumpHistoryEntry.getPodEntryTypeCode()).getGroup() == group) {
                     this.filteredHistoryList.add(pumpHistoryEntry);
                 }
             }
@@ -207,14 +209,14 @@ public class PodHistoryActivity extends NoSplashAppCompatActivity {
 
     public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.HistoryViewHolder> {
 
-        List<PodHistory> historyList;
+        List<OmnipodHistoryRecord> historyList;
 
-        RecyclerViewAdapter(List<PodHistory> historyList) {
+        RecyclerViewAdapter(List<OmnipodHistoryRecord> historyList) {
             this.historyList = historyList;
         }
 
 
-        public void setHistoryList(List<PodHistory> historyList) {
+        public void setHistoryList(List<OmnipodHistoryRecord> historyList) {
             this.historyList = historyList;
             Collections.sort(this.historyList);
         }
@@ -231,21 +233,22 @@ public class PodHistoryActivity extends NoSplashAppCompatActivity {
 
         @Override
         public void onBindViewHolder(@NotNull HistoryViewHolder holder, int position) {
-            PodHistory record = historyList.get(position);
+            OmnipodHistoryRecord record = historyList.get(position);
 
             if (record != null) {
                 holder.timeView.setText(record.getDateTimeString());
-                holder.typeView.setText(record.getPodDbEntryType().getResourceId());
+                holder.typeView.setText(PodHistoryEntryType.getByCode(record.getPodEntryTypeCode()).getResourceId());
                 setValue(record, holder.valueView);
             }
         }
 
 
-        private void setValue(PodHistory historyEntry, TextView valueView) {
+        private void setValue(OmnipodHistoryRecord historyEntry, TextView valueView) {
             //valueView.setText("");
 
             if (historyEntry.isSuccess()) {
-                switch (historyEntry.getPodDbEntryType()) {
+                PodHistoryEntryType entryType = PodHistoryEntryType.getByCode(historyEntry.getPodEntryTypeCode());
+                switch (entryType) {
 
                     case SetTemporaryBasal: {
                         TempBasalPair tempBasalPair = omnipodUtil.getGsonInstance().fromJson(historyEntry.getData(), TempBasalPair.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodManagementActivity.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodManagementActivity.kt
similarity index 79%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodManagementActivity.kt
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodManagementActivity.kt
index b6e60a707f..47ef877239 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodManagementActivity.kt
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodManagementActivity.kt
@@ -2,20 +2,21 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dialogs
 
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
+import android.widget.LinearLayout
 import androidx.fragment.app.FragmentStatePagerAdapter
 import com.atech.android.library.wizardpager.WizardPagerActivity
 import com.atech.android.library.wizardpager.WizardPagerContext
 import com.atech.android.library.wizardpager.data.WizardPagerSettings
 import com.atech.android.library.wizardpager.defs.WizardStepsWayType
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.events.EventRefreshOverview
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData
+import info.nightscout.androidaps.plugins.pump.omnipod.R
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodProgressStatus
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.defs.PodActionType
@@ -23,13 +24,13 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.model.Full
 import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.model.RemovePodWizardModel
 import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.model.ShortInitPodWizardModel
 import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.pages.InitPodRefreshAction
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodDriverState
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.comm.AapsOmnipodManager
-import info.nightscout.androidaps.plugins.pump.omnipod.events.EventOmnipodPumpValuesChanged
-import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.androidaps.utils.extensions.plusAssign
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.omnipod_pod_mgmt.*
 import javax.inject.Inject
 
@@ -39,17 +40,15 @@ import javax.inject.Inject
 class PodManagementActivity : NoSplashAppCompatActivity() {
 
     @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var commandQueue: CommandQueueProvider
-    @Inject lateinit var omnipodUtil: OmnipodUtil
     @Inject lateinit var podStateManager: PodStateManager
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var rileyLinkServiceData: RileyLinkServiceData
+    @Inject lateinit var aapsOmnipodManager: AapsOmnipodManager
 
-    private var initPodChanged = false
+    private var disposables: CompositeDisposable = CompositeDisposable()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -57,39 +56,45 @@ class PodManagementActivity : NoSplashAppCompatActivity() {
 
         initpod_init_pod.setOnClickListener {
             initPodAction()
-            initPodChanged = true
         }
 
         initpod_remove_pod.setOnClickListener {
             removePodAction()
-            initPodChanged = true
         }
 
         initpod_reset_pod.setOnClickListener {
             resetPodAction()
-            initPodChanged = true
         }
 
         initpod_pod_history.setOnClickListener {
             showPodHistory()
         }
+    }
 
-        refreshButtons();
+    override fun onResume() {
+        super.onResume()
+        disposables += rxBus
+            .toObservable(EventRileyLinkDeviceStatusChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ refreshButtons() }, { fabricPrivacy.logException(it) })
+
+        refreshButtons()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        disposables.clear()
     }
 
     override fun onDestroy() {
         super.onDestroy()
-
-        if (initPodChanged) {
-            rxBus.send(EventOmnipodPumpValuesChanged())
-            rxBus.send(EventRefreshOverview("Omnipod Pod Management"))
-        }
+        rxBus.send(EventRefreshOverview("Omnipod Pod Management"))
     }
 
     fun initPodAction() {
 
         val pagerSettings = WizardPagerSettings()
-        var refreshAction = InitPodRefreshAction(injector, this, PodActionType.InitPod)
+        var refreshAction = InitPodRefreshAction(injector, PodActionType.InitPod)
 
         pagerSettings.setWizardStepsWayType(WizardStepsWayType.CancelNext)
         pagerSettings.setFinishStringResourceId(R.string.close)
@@ -117,7 +122,7 @@ class PodManagementActivity : NoSplashAppCompatActivity() {
 
     fun removePodAction() {
         val pagerSettings = WizardPagerSettings()
-        var refreshAction = InitPodRefreshAction(injector, this, PodActionType.RemovePod)
+        var refreshAction = InitPodRefreshAction(injector, PodActionType.RemovePod)
 
         pagerSettings.setWizardStepsWayType(WizardStepsWayType.CancelNext)
         pagerSettings.setFinishStringResourceId(R.string.close)
@@ -142,27 +147,27 @@ class PodManagementActivity : NoSplashAppCompatActivity() {
     fun resetPodAction() {
         OKDialog.showConfirmation(this,
             resourceHelper.gs(R.string.omnipod_cmd_reset_pod_desc), Thread {
-            AapsOmnipodManager.getInstance().resetPodStatus()
-            omnipodUtil.setDriverState(OmnipodDriverState.Initalized_NoPod)
+            aapsOmnipodManager.resetPodStatus()
             refreshButtons()
         })
     }
 
     fun showPodHistory() {
-//        OKDialog.showConfirmation(this,
-//                MainApp.gs(R.string.omnipod_cmd_pod_history_na), null)
-
         startActivity(Intent(applicationContext, PodHistoryActivity::class.java))
     }
 
     fun refreshButtons() {
-        initpod_init_pod.isEnabled = !podStateManager.isPodRunning()
-
+        initpod_init_pod.isEnabled = !podStateManager.isPodActivationCompleted
         initpod_remove_pod.isEnabled = podStateManager.isPodInitialized
         initpod_reset_pod.isEnabled = podStateManager.hasPodState()
 
-        if (!rileyLinkServiceData.rileyLinkServiceState.isReady) {
+        val waitingForRlView = findViewById<LinearLayout>(R.id.initpod_waiting_for_rl_layout)
+
+        if (rileyLinkServiceData.rileyLinkServiceState.isReady) {
+            waitingForRlView.visibility = View.GONE
+        } else {
             // if rileylink is not running we disable all operations that require a RL connection
+            waitingForRlView.visibility = View.VISIBLE
             initpod_init_pod.isEnabled = false
             initpod_remove_pod.isEnabled = false
             initpod_reset_pod.isEnabled = false
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/defs/PodActionType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/defs/PodActionType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/defs/PodActionType.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/defs/PodActionType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionFragment.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionFragment.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionFragment.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionFragment.java
index 8dce02d7e0..192dde6c26 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionFragment.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionFragment.java
@@ -30,8 +30,8 @@ import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
 import dagger.android.support.DaggerFragment;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.plugins.pump.omnipod.R;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInitActionType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInitReceiver;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionPage.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionPage.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionPage.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionPage.java
index 8b34b99193..3ba9145749 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionPage.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionPage.java
@@ -14,7 +14,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInitActionType;
 
 /**
  * Created by andy on 12/11/2019
- *
+ * <p>
  * This page is for InitPod and RemovePod, but Fragments called for this 2 actions are different
  */
 public class InitActionPage extends Page {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitPodTask.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitPodTask.java
similarity index 87%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitPodTask.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitPodTask.java
index 129d551985..5496843cf9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitPodTask.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitPodTask.java
@@ -16,6 +16,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.comm.AapsOmnipodMa
 public class InitPodTask extends AsyncTask<Void, Void, String> {
 
     @Inject ProfileFunction profileFunction;
+    @Inject AapsOmnipodManager aapsOmnipodManager;
     private InitActionFragment initActionFragment;
 
     public InitPodTask(HasAndroidInjector injector, InitActionFragment initActionFragment) {
@@ -34,19 +35,19 @@ public class InitPodTask extends AsyncTask<Void, Void, String> {
     @Override
     protected String doInBackground(Void... params) {
         if (initActionFragment.podInitActionType == PodInitActionType.PairAndPrimeWizardStep) {
-            initActionFragment.callResult = AapsOmnipodManager.getInstance().initPod(
+            initActionFragment.callResult = aapsOmnipodManager.initPod(
                     initActionFragment.podInitActionType,
                     initActionFragment,
                     null
             );
         } else if (initActionFragment.podInitActionType == PodInitActionType.FillCannulaSetBasalProfileWizardStep) {
-            initActionFragment.callResult = AapsOmnipodManager.getInstance().initPod(
+            initActionFragment.callResult = aapsOmnipodManager.initPod(
                     initActionFragment.podInitActionType,
                     initActionFragment,
                     profileFunction.getProfile()
             );
         } else if (initActionFragment.podInitActionType == PodInitActionType.DeactivatePodWizardStep) {
-            initActionFragment.callResult = AapsOmnipodManager.getInstance().deactivatePod(initActionFragment);
+            initActionFragment.callResult = aapsOmnipodManager.deactivatePod(initActionFragment);
         }
 
         return "OK";
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/FullInitPodWizardModel.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/FullInitPodWizardModel.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/FullInitPodWizardModel.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/FullInitPodWizardModel.java
index a2e7383091..7c70f64c2c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/FullInitPodWizardModel.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/FullInitPodWizardModel.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import com.atech.android.library.wizardpager.model.DisplayTextPage;
 import com.tech.freak.wizardpager.model.PageList;
 
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.plugins.pump.omnipod.R;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInitActionType;
 import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.initpod.InitActionPage;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/InitPodWizardModel.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/InitPodWizardModel.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/InitPodWizardModel.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/InitPodWizardModel.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/RemovePodWizardModel.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/RemovePodWizardModel.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/RemovePodWizardModel.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/RemovePodWizardModel.java
index 1350ae1a49..c0088984b4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/RemovePodWizardModel.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/RemovePodWizardModel.java
@@ -24,7 +24,7 @@ import com.atech.android.library.wizardpager.model.DisplayTextPage;
 import com.tech.freak.wizardpager.model.AbstractWizardModel;
 import com.tech.freak.wizardpager.model.PageList;
 
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.plugins.pump.omnipod.R;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInitActionType;
 import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.pages.PodInfoFragment;
 import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.removepod.RemovePodActionPage;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/ShortInitPodWizardModel.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/ShortInitPodWizardModel.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/ShortInitPodWizardModel.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/ShortInitPodWizardModel.java
index 5499fdf8ec..51676a20a6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/ShortInitPodWizardModel.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/model/ShortInitPodWizardModel.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import com.atech.android.library.wizardpager.model.DisplayTextPage;
 import com.tech.freak.wizardpager.model.PageList;
 
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.plugins.pump.omnipod.R;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInitActionType;
 import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.initpod.InitActionPage;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/InitPodRefreshAction.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/InitPodRefreshAction.java
similarity index 69%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/InitPodRefreshAction.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/InitPodRefreshAction.java
index c6837f1644..80935bad7c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/InitPodRefreshAction.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/InitPodRefreshAction.java
@@ -9,17 +9,14 @@ import org.json.JSONObject;
 import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.Source;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodStateManager;
-import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.PodManagementActivity;
 import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.defs.PodActionType;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodDriverState;
-import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodUtil;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
@@ -29,18 +26,16 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
  */
 public class InitPodRefreshAction extends AbstractCancelAction implements FinishActionInterface {
 
-    private PodManagementActivity podManagementActivity;
     private PodActionType actionType;
 
-    @Inject OmnipodUtil omnipodUtil;
     @Inject PodStateManager podStateManager;
     @Inject AAPSLogger aapsLogger;
     @Inject SP sp;
     @Inject NSUpload nsUpload;
+    @Inject DatabaseHelperInterface databaseHelper;
 
-    public InitPodRefreshAction(HasAndroidInjector injector, PodManagementActivity podManagementActivity, PodActionType actionType) {
+    public InitPodRefreshAction(HasAndroidInjector injector, PodActionType actionType) {
         injector.androidInjector().inject(this);
-        this.podManagementActivity = podManagementActivity;
         this.actionType = actionType;
     }
 
@@ -49,32 +44,19 @@ public class InitPodRefreshAction extends AbstractCancelAction implements Finish
         if (cancelReason != null && cancelReason.trim().length() > 0) {
             this.cancelActionText = cancelReason;
         }
-
-        if (this.cancelActionText.equals("Cancel")) {
-            //AapsOmnipodManager.getInstance().resetPodStatus();
-        }
-
-        podManagementActivity.refreshButtons();
     }
 
     @Override
     public void execute() {
         if (actionType == PodActionType.InitPod) {
-            if (!podStateManager.isPodRunning()) {
-                omnipodUtil.setDriverState(OmnipodDriverState.Initalized_PodInitializing);
-            } else {
-                omnipodUtil.setDriverState(OmnipodDriverState.Initalized_PodAttached);
+            if (podStateManager.isPodRunning()) {
                 uploadCareportalEvent(System.currentTimeMillis(), CareportalEvent.SITECHANGE);
             }
-        } else {
-            omnipodUtil.setDriverState(OmnipodDriverState.Initalized_NoPod);
         }
-
-        podManagementActivity.refreshButtons();
     }
 
     private void uploadCareportalEvent(long date, String event) {
-        if (MainApp.getDbHelper().getCareportalEventFromTimestamp(date) != null)
+        if (databaseHelper.getCareportalEventFromTimestamp(date) != null)
             return;
         try {
             JSONObject data = new JSONObject();
@@ -87,14 +69,13 @@ public class InitPodRefreshAction extends AbstractCancelAction implements Finish
             careportalEvent.source = Source.USER;
             careportalEvent.eventType = event;
             careportalEvent.json = data.toString();
-            MainApp.getDbHelper().createOrUpdate(careportalEvent);
+            databaseHelper.createOrUpdate(careportalEvent);
             nsUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
             aapsLogger.error(LTag.PUMPCOMM, "Unhandled exception when uploading SiteChange event.", e);
         }
     }
 
-
     @Override
     public String getFinishActionText() {
         return "Finish_OK";
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/PodInfoFragment.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/PodInfoFragment.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/PodInfoFragment.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/PodInfoFragment.java
index 128211c6fd..0d4f3c52c6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/PodInfoFragment.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/PodInfoFragment.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import javax.inject.Inject;
 
 import dagger.android.support.DaggerFragment;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.plugins.pump.omnipod.R;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodUtil;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/PodInfoPage.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/PodInfoPage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/PodInfoPage.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/PodInfoPage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/removepod/RemoveActionFragment.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/removepod/RemoveActionFragment.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/removepod/RemoveActionFragment.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/removepod/RemoveActionFragment.java
index beea880d6f..935ee65085 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/removepod/RemoveActionFragment.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/removepod/RemoveActionFragment.java
@@ -17,8 +17,8 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.initpod.In
 public class RemoveActionFragment extends InitActionFragment implements PodInitReceiver {
     public static RemoveActionFragment create(String key, PodInitActionType podInitActionType) {
         Bundle args = new Bundle();
-        args.putString(InitActionFragment.ARG_KEY, key);
-        args.putSerializable(InitActionFragment.ARG_POD_INIT_ACTION_TYPE, podInitActionType);
+        args.putString(ARG_KEY, key);
+        args.putSerializable(ARG_POD_INIT_ACTION_TYPE, podInitActionType);
 
         RemoveActionFragment fragment = new RemoveActionFragment();
         fragment.setArguments(args);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/removepod/RemovePodActionPage.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/removepod/RemovePodActionPage.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/removepod/RemovePodActionPage.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/removepod/RemovePodActionPage.java
index 7f5b2b8503..444c8a4b11 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/removepod/RemovePodActionPage.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/removepod/RemovePodActionPage.java
@@ -11,7 +11,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.initpod.In
 
 /**
  * Created by andy on 12/11/2019
- *
  */
 public class RemovePodActionPage extends InitActionPage {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodPumpStatus.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodPumpStatus.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodPumpStatus.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodPumpStatus.java
index 0e1ab17b05..c7d9f24da1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodPumpStatus.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodPumpStatus.java
@@ -15,7 +15,6 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodConst;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
@@ -27,7 +26,6 @@ public class OmnipodPumpStatus extends PumpStatus {
     // TODO remove all fields that can also be obtained via PodStateManager
     //  We can probably get rid of this class altogether
 
-    private final ResourceHelper resourceHelper;
     private final SP sp;
     private final RileyLinkUtil rileyLinkUtil;
     private final RxBusWrapper rxBus;
@@ -47,9 +45,6 @@ public class OmnipodPumpStatus extends PumpStatus {
 
     public String regexMac = "([\\da-fA-F]{1,2}(?:\\:|$)){6}";
 
-    public boolean ackAlertsAvailable = false;
-    public String ackAlertsText = null;
-
     public boolean beepBolusEnabled = true;
     public boolean beepBasalEnabled = true;
     public boolean beepSMBEnabled = true;
@@ -57,16 +52,13 @@ public class OmnipodPumpStatus extends PumpStatus {
     public boolean podDebuggingOptionsEnabled = false;
     public boolean timeChangeEventEnabled = true;
 
-    public OmnipodDriverState driverState = OmnipodDriverState.NotInitalized;
     private PumpDeviceState pumpDeviceState;
 
     @Inject
-    public OmnipodPumpStatus(ResourceHelper resourceHelper,
-                             info.nightscout.androidaps.utils.sharedPreferences.SP sp,
+    public OmnipodPumpStatus(SP sp,
                              RxBusWrapper rxBus,
                              RileyLinkUtil rileyLinkUtil) {
         super(PumpType.Insulet_Omnipod);
-        this.resourceHelper = resourceHelper;
         this.sp = sp;
         this.rxBus = rxBus;
         this.rileyLinkUtil = rileyLinkUtil;
@@ -139,7 +131,6 @@ public class OmnipodPumpStatus extends PumpStatus {
                 "rileyLinkErrorDescription='" + rileyLinkErrorDescription + '\'' +
                 ", rileyLinkAddress='" + rileyLinkAddress + '\'' +
                 ", inPreInit=" + inPreInit +
-                ", currentBasal=" + currentBasal +
                 ", tempBasalStart=" + tempBasalStart +
                 ", tempBasalEnd=" + tempBasalEnd +
                 ", tempBasalAmount=" + tempBasalAmount +
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
similarity index 84%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
index c9725df95a..645802bd87 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
@@ -10,17 +10,20 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.db.OmnipodHistoryRecord;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.interfaces.TreatmentsInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
@@ -33,6 +36,7 @@ import info.nightscout.androidaps.plugins.pump.common.data.TempBasalPair;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
+import info.nightscout.androidaps.plugins.pump.omnipod.R;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.OmnipodCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.OmnipodManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.SetupActionResult;
@@ -65,15 +69,16 @@ import info.nightscout.androidaps.plugins.pump.omnipod.defs.schedule.BasalSchedu
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.schedule.BasalScheduleEntry;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.db.PodHistory;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.db.PodHistoryEntryType;
 import info.nightscout.androidaps.plugins.pump.omnipod.exception.OmnipodException;
+import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodConst;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.Disposable;
+import io.reactivex.subjects.SingleSubject;
 
-// TODO make singleton
+@Singleton
 public class AapsOmnipodManager implements IOmnipodManager {
 
     private final PodStateManager podStateManager;
@@ -85,16 +90,12 @@ public class AapsOmnipodManager implements IOmnipodManager {
     private final ActivePluginProvider activePlugin;
     private final OmnipodPumpStatus pumpStatus;
     private final Context context;
+    private final SP sp;
 
     private final OmnipodManager delegate;
+    private DatabaseHelperInterface databaseHelper;
 
-    //TODO: remove and use injection
-    private static AapsOmnipodManager instance;
-
-    public static AapsOmnipodManager getInstance() {
-        return instance;
-    }
-
+    @Inject
     public AapsOmnipodManager(OmnipodCommunicationManager communicationService,
                               PodStateManager podStateManager,
                               OmnipodPumpStatus pumpStatus,
@@ -105,7 +106,8 @@ public class AapsOmnipodManager implements IOmnipodManager {
                               ResourceHelper resourceHelper,
                               HasAndroidInjector injector,
                               ActivePluginProvider activePlugin,
-                              Context context) {
+                              Context context,
+                              DatabaseHelperInterface databaseHelper) {
         if (podStateManager == null) {
             throw new IllegalArgumentException("Pod state manager can not be null");
         }
@@ -118,9 +120,10 @@ public class AapsOmnipodManager implements IOmnipodManager {
         this.activePlugin = activePlugin;
         this.pumpStatus = pumpStatus;
         this.context = context;
+        this.databaseHelper = databaseHelper;
+        this.sp = sp;
 
         delegate = new OmnipodManager(aapsLogger, sp, communicationService, podStateManager);
-        instance = this;
     }
 
     public PodStateManager getPodStateManager() {
@@ -271,47 +274,82 @@ public class AapsOmnipodManager implements IOmnipodManager {
             showErrorDialog(getStringResource(R.string.omnipod_bolus_failed_uncertain), R.raw.boluserror);
         }
 
+        detailedBolusInfo.date = bolusStarted.getTime();
+        detailedBolusInfo.source = Source.PUMP;
+
+        // Store the current bolus for in case the app crashes, gets killed, the phone dies or whatever before the bolus finishes
+        // If we have a stored value for the current bolus on startup, we'll create a Treatment for it
+        // However this can potentially be hours later if for example your phone died and you can't charge it
+        // FIXME !!!
+        // The proper solution here would be to create a treatment right after the bolus started,
+        // and update that treatment after the bolus has finished in case the actual units delivered don't match the requested bolus units
+        // That way, the bolus would immediately be sent to NS so in case the phone dies you could still see the bolus
+        // Unfortunately this doesn't work because
+        //  a) when cancelling a bolus within a few seconds of starting it, after updating the Treatment,
+        //     we get a new treatment event from NS containing the originally created treatment with the original insulin amount.
+        //     This event is processed in TreatmentService.createTreatmentFromJsonIfNotExists().
+        //     Opposed to what the name of this method suggests, it does createOrUpdate,
+        //     overwriting the insulin delivered with the original value.
+        //     So practically it seems impossible to update a Treatment when using NS
+        //  b) we only send newly created treatments to NS, so the insulin amount in NS would never be updated
+        //
+        // I discussed this with the AAPS team but nobody seems to care so we're stuck with this ugly workaround for now
+        try {
+            sp.putString(OmnipodConst.Prefs.CurrentBolus, omnipodUtil.getGsonInstance().toJson(detailedBolusInfo));
+        } catch (Exception ex) {
+            aapsLogger.error(LTag.PUMP, "Failed to store current bolus to SP", ex);
+        }
+
         // Wait for the bolus to finish
         OmnipodManager.BolusDeliveryResult bolusDeliveryResult =
                 bolusCommandResult.getDeliveryResultSubject().blockingGet();
 
-        double unitsDelivered = bolusDeliveryResult.getUnitsDelivered();
+        detailedBolusInfo.insulin = bolusDeliveryResult.getUnitsDelivered();
 
-        long pumpId = addSuccessToHistory(bolusStarted.getTime(), PodHistoryEntryType.SetBolus, unitsDelivered + ";" + detailedBolusInfo.carbs);
+        addBolusToHistory(detailedBolusInfo);
 
-        detailedBolusInfo.date = bolusStarted.getTime();
-        detailedBolusInfo.insulin = unitsDelivered;
-        detailedBolusInfo.pumpId = pumpId;
-        detailedBolusInfo.source = Source.PUMP;
+        sp.remove(OmnipodConst.Prefs.CurrentBolus);
 
-        activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, false);
-
-        if (podStateManager.hasFaultEvent()) {
-            showPodFaultErrorDialog(podStateManager.getFaultEvent().getFaultEventCode(), R.raw.urgentalarm);
-        }
-
-        return new PumpEnactResult(injector).success(true).enacted(true).bolusDelivered(unitsDelivered);
+        return new PumpEnactResult(injector).success(true).enacted(true).bolusDelivered(detailedBolusInfo.insulin);
     }
 
     @Override
     public PumpEnactResult cancelBolus() {
-        long time = System.currentTimeMillis();
+        SingleSubject<Boolean> bolusCommandExecutionSubject = delegate.getBolusCommandExecutionSubject();
+        if (bolusCommandExecutionSubject != null) {
+            // Wait until the bolus command has actually been executed before sending the cancel bolus command
+            aapsLogger.debug(LTag.PUMP, "Cancel bolus was requested, but the bolus command is still being executed. Awaiting bolus command execution");
+            boolean bolusCommandSuccessfullyExecuted = bolusCommandExecutionSubject.blockingGet();
+            if (bolusCommandSuccessfullyExecuted) {
+                aapsLogger.debug(LTag.PUMP, "Bolus command successfully executed. Proceeding bolus cancellation");
+            } else {
+                aapsLogger.debug(LTag.PUMP, "Not cancelling bolus: bolus command failed");
+                String comment = getStringResource(R.string.omnipod_bolus_did_not_succeed);
+                addFailureToHistory(System.currentTimeMillis(), PodHistoryEntryType.CancelBolus, comment);
+                return new PumpEnactResult(injector).success(true).enacted(false).comment(comment);
+            }
+        }
+
         String comment = null;
-        while (delegate.hasActiveBolus()) {
+        for (int i = 1; delegate.hasActiveBolus(); i++) {
+            aapsLogger.debug(LTag.PUMP, "Attempting to cancel bolus (#{})", i);
             try {
                 delegate.cancelBolus(isBolusBeepsEnabled());
-                addSuccessToHistory(time, PodHistoryEntryType.CancelBolus, null);
+                aapsLogger.debug(LTag.PUMP, "Successfully cancelled bolus", i);
+                addSuccessToHistory(System.currentTimeMillis(), PodHistoryEntryType.CancelBolus, null);
                 return new PumpEnactResult(injector).success(true).enacted(true);
             } catch (PodFaultException ex) {
+                aapsLogger.debug(LTag.PUMP, "Successfully cancelled bolus (implicitly because of a Pod Fault)");
                 showPodFaultErrorDialog(ex.getFaultEvent().getFaultEventCode(), null);
-                addSuccessToHistory(time, PodHistoryEntryType.CancelBolus, null);
+                addSuccessToHistory(System.currentTimeMillis(), PodHistoryEntryType.CancelBolus, null);
                 return new PumpEnactResult(injector).success(true).enacted(true);
             } catch (Exception ex) {
+                aapsLogger.debug(LTag.PUMP, "Failed to cancel bolus", ex);
                 comment = handleAndTranslateException(ex);
             }
         }
 
-        addFailureToHistory(time, PodHistoryEntryType.CancelBolus, comment);
+        addFailureToHistory(System.currentTimeMillis(), PodHistoryEntryType.CancelBolus, comment);
         return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
     }
 
@@ -464,6 +502,12 @@ public class AapsOmnipodManager implements IOmnipodManager {
         return delegate.isPodRunning();
     }
 
+    public void addBolusToHistory(DetailedBolusInfo detailedBolusInfo) {
+        long pumpId = addSuccessToHistory(detailedBolusInfo.date, PodHistoryEntryType.SetBolus, detailedBolusInfo.insulin + ";" + detailedBolusInfo.carbs);
+        detailedBolusInfo.pumpId = pumpId;
+        activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, false);
+    }
+
     private void reportImplicitlyCanceledTbr() {
         //TreatmentsPlugin plugin = TreatmentsPlugin.getPlugin();
         TreatmentsInterface plugin = activePlugin.getActiveTreatments();
@@ -493,22 +537,22 @@ public class AapsOmnipodManager implements IOmnipodManager {
     }
 
     private long addToHistory(long requestTime, PodHistoryEntryType entryType, Object data, boolean success) {
-        PodHistory podHistory = new PodHistory(requestTime, entryType);
+        OmnipodHistoryRecord omnipodHistoryRecord = new OmnipodHistoryRecord(requestTime, entryType.getCode());
 
         if (data != null) {
             if (data instanceof String) {
-                podHistory.setData((String) data);
+                omnipodHistoryRecord.setData((String) data);
             } else {
-                podHistory.setData(omnipodUtil.getGsonInstance().toJson(data));
+                omnipodHistoryRecord.setData(omnipodUtil.getGsonInstance().toJson(data));
             }
         }
 
-        podHistory.setSuccess(success);
-        podHistory.setPodSerial(podStateManager.hasPodState() ? String.valueOf(podStateManager.getAddress()) : "None");
+        omnipodHistoryRecord.setSuccess(success);
+        omnipodHistoryRecord.setPodSerial(podStateManager.hasPodState() ? String.valueOf(podStateManager.getAddress()) : "None");
 
-        MainApp.getDbHelper().createOrUpdate(podHistory);
+        databaseHelper.createOrUpdate(omnipodHistoryRecord);
 
-        return podHistory.getPumpId();
+        return omnipodHistoryRecord.getPumpId();
     }
 
     private void handleSetupActionResult(PodInitActionType podInitActionType, PodInitReceiver podInitReceiver, SetupActionResult res, long time, Profile profile) {
@@ -571,7 +615,7 @@ public class AapsOmnipodManager implements IOmnipodManager {
                 comment = getStringResource(R.string.omnipod_driver_error_not_enough_data);
             } else if (ex instanceof PodFaultException) {
                 FaultEventCode faultEventCode = ((PodFaultException) ex).getFaultEvent().getFaultEventCode();
-                showPodFaultErrorDialog(faultEventCode, R.raw.urgentalarm);
+                showPodFaultErrorDialog(faultEventCode);
                 comment = createPodFaultErrorMessage(faultEventCode);
             } else if (ex instanceof PodReturnedErrorResponseException) {
                 comment = getStringResource(R.string.omnipod_driver_error_pod_returned_error_response);
@@ -599,15 +643,23 @@ public class AapsOmnipodManager implements IOmnipodManager {
         rxBus.send(event);
     }
 
+    private void showPodFaultErrorDialog(FaultEventCode faultEventCode) {
+        showErrorDialog(createPodFaultErrorMessage(faultEventCode), null);
+    }
+
     private void showPodFaultErrorDialog(FaultEventCode faultEventCode, Integer sound) {
         showErrorDialog(createPodFaultErrorMessage(faultEventCode), sound);
     }
 
+    private void showErrorDialog(String message) {
+        showErrorDialog(message, null);
+    }
+
     private void showErrorDialog(String message, Integer sound) {
         Intent intent = new Intent(context, ErrorHelperActivity.class);
-        intent.putExtra("soundid", sound == null ? 0 : sound);
+        intent.putExtra("soundid", sound);
         intent.putExtra("status", message);
-        intent.putExtra("title", resourceHelper.gs(R.string.treatmentdeliveryerror));
+        intent.putExtra("title", resourceHelper.gs(R.string.error));
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(intent);
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsPodStateManager.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsPodStateManager.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsPodStateManager.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsPodStateManager.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/db/PodHistoryEntryType.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/db/PodHistoryEntryType.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/db/PodHistoryEntryType.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/db/PodHistoryEntryType.java
index 981796b497..351a845e8d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/db/PodHistoryEntryType.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/db/PodHistoryEntryType.java
@@ -5,8 +5,8 @@ import androidx.annotation.StringRes;
 import java.util.HashMap;
 import java.util.Map;
 
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup;
+import info.nightscout.androidaps.plugins.pump.omnipod.R;
 
 /**
  * Created by andy on 24.11.2019
@@ -37,8 +37,7 @@ public enum PodHistoryEntryType {
     SuspendDelivery(60, R.string.omnipod_cmd_suspend_delivery, PumpHistoryEntryGroup.Basal),
     ResumeDelivery(61, R.string.omnipod_cmd_resume_delivery, PumpHistoryEntryGroup.Basal),
 
-    UnknownEntryType(99, R.string.omnipod_cmd_unknown_entry)
-    ;
+    UnknownEntryType(99, R.string.omnipod_cmd_unknown_entry);
 
     private int code;
     private static Map<Integer, PodHistoryEntryType> instanceMap;
@@ -48,7 +47,6 @@ public enum PodHistoryEntryType {
 
     private PumpHistoryEntryGroup group;
 
-
     static {
         instanceMap = new HashMap<>();
 
@@ -57,7 +55,6 @@ public enum PodHistoryEntryType {
         }
     }
 
-
     PodHistoryEntryType(int code, @StringRes int resourceId) {
         this.code = code;
         this.resourceId = resourceId;
@@ -77,6 +74,9 @@ public enum PodHistoryEntryType {
         return this.group;
     }
 
+    public static PodHistoryEntryType getByCode(long code) {
+        return getByCode((int) code);
+    }
 
     public static PodHistoryEntryType getByCode(int code) {
         if (instanceMap.containsKey(code)) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIComm.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIComm.java
similarity index 64%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIComm.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIComm.java
index 637f884500..d39559e4b5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIComm.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIComm.java
@@ -3,30 +3,34 @@ package info.nightscout.androidaps.plugins.pump.omnipod.driver.ui;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.common.defs.DeviceCommandExecutor;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
+import info.nightscout.androidaps.plugins.pump.omnipod.data.RLHistoryItemOmnipod;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.IOmnipodManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCommandType;
 
 /**
  * Created by andy on 4.8.2019
  */
-public class OmnipodUIComm implements DeviceCommandExecutor {
+public class OmnipodUIComm {
 
     private final HasAndroidInjector injector;
     private final AAPSLogger aapsLogger;
-    private final IOmnipodManager omnipodCommunicationManager;
     private final OmnipodUIPostprocessor omnipodUIPostprocessor;
+    private final IOmnipodManager omnipodCommunicationManager;
+    private RileyLinkUtil rileyLinkUtil;
 
     public OmnipodUIComm(
             HasAndroidInjector injector,
             AAPSLogger aapsLogger,
             OmnipodUIPostprocessor omnipodUIPostprocessor,
-            IOmnipodManager omnipodCommunicationManager
+            IOmnipodManager omnipodCommunicationManager,
+            RileyLinkUtil rileyLinkUtil
     ) {
         this.injector = injector;
         this.aapsLogger = aapsLogger;
         this.omnipodUIPostprocessor = omnipodUIPostprocessor;
         this.omnipodCommunicationManager = omnipodCommunicationManager;
+        this.rileyLinkUtil = rileyLinkUtil;
     }
 
 
@@ -36,34 +40,10 @@ public class OmnipodUIComm implements DeviceCommandExecutor {
 
         OmnipodUITask task = new OmnipodUITask(injector, commandType, parameters);
 
-        // new Thread(() -> {
-        // LOG.warn("@@@ Start Thread");
-        //
-        // task.execute(getCommunicationManager());
-        //
-        // LOG.warn("@@@ End Thread");
-        // });
+        rileyLinkUtil.getRileyLinkHistory().add(new RLHistoryItemOmnipod(commandType));
 
         task.execute(this.omnipodCommunicationManager);
 
-        // for (int i = 0; i < getMaxWaitTime(commandType); i++) {
-        // synchronized (task) {
-        // // try {
-        // //
-        // // //task.wait(1000);
-        // // } catch (InterruptedException e) {
-        // // LOG.error("executeCommand InterruptedException", e);
-        // // }
-        //
-        //
-        // SystemClock.sleep(1000);
-        // }
-        //
-        // if (task.isReceived()) {
-        // break;
-        // }
-        // }
-
         if (!task.isReceived()) {
             aapsLogger.warn(LTag.PUMP, "Reply not received for " + commandType);
         }
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIPostprocessor.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIPostprocessor.java
new file mode 100644
index 0000000000..33d734bdde
--- /dev/null
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIPostprocessor.java
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.driver.ui;
+
+import java.util.Date;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
+
+/**
+ * Created by andy on 4.8.2019
+ */
+// TODO remove once OmnipodPumpStatus has been removed
+@Singleton
+public class OmnipodUIPostprocessor {
+    private final AAPSLogger aapsLogger;
+    private final OmnipodPumpStatus pumpStatus;
+
+    @Inject
+    public OmnipodUIPostprocessor(AAPSLogger aapsLogger, OmnipodPumpStatus pumpStatus) {
+        this.aapsLogger = aapsLogger;
+        this.pumpStatus = pumpStatus;
+    }
+
+    // this is mostly intended for command that return certain statuses (Remaining Insulin, ...), and
+    // where responses won't be directly used
+    public void postProcessData(OmnipodUITask uiTask) {
+
+        switch (uiTask.commandType) {
+            case SetBolus:
+                if (uiTask.returnData != null) {
+
+                    PumpEnactResult result = uiTask.returnData;
+
+                    DetailedBolusInfo detailedBolusInfo = (DetailedBolusInfo) uiTask.getObjectFromParameters(0);
+
+                    if (result.success) {
+                        boolean isSmb = detailedBolusInfo.isSMB;
+
+                        if (!isSmb) {
+                            pumpStatus.lastBolusAmount = detailedBolusInfo.insulin;
+                            pumpStatus.lastBolusTime = new Date();
+                        }
+                    }
+                }
+                break;
+
+            case CancelTemporaryBasal:
+                pumpStatus.tempBasalStart = 0;
+                pumpStatus.tempBasalEnd = 0;
+                pumpStatus.tempBasalAmount = null;
+                pumpStatus.tempBasalLength = null;
+                break;
+
+            default:
+                aapsLogger.debug(LTag.PUMP, "Post-processing not implemented for {}.", uiTask.commandType.name());
+
+        }
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUITask.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUITask.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUITask.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUITask.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodAcknowledgeAlertsChanged.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodAcknowledgeAlertsChanged.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodAcknowledgeAlertsChanged.kt
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodAcknowledgeAlertsChanged.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodPumpValuesChanged.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodPumpValuesChanged.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodPumpValuesChanged.kt
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodPumpValuesChanged.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodRefreshButtonState.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodRefreshButtonState.kt
similarity index 61%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodRefreshButtonState.kt
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodRefreshButtonState.kt
index 8bbbfd33e6..9ad6f2129e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodRefreshButtonState.kt
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodRefreshButtonState.kt
@@ -2,4 +2,4 @@ package info.nightscout.androidaps.plugins.pump.omnipod.events
 
 import info.nightscout.androidaps.events.Event
 
-class EventOmnipodRefreshButtonState (val newState : Boolean): Event()
\ No newline at end of file
+class EventOmnipodRefreshButtonState(val newState: Boolean) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/exception/OmnipodException.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/exception/OmnipodException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/exception/OmnipodException.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/exception/OmnipodException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java
similarity index 85%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java
index 73209ce876..58e35dd8fd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java
@@ -9,18 +9,17 @@ import org.apache.commons.lang3.StringUtils;
 
 import javax.inject.Inject;
 
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkEncodingType;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkTargetFrequency;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService;
 import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin;
+import info.nightscout.androidaps.plugins.pump.omnipod.R;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.OmnipodCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
@@ -43,11 +42,9 @@ public class RileyLinkOmnipodService extends RileyLinkService {
     @Inject OmnipodUtil omnipodUtil;
     @Inject OmnipodUIPostprocessor omnipodUIPostprocessor;
     @Inject PodStateManager podStateManager;
-
-    private static RileyLinkOmnipodService instance;
-
-    private OmnipodCommunicationManager omnipodCommunicationManager;
-    private AapsOmnipodManager aapsOmnipodManager;
+    @Inject DatabaseHelperInterface databaseHelper;
+    @Inject AapsOmnipodManager aapsOmnipodManager;
+    @Inject OmnipodCommunicationManager omnipodCommunicationManager;
 
     private IBinder mBinder = new LocalBinder();
     private boolean rileyLinkAddressChanged = false;
@@ -57,11 +54,6 @@ public class RileyLinkOmnipodService extends RileyLinkService {
 
     public RileyLinkOmnipodService() {
         super();
-        instance = this;
-    }
-
-    public static RileyLinkOmnipodService getInstance() {
-        return instance;
     }
 
     @Override
@@ -70,22 +62,20 @@ public class RileyLinkOmnipodService extends RileyLinkService {
         super.onConfigurationChanged(newConfig);
     }
 
-
     @Override
     public IBinder onBind(Intent intent) {
         return mBinder;
     }
 
-
     @Override
     public RileyLinkEncodingType getEncoding() {
         return RileyLinkEncodingType.Manchester;
     }
 
-
     /**
      * If you have customized RileyLinkServiceData you need to override this
      */
+    @Override
     public void initRileyLinkServiceData() {
 
         rileyLinkServiceData.targetDevice = RileyLinkTargetDevice.Omnipod;
@@ -94,8 +84,6 @@ public class RileyLinkOmnipodService extends RileyLinkService {
         // get most recently used RileyLink address
         rileyLinkServiceData.rileylinkAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
 
-        rileyLinkBLE = new RileyLinkBLE(injector, this); // or this
-        rfspy = new RFSpy(injector, rileyLinkBLE);
         rfspy.startReader();
 
         initializeErosOmnipodManager();
@@ -105,23 +93,12 @@ public class RileyLinkOmnipodService extends RileyLinkService {
     }
 
     private void initializeErosOmnipodManager() {
-        AapsOmnipodManager instance = AapsOmnipodManager.getInstance();
-        if (instance == null) {
-            OmnipodCommunicationManager omnipodCommunicationService = new OmnipodCommunicationManager(injector, rfspy);
-            this.omnipodCommunicationManager = omnipodCommunicationService;
-
-            aapsOmnipodManager = new AapsOmnipodManager(omnipodCommunicationService, podStateManager, omnipodPumpStatus,
-                    omnipodUtil, aapsLogger, rxBus, sp, resourceHelper, injector, activePlugin, this);
-
-            omnipodUIComm = new OmnipodUIComm(injector, aapsLogger, omnipodUIPostprocessor, aapsOmnipodManager);
-
-        } else {
-            aapsOmnipodManager = instance;
+        if (omnipodUIComm == null) {
+            omnipodUIComm = new OmnipodUIComm(injector, aapsLogger, omnipodUIPostprocessor, aapsOmnipodManager, rileyLinkUtil);
         }
         rxBus.send(new EventOmnipodPumpValuesChanged());
     }
 
-
     public OmnipodUIComm getDeviceCommandExecutor() {
         return this.omnipodUIComm;
     }
@@ -130,7 +107,6 @@ public class RileyLinkOmnipodService extends RileyLinkService {
         rfspy.resetRileyLinkConfiguration();
     }
 
-
     @Override
     public RileyLinkCommunicationManager getDeviceCommunicationManager() {
         return omnipodCommunicationManager;
@@ -141,15 +117,12 @@ public class RileyLinkOmnipodService extends RileyLinkService {
         this.omnipodPumpStatus.setPumpDeviceState(pumpDeviceState);
     }
 
-
     public class LocalBinder extends Binder {
-
         public RileyLinkOmnipodService getServiceInstance() {
             return RileyLinkOmnipodService.this;
         }
     }
 
-
     /* private functions */
 
     // PumpInterface - REMOVE
@@ -158,7 +131,7 @@ public class RileyLinkOmnipodService extends RileyLinkService {
         return rileyLinkServiceData.rileyLinkServiceState.isReady();
     }
 
-
+    @Override
     public boolean verifyConfiguration() {
         try {
             omnipodPumpStatus.rileyLinkErrorDescription = null;
@@ -202,11 +175,8 @@ public class RileyLinkOmnipodService extends RileyLinkService {
         }
     }
 
-
     private boolean reconfigureService() {
-
         if (!inPreInit) {
-
             if (rileyLinkAddressChanged) {
                 rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkNewAddressSet, this);
                 rileyLinkAddressChanged = false;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmniCRC.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmniCRC.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmniCRC.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmniCRC.java
index ba5c91c0b5..77d0cc1aad 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmniCRC.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmniCRC.java
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.util;
 
 public class OmniCRC {
-    public static final int[] crc16lookup = new int[] {
+    public static final int[] crc16lookup = new int[]{
             0x0000, 0x8005, 0x800f, 0x000a, 0x801b, 0x001e, 0x0014, 0x8011,
             0x8033, 0x0036, 0x003c, 0x8039, 0x0028, 0x802d, 0x8027, 0x0022,
             0x8063, 0x0066, 0x006c, 0x8069, 0x0078, 0x807d, 0x8077, 0x0072,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodConst.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodConst.java
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodConst.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodConst.java
index 35889383c2..81bbf5d501 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodConst.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodConst.java
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.util;
 
 import org.joda.time.Duration;
 
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.plugins.pump.omnipod.R;
 
 /**
  * Created by andy on 4.8.2019
@@ -12,8 +12,9 @@ public class OmnipodConst {
 
     static final String Prefix = "AAPS.Omnipod.";
 
-    public class Prefs {
+    public static class Prefs {
         public static final String PodState = Prefix + "pod_state";
+        public static final String CurrentBolus = Prefix + "current_bolus";
         public static final int BeepBasalEnabled = R.string.key_omnipod_beep_basal_enabled;
         public static final int BeepBolusEnabled = R.string.key_omnipod_beep_bolus_enabled;
         public static final int BeepSMBEnabled = R.string.key_omnipod_beep_smb_enabled;
@@ -22,15 +23,13 @@ public class OmnipodConst {
         public static final int TimeChangeEventEnabled = R.string.key_omnipod_timechange_enabled;
     }
 
-    public class Statistics {
+    public static class Statistics {
         public static final String StatsPrefix = "omnipod_";
         public static final String FirstPumpStart = Prefix + "first_pump_use";
         public static final String LastGoodPumpCommunicationTime = Prefix + "lastGoodPumpCommunicationTime";
-        //public static final String LastGoodPumpFrequency = Prefix + "LastGoodPumpFrequency";
         public static final String TBRsSet = StatsPrefix + "tbrs_set";
         public static final String StandardBoluses = StatsPrefix + "std_boluses_delivered";
         public static final String SMBBoluses = StatsPrefix + "smb_boluses_delivered";
-        //public static final String LastPumpHistoryEntry = StatsPrefix + "pump_history_entry";
     }
 
     public static final double POD_PULSE_SIZE = 0.05;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java
similarity index 74%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java
rename to omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java
index 599deb8197..ddc0022372 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java
@@ -16,16 +16,12 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.plugins.pump.omnipod.R;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.AlertSet;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.AlertSlot;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.AlertType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodStateManager;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodDriverState;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * Created by andy on 4/8/19.
@@ -33,39 +29,15 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
 @Singleton
 public class OmnipodUtil {
 
-    private final AAPSLogger aapsLogger;
-    private final OmnipodPumpStatus omnipodPumpStatus;
     private final ResourceHelper resourceHelper;
-    private final SP sp;
 
     private Gson gsonInstance = createGson();
-    private OmnipodDriverState driverState = OmnipodDriverState.NotInitalized;
 
     @Inject
-    public OmnipodUtil(
-            AAPSLogger aapsLogger,
-            OmnipodPumpStatus omnipodPumpStatus,
-            SP sp,
-            ResourceHelper resourceHelper
-    ) {
-        this.aapsLogger = aapsLogger;
-        this.omnipodPumpStatus = omnipodPumpStatus;
-        this.sp = sp;
+    public OmnipodUtil(ResourceHelper resourceHelper) {
         this.resourceHelper = resourceHelper;
     }
 
-    public OmnipodDriverState getDriverState() {
-        return driverState;
-    }
-
-    public void setDriverState(OmnipodDriverState state) {
-        if (driverState == state)
-            return;
-
-        driverState = state;
-        omnipodPumpStatus.driverState = state;
-    }
-
     private Gson createGson() {
         GsonBuilder gsonBuilder = new GsonBuilder()
                 .registerTypeAdapter(DateTime.class, (JsonSerializer<DateTime>) (dateTime, typeOfSrc, context) ->
@@ -84,14 +56,6 @@ public class OmnipodUtil {
         return this.gsonInstance;
     }
 
-    public AAPSLogger getAapsLogger() {
-        return this.aapsLogger;
-    }
-
-    public SP getSp() {
-        return this.sp;
-    }
-
     public List<String> getTranslatedActiveAlerts(PodStateManager podStateManager) {
         List<String> translatedAlerts = new ArrayList<>();
         AlertSet activeAlerts = podStateManager.getActiveAlerts();
diff --git a/omnipod/src/main/res/drawable/ic_actions_temptarget.xml b/omnipod/src/main/res/drawable/ic_actions_temptarget.xml
new file mode 100644
index 0000000000..5dbd5d8b0c
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_actions_temptarget.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.71,11.606h-0.736c-0.198,-3.001 -2.579,-5.382 -5.58,-5.58V5.29c0,-0.218 -0.177,-0.394 -0.394,-0.394s-0.394,0.177 -0.394,0.394v0.736c-3.001,0.198 -5.382,2.579 -5.58,5.58H5.29c-0.218,0 -0.394,0.177 -0.394,0.394s0.177,0.394 0.394,0.394h0.736c0.198,3.001 2.579,5.382 5.58,5.58v0.736c0,0.217 0.177,0.394 0.394,0.394s0.394,-0.177 0.394,-0.394v-0.736c3.001,-0.198 5.382,-2.579 5.58,-5.58h0.736c0.217,0 0.394,-0.177 0.394,-0.394S18.927,11.606 18.71,11.606zM17.143,11.606h-1.944c-0.179,-1.478 -1.331,-2.643 -2.804,-2.841V6.85C14.939,7.044 16.953,9.06 17.143,11.606zM13.542,12.394h0.938c-0.171,1.079 -1.01,1.93 -2.085,2.115v-0.967c0,-0.217 -0.177,-0.394 -0.394,-0.394s-0.394,0.177 -0.394,0.394v0.975c-1.111,-0.156 -1.988,-1.017 -2.163,-2.122h1.016c0.218,0 0.394,-0.177 0.394,-0.394s-0.177,-0.394 -0.394,-0.394H9.442c0.171,-1.111 1.049,-1.978 2.164,-2.134v0.987c0,0.218 0.177,0.394 0.394,0.394s0.394,-0.177 0.394,-0.394v-0.98c1.079,0.185 1.92,1.041 2.086,2.126h-0.939c-0.217,0 -0.394,0.177 -0.394,0.394S13.324,12.394 13.542,12.394zM11.606,6.851v1.906C10.095,8.921 8.903,10.1 8.72,11.606H6.864C7.053,9.062 9.064,7.047 11.606,6.851zM6.866,12.394H8.72c0.183,1.505 1.374,2.684 2.885,2.849v1.884C9.071,16.931 7.065,14.928 6.866,12.394zM12.394,17.128v-1.893c1.473,-0.197 2.625,-1.362 2.804,-2.841h1.942C16.941,14.93 14.932,16.935 12.394,17.128z"
+      android:fillColor="#36FF00"/>
+</vector>
diff --git a/omnipod/src/main/res/drawable/ic_cp_pump_canula.xml b/omnipod/src/main/res/drawable/ic_cp_pump_canula.xml
new file mode 100644
index 0000000000..b43de7ceaa
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_cp_pump_canula.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M23.706,7.373c-0.149,-0.541 -0.728,-0.854 -1.294,-0.699L19.87,7.373c-0.325,-0.913 -1.301,-1.438 -2.255,-1.175l-3.008,0.826c-0.954,0.262 -1.525,1.212 -1.338,2.163l-2.542,0.698c-0.499,0.137 -0.799,0.593 -0.767,1.07c-1.696,0.439 -3.037,0.067 -4.101,-0.248c-1.047,-0.309 -1.951,-0.578 -2.713,0.152c-1.307,1.253 -0.369,2.87 0.384,4.17c0.501,0.863 1.019,1.757 0.766,2.3c-0.519,1.124 -2.729,1.128 -3.537,1.033c-0.203,-0.022 -0.392,0.122 -0.417,0.328c-0.024,0.206 0.123,0.391 0.329,0.414c0.086,0.01 1.376,0.152 2.554,-0.172c0.734,-0.202 1.424,-0.585 1.753,-1.292c0.416,-0.896 -0.173,-1.912 -0.797,-2.987c-0.844,-1.456 -1.336,-2.47 -0.515,-3.257c0.426,-0.409 0.972,-0.272 1.977,0.026c1.128,0.334 2.648,0.808 4.674,0.215c0.255,0.206 0.598,0.304 0.949,0.207l5.63,-1.547l2.016,7.338l0.127,-1.203l-1.718,-6.252l5.63,-1.547C23.517,8.479 23.855,7.914 23.706,7.373z"
+      android:fillColor="#67DFE8"/>
+</vector>
diff --git a/app/src/main/res/layout/omnipod_fragment.xml b/omnipod/src/main/res/layout/omnipod_fragment.xml
similarity index 99%
rename from app/src/main/res/layout/omnipod_fragment.xml
rename to omnipod/src/main/res/layout/omnipod_fragment.xml
index 7502f89d92..72c3910ad9 100644
--- a/app/src/main/res/layout/omnipod_fragment.xml
+++ b/omnipod/src/main/res/layout/omnipod_fragment.xml
@@ -219,7 +219,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/omnipod_pod_fw_version"
+                        android:text="@string/omnipod_pod_firmware_version"
                         android:textSize="14sp" />
 
                     <TextView
@@ -233,7 +233,7 @@
                         android:textSize="14sp" />
 
                     <TextView
-                        android:id="@+id/omnipod_pod_fw_version"
+                        android:id="@+id/omnipod_pod_firmware_version"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
diff --git a/app/src/main/res/layout/omnipod_initpod.xml b/omnipod/src/main/res/layout/omnipod_initpod.xml
similarity index 100%
rename from app/src/main/res/layout/omnipod_initpod.xml
rename to omnipod/src/main/res/layout/omnipod_initpod.xml
diff --git a/app/src/main/res/layout/omnipod_initpod_init_action.xml b/omnipod/src/main/res/layout/omnipod_initpod_init_action.xml
similarity index 100%
rename from app/src/main/res/layout/omnipod_initpod_init_action.xml
rename to omnipod/src/main/res/layout/omnipod_initpod_init_action.xml
diff --git a/app/src/main/res/layout/omnipod_initpod_pod_info.xml b/omnipod/src/main/res/layout/omnipod_initpod_pod_info.xml
similarity index 100%
rename from app/src/main/res/layout/omnipod_initpod_pod_info.xml
rename to omnipod/src/main/res/layout/omnipod_initpod_pod_info.xml
diff --git a/app/src/main/res/layout/omnipod_initpod_pod_info_item.xml b/omnipod/src/main/res/layout/omnipod_initpod_pod_info_item.xml
similarity index 100%
rename from app/src/main/res/layout/omnipod_initpod_pod_info_item.xml
rename to omnipod/src/main/res/layout/omnipod_initpod_pod_info_item.xml
diff --git a/app/src/main/res/layout/omnipod_pod_history_activity.xml b/omnipod/src/main/res/layout/omnipod_pod_history_activity.xml
similarity index 100%
rename from app/src/main/res/layout/omnipod_pod_history_activity.xml
rename to omnipod/src/main/res/layout/omnipod_pod_history_activity.xml
diff --git a/app/src/main/res/layout/omnipod_pod_history_item.xml b/omnipod/src/main/res/layout/omnipod_pod_history_item.xml
similarity index 100%
rename from app/src/main/res/layout/omnipod_pod_history_item.xml
rename to omnipod/src/main/res/layout/omnipod_pod_history_item.xml
diff --git a/app/src/main/res/layout/omnipod_pod_mgmt.xml b/omnipod/src/main/res/layout/omnipod_pod_mgmt.xml
similarity index 68%
rename from app/src/main/res/layout/omnipod_pod_mgmt.xml
rename to omnipod/src/main/res/layout/omnipod_pod_mgmt.xml
index 778757e314..fcb5b02b7b 100644
--- a/app/src/main/res/layout/omnipod_pod_mgmt.xml
+++ b/omnipod/src/main/res/layout/omnipod_pod_mgmt.xml
@@ -23,25 +23,54 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginBottom="3dp"
                 android:layout_weight="0.5"
+                android:gravity="center"
                 android:text="@string/omnipod_pod_mgmt_title"
                 android:textAlignment="center"
                 android:textSize="12pt"
-                android:gravity="center"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <LinearLayout
+                android:id="@+id/initpod_waiting_for_rl_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <ProgressBar
+                    android:id="@+id/initpod_waiting_for_rl_progress_bar"
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:layout_marginLeft="25dp"
+                    android:layout_marginRight="25dp" />
+
+                <TextView
+                    android:id="@+id/initpod_waiting_for_rl_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_marginBottom="3dp"
+                    android:layout_weight="0.5"
+                    android:gravity="center"
+                    android:text="@string/omnipod_waiting_for_rileylink_connection"
+                    android:textAlignment="center"
+                    android:textSize="8pt"/>
+            </LinearLayout>
+
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/initpod_init_pod"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="3dp"
                 android:layout_marginLeft="40dp"
-                android:layout_marginRight="40dp"
                 android:layout_marginTop="3dp"
-                android:textAllCaps="false"
+                android:layout_marginRight="40dp"
+                android:layout_marginBottom="3dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/ic_cp_pump_canula"
-                android:text="@string/omnipod_cmd_init_pod" />
+                android:text="@string/omnipod_cmd_init_pod"
+                android:textAllCaps="false" />
 
             <TextView
                 android:id="@+id/initpod_space1"
@@ -50,19 +79,19 @@
                 android:layout_weight="0.5"
                 android:text="" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/initpod_remove_pod"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="3dp"
                 android:layout_marginLeft="40dp"
-                android:layout_marginRight="40dp"
                 android:layout_marginTop="3dp"
-                android:textAllCaps="false"
+                android:layout_marginRight="40dp"
+                android:layout_marginBottom="3dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/ic_actions_temptarget"
-                android:text="@string/omnipod_cmd_deactivate_pod" />
+                android:text="@string/omnipod_cmd_deactivate_pod"
+                android:textAllCaps="false" />
 
             <TextView
                 android:id="@+id/initpod_space2"
@@ -71,7 +100,7 @@
                 android:layout_weight="0.5"
                 android:text="" />
 
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/initpod_reset_pod"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -80,10 +109,10 @@
                 android:layout_marginTop="3dp"
                 android:layout_marginRight="40dp"
                 android:layout_marginBottom="3dp"
-                android:textAllCaps="false"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/ic_cp_pump_canula"
-                android:text="@string/omnipod_cmd_reset_pod" />
+                android:text="@string/omnipod_cmd_reset_pod"
+                android:textAllCaps="false" />
 
             <TextView
                 android:id="@+id/initpod_space3"
@@ -92,8 +121,7 @@
                 android:layout_weight="0.5"
                 android:text="" />
 
-
-            <info.nightscout.androidaps.utils.SingleClickButton
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/initpod_pod_history"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -102,11 +130,10 @@
                 android:layout_marginTop="3dp"
                 android:layout_marginRight="40dp"
                 android:layout_marginBottom="3dp"
-                android:textAllCaps="false"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/ic_danarhistory"
-                android:text="@string/omnipod_cmd_pod_history" />
-
+                android:text="@string/omnipod_cmd_pod_history"
+                android:textAllCaps="false" />
 
         </LinearLayout>
 
diff --git a/omnipod/src/main/res/values/strings.xml b/omnipod/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..17a4c6d407
--- /dev/null
+++ b/omnipod/src/main/res/values/strings.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Omnipod -->
+
+    <!-- Omnipod - Base -->
+    <string name="omnipod_name" translatable="false">Omnipod</string>
+    <string name="omnipod_name_short" translatable="false">POD</string>
+    <string name="description_pump_omnipod">Pump integration for Omnipod, requires RileyLink (with at least 2.0 firmware) device.</string>
+
+    <!-- Omnipod Configuration -->
+    <string name="key_omnipod_beep_bolus_enabled" translatable="false">pref_omnipod_beep_bolus_enabled</string>
+    <string name="key_omnipod_beep_basal_enabled" translatable="false">pref_omnipod_beep_basal_enabled</string>
+    <string name="key_omnipod_beep_smb_enabled" translatable="false">pref_omnipod_beep_smb_enabled</string>
+    <string name="key_omnipod_beep_tbr_enabled" translatable="false">pref_omnipod_beep_tbr_enabled</string>
+    <string name="key_omnipod_pod_debugging_options_enabled" translatable="false">pref_omnipod_pod_debugging_options_enabled</string>
+    <string name="key_omnipod_timechange_enabled" translatable="false">pref_omnipod_timechange_enabled</string>
+    <string name="omnipod_config_beep_bolus_enabled">Bolus Beep Enabled</string>
+    <string name="omnipod_config_beep_basal_enabled">Basal Beep Enabled</string>
+    <string name="omnipod_config_beep_smb_enabled">SMB Beep Enabled</string>
+    <string name="omnipod_config_beep_tbr_enabled">TBR Beep Enabled</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Pod Debugging Options Enabled</string>
+    <string name="omnipod_config_timechange_enabled">DST/Timezone Detection Enabled</string>
+
+    <!-- Omnipod - Fragment -->
+    <string name="omnipod_moments_ago">Moments ago</string>
+    <string name="omnipod_pod_mgmt">Pod Mgmt</string>
+    <string name="omnipod_pod_status">Pod Status</string>
+    <string name="omnipod_reservoir_left">%1$.2f U left</string>
+    <string name="omnipod_reservoir_over50">Over 50 U</string>
+    <string name="omnipod_pod_address">Pod Address</string>
+    <string name="omnipod_pod_expiry">Pod Expires</string>
+    <string name="omnipod_warning">Warning</string>
+    <string name="omnipod_pod_status_no_pod_connected">No Pod connected</string>
+    <string name="omnipod_pod_setup_in_progress">Pod setup in progress (Pod progress status: %1$s)</string>
+    <string name="omnipod_pod_status_not_initalized">Pod not initialized</string>
+    <string name="omnipod_pod_status_pod_fault">Pod Fault</string>
+    <string name="omnipod_pod_status_pod_fault_description">Pod Fault: %1$s %2$s</string>
+    <string name="omnipod_pod_status_pod_running">Pod running (last delivery status: %1$s)</string>
+    <string name="omnipod_pod_active_alerts">Active Pod Alerts</string>
+    <string name="omnipod_ack_short">Ack Alerts</string>
+    <string name="omnipod_last_bolus" translatable="false">%1$.2f %2$s (%3$s)</string>
+    <string name="omnipod_pod_status_initalizing">Initializing</string>
+    <string name="omnipod_pod_status_active">Active</string>
+    <string name="omnipod_pod_status_unknown">Unknown</string>
+
+
+    <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
+
+
+    <!-- Omnipod - Error -->
+    <string name="omnipod_error_rileylink_address_invalid">RileyLink Address invalid.</string>
+    <string name="omnipod_error_operation_not_possible_no_configuration">Operation is not possible.\n\nYou need to configure Omnipod first, before you can use this operation.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">Operation is not possible.\n\n You need to wait few minutes, until AAPS tries to set profile for first time.</string>
+    <string name="omnipod_error_illegal_init_action_type">Illegal PodInitActionType: %1$s</string>
+    <string name="omnipod_error_pod_not_attached">No active pod.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Command verification failed.</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">An unexpected error occurred. Please report! (type: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Communication failed: received invalid input parameters.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Communication failed: timeout.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Communication failed: an unexpected error occurred. Please report!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Communication failed: message integrity verification failed.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Communication failed: received an invalid packet from the Pod.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Communication failed: the Pod is in a wrong state.</string>
+    <string name="omnipod_driver_error_invalid_response">Communication failed: received an invalid response from the Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Communication failed: received a message with an invalid sequence number from the Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Communication failed: received a message with an invalid address from the Pod.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Communication failed: failed to decode message from the Pod.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Communication failed: nonce resync failed.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Communication failed: nonce out of sync.</string>
+    <string name="omnipod_driver_error_not_enough_data">Communication failed: not enough data received from the Pod.</string>
+    <string name="omnipod_driver_error_pod_fault">A Pod fault (%1$03d %2$s) has been detected. Please deactivate your Pod and start a new one.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Communication failed: the Pod returned an error response.</string>
+
+    <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Pod Management</string>
+    <string name="omnipod_cmd_init_pod">Init Pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Deactivate Pod</string>
+    <string name="omnipod_cmd_reset_pod">Reset Pod</string>
+    <string name="omnipod_cmd_pod_history">Pod History</string>
+    <string name="omnipod_cmd_set_bolus">Set Bolus</string>
+    <string name="omnipod_cmd_cancel_bolus">Cancel Bolus</string>
+    <string name="omnipod_cmd_set_tbr">Set Temporary Basal</string>
+    <string name="omnipod_cmd_cancel_tbr">Cancel Temporary Basal (Internally by driver)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Cancel Temporary Basal (Forced by user)</string>
+    <string name="omnipod_cmd_set_basal_schedule">Set Basal Schedule</string>
+    <string name="omnipod_cmd_get_pod_status">Get Pod Status</string>
+    <string name="omnipod_cmd_get_pod_info">Get Pod Info</string>
+    <string name="omnipod_cmd_set_time">Set Time</string>
+    <string name="omnipod_cmd_configure_alerts">Configure Alerts</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Acknowledge Alerts</string>
+    <string name="omnipod_cmd_suspend_delivery">Suspend Delivery</string>
+    <string name="omnipod_cmd_resume_delivery">Resume Delivery</string>
+    <string name="omnipod_cmd_unknown_entry">Unknown Entry</string>
+    <string name="omnipod_cmd_bolus_value">%1$.2f U</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f U, CH=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Rate: %1$.2f U, Duration: %2$d min</string>
+    <string name="omnipod_cmd_reset_pod_desc">If you press <b>OK</b>, the Pod state will be forcibly reset and you will not be able to communicate with the Pod anymore. Do this only if you can not communicate with the Pod anymore. If you can still communicate with the Pod, please use the <b>Deactivate Pod</b> option.</string>
+    <string name="omnipod_cmd_pod_history_na">Pod History not available at the moment.</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Fill the Pod</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nFill the new Pod with enough insulin for 3 days.\n\nListen for two beeps from the Pod during the filling process. These indicate that the minimum amount of 85U has been inserted. Be sure to completely empty the fill syringe, even after hearing the two beeps.\n\nAfter filling the Pod, please press <b>Next</b>.\n\n<b>Note:</b> do not remove the Pod\'s needle cap at this time.</string>
+    <string name="omnipod_init_pod_wizard_step2_title">Priming</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">Trying to pair with the new Pod and prime it.\n\nWhen all items are checked, you can press <b>Next</b>.\n\n<b>Note:</b> please keep the Pod and the RileyLink a few inches apart at this time.</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Attach the Pod</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nPrepare the infusion site. Remove the Pod\'s needle cap and adhesive backing and attach the Pod to the infusion site.\n\nIf the cannula sticks out, please press <b>Cancel</b> and discard your Pod.\n\nPress <b>Next</b> to insert the cannula and begin basal delivery.</string>
+    <string name="omnipod_init_pod_wizard_step4_title">Inserting cannula</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">Trying to set initial basal schedule and insert the cannula.\n\nWhen all items are checked, you can press <b>Next</b>.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Pod Info</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nThe Pod is now active.\n\nYour basal schedule has been programmed and the cannula has been inserted.\n\nPlease verify that the cannula has been inserted correctly and replace your Pod if you feel hasn\'t.</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Deactivate Pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nPress <b>Next</b> to deactivate the Pod.\n\n<b>Note:</b> This will suspend all insulin delivery and deactivate the Pod.</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">Deactivating the Pod</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">Deactivating the Pod.\n\nWhen all items are checked, you can press <b>Next</b>.\n\n<b>Note:</b> If deactivating continuously fails, please press <b>Cancel</b> and use the <b>Reset Pod</b> option to forcibly reset the Pod state.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod deactivated.\n\nPlease remove the Pod from your body and discard it.</string>
+    <string name="omnipod_init_pod_pair_pod">Pair Pod</string>
+    <string name="omnipod_init_pod_prime_pod">Prime Pod</string>
+    <string name="omnipod_init_pod_fill_cannula">Fill Cannula</string>
+    <string name="omnipod_init_pod_set_basal_profile">Set Basal Profile</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Cancel Delivery</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Deactivate Pod</string>
+
+    <!-- Omnipod - Base -->
+    <string name="omnipod_dash_name" translatable="false">Omnipod Dash</string>
+    <string name="omnipod_dash_name_short" translatable="false">DASH</string>
+    <string name="description_pump_omnipod_dash">Pump integration for Omnipod Dash.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Finish pairing reminder</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Finish setup reminder</string>
+    <string name="omnipod_alert_expiration">Pod will expire soon</string>
+    <string name="omnipod_alert_expiration_advisory">Pod will expire soon</string>
+    <string name="omnipod_alert_shutdown_imminent">Shutdown is imminent</string>
+    <string name="omnipod_alert_low_reservoir">Low reservoir</string>
+    <string name="omnipod_alert_unknown_alert">Unknown alert</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">Setting basal profile might have failed. Delivery might be suspended! Please refresh Pod status.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">Setting temp basal might have failed. If there was a temp basal already running, that may have been cancelled! Please refresh pod status.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">Setting time might have failed. Delivery might be suspended! Please refresh Pod status.</string>
+    <string name="omnipod_bolus_failed_uncertain">Unable to verify whether the bolus succeeded. Please verify that your Pod is bolusing or cancel the bolus.</string>
+    <string name="omnipod_rl_stats">RL Stats</string>
+    <string name="omnipod_read_pulse_log_short">Pulse Log</string>
+    <string name="omnipod_pod_lot">LOT</string>
+    <string name="omnipod_pod_tid">TID</string>
+    <string name="omnipod_pod_firmware_version">Firmware version</string>
+    <string name="omnipod_pod_firmware_version_value" translatable="false">PM %1$s / PI %2$s</string>
+    <string name="omnipod_errors">Errors</string>
+    <string name="omnipod_cmd_basal_profile_not_set_is_same">Basal profile is the same, so it will not be set again.</string>
+    <string name="omnipod_custom_action_reset_rileylink">Reset RileyLink Config</string>
+    <string name="omnipod_time_or_timezone_change">Time and/or Timezone change on pump</string>
+    <string name="omnipod_composite_time">%1$s and %2$s</string>
+    <string name="omnipod_time_ago">%1$s ago</string>
+    <string name="omnipod_waiting_for_rileylink_connection">Waiting for RileyLink connection...</string>
+    <string name="omnipod_bolus_did_not_succeed">Bolus did not succeed</string>
+
+    <plurals name="omnipod_minutes">
+        <item quantity="one">%1$d minute</item>
+        <item quantity="other">%1$d minutes</item>
+    </plurals>
+    <plurals name="omnipod_hours">
+        <item quantity="one">%1$d hour</item>
+        <item quantity="other">%1$d hours</item>
+    </plurals>
+    <plurals name="omnipod_days">
+        <item quantity="one">%1$d day</item>
+        <item quantity="other">%1$d days</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/omnipod/src/main/res/values/styles.xml b/omnipod/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..de151a5371
--- /dev/null
+++ b/omnipod/src/main/res/values/styles.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="WizardPagePodContent">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">8dp</item>
+        <item name="android:paddingLeft">20px</item>
+        <item name="android:paddingRight">20px</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="WizardPagePodListItem">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">20dp</item>
+        <item name="android:layout_marginTop">20dp</item>
+        <item name="android:paddingTop">20px</item>
+        <item name="android:paddingBottom">20px</item>
+        <item name="android:paddingLeft">60px</item>
+        <item name="android:paddingRight">60px</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="PodInfoListView" parent="@android:style/Widget.ListView">
+        <item name="android:background">@color/colorLightGray</item>
+        <item name="android:cacheColorHint">@android:color/transparent</item>
+        <item name="android:divider">@android:color/black</item>
+        <item name="android:dividerHeight">1dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_omnipod.xml b/omnipod/src/main/res/xml/pref_omnipod.xml
similarity index 100%
rename from app/src/main/res/xml/pref_omnipod.xml
rename to omnipod/src/main/res/xml/pref_omnipod.xml
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AcknowledgeAlertsCommandTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AcknowledgeAlertsCommandTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AcknowledgeAlertsCommandTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AcknowledgeAlertsCommandTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AssignAddressCommandTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AssignAddressCommandTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AssignAddressCommandTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/AssignAddressCommandTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BasalScheduleExtraCommandTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BasalScheduleExtraCommandTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BasalScheduleExtraCommandTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BasalScheduleExtraCommandTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BeepConfigCommandTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BeepConfigCommandTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BeepConfigCommandTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BeepConfigCommandTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BolusExtraCommandTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BolusExtraCommandTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BolusExtraCommandTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/BolusExtraCommandTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/CancelDeliveryCommandTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/CancelDeliveryCommandTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/CancelDeliveryCommandTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/CancelDeliveryCommandTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/ConfigureAlertsCommandTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/ConfigureAlertsCommandTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/ConfigureAlertsCommandTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/ConfigureAlertsCommandTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/DeactivatePodCommandTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/DeactivatePodCommandTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/DeactivatePodCommandTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/DeactivatePodCommandTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/FaultConfigCommandTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/FaultConfigCommandTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/FaultConfigCommandTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/FaultConfigCommandTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/GetStatusCommandTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/GetStatusCommandTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/GetStatusCommandTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/GetStatusCommandTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetInsulinScheduleCommandTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetInsulinScheduleCommandTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetInsulinScheduleCommandTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetInsulinScheduleCommandTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetupPodCommandTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetupPodCommandTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetupPodCommandTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetupPodCommandTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/TempBasalExtraCommandTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/TempBasalExtraCommandTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/TempBasalExtraCommandTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/TempBasalExtraCommandTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/defs/schedule/BasalTableEntryTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/defs/schedule/BasalTableEntryTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/defs/schedule/BasalTableEntryTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/defs/schedule/BasalTableEntryTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/ErrorResponseTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/ErrorResponseTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/ErrorResponseTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/ErrorResponseTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/StatusResponseTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/StatusResponseTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/StatusResponseTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/StatusResponseTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/VersionResponseTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/VersionResponseTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/VersionResponseTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/VersionResponseTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoActiveAlertsTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoActiveAlertsTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoActiveAlertsTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoActiveAlertsTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoDataLogTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoDataLogTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoDataLogTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoDataLogTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java
similarity index 77%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java
index a7baff4f06..2998dc4f83 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java
+++ b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.po
 
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
+import org.junit.Assert;
 import org.junit.Test;
 
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
@@ -19,10 +20,10 @@ public class PodInfoFaultAndInitializationTimeTest {
         assertTrue(Duration.standardMinutes(1).isEqual(podInfoFaultAndInitializationTime.getTimeFaultEvent()));
 
         DateTime dateTime = podInfoFaultAndInitializationTime.getInitializationTime();
-        assertEquals(2018, dateTime.getYear());
-        assertEquals(9, dateTime.getMonthOfYear());
-        assertEquals(25, dateTime.getDayOfMonth());
-        assertEquals(23, dateTime.getHourOfDay());
-        assertEquals(14, dateTime.getMinuteOfHour());
+        Assert.assertEquals(2018, dateTime.getYear());
+        Assert.assertEquals(9, dateTime.getMonthOfYear());
+        Assert.assertEquals(25, dateTime.getDayOfMonth());
+        Assert.assertEquals(23, dateTime.getHourOfDay());
+        Assert.assertEquals(14, dateTime.getMinuteOfHour());
     }
 }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultEventTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultEventTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultEventTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultEventTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoOlderPulseLogTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoOlderPulseLogTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoOlderPulseLogTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoOlderPulseLogTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoRecentPulseLogTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoRecentPulseLogTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoRecentPulseLogTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoRecentPulseLogTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoResponseTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoResponseTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoResponseTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoResponseTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/AapsPodStateManagerTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/AapsPodStateManagerTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/AapsPodStateManagerTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/AapsPodStateManagerTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManagerTest.java b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManagerTest.java
similarity index 71%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManagerTest.java
rename to omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManagerTest.java
index 5def4c92d4..fcfd6c7d7a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManagerTest.java
+++ b/omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManagerTest.java
@@ -21,21 +21,21 @@ public class AapsOmnipodManagerTest {
 
     @Test
     public void validProfile() {
-        Profile profile = mock(Profile.class);
+        Profile profile = Mockito.mock(Profile.class);
 
-        Profile.ProfileValue value1 = mock(Profile.ProfileValue.class);
+        Profile.ProfileValue value1 = Mockito.mock(Profile.ProfileValue.class);
         value1.timeAsSeconds = 0;
         value1.value = 0.5D;
 
-        Profile.ProfileValue value2 = mock(Profile.ProfileValue.class);
+        Profile.ProfileValue value2 = Mockito.mock(Profile.ProfileValue.class);
         value2.timeAsSeconds = 18000;
         value2.value = 1.0D;
 
-        Profile.ProfileValue value3 = mock(Profile.ProfileValue.class);
+        Profile.ProfileValue value3 = Mockito.mock(Profile.ProfileValue.class);
         value3.timeAsSeconds = 50400;
         value3.value = 3.05D;
 
-        when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
+        PowerMockito.when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
                 value1,
                 value2,
                 value3
@@ -70,16 +70,16 @@ public class AapsOmnipodManagerTest {
     public void invalidProfileNullEntries() {
         thrown.expect(IllegalArgumentException.class);
         thrown.expectMessage("Basal values can not be null");
-        AapsOmnipodManager.mapProfileToBasalSchedule(mock(Profile.class));
+        AapsOmnipodManager.mapProfileToBasalSchedule(Mockito.mock(Profile.class));
     }
 
     @Test
     public void invalidProfileZeroEntries() {
         thrown.expect(IllegalArgumentException.class);
         thrown.expectMessage("Entries can not be empty");
-        Profile profile = mock(Profile.class);
+        Profile profile = Mockito.mock(Profile.class);
 
-        when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[0]);
+        PowerMockito.when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[0]);
 
         AapsOmnipodManager.mapProfileToBasalSchedule(profile);
     }
@@ -89,13 +89,13 @@ public class AapsOmnipodManagerTest {
         thrown.expect(IllegalArgumentException.class);
         thrown.expectMessage("First basal schedule entry should have 0 offset");
 
-        Profile profile = mock(Profile.class);
+        Profile profile = Mockito.mock(Profile.class);
 
-        Profile.ProfileValue value = mock(Profile.ProfileValue.class);
+        Profile.ProfileValue value = Mockito.mock(Profile.ProfileValue.class);
         value.timeAsSeconds = 1800;
         value.value = 0.5D;
 
-        when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
+        PowerMockito.when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
                 value,
         });
 
@@ -107,17 +107,17 @@ public class AapsOmnipodManagerTest {
         thrown.expect(IllegalArgumentException.class);
         thrown.expectMessage("Invalid start time");
 
-        Profile profile = mock(Profile.class);
+        Profile profile = Mockito.mock(Profile.class);
 
-        Profile.ProfileValue value1 = mock(Profile.ProfileValue.class);
+        Profile.ProfileValue value1 = Mockito.mock(Profile.ProfileValue.class);
         value1.timeAsSeconds = 0;
         value1.value = 0.5D;
 
-        Profile.ProfileValue value2 = mock(Profile.ProfileValue.class);
+        Profile.ProfileValue value2 = Mockito.mock(Profile.ProfileValue.class);
         value2.timeAsSeconds = 86400;
         value2.value = 0.5D;
 
-        when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
+        PowerMockito.when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
                 value1,
                 value2
         });
@@ -130,13 +130,13 @@ public class AapsOmnipodManagerTest {
         thrown.expect(IllegalArgumentException.class);
         thrown.expectMessage("Invalid start time");
 
-        Profile profile = mock(Profile.class);
+        Profile profile = Mockito.mock(Profile.class);
 
-        Profile.ProfileValue value = mock(Profile.ProfileValue.class);
+        Profile.ProfileValue value = Mockito.mock(Profile.ProfileValue.class);
         value.timeAsSeconds = -1;
         value.value = 0.5D;
 
-        when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
+        PowerMockito.when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
                 value,
         });
 
@@ -145,13 +145,13 @@ public class AapsOmnipodManagerTest {
 
     @Test
     public void roundsToSupportedPrecision() {
-        Profile profile = mock(Profile.class);
+        Profile profile = Mockito.mock(Profile.class);
 
-        Profile.ProfileValue value = mock(Profile.ProfileValue.class);
+        Profile.ProfileValue value = Mockito.mock(Profile.ProfileValue.class);
         value.timeAsSeconds = 0;
         value.value = 0.04D;
 
-        when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
+        PowerMockito.when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
                 value,
         });
 
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
index 8a47453ad3..729ecf9f1a 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
@@ -35,29 +35,20 @@ public abstract class RileyLinkCommunicationManager {
     @Inject protected SP sp;
     @Inject protected RileyLinkServiceData rileyLinkServiceData;
     @Inject protected ServiceTaskExecutor serviceTaskExecutor;
-
+    @Inject protected RFSpy rfspy;
+    @Inject protected HasAndroidInjector injector;
 
     private final int SCAN_TIMEOUT = 1500;
     private final int ALLOWED_PUMP_UNREACHABLE = 10 * 60 * 1000; // 10 minutes
 
-    public final HasAndroidInjector injector;
-    protected final RFSpy rfspy;
     protected int receiverDeviceAwakeForMinutes = 1; // override this in constructor of specific implementation
     protected String receiverDeviceID; // String representation of receiver device (ex. Pump (xxxxxx) or Pod (yyyyyy))
     protected long lastGoodReceiverCommunicationTime = 0;
     //    protected PumpStatus pumpStatus;
     private long nextWakeUpRequired = 0L;
-
     private int timeoutCount = 0;
 
 
-    public RileyLinkCommunicationManager(HasAndroidInjector injector, RFSpy rfspy) {
-        this.injector = injector;
-        injector.androidInjector().inject(this);
-        this.rfspy = rfspy;
-    }
-
-
     // All pump communications go through this function.
     protected RLMessage sendAndListen(RLMessage msg, int timeout_ms)
             throws RileyLinkCommunicationException {
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
index dc5e648194..128152aa31 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
@@ -5,6 +5,7 @@ import android.os.SystemClock;
 import java.util.UUID;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
 
@@ -40,6 +41,7 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
 /**
  * Created by geoff on 5/26/16.
  */
+@Singleton
 public class RFSpy {
 
     @Inject AAPSLogger aapsLogger;
@@ -64,10 +66,14 @@ public class RFSpy {
     private Double currentFrequencyMHz;
 
 
+    @Inject
     public RFSpy(HasAndroidInjector injector, RileyLinkBLE rileyLinkBle) {
-        injector.androidInjector().inject(this);
         this.injector = injector;
         this.rileyLinkBle = rileyLinkBle;
+    }
+
+    @Inject
+    public void onInit() {
         aapsLogger.debug("RileyLinkServiceData:" + rileyLinkServiceData);
         reader = new RFSpyReader(aapsLogger, rileyLinkBle);
     }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java
index a132218751..6c90c62e24 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java
@@ -18,8 +18,8 @@ import java.util.UUID;
 import java.util.concurrent.Semaphore;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 
-import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
@@ -40,6 +40,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ThreadUtil;
  * Created by geoff on 5/26/16.
  * Added: State handling, configuration of RF for different configuration ranges, connection handling
  */
+@Singleton
 public class RileyLinkBLE {
 
     @Inject AAPSLogger aapsLogger;
@@ -58,13 +59,11 @@ public class RileyLinkBLE {
     private Runnable radioResponseCountNotified;
     private boolean mIsConnected = false;
 
-
-    public RileyLinkBLE(HasAndroidInjector injector, final Context context) {
-        injector.androidInjector().inject(this);
+    @Inject
+    public RileyLinkBLE(final Context context) {
         this.context = context;
         this.bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
 
-        aapsLogger.debug(LTag.PUMPBTCOMM, "BT Adapter: " + this.bluetoothAdapter);
         bluetoothGattCallback = new BluetoothGattCallback() {
 
             @Override
@@ -257,6 +256,11 @@ public class RileyLinkBLE {
         };
     }
 
+    @Inject
+    public void onInit() {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "BT Adapter: " + this.bluetoothAdapter);
+    }
+
 
     private boolean isAnyRileyLinkServiceFound(BluetoothGattService service) {
 
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java
index c845a3afe2..7b25cf63ec 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java
@@ -2,17 +2,11 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data;
 
 import org.joda.time.LocalDateTime;
 
-
-
-
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
-//import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
-//import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
-//import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCommandType;
 
 
 /**
@@ -21,7 +15,6 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 public class RLHistoryItem {
 
-    //private MedtronicCommandType medtronicCommandType;
     protected LocalDateTime dateTime;
     protected RLHistoryItemSource source;
     protected RileyLinkServiceState serviceState;
@@ -29,9 +22,8 @@ public class RLHistoryItem {
 
     protected RileyLinkTargetDevice targetDevice;
     protected PumpDeviceState pumpDeviceState;
-    //private OmnipodCommandType omnipodCommandType;
 
-    public RLHistoryItem(LocalDateTime dateTime,  RLHistoryItemSource source, RileyLinkTargetDevice targetDevice) {
+    public RLHistoryItem(LocalDateTime dateTime, RLHistoryItemSource source, RileyLinkTargetDevice targetDevice) {
         this.dateTime = dateTime;
         this.source = source;
         this.targetDevice = targetDevice;
@@ -46,7 +38,6 @@ public class RLHistoryItem {
         this.source = RLHistoryItemSource.RileyLink;
     }
 
-
     public RLHistoryItem(PumpDeviceState pumpDeviceState, RileyLinkTargetDevice targetDevice) {
         this.pumpDeviceState = pumpDeviceState;
         this.dateTime = new LocalDateTime();
@@ -54,64 +45,34 @@ public class RLHistoryItem {
         this.source = RLHistoryItemSource.MedtronicPump;
     }
 
-
-//    public RLHistoryItem(MedtronicCommandType medtronicCommandType) {
-//        this.dateTime = new LocalDateTime();
-//        this.medtronicCommandType = medtronicCommandType;
-//        source = RLHistoryItemSource.MedtronicCommand;
-//    }
-//
-//
-//    public RLHistoryItem(OmnipodCommandType omnipodCommandType) {
-//        this.dateTime = new LocalDateTime();
-//        this.omnipodCommandType = omnipodCommandType;
-//        source = RLHistoryItemSource.OmnipodCommand;
-//    }
-
-
     public LocalDateTime getDateTime() {
         return dateTime;
     }
 
-
     public RileyLinkServiceState getServiceState() {
         return serviceState;
     }
 
-
     public RileyLinkError getErrorCode() {
         return errorCode;
     }
 
-
     public String getDescription(ResourceHelper resourceHelper) {
-
-        // TODO extend when we have Omnipod
         switch (this.source) {
             case RileyLink:
-                return "State: " + resourceHelper.gs(serviceState.getResourceId(targetDevice))
+                return "State: " + resourceHelper.gs(serviceState.getResourceId())
                         + (this.errorCode == null ? "" : ", Error Code: " + errorCode);
-
             case MedtronicPump:
                 return resourceHelper.gs(pumpDeviceState.getResourceId());
-
-//            case MedtronicCommand:
-//                return medtronicCommandType.name();
-//
-//            case OmnipodCommand:
-//                return omnipodCommandType.name();
-
             default:
                 return "Unknown Description";
         }
     }
 
-
     public RLHistoryItemSource getSource() {
         return source;
     }
 
-
     public PumpDeviceState getPumpDeviceState() {
         return pumpDeviceState;
     }
@@ -129,14 +90,12 @@ public class RLHistoryItem {
             this.desc = desc;
         }
 
-
         public String getDesc() {
             return desc;
         }
     }
 
     public static class Comparator implements java.util.Comparator<RLHistoryItem> {
-
         @Override
         public int compare(RLHistoryItem o1, RLHistoryItem o2) {
             return o2.dateTime.compareTo(o1.getDateTime());
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java
index 76c31f9cf2..97ce0c6ce1 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java
@@ -22,7 +22,7 @@ public enum RileyLinkServiceState {
     RileyLinkInitializing(R.string.rileylink_state_rl_init), // (S) start Gatt discovery (OK -> RileyLinkReady, Error ->
                                                              // BluetoothEnabled) ??
     RileyLinkError(R.string.rileylink_state_rl_error), // (E)
-    RileyLinkReady(R.string.rileylink_state_connected), // (OK) if tunning was already done we go to PumpConnectorReady
+    RileyLinkReady(R.string.rileylink_state_rl_ready), // (OK) if tunning was already done we go to PumpConnectorReady
 
     // Tunning
     TuneUpDevice(R.string.rileylink_state_pc_tune_up), // (S)
@@ -40,43 +40,23 @@ public enum RileyLinkServiceState {
     // RileyLinkConnected, // -> TuneUpPump (on 1st), else PumpConnectorReady
 
     // PumpConnected, //
-
     ;
 
     int resourceId;
-    Integer resourceIdPod;
-
 
     RileyLinkServiceState(int resourceId) {
         this.resourceId = resourceId;
     }
 
-
-    RileyLinkServiceState(int resourceId, int resourceIdPod) {
-        this.resourceId = resourceId;
-        this.resourceIdPod = resourceIdPod;
-    }
-
-
     public boolean isReady() {
         return (this == PumpConnectorReady);
     }
 
-
-    public int getResourceId(RileyLinkTargetDevice targetDevice) {
-        if (this.resourceIdPod != null) {
-
-            return (targetDevice == null || targetDevice == RileyLinkTargetDevice.MedtronicPump) ? //
-            this.resourceId
-                : this.resourceIdPod;
-        } else {
-            return this.resourceId;
-        }
+    public int getResourceId() {
+        return this.resourceId;
     }
 
-
     public boolean isConnecting() {
-
         return (this == RileyLinkServiceState.BluetoothInitializing || //
             // this == RileyLinkServiceState.BluetoothError || //
             this == RileyLinkServiceState.BluetoothReady || //
@@ -86,9 +66,7 @@ public enum RileyLinkServiceState {
         );
     }
 
-
     public boolean isError() {
-
         return (this == RileyLinkServiceState.BluetoothError || //
         // this == RileyLinkServiceState.PumpConnectorError || //
         this == RileyLinkServiceState.RileyLinkError);
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
index f48dfe95de..49094c3bcc 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
@@ -36,7 +36,6 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
 
     @Inject ActivePluginProvider activePlugin;
     @Inject ResourceHelper resourceHelper;
-    //@Inject MedtronicUtil medtronicUtil;
     @Inject AAPSLogger aapsLogger;
     @Inject RileyLinkServiceData rileyLinkServiceData;
     @Inject DateUtil dateUtil;
@@ -103,7 +102,7 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
 
         RileyLinkTargetDevice targetDevice = rileyLinkServiceData.targetDevice;
 
-        this.connectionStatus.setText(resourceHelper.gs(rileyLinkServiceData.rileyLinkServiceState.getResourceId(targetDevice)));
+        this.connectionStatus.setText(resourceHelper.gs(rileyLinkServiceData.rileyLinkServiceState.getResourceId()));
 
         if (rileyLinkServiceData != null) {
             this.configuredAddress.setText(rileyLinkServiceData.rileylinkAddress);
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
index c0ae9d3140..986bbf4d9d 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
@@ -45,10 +45,10 @@ public abstract class RileyLinkService extends DaggerService {
     @Inject protected ResourceHelper resourceHelper;
     @Inject protected RileyLinkServiceData rileyLinkServiceData;
     @Inject protected ActivePluginProvider activePlugin;
+    @Inject protected RileyLinkBLE rileyLinkBLE; // android-bluetooth management
+    @Inject protected RFSpy rfspy; // interface for RL xxx Mhz radio.
 
-    @NotNull protected RileyLinkBLE rileyLinkBLE; // android-bluetooth management, must be set in initRileyLinkServiceData
     protected BluetoothAdapter bluetoothAdapter;
-    protected RFSpy rfspy; // interface for RL xxx Mhz radio.
     protected RileyLinkBroadcastReceiver mBroadcastReceiver;
     protected RileyLinkBluetoothStateReceiver bluetoothStateReceiver;
 
diff --git a/rileylink/src/main/res/values/strings.xml b/rileylink/src/main/res/values/strings.xml
index ddb9beaf9b..8e7445464b 100644
--- a/rileylink/src/main/res/values/strings.xml
+++ b/rileylink/src/main/res/values/strings.xml
@@ -42,6 +42,7 @@
     <string name="rileylink_state_pc_tune_up">Tuning up RileyLink and Pump</string>
     <string name="rileylink_state_pc_error">Problem connecting to Pump</string>
     <string name="rileylink_state_connected">Connected</string>
+    <string name="rileylink_state_rl_ready">RileyLink ready</string>
 
     <!-- RL Errors -->
     <string name="rileylink_error_not_rl">Device is not RileyLink</string>
diff --git a/settings.gradle b/settings.gradle
index 19da851b52..4fb6743f5f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
-include ':app', ':wear', ':core', ':dana', ':danar', ':danars', ':rileylink', ':medtronic'
+include ':app', ':wear', ':core', ':dana', ':danar', ':danars', ':rileylink', ':medtronic', ':omnipod'