diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..4ce4a9be35
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,5 @@
+root = true
+
+
+[*{kt,kts}]
+disabled_rules=no-wildcard-imports
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3646d57340..66acf8e27e 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,6 +1,7 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="AUTODETECT_INDENTS" value="false" />
+    <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
     <JetCodeStyleSettings>
       <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="6" />
@@ -126,14 +127,21 @@
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <option name="RIGHT_MARGIN" value="120" />
       <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
       <option name="LINE_COMMENT_ADD_SPACE" value="true" />
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
       <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ASSIGNMENT_WRAP" value="5" />
       <option name="METHOD_ANNOTATION_WRAP" value="5" />
-      <option name="FIELD_ANNOTATION_WRAP" value="0" />
+      <option name="CLASS_ANNOTATION_WRAP" value="1" />
+      <option name="FIELD_ANNOTATION_WRAP" value="1" />
+      <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
+      <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
+      <option name="ENUM_CONSTANTS_WRAP" value="5" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index 8a685a8703..764a5727eb 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -165,7 +165,7 @@ class MainActivity : NoSplashAppCompatActivity() {
         actionBarDrawerToggle.syncState()
     }
 
-    public override fun onDestroy() {
+    override fun onDestroy() {
         super.onDestroy()
         disposable.clear()
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
index 5ef938b134..a6a77c9dd2 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
@@ -171,7 +171,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
         }
     }
 
-    public override fun onPause() {
+    override fun onPause() {
         super.onPause()
         disposable.clear()
         iobCobCalculator.stopCalculation("onPause")
@@ -183,7 +183,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
         super.onDestroy()
     }
 
-    public override fun onResume() {
+    override fun onResume() {
         super.onResume()
         disposable.add(rxBus
                 .toObservable(EventAutosensCalculationFinished::class.java)
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt
index 9b01150122..9421324b66 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt
@@ -19,7 +19,7 @@ class SingleFragmentActivity : DaggerAppCompatActivityWithResult() {
 
     private var plugin: PluginBase? = null
 
-    public override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_single_fragment)
         plugin = pluginStore.plugins[intent.getIntExtra("plugin", -1)]
@@ -52,7 +52,7 @@ class SingleFragmentActivity : DaggerAppCompatActivityWithResult() {
         return super.onCreateOptionsMenu(menu)
     }
 
-    public override fun attachBaseContext(newBase: Context) {
+    override fun attachBaseContext(newBase: Context) {
         super.attachBaseContext(LocaleHelper.wrap(newBase))
     }
 }
\ No newline at end of file
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 73ada1ebf6..ab29e1f838 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -20,6 +20,7 @@ import info.nightscout.androidaps.plugin.general.openhumans.dagger.OpenHumansMod
 import info.nightscout.androidaps.plugins.pump.common.di.PumpCommonModule
 import info.nightscout.androidaps.plugins.pump.common.di.RileyLinkModule
 import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.dagger.OmnipodDashModule
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.dagger.OmnipodErosModule
 import javax.inject.Singleton
 
@@ -42,6 +43,7 @@ import javax.inject.Singleton
         PumpCommonModule::class,
         RileyLinkModule::class,
         MedtronicModule::class,
+        OmnipodDashModule::class,
         OmnipodErosModule::class,
         APSModule::class,
         PreferencesModule::class,
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
index da8551af0b..35ef24854b 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
@@ -15,6 +15,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctionImplementation
 import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefsImpl
+import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
 import info.nightscout.androidaps.plugins.general.nsclient.DataSyncSelectorImplementation
 import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
@@ -22,6 +23,8 @@ import info.nightscout.androidaps.plugins.pump.PumpSyncImplementation
 import info.nightscout.androidaps.queue.CommandQueue
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.androidNotification.NotificationHolderImpl
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.buildHelper.BuildHelperImpl
 import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.utils.resources.IconsProviderImplementation
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -56,6 +59,10 @@ open class AppModule {
     @Singleton
     fun provideStorage(): Storage = FileStorage()
 
+    @Provides
+    @Singleton
+    fun provideBuildHelper(config: Config, fileListProvider: PrefFileListProvider): BuildHelper = BuildHelperImpl(config, fileListProvider)
+
     @Provides
     @Singleton
     internal fun provideSchedulers(): AapsSchedulers = DefaultAapsSchedulers()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.kt
index e474c94906..9fb916690b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPlugin.kt
@@ -50,7 +50,7 @@ class StorageConstraintPlugin @Inject constructor(
         return value
     }
 
-    open fun availableInternalMemorySize(): Long {
+    fun availableInternalMemorySize(): Long {
         val path = Environment.getDataDirectory()
         val stat = StatFs(path.path)
         val blockSize = stat.blockSizeLong
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/DataSyncSelectorImplementation.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/DataSyncSelectorImplementation.kt
index d894b6c146..e5d169527e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/DataSyncSelectorImplementation.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/DataSyncSelectorImplementation.kt
@@ -34,6 +34,7 @@ class DataSyncSelectorImplementation @Inject constructor(
             processChangedTemporaryBasalsCompat()
             processChangedExtendedBolusesCompat()
             processChangedProfileSwitchesCompat()
+            processChangedEffectiveProfileSwitchesCompat()
             processChangedGlucoseValuesCompat()
             processChangedTempTargetsCompat()
             processChangedFoodsCompat()
@@ -56,6 +57,7 @@ class DataSyncSelectorImplementation @Inject constructor(
         sp.remove(R.string.key_ns_extended_bolus_last_synced_id)
         sp.remove(R.string.key_ns_therapy_event_last_synced_id)
         sp.remove(R.string.key_ns_profile_switch_last_synced_id)
+        sp.remove(R.string.key_ns_effective_profile_switch_last_synced_id)
         sp.remove(R.string.key_ns_offline_event_last_synced_id)
         sp.remove(R.string.key_ns_profile_store_last_synced_timestamp)
     }
@@ -555,6 +557,48 @@ class DataSyncSelectorImplementation @Inject constructor(
         return false
     }
 
+    override fun confirmLastEffectiveProfileSwitchIdIfGreater(lastSynced: Long) {
+        if (lastSynced > sp.getLong(R.string.key_ns_effective_profile_switch_last_synced_id, 0)) {
+            aapsLogger.debug(LTag.NSCLIENT, "Setting EffectiveProfileSwitch data sync from $lastSynced")
+            sp.putLong(R.string.key_ns_effective_profile_switch_last_synced_id, lastSynced)
+        }
+    }
+
+    override fun changedEffectiveProfileSwitch(): List<EffectiveProfileSwitch> {
+        val startId = sp.getLong(R.string.key_ns_effective_profile_switch_last_synced_id, 0)
+        return appRepository.getModifiedEffectiveProfileSwitchDataFromId(startId).blockingGet().also {
+            aapsLogger.debug(LTag.NSCLIENT, "Loading EffectiveProfileSwitch data for sync from $startId. Records ${it.size}")
+        }
+    }
+
+    @Volatile private var lastEpsId = -1L
+    @Volatile private var lastEpsTime = -1L
+    override fun processChangedEffectiveProfileSwitchesCompat(): Boolean {
+        val lastDbIdWrapped = appRepository.getLastEffectiveProfileSwitchIdWrapped().blockingGet()
+        val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+        var startId = sp.getLong(R.string.key_ns_effective_profile_switch_last_synced_id, 0)
+        if (startId > lastDbId) {
+            sp.putLong(R.string.key_ns_effective_profile_switch_last_synced_id, 0)
+            startId = 0
+        }
+        if (startId == lastEpsId && dateUtil.now() - lastEpsTime < 5000) return false
+        lastEpsId = startId
+        lastEpsTime = dateUtil.now()
+        appRepository.getNextSyncElementEffectiveProfileSwitch(startId).blockingGet()?.let { ps ->
+            aapsLogger.info(LTag.DATABASE, "Loading EffectiveProfileSwitch data Start: $startId ID: ${ps.first.id} HistoryID: ${ps.second} ")
+            when {
+                // without nsId = create new
+                ps.first.interfaceIDs.nightscoutId == null ->
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", ps.first.toJson(true, dateUtil), DataSyncSelector.PairEffectiveProfileSwitch(ps.first, ps.second), "$startId/$lastDbId")
+                // with nsId = update
+                ps.first.interfaceIDs.nightscoutId != null ->
+                    nsClientPlugin.nsClientService?.dbUpdate("treatments", ps.first.interfaceIDs.nightscoutId, ps.first.toJson(false, dateUtil), DataSyncSelector.PairEffectiveProfileSwitch(ps.first, ps.second), "$startId/$lastDbId")
+            }
+            return true
+        }
+        return false
+    }
+
     override fun confirmLastOfflineEventIdIfGreater(lastSynced: Long) {
         if (lastSynced > sp.getLong(R.string.key_ns_offline_event_last_synced_id, 0)) {
             aapsLogger.debug(LTag.NSCLIENT, "Setting OfflineEvent data sync from $lastSynced")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddAckWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddAckWorker.kt
index 1df6309037..68b888f764 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddAckWorker.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddAckWorker.kt
@@ -228,6 +228,25 @@ class NSClientAddAckWorker(
                 dataSyncSelector.processChangedProfileSwitchesCompat()
             }
 
+            is PairEffectiveProfileSwitch         -> {
+                val pair = ack.originalObject
+                pair.value.interfaceIDs.nightscoutId = ack.id
+                repository.runTransactionForResult(UpdateNsIdEffectiveProfileSwitchTransaction(pair.value))
+                    .doOnError { error ->
+                        aapsLogger.error(LTag.DATABASE, "Updated ns id of EffectiveProfileSwitch failed", error)
+                        ret = Result.failure((workDataOf("Error" to error.toString())))
+                    }
+                    .doOnSuccess {
+                        ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+                        aapsLogger.debug(LTag.DATABASE, "Updated ns id of EffectiveProfileSwitch " + pair.value)
+                        dataSyncSelector.confirmLastEffectiveProfileSwitchIdIfGreater(pair.updateRecordId)
+                    }
+                    .blockingGet()
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked EffectiveProfileSwitch " + pair.value.interfaceIDs.nightscoutId))
+                // Send new if waiting
+                dataSyncSelector.processChangedEffectiveProfileSwitchesCompat()
+            }
+
             is DeviceStatus              -> {
                 val deviceStatus = ack.originalObject
                 deviceStatus.interfaceIDs.nightscoutId = ack.id
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
index 0559196eac..a7ee154080 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
@@ -185,6 +185,32 @@ class NSClientAddUpdateWorker(
                                 }
                         } ?: aapsLogger.error("Error parsing TT json $json")
                     }
+                eventType == TherapyEvent.Type.NOTE.text  && json.isEffectiveProfileSwitch()        -> // replace this by new Type when available in NS
+                    if (sp.getBoolean(R.string.key_ns_receive_profile_switch, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
+                        effectiveProfileSwitchFromJson(json, dateUtil, activePlugin)?.let { effectiveProfileSwitch ->
+                            repository.runTransactionForResult(SyncNsEffectiveProfileSwitchTransaction(effectiveProfileSwitch, invalidateByNsOnly = false))
+                                .doOnError {
+                                    aapsLogger.error(LTag.DATABASE, "Error while saving EffectiveProfileSwitch", it)
+                                    ret = Result.failure(workDataOf("Error" to it.toString()))
+                                }
+                                .blockingGet()
+                                .also { result ->
+                                    result.inserted.forEach {
+                                        uel.log(Action.PROFILE_SWITCH, Sources.NSClient,
+                                            ValueWithUnit.Timestamp(it.timestamp))
+                                        aapsLogger.debug(LTag.DATABASE, "Inserted EffectiveProfileSwitch $it")
+                                    }
+                                    result.invalidated.forEach {
+                                        uel.log(Action.PROFILE_SWITCH_REMOVED, Sources.NSClient,
+                                            ValueWithUnit.Timestamp(it.timestamp))
+                                        aapsLogger.debug(LTag.DATABASE, "Invalidated EffectiveProfileSwitch $it")
+                                    }
+                                    result.updatedNsId.forEach {
+                                        aapsLogger.debug(LTag.DATABASE, "Updated nsId EffectiveProfileSwitch $it")
+                                    }
+                                }
+                        } ?: aapsLogger.error("Error parsing EffectiveProfileSwitch json $json")
+                    }
                 eventType == TherapyEvent.Type.CANNULA_CHANGE.text ||
                     eventType == TherapyEvent.Type.INSULIN_CHANGE.text ||
                     eventType == TherapyEvent.Type.SENSOR_CHANGE.text ||
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientUpdateRemoveAckWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientUpdateRemoveAckWorker.kt
index 5a38645c4d..8b7aeddc9a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientUpdateRemoveAckWorker.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientUpdateRemoveAckWorker.kt
@@ -126,6 +126,15 @@ class NSClientUpdateRemoveAckWorker(
                 ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
             }
 
+            is PairEffectiveProfileSwitch         -> {
+                val pair = ack.originalObject
+                dataSyncSelector.confirmLastEffectiveProfileSwitchIdIfGreater(pair.updateRecordId)
+                rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked EffectiveProfileSwitch " + ack._id))
+                // Send new if waiting
+                dataSyncSelector.processChangedEffectiveProfileSwitchesCompat()
+                ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+            }
+
             is PairOfflineEvent       -> {
                 val pair = ack.originalObject
                 dataSyncSelector.confirmLastOfflineEventIdIfGreater(pair.updateRecordId)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
index 94d907973a..026bcbb603 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
@@ -148,15 +148,17 @@ class LocalProfilePlugin @Inject constructor(
     fun storeSettings(activity: FragmentActivity? = null) {
         for (i in 0 until numOfProfiles) {
             profiles[i].run {
-                val localProfileNumbered = Constants.LOCAL_PROFILE + "_" + i + "_"
-                sp.putString(localProfileNumbered + "name", name!!)
-                sp.putBoolean(localProfileNumbered + "mgdl", mgdl)
-                sp.putDouble(localProfileNumbered + "dia", dia)
-                sp.putString(localProfileNumbered + "ic", ic.toString())
-                sp.putString(localProfileNumbered + "isf", isf.toString())
-                sp.putString(localProfileNumbered + "basal", basal.toString())
-                sp.putString(localProfileNumbered + "targetlow", targetLow.toString())
-                sp.putString(localProfileNumbered + "targethigh", targetHigh.toString())
+                name?.let { name ->
+                    val localProfileNumbered = Constants.LOCAL_PROFILE + "_" + i + "_"
+                    sp.putString(localProfileNumbered + "name", name)
+                    sp.putBoolean(localProfileNumbered + "mgdl", mgdl)
+                    sp.putDouble(localProfileNumbered + "dia", dia)
+                    sp.putString(localProfileNumbered + "ic", ic.toString())
+                    sp.putString(localProfileNumbered + "isf", isf.toString())
+                    sp.putString(localProfileNumbered + "basal", basal.toString())
+                    sp.putString(localProfileNumbered + "targetlow", targetLow.toString())
+                    sp.putString(localProfileNumbered + "targethigh", targetHigh.toString())
+                }
             }
         }
         sp.putInt(Constants.LOCAL_PROFILE + "_profiles", numOfProfiles)
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
index 62bbf228e9..8553f76596 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
@@ -64,7 +64,8 @@ class CommandQueue @Inject constructor(
     private val buildHelper: BuildHelper,
     private val dateUtil: DateUtil,
     private val repository: AppRepository,
-    private val fabricPrivacy: FabricPrivacy
+    private val fabricPrivacy: FabricPrivacy,
+    private val config: Config
 ) : CommandQueueProvider {
 
     private val disposable = CompositeDisposable()
@@ -79,6 +80,10 @@ class CommandQueue @Inject constructor(
             .toObservable(EventProfileSwitchChanged::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({
+                if (config.NSCLIENT) { // Effective profileswitch should be synced over NS
+                    rxBus.send(EventNewBasalProfile())
+                    return@subscribe
+                }
                 aapsLogger.debug(LTag.PROFILE, "onProfileSwitch")
                 profileFunction.getRequestedProfile()?.let {
                     val nonCustomized = ProfileSealed.PS(it).convertToNonCustomizedProfile(dateUtil)
@@ -172,8 +177,7 @@ class CommandQueue @Inject constructor(
 
     // After new command added to the queue
     // start thread again if not already running
-    @Synchronized
-    open fun notifyAboutNewCommand() {
+    @Synchronized fun notifyAboutNewCommand() {
         waitForFinishedThread()
         if (thread == null || thread!!.state == Thread.State.TERMINATED) {
             thread = QueueThread(this, context, aapsLogger, rxBus, activePlugin, resourceHelper, sp)
@@ -195,7 +199,9 @@ class CommandQueue @Inject constructor(
 
     override fun independentConnect(reason: String, callback: Callback?) {
         aapsLogger.debug(LTag.PUMPQUEUE, "Starting new queue")
-        val tempCommandQueue = CommandQueue(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper, constraintChecker, profileFunction, activePlugin, context, sp, buildHelper, dateUtil, repository, fabricPrivacy)
+        val tempCommandQueue = CommandQueue(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper,
+                                            constraintChecker, profileFunction, activePlugin, context, sp,
+                                            buildHelper, dateUtil, repository, fabricPrivacy, config)
         tempCommandQueue.readStatus(reason, callback)
         tempCommandQueue.disposable.clear()
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
index 71e0703cb0..9d6cd6acac 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
@@ -70,7 +70,7 @@ class SetupWizardActivity : NoSplashAppCompatActivity() {
         }
     }
 
-    public override fun onPause() {
+    override fun onPause() {
         super.onPause()
         disposable.clear()
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelperImpl.kt
similarity index 75%
rename from app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt
rename to app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelperImpl.kt
index a2963c4b77..c37fedb8a4 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelperImpl.kt
@@ -5,15 +5,11 @@ import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
 import java.io.File
-import javax.inject.Inject
-import javax.inject.Singleton
 
-@OpenForTesting
-@Singleton
-class BuildHelper @Inject constructor(
+class BuildHelperImpl constructor(
     private val config: Config,
     fileListProvider: PrefFileListProvider
-) {
+) : BuildHelper {
 
     private var devBranch = false
     private var engineeringMode = false
@@ -25,11 +21,10 @@ class BuildHelper @Inject constructor(
         devBranch = BuildConfig.VERSION.contains("-") || BuildConfig.VERSION.matches(Regex(".*[a-zA-Z]+.*"))
     }
 
-    fun isEngineeringModeOrRelease(): Boolean =
+    override fun isEngineeringModeOrRelease(): Boolean =
         if (!config.APS) true else engineeringMode || !devBranch
 
-    fun isEngineeringMode(): Boolean =
-        engineeringMode
+    override fun isEngineeringMode(): Boolean = engineeringMode
 
-    fun isDev(): Boolean = devBranch
+    override fun isDev(): Boolean = devBranch
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index e07caaf848..977b5a5b32 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -868,6 +868,8 @@ Unerwartetes Verhalten.</string>
     <string name="ns_receive_temp_target_summary">Temp. Ziele akzeptieren, die in NS oder NSClient eingegeben wurden</string>
     <string name="ns_receive_profile_switch">Profilwechsel abrufen</string>
     <string name="ns_receive_profile_switch_summary">Profilwechsel akzeptieren, die in NS oder NSClient eingegeben wurden</string>
+    <string name="ns_receive_offline_event">APS Offline-Ereignisse empfangen</string>
+    <string name="ns_receive_offline_event_summary">APS Offline-Ereignisse akzeptieren, die über NS oder NSClient eingegeben wurden</string>
     <string name="ns_receive_insulin">Insulin abrufen</string>
     <string name="ns_receive_insulin_summary">Insulin akzeptieren, das in NS oder NSClient eingegeben wurden</string>
     <string name="ns_receive_carbs">Kohlenhydrate abrufen</string>
@@ -878,4 +880,5 @@ Unerwartetes Verhalten.</string>
     <string name="ns_receive_cgm_summary">CGM Daten von NS akzeptieren</string>
     <string name="sms_timeout_while_wating">Zeitüberschreitung beim Warten auf das Ende der vorherigen Kommunikation mit der Pumpe</string>
     <string name="smscommunicator_another_bolus_in_queue">In der Warteschlange befindet sich ein weiterer Bolus. Bitte später erneut versuchen.</string>
+    <string name="calculation_in_progress">Kalkulation wird gerade durchgeführt</string>
 </resources>
diff --git a/app/src/main/res/values-iw-rIL/exam.xml b/app/src/main/res/values-iw-rIL/exam.xml
index a12548e90c..754eacad96 100644
--- a/app/src/main/res/values-iw-rIL/exam.xml
+++ b/app/src/main/res/values-iw-rIL/exam.xml
@@ -59,7 +59,7 @@
     <string name="exercise_setunchanged">השאירו את ערך מטרת הסוכר ללא שינוי.</string>
     <string name="exercise_15g">המתינו עד שהגלוקוז בדם יירד מתחת לערך המטרה של היפו ואז אכלו 15 גרם של פחמימות מהירות.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="suspendloop_label">השבתת / השהיית לולאה</string>
+    <string name="suspendloop_label">השבתת \\ השהיית לולאה</string>
     <string name="suspendloop_doigetinsulin">האם אני מקבל\\ת אינסולין כאשר הלולאה מושבתת\\מושהית?</string>
     <string name="suspendloop_yes">כן, אינסולין בזאלי ממשיך להינתן.</string>
     <string name="suspendloop_no">לא, אספקת האינסולין נפסקת.</string>
@@ -161,10 +161,10 @@
     <string name="nsclient_data">ע\"מ לעקוב אחר AndroidAPS מרחוק, שני ההתקנים חייבים להיות בעלי גישה לאינטרנט (למשל באמצעות רשת אינטרנט אלחוטית או אינטרנט סלולרי).</string>
     <string name="nsclient_fullcontrol">אפליקציית NS Client אצל עוקב משמשת לניטור מרוחק ומאפשרת שליטה מלאה ב-AndroidAPS.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label_exam">יחס התיקון (ISF) </string>
+    <string name="isf_label_exam">יחס התיקון (ISF)</string>
     <string name="isf_increasingvalue">עלייה בערך יחס התיקון תביא למתן יותר אינסולין לכיסוי כמות נתונה של פחמימות.</string>
-    <string name="isf_decreasingvalue">הפחתת ערך יחס התיקון (ISF) מובילים למתן יותר אינסולין כדי לתקן רמת סוכר שמעל ערך המטרה.</string>
-    <string name="isf_noeffect">העלאת או הורדת יחס התיקון (ISF) אינו משפיע על מינון האינסולין כאשר רמות הגלוקוז בדם הן מתחת לערך המטרה.</string>
+    <string name="isf_decreasingvalue">הפחתת ערך יחס התיקון (ISF) מובילה למתן יותר אינסולין כדי לתקן רמת סוכר שמעל ערך המטרה.</string>
+    <string name="isf_noeffect">העלאת או הורדת יחס התיקון (ISF) אינה משפיעה על מינון האינסולין כאשר רמות הגלוקוז בדם הן מתחת לערך המטרה.</string>
     <string name="isf_preferences">יש להזין את יחס התיקון בהעדפות ב-AndroidAPS.</string>
     <string name="isf_profile">שינוי ערך ISF בפרופיל שלכם מספיק כדי להחיל את השינוי.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
@@ -179,7 +179,7 @@
     <string name="ic_meaning">יחס הפחמימות (IC) הוא: כמה יחידות לחם מכוסות ע\"י יחידת אינסולין אחת.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
     <string name="profileswitch_label">החלפת פרופילים</string>
-    <string name="profileswitch_pctwillchange"> בעת החלפה לפרופיל 90%, מהם ההיגדים הנכונים?</string>
+    <string name="profileswitch_pctwillchange"> בעת החלפה לפרופיל 90%, מהם כל ההיגדים הנכונים?</string>
     <string name="profileswitch_basallower">המינון הבזאלי יהיה נמוך ב-10%.</string>
     <string name="profileswitch_isfhigher">ערך פקטור התיקון (ISF) יהיה גבוה ב-10%.</string>
     <string name="profileswitch_iclower">ערך יחס הפחמימות יהיה נמוך ב-10%.</string>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 2fb794cb9b..a7b672e3c4 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -113,7 +113,7 @@
     <string name="apsmode_title">מצב APS</string>
     <string name="closedloop">לולאה סגורה</string>
     <string name="openloop">לולאה פתוחה</string>
-    <string name="lowglucosesuspend">השהיה בגלל ערך סוכר נמוך</string>
+    <string name="lowglucosesuspend">השהיה עקב ערך סוכר נמוך</string>
     <string name="disabledloop">לולאה כבויה</string>
     <string name="openloop_newsuggestion">הצעה חדשה זמינה</string>
     <string name="carbssuggestion">המלצת פחמימות</string>
@@ -241,7 +241,7 @@
     <string name="units_colon">יחידות:</string>
     <string name="units">יחידות</string>
     <string name="dia">משך פעילות אינסולין</string>
-    <string name="prefs_range_title">טווח להדמיה</string>
+    <string name="prefs_range_title">טווח הצגה</string>
     <string name="prefs_range_summary">סימוני גבוה ונמוך בתרשים סקירה כללית ובשעון חכם</string>
     <string name="low_mark">סימון נמוך</string>
     <string name="high_mark">סימון גבוה</string>
@@ -329,7 +329,7 @@
     <string name="resistantadult">מבוגר\\ת עם תנגודת אינסולין גבוהה</string>
     <string name="pregnant">הריון</string>
     <string name="patientage_summary">נא לבחור את גיל המטופל\\ת להתאמת מגבלות בטיחות</string>
-    <string name="patient_name">שם מטופל\\ת</string>
+    <string name="patient_name">שם המטופל\\ת</string>
     <string name="patient_name_summary">נא לציין את שם המטופל\\ת או כינוי, להבחנה בין מספר הגדרות</string>
     <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">משתמש</string>
     <string name="Glimp">Glimp</string>
@@ -751,7 +751,7 @@
     <string name="saveorresetchangesfirst">יש לשמור או לאפס תחילה את השינויים הנוכחיים</string>
     <string name="deletecurrentprofile">למחוק את הפרופיל הנוכחי?</string>
     <string name="copytolocalprofile">ליצור פרופיל מקומי חדש מפרופיל זה?</string>
-    <string name="profilenamecontainsdot">שם הפרפיל מכיל נקודות.\nשם כזה אינו נתמך ע\"י Nightscout \n הפרופיל לא הועלה ל-Nightscout.</string>
+    <string name="profilenamecontainsdot">שם הפרופיל מכיל נקודות.\nשם כזה אינו נתמך ע\"י Nightscout \n הפרופיל לא הועלה ל-Nightscout.</string>
     <string name="low_mark_comment">ערך נמוך יותר באזור הטווח (הצגה בלבד)</string>
     <string name="high_mark_comment">ערך גבוה יותר באזור הטווח (הצגה בלבד)</string>
     <string name="age">גיל:</string>
diff --git a/app/src/main/res/values-ko-rKR/exam.xml b/app/src/main/res/values-ko-rKR/exam.xml
index 9bd73ccc2e..bbd1b8fbb6 100644
--- a/app/src/main/res/values-ko-rKR/exam.xml
+++ b/app/src/main/res/values-ko-rKR/exam.xml
@@ -132,6 +132,7 @@
     <string name="wronginsulin_label">인슐린 주입/입력 오류</string>
     <string name="wronginsulin_whattodo">만약 펌프 기록에서 보여지는 것보다 인슐린이 적게 주입되었을 때 어떻게 해야 할까요? (예를 들어, 주입 막힘, 캐뉼라 문제, 샤워 후 펌프 재부착을 잊어버렸을 때)</string>
     <string name="wronginsulin_careportal">Nightscout 케어포탈에서 인슐린 데이터를 삭제하여 펌프 기록에서 이를 제거합니다.</string>
+    <string name="wronginsulin_compare">AndroidAPS와 펌프 기록을 비교합니다.</string>
     <string name="wronginsulin_prime">\"주입되지 않은\" 인슐린양을 계산하여 시린지/펜 또는 prime 기능을 사용하여 인슐린을 주입합니다.</string>
     <string name="wronginsulin_donothing">특별한 조치를 취하지 않고, AndroidAPS가 결과적으로 높은 혈당 정도를 조정할 수 있도록 합니다.</string>
     <string name="iob_label">활성 인슐린 (IOB)</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 66ed54c5d7..2aefb9877c 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -140,6 +140,7 @@
     <string name="filenotfound">파일을 찾을 수 없습니다</string>
     <string name="nav_export">설정 저장하기</string>
     <string name="nav_import">설정 불러오기</string>
+    <string name="openapsma_maxbasal_title">임시 Basal 최대량 [U/h]</string>
     <string name="openapsma_maxbasal_summary">이 값은 OpenAPS에서 Max Basal(최대 Basal)로 설정되는 값입니다</string>
     <string name="openapsma_maxiob_title">OpenAPS가 주입할수 있는 최대 Basal IOB [U]</string>
     <string name="openapsma_maxiob_summary">이 값은 OpenAPS에서 Max IOB라고 부르는 값입니다\n기본값은 0으로 설정되어 있습니다. 몇일 혹은 몇주 정도 사용 후 적절한 값으로 변경할 수 있습니다.</string>
@@ -147,6 +148,11 @@
     <string name="password_preferences_decrypt_prompt">내보낸 preferences를 가져오기 위해서는 마스터 비밀번호가 필요합니다.</string>
     <string name="preferences_export_canceled">내보내기 취소됩니다! 환경 설정을 내보내지 않았습니다!</string>
     <string name="preferences_import_canceled">가져오고 취소됩니다! 환경설정을 가져오지 않았습니다.</string>
+    <string name="preferences_import_impossible">기본 설정을 가져올 수 없습니다.</string>
+    <string name="goto_main_try_again">기본 화면으로 돌아가서 다시 시도하십시오.</string>
+    <string name="old_master_password">이전 마스터 비밀번호</string>
+    <string name="different_password_used">이 파일을 내보내고 다른 마스터 암호로 암호화했습니다. 파일의 암호를 해독하려면 이전 마스터 암호를 제공하십시오.</string>
+    <string name="master_password_will_be_replaced">가져오기에 성공하면 현재 마스터 암호가 이전 마스터 암호로 대체됩니다.</string>
     <string name="check_preferences_before_import">가져오기 전에 환경설정을 확인하세요.</string>
     <string name="check_preferences_cannot_import">환경 설정을 가져올 수가 없습니다.</string>
     <string name="check_preferences_dangerous_import">환경 설정을 가져오면 안됩니다.</string>
@@ -173,6 +179,9 @@
     <string name="smscommunicator_remotebolusmindistance_summary">원격 Bolus를 주입한 후 얼마간의 시간이 흐른 후에야 다음 원격 Bolus주입이 가능합니다</string>
     <string name="smscommunicator_remotebolusmindistance">원격 Bolus를 주입한 후 몇분이 지나야 다음 원격 Bolus 주입이 가능하게 합니까</string>
     <string name="smscommunicator_remotebolusmindistance_caveat">안전을 위하여 이 설정을 수정하기 위해 최소 2개의 폰 번호를 추가해야합니다.</string>
+    <string name="bolusrequested"> %1$.2f U이 주입됩니다.</string>
+    <string name="smscommunicator_bolusdelivered">Bolus %1$.2f U이 성공적으로 주입되었습니다.</string>
+    <string name="smscommunicator_mealbolusdelivered">식사 Bolus %1$.2f U 이 성공적으로 주입되었습니다. </string>
     <string name="smscommunicator_mealbolusdelivered_tt">%2$d 분 동안 목표 %1$s</string>
     <string name="smscommunicator_tt_set">%2$d 분 동안 목표 %1$s 설정이 완료되었습니다</string>
     <string name="smscommunicator_tt_canceled">임시 목표 취소가 완료되었습니다</string>
@@ -180,14 +189,25 @@
     <string name="smscommunicator_loophasbeendisabled">Loop가 중지되었습니다.</string>
     <string name="smscommunicator_loophasbeenenabled">Loop가 실행되었습니다.</string>
     <string name="smscommunicator_loopisenabled">Loop가 실행중입니다.</string>
+    <string name="smscommunicator_pumpconnectwithcode">코드 %1$s을(를) 사용하여 펌프에 연결하기</string>
+    <string name="smscommunicator_pumpconnectfail">펌프에 연결하지 못했습니다.</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">%1$d분 동안 펌프 연결을 끊으려면 코드 %2$s를 입력하세요.</string>
+    <string name="smscommunicator_pumpdisconnected">펌프가 연결되지 않았습니다.</string>
+    <string name="smscommunicator_reconnect">펌프가 다시 연결되었습니다.</string>
     <string name="smscommunicator_remotecommandnotallowed">원격 명령이 허가되지 않았습니다</string>
     <string name="smscommunicator_remotebolusnotallowed">원격 주입이 불가능합니다. 나중에 다시 시도해주세요.</string>
+    <string name="smscommunicator_basalreplywithcode">%2$d분동안 basal  %1$.2fU/h 주입하려면  %3$s을(를) 입력하세요.</string>
     <string name="smscommunicator_profilereplywithcode">프로파일 %1$s %2$d%%로 변경하려면 %3$s 를 입력하고 답장하세요</string>
+    <string name="smscommunicator_extendedreplywithcode">%2$d분동안 확장bolus %1$.2fU 주입하려면  %3$s을(를) 입력하세요.</string>
     <string name="smscommunicator_carbsreplywithcode">%2$s에 %1$dg을 입력하려면 %3$s를 입력하고 답장하세요</string>
     <string name="smscommunicator_basalpctreplywithcode">%2$d 분 동안 Basal %1$d%% 주입하려면 %3$s을 입력하고 답장하세요</string>
     <string name="smscommunicator_suspendreplywithcode">%1$d분동안 Loop 일시중지하려면 %2$s 를 입력하고 답장하세요</string>
+    <string name="smscommunicator_loopresumereplywithcode">코드 %1$s을(를) 사용하여 loop의 작동 다시 시작하기</string>
+    <string name="smscommunicator_loopenablereplywithcode">코드 %1$s을(를) 사용하여 loop의 작동 활성화하기</string>
+    <string name="smscommunicator_loopdisablereplywithcode">코드 %1$s을(를) 사용하여 loop의 작동 비활성화하기</string>
     <string name="smscommunicator_tempbasalset">Temp Basal %1$.2fU/h for %2$d min started successfully</string>
     <string name="smscommunicator_extendedset">Extended bolus %1$.2fU for %2$d min started successfully</string>
+    <string name="smscommunicator_carbsset">탄수화물 %1$dg 입력이 완료되었습니다.</string>
     <string name="smscommunicator_carbsfailed">탄수화물 %1$dg 입력이 실패하였습니다</string>
     <string name="smscommunicator_tempbasalset_percent">Temp basal %1$d%% for %2$d min started successfully</string>
     <string name="smscommunicator_tempbasalfailed">Temp Basal start failed</string>
@@ -209,9 +229,12 @@
     <string name="mealbolus">Meal</string>
     <string name="correctionbous">교정주입</string>
     <string name="actions">실행</string>
+    <string name="ns_upload_only">(비활성화 시 위험함) NS에 업로드만 하기</string>
+    <string name="ns_upload_only_summary">NS에 업로드만 하기 (sync를 비활성화 함). xDrip+와 같은 로컬 출처를 선택한 경우 외에는 SGV에 영향을 주지 않음. NS 프로파일을 사용하는 동안 프로파일에 영향을 주지 않음.\n!!! 경고!!! 이 기능을 비활성화하면 일부 구성요소 (AAPS, NS, xDrip+) 가 잘못 설정되어 있을 때 잘못 작동하거나 인슐린의 과다주입을 야기할 수 있음. AAPS에서 보여지는 정보와 펌프 상태가 일치하는지 유의해서 관찰해야 함!</string>
     <string name="pumpNotInitialized">펌프가 초기화 되지 않았습니다!</string>
     <string name="primefill">교체/채움</string>
     <string name="fillwarning">양이 인퓨전세트의 사양과 일치하는지 확인하세요!</string>
+    <string name="fillbolus_title">교체/채움 기본 인슐린 양</string>
     <string name="button1">버튼1</string>
     <string name="button2">버튼2</string>
     <string name="button3">버튼3</string>
@@ -240,6 +263,7 @@
     <string name="openapsma_autosensdata_label">Autosens 정보</string>
     <string name="openapsma_scriptdebugdata_label">스크립트 디버그</string>
     <string name="openapsama_useautosens">Autosens 기능 사용</string>
+    <string name="refresheventsfromnightscout">NS로부터 최신 정보로 업데이트 함.</string>
     <string name="deletefuturetreatments">미래시점의 관리 삭제</string>
     <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">CONF</string>
@@ -254,11 +278,13 @@
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">탭 이름 단축</string>
     <string name="always_use_shortavg">단순증분값 대신 단기평균증분값을 항상 사용합니다.</string>
+    <string name="always_use_shortavg_summary">xDrip+처럼 필터링되지 않은 혈당 출처에서 받은 데이터의 노이즈가 심할 경우 유용함.</string>
     <string name="profile">프로파일</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">기본값: 3\n이 값은 중요한 OpenAPS 안전장치입니다. 이 값의 역할은 펌프에 설정되어 있는 최대Basal보다 3배를 초과할 수 없게 제한하는 것입니다. 이 값을 변경할 필요는 없을 것이지만, 안전을 위해 \"3x max daily; 4x current\"이 의미하는 바를 알고 있어야 합니다.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">기본값: 4\n이 값은 \"3x max daily; 4x current\"의 나머지 절반에 해당하는 또 다른 중요한 OpenAPS 안전장치입니다. 이것은, 펌프에 설정된 최대 Basal과는 관계없이, Basal이 설정된 현재시간의 Basal에 이 값을 곱한 양을 초과할 수 없다는 것을 의미합니다. 이는 알고리즘의 작동 방식을 이해하기 전에 과도하게 높은 최대 기본을 설정하여 위험한 상황에 빠지지 않도록 보호하기 위한 것입니다. 다시한번, 기본 값은 4배인 것을 알아두세요; 일반적으로 이것을 조정할 필요는 전혀 없으며, 대신 이 안전장치를 변경해야할것처럼 생각이 된다면, 다른 설정을 변경해야 할 가능성이 더 큽니다.</string>
     <string name="openapsama_autosens_max_summary">기본값: 1.2\n이 옵션은 autosens의 최대 한계 값을 20%%로 제한하기 위해 autosens(곧 autotune)이 이용하는 승수값입니다. 이 값이 autosens에 대한 Basal의 최대 값, 인슐린 민감도(ISF)의 최소값 및 혈당 목표의 최소값을 결정케 합니다.</string>
     <string name="openapsama_autosens_min_summary">기본값: 0.7\nautosens 안전 제한의 나머지 부분입니다. 이는 Basal을 얼마나 낮게 조절할 수 있는지, ISF와 혈당 목표범위를 얼마나 높게 설정할 수 있는지를 결정합니다.</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens가 목표값도 조절합니다.</string>
     <string name="openapsama_autosens_adjusttargets_summary">기본값: 활성\n이것은 autosens가 ISF와 Basal뿐만 아니라, 혈당 목표범위를 조절할 수 있게 합니다.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">기본값: 2\n식사주입 후 Bolus snooze가 수행되게 되고, 따라서 식사주입 직후엔 loop가 low temp에 대응하지 않게 됩니다. 기본값이 2일때 예제는 다음과 같습니다; DIA가 3시간일 경우  bolus snooz는 점차적으로 1.5시간에 걸쳐 단계적으로 사라지게 됩니다.(3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">기본값: 3.0 (AMA) 또는 8.0 (SMB). 5분당 탄수화물이 얼만큼 흡수되었는지에 대한 기본값 설정입니다. 기본값은 3mg/dl / 5분 입니다. 이는 혈당이 예상보다 빨리 떨어지거나 혹은 예상보다 오르지 않을때, COB가 얼마나 빨리 사라지게 되는지에 영향을 주게 되고, 추정된 탄수화물 흡수량이 미래 혈당 예측 계산시에도 영향을 주게 됩니다.</string>
@@ -268,6 +294,7 @@
     <string name="xdripnotinstalled">xDrip+가 설치되지 않았습니다</string>
     <string name="calibrationsent">보정이 xDrip으로 전송되었습니다+</string>
     <string name="smscommunicator_calibrationsent">보정 전송됨. xDrip에서 수신이 되도록 설정되어 있어야 합니다+.</string>
+    <string name="smscommunicator_calibrationfailed">xDrip+에서 보정값을 받지 못합니다.</string>
     <string name="pumpsuspended">펌프 일시중지됨</string>
     <string name="executing">실행중</string>
     <string name="virtualpump_settings">가상펌프 설정</string>
@@ -295,10 +322,16 @@
     <string name="wear_detailedIOB_summary">워치페이스에 IOB를 Bolus IOB와 Basal IOB로 나누어서 보여줍니다.</string>
     <string name="nosuccess">성공하지 못했습니다. 폰을 확인하세요</string>
     <string name="notavailable">사용불가</string>
+    <string name="patientage">환자 유형</string>
     <string name="child">어린이</string>
     <string name="teenage">청소년</string>
     <string name="adult">성인</string>
     <string name="resistantadult">인슐린 저항성 높은 성인</string>
+    <string name="pregnant">임신 중</string>
+    <string name="patientage_summary">안전 제한 설정을 위해 환자 유형을 선택하십시오.</string>
+    <string name="patient_name">환자 이름</string>
+    <string name="patient_name_summary">다양한 설정들을 구별하기 위하여 환자 이름 또는 별명을 입력합니다.</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">사용자</string>
     <string name="Glimp">Glimp</string>
     <string name="needwhitelisting">최적의 성능을 위해 %1$s에서 배터리 최적화를 해제해야합니다.</string>
     <string name="loopsuspended">Loop 일시중지</string>
@@ -313,6 +346,8 @@
     <string name="disconnectpumpfor1h">1시간동안 펌프 일시중지</string>
     <string name="disconnectpumpfor2h">2시간동안 펌프 일시중지</string>
     <string name="disconnectpumpfor3h">3시간동안 펌프 일시중지</string>
+    <string name="duration15m">15분</string>
+    <string name="duration30m">30분</string>
     <string name="duration1h">1시간</string>
     <string name="duration2h">2시간</string>
     <string name="duration3h">3시간</string>
@@ -334,13 +369,32 @@
     <string name="enablesuperbolus">마법사에서 Superbolus 활성화하기</string>
     <string name="enablesuperbolus_summary">마법사에서 Superbolus 기능을 활성화합니다. 어떤 기능인지 확실히 알기전까지 활성화 하지 마세요. 제대로 알지 못하고 사용하면 일슐린이 과다 주입될 수 있습니다!</string>
     <string name="show_statuslights">홈화면에 상태 표시등 보여주기</string>
+    <string name="statuslights_cage_warning">캐뉼라 사용 기간 경고 기준 [h]</string>
+    <string name="statuslights_cage_critical">캐뉼라 사용 기간 위험 기준 [h]</string>
+    <string name="statuslights_iage_warning">인슐린 사용 기간 경고 기준 [h]</string>
+    <string name="statuslights_iage_critical">인슐린 사용 기간 위험 기준 [h]</string>
+    <string name="statuslights_sage_warning">센서 사용 기간 경고 기준 [h]</string>
+    <string name="statuslights_sage_critical">센서 사용 기간 위험 기준 [h]</string>
+    <string name="statuslights_sbat_warning">배터리 잔량 경고 기준 [%]</string>
+    <string name="statuslights_sbat_critical">배터리 잔량 위험 기준 [%]</string>
+    <string name="statuslights_bage_warning">펌프 배터리 사용 기간 경고 기준 [h]</string>
+    <string name="statuslights_bage_critical">펌프 배터리 사용 기간 위험 기준 [h]</string>
     <string name="statuslights_res_warning">주사기량 경고 기준값[U]</string>
     <string name="statuslights_res_critical">주사기량 위험 기준값[U]</string>
+    <string name="statuslights_bat_warning">펌프 배터리 잔량 경고 기준 [%]</string>
+    <string name="statuslights_bat_critical">펌프 배터리 잔량 위험 기준 [%]</string>
+    <string name="prediction_shortname">PRED</string>
     <string name="basal_shortname">BAS</string>
+    <string name="deviation_shortname">DEV</string>
     <string name="activity_shortname">ACT</string>
+    <string name="bgi_shortname">-BGI</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">DEVSLOPE</string>
     <string name="nav_about">버전정보</string>
     <string name="smscommunicator_missingsmspermission">SMS 권한 누락</string>
     <string name="smscommunicator_missingphonestatepermission">전화 상태 권한이 허가되지 않았습니다</string>
+    <string name="xdripstatus_settings">xDrip+ 상태 (워치)</string>
+    <string name="xdripstatus">xDrip+ 상태표시라인 (워치)</string>
     <string name="xdripstatus_shortname">xds</string>
     <string name="wear_showbgi_title">BGI 보기</string>
     <string name="wear_showbgi_summary">BGI를 상태라인에 추가하기</string>
@@ -348,8 +402,12 @@
     <string name="doprofileswitch">프로파일 변경 실행</string>
     <string name="careportal_sensor_label">센서</string>
     <string name="careportal_insulin_label">인슐린</string>
+    <string name="careportal_pb_label">펌프 배터리</string>
     <string name="careportal_age_label">나이:</string>
+    <string name="careportal_level_label">레벨:</string>
     <string name="ns_alarmoptions">알람 옵션</string>
+    <string name="ns_alarms">NS 알람에서 알림 만들기</string>
+    <string name="ns_announcements">NS 안내에서 알림 만들기</string>
     <string name="nsalarm_staledatavalue_label">누락 데이터 기준값 [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">위험 누락 데이터 기준값 [min]</string>
     <string name="openapsama_autosens_period">autosens 시간 [h]</string>
@@ -375,6 +433,7 @@
     <string name="mdtp_cancel">취소</string>
     <string name="notloadedplugins">모든 프로파일이 로드되지 않았습니다.</string>
     <string name="valuesnotstored">값이 저장되지 않았습니다!</string>
+    <string name="ns_localbroadcasts">다른 앱 (예: xDrip)으로 데이터 전송을 활성화합니다. AAPS 또는 NSClient를 두 개 이상 설치 한 경우 활성화하지 마세요!</string>
     <string name="ns_localbroadcasts_title">Local Broadcasts 활성화하기</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="enableuam">UAM 활성화하기</string>
@@ -386,6 +445,7 @@
     <string name="free_peak_oref">사용자지정-피크 Oref</string>
     <string name="rapid_acting_oref">초속효성 Oref</string>
     <string name="ultrarapid_oref">초-초속효성 Oref</string>
+    <string name="lyumjev">Lyumjev</string>
     <string name="dia_too_short">DIA %1$f는 너무 짧습니다. 대신 %2$f을 사용하세요!</string>
     <string name="activate_profile">프로파일 활성화하기</string>
     <string name="invalid">유효하지 않음</string>
@@ -398,6 +458,7 @@
     <string name="activity_target">활동 목표</string>
     <string name="hypo_duration">저혈당 기간</string>
     <string name="hypo_target">저혈당 목표</string>
+    <string name="reuse_profile_pct_hours">%1$d%%를 %2$dh 동안 재사용하기</string>
     <string name="wearcontrol_title">워치로 제어하기</string>
     <string name="wearcontrol_summary">임시목표와 관리입력을 워치로 설정합니다.</string>
     <string name="food">음식</string>
@@ -411,10 +472,12 @@
     <string name="executingrightnow">명령을 지금 실행합니다.</string>
     <string name="missed_bg_readings">혈당 읽기가 누락되었습니다.</string>
     <string name="raise_notifications_as_android_notifications">경고와 알림시 시스템 알림 사용하기</string>
+    <string name="gradually_increase_notification_volume">알람과 알림의 소리를 점차적으로 증가시킴</string>
     <string name="localalertsettings_title">자체 경고 기능</string>
     <string name="enable_missed_bg_readings_alert">혈당 데이터 누락시 경고하기</string>
     <string name="enable_pump_unreachable_alert">펌프와 연결불가시 경고하기</string>
     <string name="pump_unreachable_threshold">펌프 연결불가 기준시간 [min]</string>
+    <string name="enable_carbs_req_alert">탄수화물이 요구되는 경우 경고함</string>
     <string name="urgent_alarm">긴급 알람</string>
     <string name="info">정보</string>
     <string name="eversense">Eversense 앱(패치버전)</string>
@@ -422,7 +485,12 @@
     <string name="bgsource_upload">혈당 업로드 설정</string>
     <string name="wear_detailed_delta_title">델타(혈당증분값) 자세히 보여주기</string>
     <string name="wear_detailed_delta_summary">소수점 자리 추가된 증분값 보여주기</string>
+    <string name="smbinterval_summary">SMB를 주입하는 빈도 (몇 분마다)</string>
     <string name="smbmaxminutes_summary">SMB가 Basal을 제한할 수 있는 최대 시간(분)</string>
+    <string name="uamsmbmaxminutes">UAM SMB의 최대 기간 (분)</string>
+    <string name="uamsmbmaxminutes_summary">SMB가 UAM에 대해 basal을 제한할 수 있는 최대 시간(분)</string>
+    <string name="carbsReqThreshold">제안을 위한 최소 탄수화물 필요량</string>
+    <string name="carbsReqThreshold_summary">탄수화물 제안 알림을 보여주는 최소 탄수화물 g수. 이 양보다 적은 경우 탄수화물 제안 알림이 작동하지 않습니다.</string>
     <string name="dexcomg5_xdripupload_title">혈당 데이터를 xDrip+에 전송하기</string>
     <string name="dexcomg5_xdripupload_summary">xDrip+ 데이터 소스에서 640g/Eversense을 선택하세요</string>
     <string name="nsclientbg">NSClient 혈당</string>
@@ -451,6 +519,7 @@
     <string name="enablesmbwithtemptarget">임시 목표에서 SMB 사용하기</string>
     <string name="enablesmbwithtemptarget_summary">활성화된 임시 목표(식사직전, 운동)가 있으면 SMB를 사용합니다.</string>
     <string name="enablesmbwithhightemptarget">높은 임시 목표에서 SMB 사용하기</string>
+    <string name="enablesmbwithhightemptarget_summary">높은 임시 목표 (운동, 100mg/dl 또는 5.5 mmol/l 초과)가 활성되어 있을 때 SMB 사용하기</string>
     <string name="overview_insulin_label">인슐린</string>
     <string name="overview_buttons_selection">버튼</string>
     <string name="show_calibration_button_summary">xDrip+에 보정값을 전송하거나 G5 보정창을 엽니다.</string>
@@ -459,11 +528,17 @@
     <string name="insulin_increment_button_message">버튼을 누를때 추가될 인슐린 양</string>
     <string name="error_starting_cgm">CGM앱을 실행할 수 없습니다. 앱이 설치되어 있는지 확인하세요.</string>
     <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">5분간 무시하기</string>
+    <string name="ignore15m">5분간 무시하기</string>
+    <string name="ignore30m">30분간 무시하기</string>
+    <string name="required">필요량</string>
     <string name="nav_historybrowser">이력 브라우저</string>
     <string name="wear_notifysmb_title">SMB 알림</string>
     <string name="wear_notifysmb_summary">일반 Bolus처럼 워치에 SMB 표시</string>
     <string name="ns_create_announcements_from_errors_title">에러 발생시 알림 생성</string>
+    <string name="ns_create_announcements_from_carbs_req_title">\"필요 탄수화물 경고\"에서 알림 만들기</string>
     <string name="ns_create_announcements_from_errors_summary">에러 발생에 대한 Nightscout 알림과 자체 경고를 생성합니다. (케어포털 관리에서도 표시됩니다.)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">\"필요한 탄수화물 경고\"를 위해 Nightscout 알림 만들기</string>
     <string name="wear_predictions_summary">워치페이스에서 예측치를 보여줍니다.</string>
     <string name="wear_predictions_title">예측</string>
     <string name="data_choices">데이터선택</string>
@@ -477,8 +552,10 @@
     <string name="do_not_bolus_record_only">실제 Bolus 주입않고, 기록만 하기</string>
     <string name="category">분류</string>
     <string name="subcategory">하위 분류</string>
+    <string name="bolusrecordedonly">Bolus 기록만 하기 (펌프에서 주입되지 않음)</string>
     <string name="loop_smbsetbypump_label">펌프에 의한 SMB 설정</string>
     <string name="overview_show_activity">활동</string>
+    <string name="overview_show_bgi">BG impact</string>
     <string name="overview_show_sensitivity">민감도</string>
     <string name="overview_show_deviations">편차</string>
     <string name="overview_show_cob">체내탄수화물양(COB)</string>
@@ -556,10 +633,14 @@
     <string name="nsclientinfotext">NSClient는 Nightscout와의 연결을 처리합니다. 이 부분을 건너뛸 수 있지만 설정하기 전엔 목적을 수행할 수 없습니다.</string>
     <string name="diawarning">새로운 인슐린 프로파일은 최소 5시간의 DIA가 요구됩니다. 새로운 프로파일의 DIA 5-6시간은 구식 인슐린 프로파일의 DIA 3시간과 동일합니다.</string>
     <string name="setupwizard_aps_description">사용 가능한 알고리즘 중 하나를 선택하세요. 과거부터 최신의 순으로 정렬이 되어 있습니다. 일반적으로 새로운 알고리즘은 보다 강력하고 공격적입니다. 따라서 당신이 신규 사용자라면 최신의 알고리즘보단 AMA로 시작하는것이 나을 수 있습니다. 사용 전에 OpenAPS 문서를 읽어보고 설정하는 것을 잊지마세요.</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">하단의 RileyLink를 설정하십시오. RileyLink를 선택한 뒤, RileyLink 상태가 \"연결됨\"이 되고 나면 설정을 계속 할 수 있습니다. 이 작업은 금방 진행됩니다.\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>참고:</b> 펌프가 한 번 연동되면 계속 설정할 수 있습니다.\n</string>
     <string name="startobjective">첫번째 목표를 시작하세요.</string>
     <string name="permission">권한</string>
     <string name="askforpermission">권한 요청하기</string>
     <string name="needsystemwindowpermission">알림에 대한 시스템 창 권한이 필요합니다</string>
+    <string name="needlocationpermission">어플은 BT scan과 WiFi 식별을 위해 \"위치 허용\"이 요구됩니다.</string>
+    <string name="needstoragepermission">어플은 로그 파일 저장과 설정 내보내기를 위해 \"저장공간 허용\"이 요구됩니다.</string>
     <string name="request">요청</string>
     <string name="open_navigation">메뉴 열기</string>
     <string name="close_navigation">메뉴 닫기</string>
@@ -574,12 +655,17 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[임시목표 100이상을 위해 민감도를 올립니다.]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">낮은 임시목표는 민감도를 내립니다.</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[임시목표 100미만을 위해 민감도를 낮춥니다.]]></string>
+    <string name="resistance_lowers_target_title">저항성이 목표 낮추기</string>
+    <string name="resistance_lowers_target_summary">저항성이 감지되면, 목표 혈당을 낮춥니다.</string>
+    <string name="sensitivity_raises_target_title">민감성이 목표 올리기</string>
+    <string name="sensitivity_raises_target_summary">민감성이 감지되면, 목표 혈당을 높입니다.</string>
     <string name="careportal_removestartedevents">\"AndroidAPS 시작\" 기록 삭제하기</string>
     <string name="storedsettingsfound">저장된 설정이 있습니다.</string>
     <string name="allow_hardware_pump_text">주의: 활성화하고 펌프에 연결하게되면, AndroidAPS는 프로파일의 Basal설정을 복사해서 기존에 펌프에 저장되어 있던 Basal설정을 덮어쓰게 될것입니다. AndroidAPS의 Basal설정이 올바른지 반드시 확인하세요. 만약 확실치 않거나 Basal설정을 덮어씌우길 원치않는다면, 취소버튼을 누르고 나중에 다시 연결하세요.</string>
     <string name="error_adding_treatment_title">관리 데이터가 불완전합니다</string>
     <string name="maintenance_settings">정비 설정</string>
     <string name="maintenance_email">Email</string>
+    <string name="maintenance_encrypt_exported_prefs">내보내는 설정을 암호화하기</string>
     <string name="maintenance_amount">전송할 로그 수</string>
     <string name="maintenance">정비</string>
     <string name="maintenance_shortname">MAINT</string>
@@ -624,6 +710,7 @@
     <string name="storage">내부 저장 용량 제한</string>
     <string name="diskfull">내부 저장 공간을 최소 %1$d MB 이상 비우세요! Loop가 비활성화되었습니다!</string>
     <string name="wrongformat">잘못된 형식</string>
+    <string name="wrongTbrDuration">TBR 기간은 %1$d분의 배수가 되어야 하고 0보다 커야 함.</string>
     <string name="sms_wrongcode">잘못된 코드입니다. 명령이 취소됩니다.</string>
     <string name="notconfigured">설정되지 않음</string>
     <string name="profileswitchcreated">프로파일 변경 생성됨</string>
@@ -635,6 +722,8 @@
     <string name="dexcom_app_patched">Dexcom 앱(패치버전)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">패치된 Dexcom 앱에서 혈당값 받기</string>
+    <string name="cobvsiob">COB vs IOB</string>
+    <string name="bolusconstraintappliedwarn">Bolus 제한이 적용됨: %1$.2f U에서 %2$.2f U으로</string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! 느린 탄수화물 흡수 감지: %2$d%% of time. 계산을 다시 확인하십시오. COB를 과대하게 측정하여 더 많은 인슐린이 주입될 수 있습니다 !!!!!</font>]]></string>
     <string name="partialboluswizard">Bolus 마법사 결과의 이 부분 주입[%]</string>
     <string name="deliverpartofboluswizard">Bolus 마법사는 계산을 수행하지만 계산된 인슐린의 이 부분만 주입됩니다. SMB 알고리즘에 유용합니다.</string>
@@ -661,6 +750,7 @@
     <string name="clone_label">복사</string>
     <string name="saveorresetchangesfirst">우선 현재 변경사항을을 저장하거나 재설정하세요</string>
     <string name="deletecurrentprofile">현재 프로파일을 삭제 하시겠습니까?</string>
+    <string name="copytolocalprofile">프로파일에서 새로운 로컬 프로파일을 만드시겠습니까?</string>
     <string name="profilenamecontainsdot">프로파일명에 점을 포함하고 있습니다.\n이는 NS에서 지원하지 않습니다.\n프로파일이 NS에 업로드되지 않습니다.</string>
     <string name="low_mark_comment">혈당 정상범위의 하한값(표시 전용)</string>
     <string name="high_mark_comment">혈당 정상범위의 상한값(표시 전용)</string>
@@ -672,6 +762,7 @@
     <string name="survey_comment">참고: 이 화면에 보이는 데이터만 익명으로 업로드됩니다. ID는 AndroidAPS 설치에 할당됩니다. 기본 프로파일이 변경되면 데이터를 다시 제출할 수 있지만 어느정도 시간 범위의 결과가 보이도록 최소 1주일 이상 실행하여 주세요. 당신의 도움 감사하겠습니다.</string>
     <string name="invalidage">유효하지 않은 나이입니다</string>
     <string name="invalidweight">유효하지 않은 몸무게입니다</string>
+    <string name="invalidpct">유효하지 않은 % 입력</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Low: <b>%2$02d%%</b> In: <b>%3$02d%%</b> High: <b>%4$02d%%</b>]]></string>
     <string name="average">평균</string>
     <string name="tir">TIR</string>
@@ -683,6 +774,7 @@
     <string name="randombg_short">BG</string>
     <string name="tools">도구</string>
     <string name="show_calculation">계산 표시</string>
+    <string name="show_removed">삭제된 기록 표시</string>
     <string name="clearqueueconfirm">대기열을 삭제하시겠습니까? 대기열에 있는 모든 데이터가 삭제됩니다!</string>
     <string name="ebstopsloop">확장 Bolus 기능을 사용하는 동안에는 Closed Loop 모드가 중지됩니다. 정말 원하십니까?</string>
     <string name="closed_loop_disabled_with_eb">확장 Bolus 사용으로 인해 Closed Loop가 비활성화됨</string>
@@ -693,7 +785,99 @@
     <string name="loop_tbrrequest_time_label">임시 Basal 요청시간</string>
     <string name="loop_tbrexecution_time_label">임시 Basal 실행시간</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">인증 어플에서: %1$s 뒤에 PIN</string>
+    <string name="smscommunicator_otp_pin">암호 끝에 더해지는 자동형성 PIN</string>
+    <string name="smscommunicator_otp_pin_summary">부가적인 숫자를 생성되는 일회성 비밀번호 끝에 더하고 기억해야 함.</string>
+    <string name="smscomunicator_tab_otp_label">인증 설정</string>
+    <string name="smscommunicator_code_verify_label">확인용 code:</string>
+    <string name="smscommunicator_code_verify_hint">OTP + PIN</string>
+    <string name="smscommunicator_code_verify_info">유효한 코드는 인증 어플에서 보여지는 6개의 숫자 (OTP) 뒤에 자동형성 PIN의 3개 또는 그 이상의 숫자가 이어져야 함.</string>
+    <string name="smscommunicator_otp_reset_btn">인증 초기화</string>
+    <string name="smscommunicator_otp_reset_title">인증 암호 초기화</string>
+    <string name="smscommunicator_otp_reset_prompt">인증 암호를 초기화하는 것이 확실합니까? 현재 설정된 인증 암호를 모두 무효화 시키며, 이들을 모두 다시 설정해야 합니다.</string>
+    <string name="smscommunicator_otp_reset_successful">새로운 인증 암호가 생성되었습니다! 준비된 인증 어플에서 업데이트된 QRCode를 사용하십시오.</string>
+    <string name="smscommunicator_otp_export_title">OTP 비밀번호 내보내기</string>
+    <string name="smscommunicator_otp_export_prompt">OTP 비밀번호의 클립보드 복사를 원하는 것이 확실합니까?\n\n 이는 인증 어플이 QRCode를 스캐닝하는데 문제가 있을 때, 비밀번호 수동 입력을 원할 때, 또는 공용 어플 사용 시에 하드웨어 OTP 암호 설정을 원할 때에만 필요합니다.</string>
+    <string name="smscommunicator_otp_export_successful">OTP 비밀번호 (Base32 포맷)가 클립보드에 내보내져서 복사되었습니다. 인증 어플 또는 하드웨어 OTP burner에 붙여넣기 하십시오!</string>
+    <string name="smscommunicator_otp_step1_install_header">1. 인증어플 설치하기</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. AndroidAPS OTP 코드 설정을 위해 code를 스캔하기</string>
+    <string name="smscommunicator_otp_step3_test_header">3. 일회성 비밀번호 테스트</string>
+    <string name="smscommunicator_otp_reset_header">인증 초기화</string>
+    <string name="smscommunicator_otp_install_info">각각의 팔로워 폰에 RFC 6238 TOTP 암호를 사용하는 인증 어플을 설치합니다. 대중적인 무료 어플은 다음과 같습니다:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator.</string>
+    <string name="smscommunicator_otp_reset_warning">인증을 초기화함으로써 준비된 인증을 모두 무효화합니다. 이들을 다시 설정해야 합니다.</string>
     <string name="overview_show_predictions">예측</string>
+    <string name="overview_show_deviationslope">편차 기울기</string>
+    <string name="authorizationfailed">인증 실패</string>
+    <string name="overview_show_absinsulin">인슐린 절대값</string>
+    <string name="master_password_summary">마스터 비밀번호는 백업 암호 또는 보안 해제를 위해 사용됩니다. 이를 기억하거나 안전한 곳에 저장해두세요.</string>
+    <string name="current_master_password">현재 마스터 비밀번호</string>
+    <string name="statuslights">상태 등</string>
+    <string name="statuslights_copy_ns">NS에서 설정을 복사해오기</string>
+    <string name="copyexistingvalues">NS 설정(이 존재하는 경우) 복사하기?</string>
+    <string name="classic_description">기본 스킨</string>
+    <string name="lowres_description">저해상도 스킨</string>
+    <string name="buttonson_description">버튼을 화면 아래 고정하여 보여주기</string>
+    <string name="largedisplay_description">큰 화면</string>
+    <string name="skin">스킨</string>
+    <string name="comapareprofile">프로파일 비교하기</string>
+    <string name="nav_profilehelper">프로파일 보조기</string>
+    <string name="motoldefaultprofile">기본 프로파일</string>
+    <string name="currentprofile">현재 프로파일</string>
+    <string name="availableprofile">사용 가능한 프로파일</string>
+    <string name="profiletype">프로파일 종류</string>
+    <string name="formatwithtdd">나이: %1$.0f TDD: %2$.0f U</string>
+    <string name="formatwittddandpct">나이: %1$.0f TDD: %2$.0f U %3$d%%</string>
+    <string name="formatwithweight">나이: %1$.0f 체중: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% basal</string>
+    <string name="dpvdefaultprofile">DPV 기본 프로파일</string>
+    <string name="setupwizard_pump_riley_link_status">RileyLink 상태:</string>
+    <string name="filter">필터</string>
+    <string name="copytolocalprofile_invalid">로컬 프로파일 생성 불가능. 프로파일이 유효하지 않습니다.</string>
+    <string name="cta_dont_kill_my_app_info">앱이 종료되지 않도록 합니다?</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">허용되지 않는 펌프 이벤트가 발생하면 SMS를 보내기</string>
+    <string name="smscommunicator_pump_ureachable">허용되지 않는 펌프 기록</string>
+    <string name="advisoralarm">식사 시간이 되면 알람을 울리기</string>
+    <string name="alarminxmin">%1$d분 뒤 알람 울림</string>
+    <string name="bolusadvisor">Bolus advisor</string>
+    <string name="bolusadvisormessage">현재 혈당이 높습니다. 지금 식사를 하기 보다 적절한 혈당이 되도록 기다리는 것을 추천합니다. 교정 bolus를 지금 주입하고 식사할 시간이 되면 알려드릴까요? 이 경우 탄수화물은 기록되지 않으며, 알림을 받으면 wizard를 다시 사용해야 합니다.</string>
+    <string name="enablebolusadvisor">Bolus advisor 활성화</string>
+    <string name="enablebolusadvisor_summary">혈당이 높을 때 wizard 결과 대신 reminder를 사용하여 나중에 식사하기 (pre-bolus)</string>
+    <string name="time_to_eat">식사할 시간입니다! \nBolus wizard를 켜고 다시 계산하십시오.</string>
+    <string name="timetoeat">식사할 시간</string>
+    <string name="fabric_upload_disabled">충돌 로그 업로드가 작동하지 않습니다.</string>
+    <string name="graph_menu_divider_header">그래프</string>
     <string name="chart_menu">차트 메뉴</string>
+    <string name="clear_filter">필터 지우기</string>
+    <string name="trend_arrow">경향 화살표</string>
+    <string name="cannula">캐뉼라</string>
+    <string name="userentry">사용자 항목</string>
+    <string name="common_values">평소 섭취하는 가장 많은 양의 탄수화물 값을 사용하세요.\n</string>
+    <string name="summary_email_for_crash_report">긴급 상황에서 사용자에게 연락을 취하기 위해 이 이메일 주소를 충돌 보고에 첨부합니다. 이는 선택사항입니다.</string>
+    <string name="email_address">이메일 주소</string>
+    <string name="privacy_settings">개인정보 설정</string>
+    <string name="privacy_summary">어플의 충돌에 대해 통지를 받기 원하는 경우 선택적으로 이메일 주소를 제공할 수 있습니다. 이는 자동 지원 서비스는 아닙니다. 위험 상황에서 개발자들에게 연락이 올 것입니다.</string>
+    <string name="full_sync">전체 동기화 됨</string>
     <string name="prime">교체</string>
+    <string name="ns_sync_options">동기화</string>
+    <string name="ns_upload_summary">프로파일, bolus, 탄수화물, 임시 basal이 NS에 업로드 됨</string>
+    <string name="ns_upload">NS에 데이터 업로드하기</string>
+    <string name="ns_receive_profile_store">프로파일 목록 받기</string>
+    <string name="ns_receive_profile_store_summary">NS 프로파일 편집기에서 로컬 프로파일로 프로파일들 동기화하기</string>
+    <string name="ns_receive_temp_target">임시 목표들 받기</string>
+    <string name="ns_receive_temp_target_summary">NS 또는 NSClient에서 입력한 임시 목표 수락하기</string>
+    <string name="ns_receive_profile_switch">프로파일 변경 받기</string>
+    <string name="ns_receive_profile_switch_summary">NS 또는 NSClient에서 입력한 프로파일 변경 수락하기</string>
+    <string name="ns_receive_offline_event">APS 오프라인 이벤트 받기</string>
+    <string name="ns_receive_offline_event_summary">NS 또는 NSClient에서 입력한 APS 오프라인 이벤트 수락하기</string>
+    <string name="ns_receive_insulin">인슐린 받기</string>
+    <string name="ns_receive_insulin_summary">NS 또는 NSClient에서 입력한 인슐린 수락하기 (주입되지는 않음, IOB에 계산만 됨)</string>
+    <string name="ns_receive_carbs">탄수화물 받기</string>
+    <string name="ns_receive_carbs_summary">NS 또는 NSClient에서 입력한 탄수화물 수락하기</string>
+    <string name="ns_receive_therapy_events">처치 이벤트 받기</string>
+    <string name="ns_receive_therapy_events_summary">NS 또는 NSClient에서 입력한 처치 이벤트 (캐뉼라, 인슐린, 배터리 교체 등) 수락하기</string>
+    <string name="ns_receive_cgm">CGM 데이터 받기/다시 채우기</string>
+    <string name="ns_receive_cgm_summary">NS로부터 CGM 데이터 수락하기</string>
+    <string name="sms_timeout_while_wating">직전의 펌프 통신 종료를 기다리는 동안 타임 아웃</string>
+    <string name="smscommunicator_another_bolus_in_queue">대기열에 또다른 bolus가 있습니다. 이후에 다시 시도하세요.</string>
+    <string name="calculation_in_progress">계산 진행 중</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a248a82b14..c6cd5c5c23 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -46,6 +46,7 @@
     <string name="key_ns_temporary_basal_last_synced_id" translatable="false">ns_temporary_basal_last_synced_id</string>
     <string name="key_ns_extended_bolus_last_synced_id" translatable="false">ns_extended_bolus_last_synced_id</string>
     <string name="key_ns_profile_switch_last_synced_id" translatable="false">profile_switch_last_synced_id</string>
+    <string name="key_ns_effective_profile_switch_last_synced_id" translatable="false">ns_effective_profile_switch_last_synced_id</string>
     <string name="key_ns_offline_event_last_synced_id" translatable="false">ns_offline_event_last_synced_id</string>
     <string name="key_ns_profile_store_last_synced_timestamp" translatable="false">ns_profile_store_last_synced_timestamp</string>
     <string name="key_local_profile_last_change" translatable="false">local_profile_last_change</string>
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
index 19f7b55364..0e086f2957 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -29,7 +29,7 @@ import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.plugins.source.GlimpPlugin
 import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.Profiler
-import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.buildHelper.BuildHelperImpl
 import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
@@ -138,7 +138,10 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, sp, commandQueue, profileFunction, context, ConfigImpl(), dateUtil, insightDbHelper, pumpSync)
         openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, iobCobCalculator, hardLimits, profiler, sp, dateUtil, repository, glucoseStatusProvider)
         openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, iobCobCalculator, hardLimits, profiler, fabricPrivacy, dateUtil, repository, glucoseStatusProvider)
-        safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, BuildHelper(ConfigImpl(), fileListProvider), iobCobCalculator, ConfigImpl(), dateUtil)
+        safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker,
+                                    openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin,
+                                    hardLimits, BuildHelperImpl(ConfigImpl(), fileListProvider), iobCobCalculator,
+                                    ConfigImpl(), dateUtil)
         val constraintsPluginsList = ArrayList<PluginBase>()
         constraintsPluginsList.add(safetyPlugin)
         constraintsPluginsList.add(objectivesPlugin)
diff --git a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
index 53059c931f..1398462b42 100644
--- a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
@@ -12,6 +12,7 @@ import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.database.entities.Bolus
 import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.PumpSync
@@ -23,6 +24,7 @@ import info.nightscout.androidaps.queue.commands.*
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.buildHelper.BuildHelperImpl
 import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
@@ -59,8 +61,10 @@ class CommandQueueTest : TestBaseWithProfile() {
         buildHelper: BuildHelper,
         dateUtil: DateUtil,
         repository: AppRepository,
-        fabricPrivacy: FabricPrivacy
-    ) : CommandQueue(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper, constraintChecker, profileFunction, activePlugin, context, sp, buildHelper, dateUtil, repository, fabricPrivacy) {
+        fabricPrivacy: FabricPrivacy,
+        config: Config
+    ) : CommandQueue(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper, constraintChecker, profileFunction,
+                     activePlugin, context, sp, buildHelper, dateUtil, repository, fabricPrivacy, config) {
 
         override fun notifyAboutNewCommand() {}
 
@@ -96,7 +100,10 @@ class CommandQueueTest : TestBaseWithProfile() {
 
     @Before
     fun prepare() {
-        commandQueue = CommandQueueMocked(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper, constraintChecker, profileFunction, activePlugin, context, sp, BuildHelper(ConfigImpl(), fileListProvider), dateUtil, repository, fabricPrivacy)
+        commandQueue = CommandQueueMocked(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper,
+                                          constraintChecker, profileFunction, activePlugin, context, sp,
+                                         BuildHelperImpl(ConfigImpl(), fileListProvider), dateUtil, repository,
+                                          fabricPrivacy, config)
         testPumpPlugin = TestPumpPlugin(injector)
 
         testPumpPlugin.pumpDescription.basalMinimumRate = 0.1
@@ -127,7 +134,10 @@ class CommandQueueTest : TestBaseWithProfile() {
 
     @Test
     fun commandIsPickedUp() {
-        val commandQueue = CommandQueue(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper, constraintChecker, profileFunction, activePlugin, context, sp, BuildHelper(ConfigImpl(), fileListProvider), dateUtil, repository, fabricPrivacy)
+        val commandQueue = CommandQueue(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper,
+                                        constraintChecker, profileFunction, activePlugin, context, sp,
+                                        BuildHelperImpl(ConfigImpl(), fileListProvider), dateUtil, repository,
+                                        fabricPrivacy, config)
         // start with empty queue
         Assert.assertEquals(0, commandQueue.size())
 
diff --git a/app/src/test/java/info/nightscout/androidaps/queue/QueueThreadTest.kt b/app/src/test/java/info/nightscout/androidaps/queue/QueueThreadTest.kt
index 9319ba7a63..7944588efd 100644
--- a/app/src/test/java/info/nightscout/androidaps/queue/QueueThreadTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/queue/QueueThreadTest.kt
@@ -15,7 +15,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
 import info.nightscout.androidaps.queue.commands.Command
 import info.nightscout.androidaps.queue.commands.CommandTempBasalAbsolute
-import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.buildHelper.BuildHelperImpl
 import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
@@ -52,7 +52,11 @@ class QueueThreadTest : TestBaseWithProfile() {
     @Before
     fun prepare() {
         pumpPlugin = TestPumpPlugin(injector)
-        commandQueue = CommandQueue(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper, constraintChecker, profileFunction, activePlugin, context, sp, BuildHelper(ConfigImpl(), fileListProvider), dateUtil, repository, fabricPrivacy)
+        commandQueue = CommandQueue(
+            injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper, constraintChecker,
+            profileFunction, activePlugin, context, sp,
+            BuildHelperImpl(ConfigImpl(), fileListProvider), dateUtil, repository, fabricPrivacy, config
+        )
 
         val pumpDescription = PumpDescription()
         pumpDescription.basalMinimumRate = 0.1
@@ -69,7 +73,8 @@ class QueueThreadTest : TestBaseWithProfile() {
         val rateConstraint = Constraint(0.0)
         Mockito.`when`(constraintChecker.applyBasalConstraints(anyObject(), anyObject())).thenReturn(rateConstraint)
         val percentageConstraint = Constraint(0)
-        Mockito.`when`(constraintChecker.applyBasalPercentConstraints(anyObject(), anyObject())).thenReturn(percentageConstraint)
+        Mockito.`when`(constraintChecker.applyBasalPercentConstraints(anyObject(), anyObject()))
+            .thenReturn(percentageConstraint)
 
         sut = QueueThread(commandQueue, context, aapsLogger, rxBus, activePlugin, resourceHelper, sp)
     }
diff --git a/automation/src/main/res/values-ko-rKR/strings.xml b/automation/src/main/res/values-ko-rKR/strings.xml
index 8ae570f554..d6e91aec5b 100644
--- a/automation/src/main/res/values-ko-rKR/strings.xml
+++ b/automation/src/main/res/values-ko-rKR/strings.xml
@@ -74,6 +74,7 @@
     <string name="copy_short">복사</string>
     <string name="temptargetcompared">임시 목표 %1$s</string>
     <string name="btdevicecompared">장치에 블루투스 연결 %1$s %2$s</string>
+    <string name="btdevice">블루투스 장치에 연결</string>
     <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
     <string name="autosenscompared">Autosens %1$s %2$s %%</string>
     <string name="autosenslabel">Autosens %</string>
diff --git a/build.gradle b/build.gradle
index e3ab201499..1ef448fdf1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         rxkotlin_version = '2.4.0'
         room_version = '2.3.0'
         lifecycle_version = '2.3.1'
-        dagger_version = '2.38.1'
+        dagger_version = '2.39'
         coroutinesVersion = '1.4.1'
         activityVersion = '1.3.1'
         fragmentktx_version = '1.3.6'
@@ -21,8 +21,9 @@ buildscript {
         preferencektx_version = '1.1.1'
         commonslang3_version = '3.11'
         commonscodec_version = '1.15'
-        jodatime_version = '2.10.11'
+        jodatime_version = '2.10.12'
         work_version = '2.5.0'
+        tink_version = '1.5.0'
 
         junit_version = '4.13.2'
         mockitoVersion = '3.12.4'
@@ -50,26 +51,20 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
         classpath 'com.hiya:jacoco-android:0.2'
-        modules {
-            module("org.jetbrains.trove4j:trove4j") {
-                replacedBy("org.jetbrains.intellij.deps:trove4j")
-            }
-        }
     }
 }
 
+plugins {
+    id "io.gitlab.arturbosch.detekt" version "1.18.1"
+    id "org.jlleitschuh.gradle.ktlint" version "10.2.0"
+}
+
 allprojects {
     repositories {
         google()
         mavenCentral()
         maven { url "https://maven.google.com" }
         maven { url 'https://jitpack.io' }
-        ivy {
-            url 'https://github.com/'
-            patternLayout {
-                artifact '/[organisation]/[module]/archive/[revision].[ext]'
-            }
-        }
     }
     //Support @JvmDefault
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
diff --git a/core/core_dependencies.gradle b/core/core_dependencies.gradle
index aa285737bb..fbfb5ce29e 100644
--- a/core/core_dependencies.gradle
+++ b/core/core_dependencies.gradle
@@ -46,6 +46,7 @@ dependencies {
 
     //CryptoUtil
     api 'com.madgag.spongycastle:core:1.58.0.0'
+    api "com.google.crypto.tink:tink-android:$tink_version"
 
     // Graphview cannot be upgraded
     api "com.jjoe64:graphview:4.0.1"
diff --git a/core/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt
index 14f941a422..6150a62840 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt
@@ -5,7 +5,7 @@ import dagger.android.support.DaggerAppCompatActivity
 import info.nightscout.androidaps.utils.locale.LocaleHelper
 
 open class DialogAppCompatActivity : DaggerAppCompatActivity() {
-    public override fun attachBaseContext(newBase: Context) {
+    override fun attachBaseContext(newBase: Context) {
         super.attachBaseContext(LocaleHelper.wrap(newBase))
     }
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt
index 78e2e009e3..c8f9888ec6 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt
@@ -7,12 +7,12 @@ import info.nightscout.androidaps.utils.locale.LocaleHelper
 
 open class NoSplashAppCompatActivity : DaggerAppCompatActivityWithResult() {
 
-    public override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setTheme(R.style.AppTheme_NoActionBar)
     }
 
-    public override fun attachBaseContext(newBase: Context) {
+    override fun attachBaseContext(newBase: Context) {
         super.attachBaseContext(LocaleHelper.wrap(newBase))
     }
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/EffectiveProfileSwitchExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/EffectiveProfileSwitchExtension.kt
index 65b1396e0c..98a6751798 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/EffectiveProfileSwitchExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/EffectiveProfileSwitchExtension.kt
@@ -1,8 +1,15 @@
 package info.nightscout.androidaps.extensions
 
+import info.nightscout.androidaps.data.ProfileSealed
+import info.nightscout.androidaps.database.embedments.InterfaceIDs
 import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch
+import info.nightscout.androidaps.database.entities.TherapyEvent
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.GlucoseUnit
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.JsonHelper
 import info.nightscout.androidaps.utils.T.Companion.mins
-
+import org.json.JSONObject
 
 fun List<EffectiveProfileSwitch>.isEPSEvent5minBack(time: Long): Boolean {
     for (event in this) {
@@ -15,3 +22,72 @@ fun List<EffectiveProfileSwitch>.isEPSEvent5minBack(time: Long): Boolean {
     }
     return false
 }
+
+fun EffectiveProfileSwitch.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject =
+    JSONObject()
+        .put("created_at", dateUtil.toISOString(timestamp))
+        .put("enteredBy", "openaps://" + "AndroidAPS")
+        .put("isValid", isValid)
+        .put("eventType", TherapyEvent.Type.NOTE.text) // move to separate collection when available in NS
+        .put("profileJson", ProfileSealed.EPS(this).toPureNsJson(dateUtil).toString())
+        .put("originalProfileName", originalProfileName)
+        .put("originalCustomizedName", originalCustomizedName)
+        .put("originalTimeshift", originalTimeshift)
+        .put("originalPercentage", originalPercentage)
+        .put("originalDuration", originalDuration)
+        .put("originalEnd", originalEnd)
+        .also {
+            if (interfaceIDs.pumpId != null) it.put("pumpId", interfaceIDs.pumpId)
+            if (interfaceIDs.pumpType != null) it.put("pumpType", interfaceIDs.pumpType!!.name)
+            if (interfaceIDs.pumpSerial != null) it.put("pumpSerial", interfaceIDs.pumpSerial)
+            if (isAdd && interfaceIDs.nightscoutId != null) it.put("_id", interfaceIDs.nightscoutId)
+        }
+
+fun effectiveProfileSwitchFromJson(jsonObject: JSONObject, dateUtil: DateUtil, activePlugin: ActivePlugin): EffectiveProfileSwitch? {
+    val timestamp = JsonHelper.safeGetLongAllowNull(jsonObject, "mills", null) ?: return null
+    val originalTimeshift = JsonHelper.safeGetLong(jsonObject, "originalTimeshift")
+    val originalDuration = JsonHelper.safeGetLong(jsonObject, "originalDuration")
+    val originalEnd = JsonHelper.safeGetLong(jsonObject, "originalEnd")
+    val originalPercentage = JsonHelper.safeGetInt(jsonObject, "originalPercentage", 100)
+    val isValid = JsonHelper.safeGetBoolean(jsonObject, "isValid", true)
+    val id = JsonHelper.safeGetStringAllowNull(jsonObject, "_id", null)
+    val originalProfileName = JsonHelper.safeGetStringAllowNull(jsonObject, "originalProfileName", null) ?: return null
+    val originalCustomizedName = JsonHelper.safeGetStringAllowNull(jsonObject, "originalCustomizedName", null) ?: return null
+    val profileJson = JsonHelper.safeGetStringAllowNull(jsonObject, "profileJson", null) ?: return null
+    val pumpId = JsonHelper.safeGetLongAllowNull(jsonObject, "pumpId", null)
+    val pumpType = InterfaceIDs.PumpType.fromString(JsonHelper.safeGetStringAllowNull(jsonObject, "pumpType", null))
+    val pumpSerial = JsonHelper.safeGetStringAllowNull(jsonObject, "pumpSerial", null)
+
+    if (timestamp == 0L) return null
+    val pureProfile = pureProfileFromJson(JSONObject(profileJson), dateUtil) ?: return null
+    val profileSealed = ProfileSealed.Pure(pureProfile)
+
+
+    return EffectiveProfileSwitch(
+        timestamp = timestamp,
+        basalBlocks = profileSealed.basalBlocks,
+        isfBlocks = profileSealed.isfBlocks,
+        icBlocks = profileSealed.icBlocks,
+        targetBlocks = profileSealed.targetBlocks,
+        glucoseUnit = EffectiveProfileSwitch.GlucoseUnit.fromConstant(profileSealed.units),
+        originalProfileName = originalProfileName,
+        originalCustomizedName = originalCustomizedName,
+        originalTimeshift = originalTimeshift,
+        originalPercentage = originalPercentage,
+        originalDuration = originalDuration,
+        originalEnd = originalEnd,
+        insulinConfiguration = profileSealed.insulinConfiguration,
+        isValid = isValid
+    ).also {
+        it.interfaceIDs.nightscoutId = id
+        it.interfaceIDs.pumpId = pumpId
+        it.interfaceIDs.pumpType = pumpType
+        it.interfaceIDs.pumpSerial = pumpSerial
+    }
+}
+
+fun EffectiveProfileSwitch.GlucoseUnit.Companion.fromConstant(units: GlucoseUnit): EffectiveProfileSwitch.GlucoseUnit =
+    if (units == GlucoseUnit.MGDL) EffectiveProfileSwitch.GlucoseUnit.MGDL
+    else EffectiveProfileSwitch.GlucoseUnit.MMOL
+
+fun JSONObject.isEffectiveProfileSwitch() = has("originalProfileName")
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DataSyncSelector.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/DataSyncSelector.kt
index 83f9e5e7bb..168a51c97e 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/DataSyncSelector.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/DataSyncSelector.kt
@@ -16,6 +16,7 @@ interface DataSyncSelector {
     data class PairTemporaryBasal(val value: TemporaryBasal, val updateRecordId: Long)
     data class PairExtendedBolus(val value: ExtendedBolus, val updateRecordId: Long)
     data class PairProfileSwitch(val value: ProfileSwitch, val updateRecordId: Long)
+    data class PairEffectiveProfileSwitch(val value: EffectiveProfileSwitch, val updateRecordId: Long)
     data class PairOfflineEvent(val value: OfflineEvent, val updateRecordId: Long)
     data class PairProfileStore(val value: JSONObject, val timestampSync: Long)
 
@@ -78,6 +79,11 @@ interface DataSyncSelector {
     // Until NS v3
     fun processChangedProfileSwitchesCompat(): Boolean
 
+    fun confirmLastEffectiveProfileSwitchIdIfGreater(lastSynced: Long)
+    fun changedEffectiveProfileSwitch() : List<EffectiveProfileSwitch>
+    // Until NS v3
+    fun processChangedEffectiveProfileSwitchesCompat(): Boolean
+
     fun confirmLastOfflineEventIdIfGreater(lastSynced: Long)
     fun changedOfflineEvents() : List<OfflineEvent>
     // Until NS v3
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt
index 9e29f529f9..9a8f8a588b 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt
@@ -127,7 +127,7 @@ class PrefImportListActivity : DaggerAppCompatActivity() {
         return false
     }
 
-    public override fun attachBaseContext(newBase: Context) {
+    override fun attachBaseContext(newBase: Context) {
         super.attachBaseContext(LocaleHelper.wrap(newBase))
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt
new file mode 100644
index 0000000000..ca6a251f65
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.utils.buildHelper
+
+interface BuildHelper {
+
+    fun isEngineeringModeOrRelease(): Boolean
+    fun isEngineeringMode(): Boolean
+    fun isDev(): Boolean
+}
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/rx/RxExtensions.kt b/core/src/main/java/info/nightscout/androidaps/utils/rx/RxExtensions.kt
index 78e2db0e7a..aef2b17e18 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/rx/RxExtensions.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/rx/RxExtensions.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.utils.rx
 
 import io.reactivex.Completable
 import io.reactivex.Flowable
+import io.reactivex.Observable
 import io.reactivex.Single
 import java.util.concurrent.TimeUnit
 import kotlin.math.pow
@@ -40,4 +41,22 @@ fun Completable.retryExponentialBackoff(retries: Int, time: Long, timeUnit: Time
         ).flatMap { retryCount: Int ->
             Flowable.timer(time * 2.toDouble().pow(retryCount.toDouble()).toLong(), timeUnit)
         }
-    }
\ No newline at end of file
+    }
+
+inline fun <reified T> Observable<T>.retryWithBackoff(
+    retries: Int,
+    delay: Long,
+    timeUnit: TimeUnit,
+    delayFactor: Double = 1.0
+): Observable<T> = this.retryWhen {
+    it.zipWith(Observable.range(0, retries + 1), { throwable: Throwable, count: Int ->
+        if (count >= retries) {
+            throw throwable
+        } else {
+            count
+        }
+    }).flatMap { retryCount: Int ->
+        val actualDelay = (timeUnit.toMillis(delay) * delayFactor.pow(retryCount.toDouble())).toLong()
+        Observable.timer(actualDelay, TimeUnit.MILLISECONDS)
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index 1ad829543c..d5b5d2adb6 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -316,6 +316,7 @@
     <string name="uel_disconnect">VERBINDUNG TRENNEN</string>
     <string name="uel_resume">FORTFAHREN</string>
     <string name="uel_suspend">UNTERBRECHEN</string>
+    <string name="uel_hw_pump_allowed">HW PUMPE ERLAUBT</string>
     <string name="uel_clear_pairing_keys">PAIRING SCHLÜSSEL LÖSCHEN</string>
     <string name="uel_accepts_temp_basal">TEMP BASAL AKZEPTIEREN</string>
     <string name="uel_cancel_temp_basal">TEMP BASAL ABBRECHEN</string>
@@ -332,22 +333,57 @@
     <string name="uel_profile_switch_ns_refresh">PROFILWECHSEL NIGHTSCOUT AKTUALISIEREN</string>
     <string name="uel_treatments_ns_refresh">BEHANDLUNGEN NIGHTSCOUT AKTUALISIEREN </string>
     <string name="uel_tt_ns_refresh">TEMP. ZIEL NS AKTUALISIEREN</string>
+    <string name="uel_automation_removed">AUTOMATION ENTFERNT</string>
+    <string name="uel_bg_removed">BZ ENTFERNT</string>
+    <string name="uel_careportal_removed">CAREPORTAL ENTFERNT</string>
     <string name="uel_bolus_removed">BOLUS ENTFERNT</string>
     <string name="uel_carbs_removed">KOHLENHYDRATE ENTFERNT</string>
     <string name="uel_temp_basal_removed">TEMP BASAL ENTFERNT</string>
+    <string name="uel_extended_bolus_removed">VERZÖGERTER BOLUS ENTFERNT</string>
     <string name="uel_food">NAHRUNG</string>
+    <string name="uel_food_removed">LEBENSMITTEL ENTFERNT</string>
+    <string name="uel_profile_removed">PROFIL ENTFERNT</string>
+    <string name="uel_profile_switch_removed">PROFILWECHSEL ENTFERNT</string>
+    <string name="uel_restart_events_removed">NEUSTARTS ENTFERNT</string>
+    <string name="uel_treatment_removed">BEHANDLUNGEN ENTFERNT</string>
     <string name="uel_tt_removed">TEMP ZIEL ENTFERNT</string>
+    <string name="uel_ns_paused">NS PAUSIERT</string>
+    <string name="uel_ns_resume">NS NEUSTART</string>
+    <string name="uel_ns_queue_cleared">NS WARTESCHLANGE GELÖSCHT</string>
+    <string name="uel_ns_settings_copied">NS EINSTELLUNGEN KOPIERT</string>
+    <string name="uel_error_dialog_ok">WARNMELDUNG OK</string>
+    <string name="uel_error_dialog_mute">WARNMELDUNGEN STUMM</string>
+    <string name="uel_error_dialog_mute_5min">WARNMELDUNGEN STUMM 5 MIN</string>
+    <string name="uel_objective_started">OBJECTIVE GESTARTET</string>
+    <string name="uel_objective_unstarted">OBJECTIVE NICHT GESTARTET</string>
+    <string name="uel_objectives_skipped">OBJECTIVES ÜBERSPRUNGEN</string>
+    <string name="uel_stat_reset">STATISTIKEN ZURÜCKGESETZT</string>
+    <string name="uel_delete_logs">LOGS LÖSCHEN</string>
+    <string name="uel_delete_future_treatments">BEHANDLUNGEN IN DER ZUKUNFT ENTFERNEN</string>
+    <string name="uel_export_settings">EINSTELLUNGEN EXPORTIEREN</string>
+    <string name="uel_import_settings">EINSTELLUNGEN IMPORTIEREN</string>
+    <string name="uel_reset_databases">DATENBANK ZURÜCKSETZEN</string>
+    <string name="uel_export_databases">DATENBANK EXPORTIEREN</string>
+    <string name="uel_import_databases">DATENBANK IMPORTIEREN</string>
+    <string name="uel_otp_export">OTP EXPORT</string>
+    <string name="uel_otp_reset">OTP ZURÜCKSETZEN</string>
     <string name="uel_stop_sms">STOP SMS</string>
+    <string name="uel_export_csv">BENUTZEREINTRÄGE EXPORTIEREN</string>
     <string name="uel_start_aaps">STARTE AAPS</string>
     <string name="uel_exit_aaps">AAPS BEENDEN</string>
     <string name="uel_plugin_enabled">PLUGIN AKTIVIERT</string>
     <string name="uel_plugin_disabled">PLUGIN DEAKTIVIERT</string>
+    <string name="uel_unknown">UNBEKANNT</string>
     <string name="ue_string">Zeichenfolge</string>
     <string name="ue_source">Quelle</string>
     <string name="ue_utc_offset">UTC-Abstand</string>
     <string name="ue_action">Aktion</string>
     <string name="ue_timestamp">Zeitstempel</string>
     <string name="ue_none">Keine Einheit</string>
+    <string name="ue_export_to_csv">Benutzereinträge nach Excel exportieren (csv)</string>
+    <string name="uel_loop_change">LOOP GEÄNDERT</string>
+    <string name="uel_loop_removed">LOOP ENTFERNT</string>
+    <string name="uel_other">ANDERE</string>
     <!-- HardLimits -->
     <string name="profile_low_target">Profil unteres Ziel</string>
     <string name="profile_high_target">Profil oberes Ziel</string>
@@ -361,6 +397,8 @@
     <string name="profile_carbs_ratio_value">Profil KH-Faktor</string>
     <string name="valuelimitedto">%1$.2f limitiert auf %2$.2f</string>
     <string name="valueoutofrange">»%1$s« ist außerhalb der fest programmierten Grenzen</string>
+    <string name="value_out_of_hard_limits">»%1$s« %2$.2f ist außerhalb der fest programmierten Grenzen</string>
+    <string name="basal_value">Basal-Wert</string>
     <plurals name="days">
         <item quantity="one">%1$d Tag</item>
         <item quantity="other">%1$d Tage</item>
diff --git a/core/src/main/res/values-ko-rKR/strings.xml b/core/src/main/res/values-ko-rKR/strings.xml
index 38e95bbb57..b86cec36ae 100644
--- a/core/src/main/res/values-ko-rKR/strings.xml
+++ b/core/src/main/res/values-ko-rKR/strings.xml
@@ -9,8 +9,10 @@
     <string name="profile_set_ok">Basal 프로파일이 펌프에 업데이트 되었습니다</string>
     <string name="invalidinput">사용할수 없는 입력 데이터</string>
     <string name="tempbasaldeliveryerror">임시Basal 주입 에러</string>
+    <string name="goingtodeliver">%1$.2f U을 주입합니다.</string>
     <string name="waitingforpump">펌프를 기다리는 중</string>
     <string name="connectingfor">%1$d 초 동안 연결중</string>
+    <string name="bolusdelivering">%1$.2f U 주입 중</string>
     <string name="handshaking">통신 확인</string>
     <string name="connecting">연결중</string>
     <string name="connected">연결됨</string>
@@ -19,6 +21,8 @@
     <string name="androidaps_start">AndroidAPS 시작</string>
     <string name="formatinsulinunits1">%1$.1f U</string>
     <string name="formatinsulinunits">%1$.2f U</string>
+    <string name="formatsignedinsulinunits">%1$+.2f U</string>
+    <string name="format_carbs">%1$d g</string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="format_hours">%1$.2f 시간</string>
@@ -59,6 +63,7 @@
     <string name="mgdl">mg/dl</string>
     <string name="mmol">mmol/l</string>
     <string name="shortgram">g</string>
+    <string name="shortpercent">%</string>
     <string name="advancedsettings_title">고급 설정</string>
     <string name="bluetooth">블루투스</string>
     <string name="btwatchdog_title">블루투스 감시기능</string>
@@ -67,6 +72,7 @@
     <string name="yes">네</string>
     <string name="no">아니오</string>
     <string name="loopdisabled">제한으로 인해 LOOP가 사용불가합니다.</string>
+    <string name="bolusdelivered">Bolus %1$.2f U이 성공적으로 주입되었습니다.</string>
     <string name="virtualpump_resultok">네</string>
     <string name="novalidbasalrate">펌프에서 유효한 Basal양을 읽을 수 없습니다.</string>
     <string name="limitingmaxiob">%2$s로 인해 최대 IOB가 %1$.1f U로 제한됩니다.</string>
@@ -93,10 +99,12 @@
     <string name="name_short">이름:</string>
     <string name="time">시간</string>
     <string name="ns_wifi_ssids">와이파이 SSID</string>
+    <string name="loading">로딩 중 …</string>
     <string name="event_time_label">이벤트 시간</string>
     <string name="notes_label">노트</string>
     <string name="remove_button">삭제</string>
     <string name="addnew">새로 추가</string>
+    <string name="wrong_pump_data">다른 펌프에서 전송된 데이터. 펌프 상태 재설정을 위해 펌프 드라이버를 바꾸세요.</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">%2$s로 인해 최대 Basal양이 %1$.2f U/h으로 제한됩니다.</string>
     <string name="pumplimit">펌프 제한</string>
@@ -112,10 +120,13 @@
     <string name="dismiss">무시</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">BLE(블루투스 저전력) 지원되지 않음</string>
+    <string name="ble_not_supported_or_not_paired">저전력 블루투스(BLE)가 작동하지 않거나, 기기가 연동되지 않았습니다.</string>
     <string name="ble_not_enabled">블루투스가 활성화되지 않았습니다.</string>
     <string name="location_not_found_title">위치가 활성화되지 않았습니다.</string>
     <string name="location_not_found_message">최신 스마트폰에서 블루투스 검색이 작동하려면 위치가 활성화되어 있어야합니다. AAPS는 당신의 위치를 추적하지 않으며 페어링에 성공한 후 비활성화 할 수 있습니다.</string>
     <!--    DateUtil-->
+    <string name="minago">%1$d 분 전</string>
+    <string name="hoursago">%1$.1f 시간 전</string>
     <string name="shorthour">시간</string>
     <string name="days">일</string>
     <string name="hours">시간</string>
@@ -133,6 +144,7 @@
     <string name="shortday">일</string>
     <!--    Protection-->
     <string name="wrongpassword">잘못된 비밀번호</string>
+    <string name="passwords_dont_match">비밀번호가 일치하지 않습니다.</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Basal값이 시간단위로 설정되지 않았습니다: %1$s</string>
     <string name="minimalbasalvaluereplaced">지원되는 최소값으로 Basal값이 대체되었습니다:%1$s</string>
@@ -155,9 +167,14 @@
     <!--    ProfileSwitch-->
     <string name="zerovalueinprofile">유효하지 않은 프로파일: %1$s</string>
     <!--    Temptarget-->
+    <string name="mins">%1$d 분</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f U</b> Bol: <b>%3$.2f U</b> Bas: <b>%4$.2f U(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f U</b> Bol: <b>%3$.2f U</b> Bas: <b>%4$.2f U(%5$.0f%%)</b> Carbs: <b>%6$.0f g</b>]]></string>
+    <string name="activitymonitorformat"><![CDATA[<b>%3$d</b> 일<br>에 <b><span style=\"color:yellow\">%1$s:</span></b> <b>%2$s</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">혈당 체크</string>
+    <string name="careportal_mbg">수동 BG 값 입력 또는 보정</string>
     <string name="careportal_announcement">알림</string>
     <string name="careportal_note">노트</string>
     <string name="careportal_question">의문</string>
@@ -165,6 +182,8 @@
     <string name="careportal_pumpsitechange">펌프 위치 변경</string>
     <string name="careportal_cgmsensorinsert">CGM 센서 삽입</string>
     <string name="careportal_cgmsensorstart">CGM 센서 시작</string>
+    <string name="careportal_cgm_sensor_stop">CGM 센서 정지</string>
+    <string name="careportal_dad_alert">D.A.D 경고</string>
     <string name="careportal_insulincartridgechange">인슐린 카트리지 교체</string>
     <string name="careportal_profileswitch">프로파일 변경</string>
     <string name="careportal_snackbolus">간식Bolus</string>
@@ -191,6 +210,8 @@
     <string name="custom">사용자 정의</string>
     <string name="pump">펌프</string>
     <string name="loop">Loop</string>
+    <string name="ns">NS</string>
+    <string name="record">기록</string>
     <!--    Command-->
     <string name="connectiontimedout">연결시간초과</string>
     <!--    PumpEnactResult-->
@@ -204,7 +225,9 @@
     <string name="waitingforpumpresult">결과 기다리는 중</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">%2$d 분 안에 %1$d g의 추가적인 탄수화물이 요구됨</string>
     <!--    TDDStatsActivity-->
+    <string name="stats">통계</string>
     <string name="cumulative_tdd">누적 일총량</string>
     <string name="expweight">지수가중 일총량</string>
     <string name="basalrate">Basal</string>
@@ -219,13 +242,43 @@
     <string name="tbb2">총기초량 * 2</string>
     <!--    Ntp-->
     <string name="timedetection">시간 감지</string>
+    <string name="format_hour_minute">%1$d시 %2$d분</string>
+    <string name="mute5min">5분 동안 음소거</string>
     <!-- Maintenance -->
+    <string name="metadata_label_format">파일 형식</string>
+    <string name="metadata_label_created_at">생성 일자</string>
+    <string name="metadata_label_aaps_version">AAPS 버전</string>
+    <string name="metadata_label_aaps_flavour">다른 형식 빌드</string>
+    <string name="metadata_label_device_name">장치의 환자 이름 내보내기</string>
+    <string name="metadata_label_device_model">장치 모델 내보내기</string>
+    <string name="metadata_label_encryption">파일 암호화</string>
+    <string name="metadata_format_old">오래된 내보내기 형식</string>
+    <string name="metadata_format_new">암호화된 새로운 형식</string>
+    <string name="metadata_format_debug">오류가 제거된 새로운 형식 (암호화되지 않음)</string>
+    <string name="metadata_format_other">알려지지 않은 내보내기 형식</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">%1$s 전에 내보내기 함</string>
+    <string name="exported_at" comment="at placeholder we add export date">%1$s에 내보내기 함</string>
+    <string name="exported_less_than_hour_ago">내보내기 한지 1시간이 지나지 않았습니다.</string>
+    <string name="in_directory" comment="placeholder is for exported file path">디렉토리: %1$s</string>
     <string name="preferences_import_list_title">가져올 파일을 선택하세요.</string>
     <string name="metadata_warning_different_flavour">환경설정은 AAPS (%1$s) 와는 다르게 생성되기 때문에 불러오는 도중 일부 설정이 누락되거나 설정이 되지 않을 수 있습니다. - 가져오기를 수행한 후 설정을 확인하고 업데이트 해주시기 바랍니다.</string>
     <string name="metadata_warning_different_device">환경설정은 다른 기기에서 설정되었습니다. 다른 혹은 전에 쓰던 기기에서 환경설정을 가져오는 건 괜찮지만 가져온 후 환경설정이 올바르게 설정되었는지 확인해주시기 바랍니다.</string>
     <string name="metadata_warning_outdated_format">이전 버전의 AAPS에서 사용하는 구식 legacy 포멧은 안전하지 않습니다. 최근에 내보내기한 설정이 없는 경우에만 최후의 수단으로 JSONㅠ포멧을 사용해주시기 바랍니다.</string>
     <string name="metadata_warning_old_export">가져온 환경설정은 이미 %1$s일이 지났습니다. 최신의 환경설정으로 업데이트된 파일이 있거나 잘못된 파일을 선택하셨을 수도 있습니다. 환경설정을 정기적으로 내보주시기 바랍니다.</string>
     <string name="metadata_warning_date_format">잘못된 날짜 형식입니다.</string>
+    <string name="metadata_warning_different_version">다른 하위 버전 어플의 설정입니다. 업그레이드 후에 설정을 불러오는 것은 괜찮지만, 설정이 올바른지 확인하십시오!</string>
+    <string name="metadata_urgent_different_version">다른 상위 버전 어플의 설정입니다. 상위 버전은 매우 상이하며, 호환되지 않는 설정일 수 있습니다! 설정을 불러온 후 올바른지 반드시 확인하십시오!</string>
+    <string name="prefdecrypt_settings_tampered">설정 파일 변경됨</string>
+    <string name="prefdecrypt_settings_secure">설정 파일 안전함</string>
+    <string name="prefdecrypt_settings_unencrypted">안전하지 않음, 암호화되지 않은 설정 형식</string>
+    <string name="prefdecrypt_wrong_json">JSON 형식 에러, 필요 영역 손실됨 (형식, 내용, 메타데이터, 또는 보안)</string>
+    <string name="prefdecrypt_wrong_password">암호 해독 에러, 입력한 비빌번호가 파일을 열 수 없습니다.</string>
+    <string name="prefdecrypt_issue_missing_file_hash">파일의 checksum (hash) 손실됨, 설정의 진위를 확인할 수 없습니다.</string>
+    <string name="prefdecrypt_issue_modified">내보내기 후 파일이 변형되었습니다!</string>
+    <string name="prefdecrypt_issue_parsing">해독 에러, 파싱 설정 실패함!</string>
+    <string name="prefdecrypt_issue_wrong_pass">해독 에러, 입력한 비밀번호가 유효하지 않거나 설정 파일이 수정되었습니다. 가져온 파일이 다른 마스터 비밀번호로 내보내기 되었을 가능성이 있습니다.</string>
+    <string name="prefdecrypt_issue_wrong_format">암호화 설정이 누락되었음, 설정 형식이 유효하지 않습니다!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">지원되지 않는 또는 명시되지 않은 암호화 알고리즘!</string>
     <!-- VersionChecker -->
     <string name="signature_verifier">서명 확인</string>
     <string name="running_invalid_version">유효하지 않은 버전을 이용 중입니다. Loop가 비활성화 되었습니다!</string>
@@ -233,9 +286,119 @@
     <!-- Permissions -->
     <string name="alert_dialog_storage_permission_text">폰을 재부팅하거나 AndroidAPS를 재시작하세요 \n그렇지 않으면 로그 기록이 되지 않습니다.(알고리즘이 정상적인 작동하는지 확인하기 위해 로그가 필요합니다.)!</string>
     <!-- WeekdayPicker -->
+    <string name="monday_short">월</string>
+    <string name="tuesday_short">화</string>
+    <string name="wednesday_short">수</string>
+    <string name="thursday_short">목</string>
+    <string name="friday_short">금</string>
+    <string name="saturday_short">토</string>
+    <string name="sunday_short">일</string>
     <!-- User Entry -->
+    <string name="uel_bolus">Bolus</string>
+    <string name="uel_bolus_advisor">Bolus 어드바이저</string>
+    <string name="uel_extended_bolus">확장 bolus</string>
+    <string name="uel_superbolus_tbr">Superbolus TBR</string>
+    <string name="uel_carbs">탄수화물</string>
+    <string name="uel_extended_carbs">확장 탄수화물</string>
+    <string name="uel_temp_basal">임시 basal</string>
+    <string name="uel_tt">임시 목표</string>
+    <string name="uel_new_profile">새로운 프로파일</string>
+    <string name="uel_clone_profile">프로파일 복사</string>
+    <string name="uel_store_profile">프로파일 저장</string>
+    <string name="uel_profile_switch">프로파일 변경</string>
+    <string name="uel_profile_switch_cloned">프로파일 변경 복사됨</string>
+    <string name="uel_closed_loop_mode">Closed loop 모드</string>
+    <string name="uel_lgs_loop_mode">LGS loop 모드</string>
+    <string name="uel_open_loop_mode">Open loop 모드</string>
+    <string name="uel_loop_disabled">Loop 사용하지 않음</string>
+    <string name="uel_loop_enabled">Loop 사용함</string>
+    <string name="uel_reconnect">재연결</string>
+    <string name="uel_disconnect">연결 끊기</string>
+    <string name="uel_resume">재시작</string>
+    <string name="uel_suspend">일시 정지</string>
+    <string name="uel_hw_pump_allowed">HW 펌프 허가됨</string>
+    <string name="uel_clear_pairing_keys">연동 비밀번호 삭제</string>
+    <string name="uel_accepts_temp_basal">임시 basal 수락</string>
+    <string name="uel_cancel_temp_basal">임시 basal 취소</string>
+    <string name="uel_cancel_bolus">Bolus 취소</string>
+    <string name="uel_cancel_extended_bolus">확장 bolus 취소</string>
+    <string name="uel_cancel_tt">임시 목표 취소</string>
+    <string name="uel_careportal">케어포털</string>
+    <string name="uel_site_change">삽입 위치 변경</string>
+    <string name="uel_reservoir_change">펌프 주사기 변경</string>
+    <string name="uel_calibration">보정</string>
+    <string name="uel_prime_bolus">프라임 bolus</string>
+    <string name="uel_treatment">처치</string>
+    <string name="uel_careportal_ns_refresh">케어포털 NS 새로고침</string>
+    <string name="uel_profile_switch_ns_refresh">프로파일 변경 NS 새로고침</string>
+    <string name="uel_treatments_ns_refresh">처치 NS 새로고침</string>
+    <string name="uel_tt_ns_refresh">임시 목표 NS 새로고침</string>
+    <string name="uel_automation_removed">자동화 제거됨</string>
+    <string name="uel_bg_removed">혈당 제거됨</string>
+    <string name="uel_careportal_removed">케어포털 제거됨</string>
+    <string name="uel_bolus_removed">bolus 제거됨</string>
+    <string name="uel_carbs_removed">탄수화물 제거됨</string>
+    <string name="uel_temp_basal_removed">임시 basal 제거됨</string>
+    <string name="uel_extended_bolus_removed">확장 bolus 제거됨</string>
+    <string name="uel_food">음식</string>
+    <string name="uel_food_removed">음식 제거됨</string>
+    <string name="uel_profile_removed">프로파일 제거됨</string>
+    <string name="uel_profile_switch_removed">프로파일 변경 제거됨</string>
+    <string name="uel_restart_events_removed">재시작 이벤트 제거됨</string>
+    <string name="uel_treatment_removed">처치 제거됨</string>
+    <string name="uel_tt_removed">임시 목표 제거됨</string>
+    <string name="uel_ns_paused">NS 정지</string>
+    <string name="uel_ns_resume">NS 재시작</string>
+    <string name="uel_ns_queue_cleared">NS 대기열 제거함</string>
+    <string name="uel_ns_settings_copied">NS 설정 복사됨</string>
+    <string name="uel_error_dialog_ok">에러 대화상자 확인</string>
+    <string name="uel_error_dialog_mute">에러 대화상자 음소거 </string>
+    <string name="uel_error_dialog_mute_5min">에러 대화상자 5분간 음소거</string>
+    <string name="uel_objective_started">목표 시작됨</string>
+    <string name="uel_objective_unstarted">목표 시작되지 않음</string>
+    <string name="uel_objectives_skipped">목표를 건너뜀</string>
+    <string name="uel_stat_reset">통계 재설정</string>
+    <string name="uel_delete_logs">로그 지우기</string>
+    <string name="uel_delete_future_treatments">이후의 처치 지우기</string>
+    <string name="uel_export_settings">설정 내보내기</string>
+    <string name="uel_import_settings">설정 들여오기</string>
+    <string name="uel_reset_databases">데이터베이스 재설정</string>
+    <string name="uel_export_databases">데이터베이스 내보내기</string>
+    <string name="uel_import_databases">데이터베이스 들여오기</string>
+    <string name="uel_otp_export">OTP 내보내기</string>
+    <string name="uel_otp_reset">OPT 재설정</string>
+    <string name="uel_stop_sms">SMS 중지</string>
+    <string name="uel_export_csv">사용자 항목 내보내기</string>
+    <string name="uel_start_aaps">AAPS 시작하기</string>
+    <string name="uel_exit_aaps">AAPS 나가기</string>
+    <string name="uel_plugin_enabled">플러그인 활성화됨</string>
+    <string name="uel_plugin_disabled">플러그인 비활성화됨</string>
+    <string name="uel_unknown">알 수 없음</string>
+    <string name="ue_string">문자열</string>
+    <string name="ue_source">소스</string>
+    <string name="ue_utc_offset">UTC 오프셋</string>
     <string name="ue_action">실행</string>
+    <string name="ue_timestamp">시간 기록</string>
+    <string name="ue_none">Unit 없음</string>
+    <string name="ue_export_to_csv">사용자 항목 엑셀 파일로 내보내기 (csv)</string>
+    <string name="uel_loop_change">Loop 변경됨</string>
+    <string name="uel_loop_removed">Loop 제거됨</string>
+    <string name="uel_other">기타</string>
     <!-- HardLimits -->
+    <string name="profile_low_target">프로파일 저혈당 목표</string>
+    <string name="profile_high_target">프로파일 고혈당 목표</string>
+    <string name="temp_target_low_target">임시 목표 최저값</string>
+    <string name="temp_target_high_target">임시 목표 최고값</string>
+    <string name="temp_target_value">임시 목표 수치</string>
+    <string name="profile_dia">프로파일 DIA 값</string>
+    <string name="profile_sensitivity_value">프로파일 민감도 값</string>
+    <string name="profile_max_daily_basal_value">프로파일의 최대 basal 값</string>
+    <string name="current_basal_value">현재 basal 값</string>
+    <string name="profile_carbs_ratio_value">프로파일의 탄수화물 비율 값</string>
+    <string name="valuelimitedto">%1$.2f은 %2$.2f까지 제한됨</string>
+    <string name="valueoutofrange">»%1$s«이 \'고정된 한계값\'을 벗어났습니다.</string>
+    <string name="value_out_of_hard_limits">»%1$s« %2$.2f이 \'고정된 한계값\'을 벗어났습니다.</string>
+    <string name="basal_value">Basal 값</string>
     <plurals name="days">
         <item quantity="other">%1$d 일</item>
     </plurals>
diff --git a/core/src/main/res/values-ko-rKR/validator.xml b/core/src/main/res/values-ko-rKR/validator.xml
index 64e4675402..f7ba8f1061 100644
--- a/core/src/main/res/values-ko-rKR/validator.xml
+++ b/core/src/main/res/values-ko-rKR/validator.xml
@@ -2,6 +2,23 @@
 <resources>
     <string name="error_only_numeric_digits_allowed">숫자만 입력가능합니다.</string>
     <string name="error_only_numeric_digits_range_allowed">이 범위(%1$s - %2$s)안에 해당하는 숫자만 입력가능합니다.</string>
+    <string name="error_this_field_cannot_contain_special_character">이 영역은 특수 문자를 입력할 수 없습니다</string>
+    <string name="error_only_standard_letters_are_allowed">표준 문자만 입력 가능합니다.</string>
     <string name="error_field_must_not_be_empty">필수 입력 항목입니다.</string>
+    <string name="error_email_address_not_valid">유효하지 않은 이메일 주소</string>
+    <string name="error_creditcard_number_not_valid">신용 카드 번호가 유효하지 않습니다.</string>
     <string name="error_phone_not_valid">폰번호가 유효하지 않습니다</string>
+    <string name="error_domain_not_valid">유효하지 않은 도메인 이름</string>
+    <string name="error_ip_not_valid">유효하지 않은 IP 주소</string>
+    <string name="error_url_not_valid">Web URL이 유효하지 않습니다.</string>
+    <string name="error_notvalid_personname">유효하지 않은 성 또는 이름</string>
+    <string name="error_notvalid_personfullname">유효하지 않은 이름</string>
+    <string name="error_date_not_valid">유효하지 않은 형식</string>
+    <string name="error_mustbe4digitnumber">4자리 숫자이어야 함</string>
+    <string name="error_mustbe6digitnumber">6자리 숫자이어야 함</string>
+    <string name="error_mustbe12hexadidits">ABCDEF0123456789로 구성된 12자리 문자이어야 함</string>
+    <string name="error_mustbe8hexadidits">ABCDEF083456789로 구성된 8자리 문자이어야 함</string>
+    <string name="error_mustbe4hexadidits">ABCDEF043456789로 구성된 4자리 문자이어야 함</string>
+    <string name="error_not_a_minimum_length">최소 길이가 안됨</string>
+    <string name="error_pin_not_valid">비밀번호는 똑같은 숫자나 연속된 숫자를 제외한 3~6자리 숫자이어야 함</string>
 </resources>
diff --git a/core/src/test/java/info/nightscout/androidaps/utils/rx/RxExtensionsTest.kt b/core/src/test/java/info/nightscout/androidaps/utils/rx/RxExtensionsTest.kt
new file mode 100644
index 0000000000..2e84af6618
--- /dev/null
+++ b/core/src/test/java/info/nightscout/androidaps/utils/rx/RxExtensionsTest.kt
@@ -0,0 +1,132 @@
+package info.nightscout.androidaps.utils.rx
+
+import io.reactivex.Observable
+import io.reactivex.observers.TestObserver
+import io.reactivex.schedulers.TestScheduler
+import org.junit.Assert.assertEquals
+import org.junit.Rule
+import org.junit.Test
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicInteger
+
+class RxExtensionsTest {
+
+    private val testScheduler = TestScheduler()
+
+    @get:Rule
+    val schedulerRule = RxSchedulerRule(testScheduler)
+
+    @Test
+    fun `fail after 4 retries`() {
+        val atomicInteger = AtomicInteger()
+        val testObservable: TestObserver<Int> = succeedOnObservable(atomicInteger, 5)
+            .retryWithBackoff(4, 1, TimeUnit.SECONDS)
+            .test()
+        assertEquals(1, atomicInteger.get()) // 1st failure
+        testObservable.assertNotComplete()
+        testObservable.assertNotTerminated()
+        testObservable.assertNever(1)
+
+        testScheduler.advanceTimeBy(3, TimeUnit.SECONDS)  // 2nd, 3rd, 4th failure
+        assertEquals(4, atomicInteger.get())
+        testObservable.assertNotComplete()
+        testObservable.assertNotTerminated()
+        testObservable.assertNever(1)
+
+        testScheduler.advanceTimeBy(1, TimeUnit.SECONDS)  // 5th failure on 4th retry
+        assertEquals(5, atomicInteger.get())
+        testObservable.assertError(RuntimeException::class.java)
+        testObservable.assertNever(1)
+    }
+
+    @Test
+    fun `succeed after 4 retries`() {
+        val atomicInteger = AtomicInteger()
+        val testObservable: TestObserver<Int> = succeedOnObservable(atomicInteger, 4)
+            .retryWithBackoff(4, 1, TimeUnit.SECONDS)
+            .test()
+        assertEquals(1, atomicInteger.get()) // 1st failure
+        testObservable.assertNotComplete()
+        testObservable.assertNotTerminated()
+        testObservable.assertNever(1)
+
+        testScheduler.advanceTimeBy(3, TimeUnit.SECONDS)  // 2nd, 3rd, 4th failure
+        assertEquals(4, atomicInteger.get())
+        testObservable.assertNotComplete()
+        testObservable.assertNotTerminated()
+        testObservable.assertNever(1)
+
+        testScheduler.advanceTimeBy(1, TimeUnit.SECONDS)  // 5th is a charm
+        assertEquals(5, atomicInteger.get())
+        testObservable.assertValue(1)
+    }
+
+    @Test
+    fun `succeed after 4 retries with delay factor`() {
+        val atomicInteger = AtomicInteger()
+        val testObservable: TestObserver<Int> = succeedOnObservable(atomicInteger, 4)
+            .retryWithBackoff(4, 1, TimeUnit.SECONDS, delayFactor = 1.2)
+            .test()
+        assertEquals(1, atomicInteger.get()) // 1st failure
+        testObservable.assertNotComplete()
+        testObservable.assertNotTerminated()
+        testObservable.assertNever(1)
+
+        testScheduler.advanceTimeBy(999, TimeUnit.MILLISECONDS)
+        assertEquals(1, atomicInteger.get())
+        testObservable.assertNotComplete()
+        testObservable.assertNotTerminated()
+        testObservable.assertNever(1)
+
+        testScheduler.advanceTimeBy(1, TimeUnit.MILLISECONDS) //1st retry after 1 second
+        assertEquals(2, atomicInteger.get())
+        testObservable.assertNotComplete()
+        testObservable.assertNotTerminated()
+        testObservable.assertNever(1)
+
+        testScheduler.advanceTimeBy(1199, TimeUnit.MILLISECONDS)
+        assertEquals(2, atomicInteger.get())
+        testObservable.assertNotComplete()
+        testObservable.assertNotTerminated()
+        testObservable.assertNever(1)
+
+        testScheduler.advanceTimeBy(1, TimeUnit.MILLISECONDS) //2nd retry after 1.2 seconds more
+        assertEquals(3, atomicInteger.get())
+        testObservable.assertNotComplete()
+        testObservable.assertNotTerminated()
+        testObservable.assertNever(1)
+
+        testScheduler.advanceTimeBy(1439, TimeUnit.MILLISECONDS)
+        assertEquals(3, atomicInteger.get())
+        testObservable.assertNotComplete()
+        testObservable.assertNotTerminated()
+        testObservable.assertNever(1)
+
+        testScheduler.advanceTimeBy(1, TimeUnit.MILLISECONDS) //3rd retry after 1.44 seconds more
+        assertEquals(4, atomicInteger.get())
+        testObservable.assertNotComplete()
+        testObservable.assertNotTerminated()
+        testObservable.assertNever(1)
+
+        testScheduler.advanceTimeBy(1726, TimeUnit.MILLISECONDS)
+        assertEquals(4, atomicInteger.get())
+        testObservable.assertNotComplete()
+        testObservable.assertNotTerminated()
+        testObservable.assertNever(1)
+
+        //4th retry = 5th try is a charm after 1.728 seconds more - rounding error by 1 millisecond!!
+        testScheduler.advanceTimeBy(1, TimeUnit.MILLISECONDS)
+        assertEquals(5, atomicInteger.get())
+        testObservable.assertValue(1)
+    }
+
+    private fun succeedOnObservable(atomicInteger: AtomicInteger, initialFailures: Int): Observable<Int> =
+        Observable.defer {
+            if (atomicInteger.incrementAndGet() == initialFailures + 1) {
+                Observable.just(1)
+            } else {
+                Observable.error(RuntimeException())
+            }
+        }
+
+}
\ No newline at end of file
diff --git a/core/src/test/java/info/nightscout/androidaps/utils/rx/RxSchedulerRule.kt b/core/src/test/java/info/nightscout/androidaps/utils/rx/RxSchedulerRule.kt
new file mode 100644
index 0000000000..3ccdc9dcf4
--- /dev/null
+++ b/core/src/test/java/info/nightscout/androidaps/utils/rx/RxSchedulerRule.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.utils.rx
+
+import io.reactivex.Scheduler
+import io.reactivex.android.plugins.RxAndroidPlugins
+import io.reactivex.plugins.RxJavaPlugins
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+
+class RxSchedulerRule(val scheduler: Scheduler) : TestRule {
+
+    override fun apply(base: Statement, description: Description) =
+        object : Statement() {
+            override fun evaluate() {
+                RxAndroidPlugins.reset()
+                RxAndroidPlugins.setInitMainThreadSchedulerHandler { scheduler }
+                RxJavaPlugins.reset()
+                RxJavaPlugins.setIoSchedulerHandler { scheduler }
+                RxJavaPlugins.setNewThreadSchedulerHandler { scheduler }
+                RxJavaPlugins.setComputationSchedulerHandler { scheduler }
+
+                try {
+                    base.evaluate()
+                } finally {
+                    RxJavaPlugins.reset()
+                    RxAndroidPlugins.reset()
+                }
+
+            }
+        }
+}
\ No newline at end of file
diff --git a/dana/src/main/res/values-de-rDE/strings.xml b/dana/src/main/res/values-de-rDE/strings.xml
index c6b0d17822..07b1afd24a 100644
--- a/dana/src/main/res/values-de-rDE/strings.xml
+++ b/dana/src/main/res/values-de-rDE/strings.xml
@@ -5,7 +5,9 @@
     <string name="danars_pairingok">Pairing OK</string>
     <string name="danars_pairingtimedout">Zeitüberschreitung beim Pairing</string>
     <string name="danars_waitingforpairing">Auf Verbindung warten</string>
+    <string name="danarspump">Dana-i/RS</string>
     <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Pumpen-Integration für Dana Diabecare RS und Dana-i Pumpen</string>
     <string name="maxbolusviolation">Max. Bolus überschritten</string>
     <string name="commanderror">Fehler bei Befehl</string>
     <string name="speederror">Geschwindigkeits-Fehler</string>
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
index a73ea6b675..896f456d68 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
@@ -439,7 +439,7 @@ class DanaRSPlugin @Inject constructor(
         result.enacted = false
         result.success = false
         result.comment = resourceHelper.gs(R.string.tempbasaldeliveryerror)
-        aapsLogger.error("setTempBasalPercent: Failed to set temp basal")
+        aapsLogger.error("setTempBasalPercent: Failed to set temp basal. connectionOK: $connectionOK isTempBasalInProgress: ${danaPump.isTempBasalInProgress} tempBasalPercent: ${danaPump.tempBasalPercent}")
         return result
     }
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
index ab5d1e13a0..b740eaa1d7 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
@@ -376,6 +376,7 @@ class DanaRSService : DaggerService() {
         sendMessage(msgTBR)
         loadEvents()
         val tbr = pumpSync.expectedPumpState().temporaryBasal
+        aapsLogger.debug(LTag.PUMPCOMM, "Expected TBR found: $tbr")
         danaPump.fromTemporaryBasal(tbr)
         rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
         return msgTBR.success()
diff --git a/database/src/main/java/info/nightscout/androidaps/database/AppRepository.kt b/database/src/main/java/info/nightscout/androidaps/database/AppRepository.kt
index eaab40563d..6654bd1377 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/AppRepository.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/AppRepository.kt
@@ -17,8 +17,7 @@ import javax.inject.Singleton
 import kotlin.math.roundToInt
 
 @OpenForTesting
-@Singleton
-open class AppRepository @Inject internal constructor(
+@Singleton class AppRepository @Inject internal constructor(
     internal val database: AppDatabase
 ) {
 
@@ -263,6 +262,10 @@ open class AppRepository @Inject internal constructor(
                 }
             }
 
+    fun getModifiedEffectiveProfileSwitchDataFromId(lastId: Long): Single<List<EffectiveProfileSwitch>> =
+        database.effectiveProfileSwitchDao.getModifiedFrom(lastId)
+            .subscribeOn(Schedulers.io())
+
     fun createEffectiveProfileSwitch(profileSwitch: EffectiveProfileSwitch) {
         database.effectiveProfileSwitchDao.insert(profileSwitch)
     }
@@ -485,7 +488,7 @@ open class AppRepository @Inject internal constructor(
     private fun Single<List<Carbs>>.expand() = this.map { it.map(::expandCarbs).flatten() }
     private fun Single<List<Carbs>>.filterOutExtended() = this.map { it.filter { c -> c.duration == 0L } }
     private fun Single<List<Carbs>>.fromTo(from: Long, to: Long) = this.map { it.filter { c -> c.timestamp in from..to } }
-    private fun Single<List<Carbs>>.until(to: Long) = this.map { it.filter { c -> c.timestamp <= to } }
+    private infix fun Single<List<Carbs>>.until(to: Long) = this.map { it.filter { c -> c.timestamp <= to } }
     private fun Single<List<Carbs>>.from(start: Long) = this.map { it.filter { c -> c.timestamp >= start } }
     private fun Single<List<Carbs>>.sort() = this.map { it.sortedBy { c -> c.timestamp } }
 
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/EffectiveProfileSwitchDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/EffectiveProfileSwitchDao.kt
index db5c4c1134..a6db4442c1 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/EffectiveProfileSwitchDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/EffectiveProfileSwitchDao.kt
@@ -2,9 +2,7 @@ package info.nightscout.androidaps.database.daos
 
 import androidx.room.Dao
 import androidx.room.Query
-import info.nightscout.androidaps.database.TABLE_CARBS
 import info.nightscout.androidaps.database.TABLE_EFFECTIVE_PROFILE_SWITCHES
-import info.nightscout.androidaps.database.entities.Carbs
 import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch
 import io.reactivex.Maybe
 import io.reactivex.Single
@@ -22,6 +20,12 @@ internal interface EffectiveProfileSwitchDao : TraceableDao<EffectiveProfileSwit
     @Query("SELECT id FROM $TABLE_EFFECTIVE_PROFILE_SWITCHES ORDER BY id DESC limit 1")
     fun getLastId(): Maybe<Long>
 
+    @Query("SELECT * FROM $TABLE_EFFECTIVE_PROFILE_SWITCHES WHERE timestamp = :timestamp AND referenceId IS NULL")
+    fun findByTimestamp(timestamp: Long): EffectiveProfileSwitch?
+
+    @Query("SELECT * FROM $TABLE_EFFECTIVE_PROFILE_SWITCHES WHERE nightscoutId = :nsId AND referenceId IS NULL")
+    fun findByNSId(nsId: String): EffectiveProfileSwitch?
+
     @Query("SELECT * FROM $TABLE_EFFECTIVE_PROFILE_SWITCHES WHERE isValid = 1 AND referenceId IS NULL ORDER BY id ASC LIMIT 1")
     fun getOldestEffectiveProfileSwitchRecord(): EffectiveProfileSwitch?
 
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/ProfileSwitchDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/ProfileSwitchDao.kt
index da390174d9..14ab01da4d 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/ProfileSwitchDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/ProfileSwitchDao.kt
@@ -2,11 +2,9 @@ package info.nightscout.androidaps.database.daos
 
 import androidx.room.Dao
 import androidx.room.Query
-import info.nightscout.androidaps.database.TABLE_GLUCOSE_VALUES
 import info.nightscout.androidaps.database.TABLE_PROFILE_SWITCHES
 import info.nightscout.androidaps.database.daos.workaround.ProfileSwitchDaoWorkaround
 import info.nightscout.androidaps.database.data.checkSanity
-import info.nightscout.androidaps.database.entities.GlucoseValue
 import info.nightscout.androidaps.database.entities.ProfileSwitch
 import io.reactivex.Maybe
 import io.reactivex.Single
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/EffectiveProfileSwitch.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/EffectiveProfileSwitch.kt
index 7a2285831e..a7ff14eb64 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/EffectiveProfileSwitch.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/EffectiveProfileSwitch.kt
@@ -54,6 +54,8 @@ data class EffectiveProfileSwitch(
 
     enum class GlucoseUnit {
         MGDL,
-        MMOL
+        MMOL;
+
+        companion object
     }
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
index 4b2b56d019..e7a753713a 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
@@ -21,7 +21,7 @@ data class UserEntry(
     var action: Action,
     var source: Sources,
     var note: String,
-    var values: List<ValueWithUnit?>
+    var values: List<@JvmSuppressWildcards ValueWithUnit?>
 ) : DBEntry, DBEntryWithTime {
     enum class Action (val colorGroup: ColorGroup) {
         BOLUS (ColorGroup.InsulinTreatment),
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsEffectiveProfileSwitchTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsEffectiveProfileSwitchTransaction.kt
new file mode 100644
index 0000000000..fd7eced13c
--- /dev/null
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsEffectiveProfileSwitchTransaction.kt
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.database.transactions
+
+import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch
+
+/**
+ * Sync the EffectiveProfileSwitch from NS
+ */
+class SyncNsEffectiveProfileSwitchTransaction(private val effectiveProfileSwitch: EffectiveProfileSwitch, private val invalidateByNsOnly: Boolean) : Transaction<SyncNsEffectiveProfileSwitchTransaction.TransactionResult>() {
+
+    override fun run(): TransactionResult {
+        val result = TransactionResult()
+
+        val current: EffectiveProfileSwitch? =
+            effectiveProfileSwitch.interfaceIDs.nightscoutId?.let {
+                database.effectiveProfileSwitchDao.findByNSId(it)
+            }
+
+        if (current != null) {
+            // nsId exists, allow only invalidation
+            if (current.isValid && !effectiveProfileSwitch.isValid) {
+                current.isValid = false
+                database.effectiveProfileSwitchDao.updateExistingEntry(current)
+                result.invalidated.add(current)
+            }
+            return result
+        }
+
+        if (invalidateByNsOnly) return result
+
+        // not known nsId
+        val existing = database.effectiveProfileSwitchDao.findByTimestamp(effectiveProfileSwitch.timestamp)
+        if (existing != null && existing.interfaceIDs.nightscoutId == null) {
+            // the same record, update nsId only
+            existing.interfaceIDs.nightscoutId = effectiveProfileSwitch.interfaceIDs.nightscoutId
+            existing.isValid = effectiveProfileSwitch.isValid
+            database.effectiveProfileSwitchDao.updateExistingEntry(existing)
+            result.updatedNsId.add(existing)
+        } else {
+            database.effectiveProfileSwitchDao.insertNewEntry(effectiveProfileSwitch)
+            result.inserted.add(effectiveProfileSwitch)
+        }
+        return result
+    }
+
+    class TransactionResult {
+
+        val updatedNsId = mutableListOf<EffectiveProfileSwitch>()
+        val inserted = mutableListOf<EffectiveProfileSwitch>()
+        val invalidated = mutableListOf<EffectiveProfileSwitch>()
+    }
+}
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdEffectiveProfileSwitchTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdEffectiveProfileSwitchTransaction.kt
new file mode 100644
index 0000000000..027bf61b3a
--- /dev/null
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdEffectiveProfileSwitchTransaction.kt
@@ -0,0 +1,14 @@
+package info.nightscout.androidaps.database.transactions
+
+import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch
+
+class UpdateNsIdEffectiveProfileSwitchTransaction(val effectiveProfileSwitch: EffectiveProfileSwitch) : Transaction<Unit>() {
+
+    override fun run() {
+        val current = database.effectiveProfileSwitchDao.findById(effectiveProfileSwitch.id)
+        if (current != null && current.interfaceIDs.nightscoutId != effectiveProfileSwitch.interfaceIDs.nightscoutId) {
+            current.interfaceIDs.nightscoutId = effectiveProfileSwitch.interfaceIDs.nightscoutId
+            database.effectiveProfileSwitchDao.updateExistingEntry(current)
+        }
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingPacket.kt
index d0805f6a5f..081362f1c6 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingPacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingPacket.kt
@@ -22,7 +22,7 @@ class AppConfirmSettingPacket(
     }
 
     override fun encode(msgSeq:Int): ByteArray {
-        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
 
         buffer.put(reqMsgType)  // 명령코드
         buffer.putInt(otp) //  응답시 전달받은 opt (random 6digit numbner)
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquirePacket.kt
index 36a484cf4a..5dc1860e03 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquirePacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquirePacket.kt
@@ -20,7 +20,7 @@ class BasalLimitInquirePacket(
     }
 
     override fun encode(msgSeq:Int): ByteArray {
-        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
         return suffixEncode(buffer)
     }
 
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingPacket.kt
index 69c88187e9..e0557dd9ca 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingPacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingPacket.kt
@@ -21,7 +21,7 @@ class BasalPauseSettingPacket(
     }
 
     override fun encode(msgSeq:Int): ByteArray {
-        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
         buffer.put(status.toByte()) // (1:pause, 2: cancel pause)
         return suffixEncode(buffer)
     }
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquirePacket.kt
index 9c0692ab45..3d9f9d2769 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquirePacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquirePacket.kt
@@ -20,7 +20,7 @@ class DisplayTimeInquirePacket(
     }
 
     override fun encode(msgSeq:Int): ByteArray {
-        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
         return suffixEncode(buffer)
     }
 
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingPacket.kt
index 4e9cbf546b..a912b284d7 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingPacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingPacket.kt
@@ -20,7 +20,7 @@ class InjectionBasalSettingPacket(
     }
 
     override fun encode(msgSeq:Int): ByteArray {
-        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
         buffer.put(pattern.toByte())
         return suffixEncode(buffer)
     }
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingPacket.kt
index ed901b9187..5460a2de20 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingPacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingPacket.kt
@@ -21,7 +21,7 @@ class InjectionMealSettingPacket(
     }
 
     override fun encode(msgSeq:Int): ByteArray {
-        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
         buffer.putShort(amount.toShort())
         buffer.putLong(bcDttm)
         return suffixEncode(buffer)
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingPacket.kt
index 5312aa348e..a3b80bba6a 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingPacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingPacket.kt
@@ -20,7 +20,7 @@ class InjectionSnackSettingPacket(
     }
 
     override fun encode(msgSeq:Int): ByteArray {
-        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
         buffer.putShort(amount.toShort())
         return suffixEncode(buffer)
     }
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquirePacket.kt
index 7bca3e499b..d727abd40f 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquirePacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquirePacket.kt
@@ -20,7 +20,7 @@ class LanguageInquirePacket(
     }
 
     override fun encode(msgSeq:Int): ByteArray {
-        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
         return suffixEncode(buffer)
     }
 
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquirePacket.kt
index 983887eccb..d4357b1554 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquirePacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquirePacket.kt
@@ -20,7 +20,7 @@ class SneckLimitInquirePacket(
     }
 
     override fun encode(msgSeq:Int): ByteArray {
-        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
         return suffixEncode(buffer)
     }
 
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquirePacket.kt
index 790523aff9..883fc8b283 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquirePacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquirePacket.kt
@@ -20,7 +20,7 @@ class SoundInquirePacket(
     }
 
     override fun encode(msgSeq:Int): ByteArray {
-        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
         return suffixEncode(buffer)
     }
 
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquirePacket.kt
index 722e2030d2..2491bea781 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquirePacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquirePacket.kt
@@ -20,7 +20,7 @@ class TimeInquirePacket(
     }
 
     override fun encode(msgSeq:Int): ByteArray {
-        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
         return suffixEncode(buffer)
     }
 
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt
index 86b1f3befd..0e9436718d 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt
@@ -31,7 +31,7 @@ class TimeInquireResponsePacket(
         val result2 =  getByteToInt(bufferData)
         if(!isSuccInquireResponseResult(result2)) {
             failed = true
-            return;
+            return
         }
     }
 
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingPacket.kt
index ad158bb211..b67b96c623 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingPacket.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingPacket.kt
@@ -25,7 +25,7 @@ class TimeSettingPacket(
     }
 
     override fun encode(msgSeq:Int): ByteArray {
-        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
         val date = DateTime(time).withZone(DateTimeZone.UTC)
         buffer.put((date.year - 2000 and 0xff).toByte())
         buffer.put((date.monthOfYear and 0xff).toByte())
diff --git a/diaconn/src/main/res/values-de-rDE/strings.xml b/diaconn/src/main/res/values-de-rDE/strings.xml
index 76017f5a34..716f9e053b 100644
--- a/diaconn/src/main/res/values-de-rDE/strings.xml
+++ b/diaconn/src/main/res/values-de-rDE/strings.xml
@@ -52,6 +52,8 @@
     <string name="diagonn_g8_useroptions">BENUTZER-OPTIONEN</string>
     <string name="pairfirst">Bitte kopple deine Pumpe mit deinem Telefon!</string>
     <string name="processinghistory">"Ereignis wird verarbeitet "</string>
+    <string name="apslastLogNum">aps_last_log_num</string>
+    <string name="apsWrappingCount">aps_wrapping_count</string>
     <string name="diaconn_g8_history_tempbasal">Temporäre Basalrate</string>
     <string name="diaconng8_pump_settings">Diaconn-Pumpen Einstellungen</string>
     <string name="diaconn_g8_pumpalarm">Töne</string>
@@ -79,6 +81,9 @@
     <string name="insulinlackwarning">Warnung Insulinmangel</string>
     <string name="needbatteryreplace">Batteriewechsel erforderlich</string>
     <string name="needinsullinreplace">Neues Insulin erforderlich</string>
+    <string name="pumpversion">pump_version</string>
+    <string name="apsIncarnationNo">aps_incarnation_no</string>
+    <string name="pumpserialno">pump_serial_no</string>
     <string name="diaconn_g8_loginsulinchange_title">Reservoirwechsel aufzeichnen</string>
     <string name="diaconn_g8_loginsulinchange_summary">Reservoirwechsel im Careportal hinzufügen, falls dies in der Historie gefunden wird.</string>
     <string name="diaconn_g8_logcanulachange_title">Kanülenwechsel protokollieren</string>
@@ -112,6 +117,7 @@
     <string name="diacon_g8_blockdualbolus">DUAL BOLUS</string>
     <string name="diacon_g8_blockreplacetube">KATHETER WECHSELN</string>
     <string name="diacon_g8_blockreplaceneedle">KANÜLE WECHSELN</string>
+    <string name="diacon_g8_blockreplacesyringe">NADEL WECHSELN</string>
     <string name="diaconn_g8_logalarmblock">Verstopfung (%s)</string>
     <string name="diaconn_g8_lgorelease">Basalabgabe (%s)</string>
     <string name="diaconn_g8_lgosuspend">Basal unterbrechen (%s)</string>
diff --git a/diaconn/src/main/res/values-ko-rKR/strings.xml b/diaconn/src/main/res/values-ko-rKR/strings.xml
index 17265a3e78..2000c331b4 100644
--- a/diaconn/src/main/res/values-ko-rKR/strings.xml
+++ b/diaconn/src/main/res/values-ko-rKR/strings.xml
@@ -6,11 +6,21 @@
     <string name="pumperror">펌프 에러</string>
     <string name="diaconn_g8_history_alarm">알람</string>
     <string name="diaconn_g8_history_basalhours">시간당 Basal 주입량</string>
+    <string name="diaconn_g8_history_bolus">Bolus</string>
     <string name="diaconn_g8_history_dailyinsulin">하루 주입량</string>
+    <string name="diaconn_g8_history_errors">에러</string>
+    <string name="diaconn_g8_history_prime">프라임</string>
     <string name="diaconn_g8_history_refill">교체</string>
     <string name="diaconn_g8_history_suspend">중지</string>
+    <string name="diaconn_g8_pairingok">연동 완료</string>
+    <string name="diaconn_g8_waitingforpairing">연동 대기</string>
+    <string name="diaconn_firmware_version">버전</string>
+    <string name="invalidpairing">잘못된 연동 정보. 새로운 연동 요청함.</string>
     <string name="gettingpumpsettings">펌프상태조회</string>
     <string name="gettingpumptime">펌프시간정보 조회</string>
+    <string name="largetimediff">큰 시간 차이:\n펌프의 시간과 1.5시간 이상 차이가 납니다.\n펌프의 시간을 수동으로 변경하고, 예상치 못한 적용이 발생하지 않도록 펌프의 이력을 반드시 확인하십시오.\n가능한 경우, 시간을 변경하기 전에 펌프의 이력을 삭제하거나, 잘못 입력된 마지막 이력으로부터 DIA 시간만큼, 단 지금으로부터 최소한의 DIA 만큼, closed loop을 비활성화 하십시오.</string>
+    <string name="largetimedifftitle">큰 시간 차이</string>
+    <string name="approachingdailylimit">인슐린 하루 허용량 근접</string>
     <string name="startingbolus">Bolus 주입 시작</string>
     <string name="waitingforestimatedbolusend">Bolus 주입이 진행 중 입니다.</string>
     <string name="gettingbolusstatus">Bolus 상태 조회</string>
@@ -20,11 +30,30 @@
     <string name="stoppingextendedbolus">확장 Bolus 중지</string>
     <string name="updatingbasalrates">Basal 패턴 반영</string>
     <string name="description_pump_diaconn_g8">G2e에서 만든 Diaconn G8 펌프</string>
+    <string name="diaconn_g8_pump">디아콘 G8</string>
+    <string name="diaconn_g8_pump_shortname">디아콘 G8</string>
+    <string name="maxbolusviolation">최대 bolus 초과</string>
+    <string name="commanderror">명령 오류</string>
     <string name="speederror">속도 에러</string>
+    <string name="insulinlimitviolation">인슐린 제한 초과</string>
+    <string name="boluserrorcode">요청: %1$.2fU 주입됨: %2$.2fU 에러 코드: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly">적절하지 않은 값</string>
+    <string name="diaconn_g8_bt_name_title">디아콘 G8 블루투스 장치</string>
+    <string name="diaconn_g8_password_title">펌프 비밀번호</string>
     <string name="bolusspeed">Bolus 주입속도</string>
     <string name="selectedpump">펌프를 선택하세요.</string>
+    <string name="diaconn_g8_useextended_title">&gt;200%% 주입 위해 확장 bolus 사용</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">확장 bolus를 %%로 표시하기</string>
+    <string name="diaconn_g8_bluetooth_status">블루투스 상태</string>
+    <string name="diagonn_g8_tdd_label">일총량</string>
+    <string name="bolus_step">Bolus 단위</string>
+    <string name="basal_step">Basal 단위</string>
+    <string name="pump_firmware_label">펌웨어</string>
     <string name="diagonn_g8_useroptions">사용자설정</string>
     <string name="pairfirst">펌프와 전화기를 페어링해 주세요!</string>
+    <string name="processinghistory">"이벤트 처리 중 "</string>
+    <string name="apslastLogNum">aps_last_log_num</string>
+    <string name="apsWrappingCount">apsaps_wrapping_count</string>
     <string name="diaconn_g8_history_tempbasal">임시 Basal</string>
     <string name="diaconng8_pump_settings">디아콘 펌프 설정</string>
     <string name="diaconn_g8_pumpalarm">음향 선택</string>
@@ -36,17 +65,25 @@
     <string name="diaconn_g8_pumpalarm_intensity_middle">중</string>
     <string name="diaconn_g8_pumpalarm_intensity_high">대</string>
     <string name="diaconn_g8_screentimeout">조명지속시간[초]</string>
+    <string name="diaconn_g8_saveuseroptions">펌프에 옵션 저장</string>
     <string name="diaconn_g8_language">언어설정</string>
     <string name="diaconn_g8_bolus_speed">Bolus 주입속도 [U/min]</string>
     <string name="diaconn_g8_pumplang_chiness">중국어</string>
     <string name="diaconn_g8_pumplang_korean">한국어</string>
     <string name="diaconn_g8_pumplang_english">영어</string>
+    <string name="diaconn_g8_screentimeout_10">"10 "</string>
+    <string name="diaconn_g8_pumpscreentimeout_10">10</string>
+    <string name="diaconn_g8_pumpscreentimeout_20">20</string>
+    <string name="diaconn_g8_pumpscreentimeout_30">30</string>
     <string name="diaconn_g8_pumpalarm_low">소</string>
     <string name="injectionblocked">Bolus 주입막힘</string>
     <string name="batterywarning">베터리 경고</string>
     <string name="insulinlackwarning">인슐린 부족 경고</string>
     <string name="needbatteryreplace">베터리 교체가 필요합니다.</string>
     <string name="needinsullinreplace">인슐린 교체가 필요합니다.</string>
+    <string name="pumpversion">펌프_버전</string>
+    <string name="apsIncarnationNo">aps_incarnation_no</string>
+    <string name="pumpserialno">펌프_시리얼_넘버</string>
     <string name="diaconn_g8_loginsulinchange_title">인슐린 교체</string>
     <string name="diaconn_g8_loginsulinchange_summary">로그 동기화 시 케어포털 \"인슐린 교체\" 정보 자동 업로드</string>
     <string name="diaconn_g8_logcanulachange_title">바늘 교체</string>
@@ -92,6 +129,7 @@
     <string name="diaconn_g8_logmealfail">식사 실패</string>
     <string name="diaconn_g8_logsuccess">성공</string>
     <string name="diaconn_g8_logmealsuccess">식사 성공</string>
+    <string name="key_diaconn_g8_logtubechange">디아콘_g8_로그튜브변경</string>
     <string name="diaconn_g8_errorcode_1">패킷 CRC 오류로 조회 불가합니다.</string>
     <string name="diaconn_g8_errorcode_2">입력 파라미터 오류로 설정 불가합니다.</string>
     <string name="diaconn_g8_errorcode_3">프로토콜 규격 오류로 설정 불가합니다.</string>
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index 56cac1b6c7..ead54ec5e3 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -1433,7 +1433,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
         bolusID = insightDbHelper.getInsightBolusID(serial, event.getBolusID(), startTimestamp); // Line added to get id
         if (event.getBolusType() == BolusType.STANDARD || event.getBolusType() == BolusType.MULTIWAVE) {
             pumpSync.syncBolusWithPumpId(
-                    startTimestamp,
+                    bolusID.getTimestamp(),
                     event.getImmediateAmount(),
                     null,
                     bolusID.getId(),
@@ -1443,7 +1443,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
         if (event.getBolusType() == BolusType.EXTENDED || event.getBolusType() == BolusType.MULTIWAVE) {
             if (event.getDuration() > 0 && profileFunction.getProfile(bolusID.getTimestamp()) != null)
                     pumpSync.syncExtendedBolusWithPumpId(
-                            startTimestamp,
+                            bolusID.getTimestamp(),
                             event.getExtendedAmount(),
                             timestamp - startTimestamp,
                             isFakingTempsByExtendedBoluses(),
@@ -1557,8 +1557,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
     }
 
     private long parseRelativeDate(int year, int month, int day, int hour, int minute, int second, int relativeHour, int relativeMinute, int relativeSecond) {
-        if (relativeHour * 60 * 60 + relativeMinute * 60 + relativeSecond >= hour * 60 * 60 * minute * 60 + second)
-            day--;
         Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
         calendar.set(Calendar.YEAR, year);
         calendar.set(Calendar.MONTH, month - 1);
@@ -1566,7 +1564,9 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
         calendar.set(Calendar.HOUR_OF_DAY, relativeHour);
         calendar.set(Calendar.MINUTE, relativeMinute);
         calendar.set(Calendar.SECOND, relativeSecond);
-        return calendar.getTimeInMillis();
+        long dayOffset =
+                relativeHour * 60 * 60 + relativeMinute * 60 + relativeSecond >= hour * 60 * 60 + minute * 60 + second ? T.Companion.days(1).msecs() : 0L;
+        return calendar.getTimeInMillis() - dayOffset;
     }
 
     private void uploadCareportalEvent(long date, DetailedBolusInfo.EventType event) {
diff --git a/insight/src/main/res/values-ko-rKR/strings.xml b/insight/src/main/res/values-ko-rKR/strings.xml
index 723469bd12..efb441f1ed 100644
--- a/insight/src/main/res/values-ko-rKR/strings.xml
+++ b/insight/src/main/res/values-ko-rKR/strings.xml
@@ -26,9 +26,15 @@
     <string name="code_compare">이 장치에서 보여지는 코드와 펌프에서 보여지는 코드가 동일한가요?</string>
     <string name="insight_pairing">Insight와 동기화</string>
     <string name="insight_local">아큐-첵 Insight</string>
+    <string name="insight_delivered">%1$.2f U / %2$.2f U 주입됨</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">튜브 변경</string>
     <string name="insightpump_shortname">Sight</string>
+    <string name="insight_alert_notification_channel">인사이트 펌프 경고</string>
+    <string name="disable_vibration">수동 bolus 주입 시 진동 비활성화</string>
+    <string name="disable_vibration_summary">Bolus와 확장 bolus의 경우 (인사이트 펌웨어 3.x에서만 가능함)</string>
+    <string name="disable_vibration_auto">자동 bolus 주입 시 진동 비활성화</string>
+    <string name="disable_vibration_auto_summary">SMB와 TBR 기능을 통한 임시 basal의 경우 (인사이트 펌웨어 3.x에서만 가능함)</string>
     <string name="timeout_during_handshake">연결 시간 초과 - 블루투스 재설정</string>
     <string name="pump_stopped">펌프 중지</string>
     <string name="pump_started">펌프 시작</string>
@@ -38,6 +44,7 @@
     <string name="short_status_extended">확장: %3$d분 동안 %1$.2f / %2$.2f U</string>
     <string name="short_status_multiwave">Multiwave: %3$d 분 동안 %1$.2f / %2$.2f U</string>
     <string name="short_status_tdd">TDD: %1$.2f</string>
+    <string name="short_status_reservoir">잔여 인슐린 양 : %1$.2f U</string>
     <string name="short_status_battery">Batt.: %1$d%%</string>
     <string name="confirm">확인</string>
     <string name="mute_alert">음소거</string>
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt
index 4f918f1ceb..3478cfce7c 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt
@@ -54,9 +54,12 @@ class MedtronicCommunicationManager  // This empty constructor must be kept, oth
     @Inject lateinit var medtronicUtil: MedtronicUtil
     @Inject lateinit var medtronicPumpHistoryDecoder: MedtronicPumpHistoryDecoder
 
-    private val MAX_COMMAND_TRIES = 3
-    private val DEFAULT_TIMEOUT = 2000
-    private val RILEYLINK_TIMEOUT: Long = 15 * 60 * 1000 // 15 min
+    companion object {
+
+        private const val MAX_COMMAND_TRIES = 3
+        private const val DEFAULT_TIMEOUT = 2000
+        private const val RILEYLINK_TIMEOUT: Long = 15 * 60 * 1000L // 15 min
+    }
 
     var errorResponse: String? = null
         private set
@@ -64,7 +67,7 @@ class MedtronicCommunicationManager  // This empty constructor must be kept, oth
     private var doWakeUpBeforeCommand = true
 
     @Inject
-    fun onInit(): Unit {
+    fun 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)
@@ -92,7 +95,7 @@ class MedtronicCommunicationManager  // This empty constructor must be kept, oth
      *
      * @return
      */
-    fun isDeviceReachable(canPreventTuneUp: Boolean): Boolean {
+    private fun isDeviceReachable(canPreventTuneUp: Boolean): Boolean {
         val state = medtronicPumpStatus.pumpDeviceState
         if (state !== PumpDeviceState.PumpUnreachable) medtronicPumpStatus.pumpDeviceState = PumpDeviceState.WakingUp
         for (retry in 0..4) {
@@ -189,6 +192,7 @@ class MedtronicCommunicationManager  // This empty constructor must be kept, oth
         }
     }
 
+    @Suppress("SameParameterValue")
     @Throws(RileyLinkCommunicationException::class)
     private fun runCommandWithFrames(commandType: MedtronicCommandType, frames: List<List<Byte>>): PumpMessage? {
         aapsLogger.debug(LTag.PUMPCOMM, "Run command with Frames: " + commandType.name)
@@ -266,7 +270,7 @@ class MedtronicCommunicationManager  // This empty constructor must be kept, oth
             while (!done) {
                 // examine current response for problems.
                 val frameData = currentResponse.frameData
-                if (frameData.size > 0 && currentResponse.frameNumber == expectedFrameNum) {
+                if (frameData.isNotEmpty() && currentResponse.frameNumber == expectedFrameNum) {
                     // success! got a frame.
                     if (frameData.size != 64) {
                         aapsLogger.warn(LTag.PUMPCOMM, "Expected frame of length 64, got frame of length " + frameData.size)
@@ -286,12 +290,12 @@ class MedtronicCommunicationManager  // This empty constructor must be kept, oth
                         done = true // successful completion
                     }
                 } else {
-                    if (frameData.size == 0) {
+                    if (frameData.isEmpty()) {
                         aapsLogger.error(LTag.PUMPCOMM, "null frame data, retrying")
                     } else if (currentResponse.frameNumber != expectedFrameNum) {
                         aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Expected frame number %d, received %d (retrying)", expectedFrameNum,
                             currentResponse.frameNumber))
-                    } else if (frameData.size == 0) {
+                    } else if (frameData.isEmpty()) {
                         aapsLogger.warn(LTag.PUMPCOMM, "Frame has zero length, retrying")
                     }
                     failures++
@@ -381,8 +385,7 @@ class MedtronicCommunicationManager  // This empty constructor must be kept, oth
         medtronicPumpStatus.pumpDeviceState = PumpDeviceState.Active
 
         // create message
-        val msg: PumpMessage
-        msg = bodyData?.let { makePumpMessage(commandType, it) } ?: makePumpMessage(commandType)
+        val msg: PumpMessage = bodyData?.let { makePumpMessage(commandType, it) } ?: makePumpMessage(commandType)
 
         // send and wait for response
         val response = sendAndListen(msg, timeoutMs)
@@ -396,8 +399,7 @@ class MedtronicCommunicationManager  // This empty constructor must be kept, oth
     }
 
     // All pump communications go through this function.
-    @Throws(RileyLinkCommunicationException::class)
-    protected /*override*/ fun sendAndListen(msg: PumpMessage, timeout_ms: Int): PumpMessage {
+    @Throws(RileyLinkCommunicationException::class) private /*override*/ fun sendAndListen(msg: PumpMessage, timeout_ms: Int): PumpMessage {
         return super.sendAndListen(msg, timeout_ms)!!
     }
 
@@ -451,7 +453,7 @@ class MedtronicCommunicationManager  // This empty constructor must be kept, oth
             return responseData
         }
         val contents = response.rawContent
-        return if (contents.size > 0) {
+        return if (contents.isNotEmpty()) {
             if (contents.size >= expectedLength) {
                 aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "%s: Content: %s", method, ByteUtil.shortHexString(contents)))
                 null
@@ -493,8 +495,7 @@ class MedtronicCommunicationManager  // This empty constructor must be kept, oth
         for (retries in 0..MAX_COMMAND_TRIES) {
             try {
                 // create message
-                var msg: PumpMessage
-                msg = makePumpMessage(commandType)
+                val msg: PumpMessage = makePumpMessage(commandType)
 
                 // send and wait for response
                 var response = sendAndListen(msg, DEFAULT_TIMEOUT + DEFAULT_TIMEOUT * retries)
@@ -527,7 +528,7 @@ class MedtronicCommunicationManager  // This empty constructor must be kept, oth
 
                 aapsLogger.debug(LTag.PUMPCOMM, "End Response: {}", ByteUtil.getHex(data))
 
-                var basalProfile: BasalProfile? = medtronicConverter.decodeBasalProfile(medtronicPumpPlugin.pumpDescription.pumpType, data)
+                val basalProfile: BasalProfile? = medtronicConverter.decodeBasalProfile(medtronicPumpPlugin.pumpDescription.pumpType, data)
                 // checkResponseRawContent(data, commandType) {
                 //     basalProfile = medtronicConverter.decodeBasalProfile(medtronicPumpPlugin.pumpDescription.pumpType, data)
                 // }
diff --git a/medtronic/src/main/res/values-ko-rKR/strings.xml b/medtronic/src/main/res/values-ko-rKR/strings.xml
index 8128024b04..244dc5ef7f 100644
--- a/medtronic/src/main/res/values-ko-rKR/strings.xml
+++ b/medtronic/src/main/res/values-ko-rKR/strings.xml
@@ -22,8 +22,10 @@
     <string name="medtronic_pump_battery_alkaline">알카라인(확장뷰)</string>
     <string name="medtronic_pump_battery_lithium">리튬(확장뷰)</string>
     <string name="medtronic_pump_battery_nizn">NiZn (확장 뷰)</string>
+    <string name="medtronic_pump_battery_nimh">니켈수소전지 (연장 뷰)</string>
     <string name="medtronic_bolus_debugging">Bolus/관리 디버깅</string>
     <!-- MDT Fragment -->
+    <string name="rl_battery_label">RileyLink 배터리</string>
     <!-- MDT Errors -->
     <string name="medtronic_errors">에러</string>
     <string name="medtronic_error_serial_not_set">일련번호 # 설정되지 않음</string>
@@ -63,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">이력 받기 - 페이지 %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">이력 받기 - 페이지 %1$d</string>
     <string name="medtronic_cmd_desc_get_time">펌프 시간 받기</string>
+    <string name="medtronic_cmd_desc_set_time">펌프 시간 설정</string>
+    <string name="medtronic_cmd_desc_get_battery_status">배터리 상태 확인</string>
     <string name="medtronic_cmd_desc_get_settings">설정 받기</string>
     <string name="medtronic_cmd_desc_get_model">펌프 모델 받기</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Basal 프로파일 받기</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Basal 프로파일 설정</string>
     <string name="medtronic_cmd_desc_get_tbr">임시 Basal 받기</string>
     <string name="medtronic_cmd_desc_set_tbr">임시 Basal 설정</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">임시 basal 취소</string>
     <string name="medtronic_cmd_desc_set_bolus">Bolus 설정</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">잔여 인슐린 확인</string>
     <string name="medtronic_pump_status_pump_unreachable">펌프에 연결할 수 없습니다</string>
     <string name="medtronic_warning">경고</string>
     <!-- medtronic_warning -->
@@ -81,4 +87,7 @@
     <string name="common_on">켜짐</string>
     <string name="common_off">끄기</string>
     <string name="pump_time_updated">펌프 시간 업데이트</string>
+    <string name="set_neutral_temps_title">기본 임시 basal 설정</string>
+    <string name="set_neutral_temps_summary">활성화되면, 매 한 시간 전에 임시 basal을 취소할 것입니다. 이 기능은 일부 펌프에서 한 시간마다 울리는 소리/진동 경고를 멈추게 합니다.</string>
+    <string name="mdt_tbr_remaining">%1$.1f U/h (%2$d 분 남음)</string>
 </resources>
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/dagger/OmnipodWizardModule.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/dagger/OmnipodWizardModule.kt
index 5b3a0075c0..889ac70ea5 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/dagger/OmnipodWizardModule.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/dagger/OmnipodWizardModule.kt
@@ -23,7 +23,10 @@ abstract class OmnipodWizardModule {
 
         @Provides
         @OmnipodPluginQualifier
-        fun providesViewModelFactory(@OmnipodPluginQualifier viewModels: MutableMap<Class<out ViewModel>, @JvmSuppressWildcards Provider<ViewModel>>): ViewModelProvider.Factory {
+        fun providesViewModelFactory(
+            @OmnipodPluginQualifier
+            viewModels: MutableMap<Class<out ViewModel>, @JvmSuppressWildcards Provider<ViewModel>>
+        ): ViewModelProvider.Factory {
             return ViewModelFactory(viewModels)
         }
     }
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandAcknowledgeAlerts.java b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSilenceAlerts.java
similarity index 80%
rename from omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandAcknowledgeAlerts.java
rename to omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSilenceAlerts.java
index ea8aa4fba3..b0089d949f 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandAcknowledgeAlerts.java
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/queue/command/CommandSilenceAlerts.java
@@ -4,7 +4,7 @@ import org.jetbrains.annotations.NotNull;
 
 import info.nightscout.androidaps.queue.commands.CustomCommand;
 
-public final class CommandAcknowledgeAlerts implements CustomCommand {
+public final class CommandSilenceAlerts implements CustomCommand {
     @NotNull @Override public String getStatusDescription() {
         return "ACKNOWLEDGE ALERTS";
     }
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/AttachPodFragment.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/AttachPodFragment.kt
index 3087690353..81befa950b 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/AttachPodFragment.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/info/AttachPodFragment.kt
@@ -41,7 +41,11 @@ class AttachPodFragment : InfoFragmentBase() {
                     .setIcon(android.R.drawable.ic_dialog_alert)
                     .setTitle(getString(getTitleId()))
                     .setMessage(getString(R.string.omnipod_common_pod_activation_wizard_attach_pod_confirm_insert_cannula_text))
-                    .setPositiveButton(getString(R.string.omnipod_common_ok)) { _, _ -> findNavController().navigate(getNextPageActionId()) }
+                    .setPositiveButton(getString(R.string.omnipod_common_ok)) { _, _ ->
+                        findNavController().navigate(
+                            getNextPageActionId()
+                        )
+                    }
                     .setNegativeButton(getString(R.string.omnipod_common_cancel), null)
                     .show()
             }
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt
index fcaf143c99..1b394cf7d8 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InitializePodViewModel.kt
@@ -1,3 +1,9 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action
 
-abstract class InitializePodViewModel : PodActivationActionViewModelBase()
\ No newline at end of file
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.AAPSLogger
+
+abstract class InitializePodViewModel(
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : PodActivationActionViewModelBase(injector, logger)
\ No newline at end of file
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt
index 73ebaa7bee..a07ce28eab 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/InsertCannulaViewModel.kt
@@ -1,3 +1,9 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action
 
-abstract class InsertCannulaViewModel : PodActivationActionViewModelBase()
\ No newline at end of file
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.AAPSLogger
+
+abstract class InsertCannulaViewModel(
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : PodActivationActionViewModelBase(injector, logger)
\ No newline at end of file
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt
index 2f5d8b2f51..b71ede17bf 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/viewmodel/action/PodActivationActionViewModelBase.kt
@@ -1,8 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action
 
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.viewmodel.ActionViewModelBase
 
-abstract class PodActivationActionViewModelBase : ActionViewModelBase() {
+abstract class PodActivationActionViewModelBase(
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : ActionViewModelBase(injector, logger) {
 
     abstract fun isPodInAlarm(): Boolean
 
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/ActionFragmentBase.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/ActionFragmentBase.kt
index 681f837150..2b8e628f81 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/ActionFragmentBase.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/ActionFragmentBase.kt
@@ -24,7 +24,8 @@ abstract class ActionFragmentBase : WizardFragmentBase() {
         binding.navButtonsLayout.buttonNext.isEnabled = false
         view.findViewById<TextView>(R.id.omnipod_wizard_action_page_text).setText(getTextId())
 
-        view.findViewById<Button>(R.id.omnipod_wizard_button_retry).setOnClickListener { actionViewModel.executeAction() }
+        view.findViewById<Button>(R.id.omnipod_wizard_button_retry)
+            .setOnClickListener { actionViewModel.executeAction() }
 
         actionViewModel.isActionExecutingLiveData.observe(viewLifecycleOwner, { isExecuting ->
             if (isExecuting) {
@@ -33,7 +34,8 @@ abstract class ActionFragmentBase : WizardFragmentBase() {
                 view.findViewById<Button>(R.id.omnipod_wizard_button_discard_pod).visibility = View.GONE
                 view.findViewById<Button>(R.id.omnipod_wizard_button_retry).visibility = View.GONE
             }
-            view.findViewById<ProgressBar>(R.id.omnipod_wizard_action_progress_indication).visibility = isExecuting.toVisibility()
+            view.findViewById<ProgressBar>(R.id.omnipod_wizard_action_progress_indication).visibility =
+                isExecuting.toVisibility()
             view.findViewById<Button>(R.id.button_cancel).isEnabled = !isExecuting
         })
 
@@ -42,9 +44,12 @@ abstract class ActionFragmentBase : WizardFragmentBase() {
                 val isExecuting = isActionExecuting()
 
                 view.findViewById<Button>(R.id.button_next).isEnabled = result.success
-                view.findViewById<ImageView>(R.id.omnipod_wizard_action_success).visibility = result.success.toVisibility()
-                view.findViewById<TextView>(R.id.omnipod_wizard_action_error).visibility = (!isExecuting && !result.success).toVisibility()
-                view.findViewById<Button>(R.id.omnipod_wizard_button_retry).visibility = (!isExecuting && !result.success).toVisibility()
+                view.findViewById<ImageView>(R.id.omnipod_wizard_action_success).visibility =
+                    result.success.toVisibility()
+                view.findViewById<TextView>(R.id.omnipod_wizard_action_error).visibility =
+                    (!isExecuting && !result.success).toVisibility()
+                view.findViewById<Button>(R.id.omnipod_wizard_button_retry).visibility =
+                    (!isExecuting && !result.success).toVisibility()
 
                 if (!result.success) {
                     view.findViewById<TextView>(R.id.omnipod_wizard_action_error).text = result.comment
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt
index 8542d274e5..4d477881a7 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt
@@ -47,7 +47,8 @@ abstract class WizardFragmentBase : DaggerFragment() {
 
         if (nextPage == null) {
             binding.navButtonsLayout.buttonNext.text = getString(R.string.omnipod_common_wizard_button_finish)
-            binding.navButtonsLayout.buttonNext.backgroundTintList = ColorStateList.valueOf(resources.getColor(R.color.omnipod_wizard_finish_button, context?.theme))
+            binding.navButtonsLayout.buttonNext.backgroundTintList =
+                ColorStateList.valueOf(resources.getColor(R.color.omnipod_wizard_finish_button, context?.theme))
         }
 
         updateProgressIndication()
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt
index 3bc13ff952..91ee56d19d 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt
@@ -2,11 +2,17 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
-import io.reactivex.schedulers.Schedulers
-import io.reactivex.subjects.SingleSubject
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import io.reactivex.Single
+import io.reactivex.rxkotlin.subscribeBy
 
-abstract class ActionViewModelBase : ViewModelBase() {
+abstract class ActionViewModelBase(
+    protected val injector: HasAndroidInjector,
+    protected val logger: AAPSLogger
+) : ViewModelBase() {
 
     private val _isActionExecutingLiveData = MutableLiveData(false)
     val isActionExecutingLiveData: LiveData<Boolean> = _isActionExecutingLiveData
@@ -16,14 +22,18 @@ abstract class ActionViewModelBase : ViewModelBase() {
 
     fun executeAction() {
         _isActionExecutingLiveData.postValue(true)
-        SingleSubject.fromCallable(this::doExecuteAction)
-            .subscribeOn(Schedulers.io())
-            .doOnSuccess { result ->
+        val disposable = doExecuteAction().subscribeBy(
+            onSuccess = { result ->
                 _isActionExecutingLiveData.postValue(false)
                 _actionResultLiveData.postValue(result)
-            }
-            .subscribe()
+            },
+            onError = { throwable ->
+                logger.error(LTag.PUMP, "Caught exception in while executing action in ActionViewModelBase", throwable)
+                _isActionExecutingLiveData.postValue(false)
+                _actionResultLiveData.postValue(PumpEnactResult(injector).success(false).comment(
+                    throwable.message ?: "Caught exception in while executing action in ActionViewModelBase"))
+            })
     }
 
-    protected abstract fun doExecuteAction(): PumpEnactResult
+    protected abstract fun doExecuteAction(): Single<PumpEnactResult>
 }
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/action/DeactivatePodFragment.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/action/DeactivatePodFragment.kt
index 679a12967b..baf0ea5bca 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/action/DeactivatePodFragment.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/action/DeactivatePodFragment.kt
@@ -31,7 +31,8 @@ class DeactivatePodFragment : ActionFragmentBase() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        view.findViewById<Button>(R.id.omnipod_wizard_button_discard_pod)?.setOnClickListener {
+        buttonDiscardPod = view.findViewById(R.id.omnipod_wizard_button_discard_pod)
+        buttonDiscardPod.setOnClickListener {
             context?.let {
                 AlertDialog.Builder(it)
                     .setIcon(android.R.drawable.ic_dialog_alert)
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt
index 15abe11e69..541013e82f 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/viewmodel/action/DeactivatePodViewModel.kt
@@ -1,8 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.action
 
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.viewmodel.ActionViewModelBase
 
-abstract class DeactivatePodViewModel : ActionViewModelBase() {
+abstract class DeactivatePodViewModel(
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : ActionViewModelBase(injector, logger) {
 
     abstract fun discardPod()
 }
\ No newline at end of file
diff --git a/omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml b/omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml
index 9cb7ae62dc..06e800f044 100644
--- a/omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml
+++ b/omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml
@@ -6,6 +6,7 @@
 
     <!-- Unique ID -->
     <LinearLayout
+        android:id="@+id/omnipod_common_overview_pod_unique_id_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
@@ -32,7 +33,7 @@
             tools:ignore="HardcodedText" />
 
         <TextView
-            android:id="@+id/pod_address"
+            android:id="@+id/unique_id"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -45,6 +46,7 @@
 
     <!-- Pod Lot -->
     <LinearLayout
+        android:id="@+id/omnipod_common_overview_lot_number_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
@@ -110,7 +112,7 @@
             tools:ignore="HardcodedText" />
 
         <TextView
-            android:id="@+id/pod_tid"
+            android:id="@+id/pod_sequence_number"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
diff --git a/omnipod-common/src/main/res/values-de-rDE/strings.xml b/omnipod-common/src/main/res/values-de-rDE/strings.xml
index e35fcaa95a..b4fd7e95ea 100644
--- a/omnipod-common/src/main/res/values-de-rDE/strings.xml
+++ b/omnipod-common/src/main/res/values-de-rDE/strings.xml
@@ -2,17 +2,194 @@
 <resources>
     <!-- Omnipod - Keys -->
     <!-- Omnipod - Pod Management -->
+    <string name="omnipod_common_pod_management_title">Pod Management</string>
+    <string name="omnipod_common_pod_management_heading_actions">Aktionen</string>
+    <string name="omnipod_common_pod_management_heading_tools">Tools</string>
+    <string name="omnipod_common_pod_management_button_activate_pod">Pod aktivieren</string>
+    <string name="omnipod_common_pod_management_button_deactivate_pod">Pod deaktivieren</string>
+    <string name="omnipod_common_pod_management_button_discard_pod">Pod verwerfen</string>
+    <string name="omnipod_common_pod_management_discard_pod_confirmation">Wenn Du den Pod verwirfst, kannst Du nicht mehr mit ihm kommunizieren. Mache das nur, wenn jede Kommunikation mit dem Pod dauerhaft fehlschlägt. Falls Du noch mit dem Pod kommunizieren kannst, verwende bitte die Option <b>Pod deaktivieren</b>.\n\nWenn Du fortfahren willst, entferne jetzt den Pod von Deinem Körper!</string>
+    <string name="omnipod_common_pod_management_button_play_test_beep">Testton abspielen</string>
+    <string name="omnipod_common_pod_management_button_playing_test_beep">Spiele Testton ab....</string>
+    <string name="omnipod_common_pod_management_button_pod_history">Pod Historie</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_common_error_pod_not_attached">Kein aktiver Pod</string>
+    <string name="omnipod_common_error_set_basal_failed">Setzen des Basal-Profils fehlgeschlagen.</string>
+    <string name="omnipod_common_error_bolus_did_not_succeed">Bolus nicht abgegeben</string>
+    <string name="omnipod_common_error_failed_to_set_profile_empty_profile">Fehler beim Festlegen des Basalprofils: Ein leeres Profil wurde empfangen. Akiviere Dein Basalprofil.</string>
+    <string name="omnipod_common_error_set_initial_basal_schedule_no_profile">Kein Basalprofil aktiv. Aktiviere Dein Profil.</string>
+    <string name="omnipod_common_error_unsupported_custom_command">Nicht unterstützter benutzerdefinierter Befehl: %1$s</string>
+    <string name="omnipod_common_error_failed_to_refresh_status">Status konnte nicht aktualisiert werden.</string>
+    <string name="omnipod_common_error_failed_to_refresh_status_on_startup">Status konnte beim Start nicht aktualisiert werden</string>
+    <string name="omnipod_common_error_failed_to_silence_alerts">Alarme können nicht stumm geschaltet werden</string>
+    <string name="omnipod_common_error_failed_to_suspend_delivery">Insulinabgabe konnte nicht unterbrochen werden.</string>
+    <string name="omnipod_common_error_failed_to_set_time">Zeiteinstellung fehlgeschlagen</string>
+    <string name="omnipod_common_error_failed_to_resume_delivery">Insulinabgabe konnte nicht gestartet werden.</string>
+    <string name="omnipod_common_error_failed_to_initialize_pod">Pod konnte nicht initalisiert werden.</string>
+    <string name="omnipod_common_error_failed_to_insert_cannula">Kanüle konnte nicht eingeführt werden.</string>
+    <string name="omnipod_common_error_pod_fault_activation_time_exceeded">Die Aktivierungszeit des Pods wurde überschritten. Dieser Pod kann nicht mehr aktiviert werden.</string>
+    <string name="omnipod_common_error_failed_to_verify_activation_progress">Überprüfen des Aktivierungsfortschritts gescheitert. Bitte erneut versuchen.</string>
+    <string name="omnipod_common_error_pod_suspended">Pod unterbrochen</string>
+    <string name="omnipod_common_error_failed_to_play_test_beep">Test-Piepton konnte nicht abgespielt werden</string>
+    <string name="omnipod_common_error_time_out_of_sync">Zeit auf dem Pod ist nicht synchron. Aktualisiere die Zeit auf der Registerkarte \"Omnipod\".</string>
+    <string name="omnipod_common_error_unexpected_exception">Es ist ein unerwarteter Fehler aufgetreten. Bitte melden! (%1$s: %2$s)</string>
     <!-- Omnipod - Confirmation -->
+    <string name="omnipod_common_confirmation">Bestätigung</string>
+    <string name="omnipod_common_confirmation_time_or_timezone_change">Zeit und/oder Zeitzone auf dem Pod geändert.</string>
+    <string name="omnipod_common_confirmation_expiration_alerts_updated">Alarm-Einstellungen auf dem Pod geändert.</string>
+    <string name="omnipod_common_confirmation_time_on_pod_updated">Zeit auf dem Pod geändert.</string>
+    <string name="omnipod_common_confirmation_suspended_delivery">Insulinabgabe komplett ausgesetzt.</string>
+    <string name="omnipod_common_confirmation_silenced_alerts">Aktive Alarme stummgeschaltet.</string>
+    <string name="omnipod_common_confirmation_delivery_resumed">Insulinabgabe wieder aufgenommen.</string>
     <!-- Omnipod - Overview -->
+    <string name="omnipod_common_overview_button_set_time">Zeit einstellen</string>
+    <string name="omnipod_common_overview_button_suspend_delivery">Unterbrechungen</string>
+    <string name="omnipod_common_overview_button_resume_delivery">Abgabe fortsetzen</string>
+    <string name="omnipod_common_overview_button_pod_management">Pod Mgmt</string>
+    <string name="omnipod_common_overview_button_silence_alerts">Alarme stummschalten</string>
+    <string name="omnipod_common_overview_pod_status">Pod Status</string>
+    <string name="omnipod_common_overview_total_delivered">Insgesamt abgegeben</string>
+    <string name="omnipod_common_overview_total_delivered_value">%1$.2f IE</string>
+    <string name="omnipod_common_overview_pod_unique_id">Eindeutige ID</string>
+    <string name="omnipod_common_overview_lot_number">LOT Nummer</string>
+    <string name="omnipod_common_overview_pod_sequence_number">Laufende Nummer</string>
+    <string name="omnipod_common_overview_pod_expiry_date">Pod läuft ab</string>
+    <string name="omnipod_common_overview_last_connection">Letzte Verbindung</string>
+    <string name="omnipod_common_overview_last_bolus">Letzter Bolus</string>
+    <string name="omnipod_common_overview_temp_basal_rate">Temporäre Basalrate</string>
+    <string name="omnipod_common_overview_base_basal_rate">Basis-Basalrate</string>
+    <string name="omnipod_common_overview_reservoir">Reservoir</string>
+    <string name="omnipod_common_overview_pod_active_alerts">Aktive Pod-Warnungen</string>
+    <string name="omnipod_common_overview_firmware_version">Firmware-Version</string>
+    <string name="omnipod_common_overview_time_on_pod">Zeit auf dem Pod</string>
+    <string name="omnipod_common_overview_temp_basal_value">%1$.2fIE/h @%2$s (%3$d/%4$d min.)</string>
+    <string name="omnipod_common_overview_reservoir_value">%1$.2f IE übrig</string>
+    <string name="omnipod_common_overview_reservoir_value_over50">Mehr als 50 IE verbleibend</string>
+    <string name="omnipod_common_overview_errors">Fehler</string>
     <!-- Omnipod - Wizard Base -->
+    <string name="omnipod_common_wizard_button_cancel">Abbrechen</string>
+    <string name="omnipod_common_wizard_button_finish">Beenden</string>
+    <string name="omnipod_common_wizard_button_next">Weiter</string>
+    <string name="omnipod_common_wizard_button_retry">Erneut versuchen</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Pod deaktivieren</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Pod verwerfen</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Du hast noch nicht alle Schritte abgeschlossen. Willst Du wirklich beenden?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Schließen</string>
     <!-- Omnipod - Pod Activation Wizard -->
+    <string name="omnipod_common_pod_activation_wizard_start_pod_activation_title">Pod füllen</string>
+    <string name="omnipod_common_pod_activation_wizard_initialize_pod_title">Pod initialisieren</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_title">Pod anlegen</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_text">Bereite die Infusionsstelle vor. Entferne den Nadelschutz des Pods und die Schutzfolie über dem Kleber. Klebe dann den Pod an die gewünschte Körperstelle.\n\nFalls die Kanüle herausragt, klicke <b>Abbrechen</b> und verwirf den Pod.\n\nKlicke <b>Weiter</b>; um die Kanüle zu setzen und die Insulinabgabe zu beginnen.</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_confirm_insert_cannula_text">Nachdem Du <b>OK</b> gedrückt hast, wird die Kanüle eingeführt. Klebe den Pod vorher auf die gewünschte Infusionsstelle.</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_title">Kanüle setzen</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_text">Basalrate wird übertragen und Kanüle gesetzt.\n\nKlicke auf <b>Weiter</b> nachdem die Kanüle erfolgreich gesetzt wurde.</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_title">Pod aktiviert</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_text">\nDer neue Pod ist jetzt aktiv.\n\nDeine Basalrate ist programmiert und die Kanüle wurde gesetzt.\n\nBitte überprüfe, ob die Kanüle korrekt gesetzt wurde und ersetze den Pod, wenn Du das Gefühl hast, dass dies nicht erfolgreich war.</string>
     <!-- Omnipod - Pod Deactivation Wizard -->
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_title">Pod deaktivieren</string>
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_text">Drücke <b>Weiter</b> um den Pod zu deaktivieren.\n\n<b>Hinweis:</b> Dies unterbricht die gesamte Insulinabgabe und deaktiviert den Pod.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_title">Deaktiviere den Pod...</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_text">Deaktiviere den Pod.\n\nNachdem die Deaktivierung komplett abgeschlossen wurde, kannst Du <b>Weiter</b> drücken.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_title">Pod deaktiviert</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_text">Pod wurde deaktiviert.\n\nBitte entferne den Pod von Deinem Körper und recycle ihn.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_title">Pod verworfen</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_text">Der Pod-Status wurde verworfen. Die Insulinabgabe wurde nicht unterbrochen, weil der Pod nicht korrekt deaktiviert wurde!\n\nBitte entferne den Pod von Deinem Körper und recycele ihn.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod_confirmation">Wenn Du den Pod verwirfst, kannst Du nicht mehr mit ihm kommunizieren. Mache das nur, wenn jede Kommunikation mit dem Pod dauerhaft fehlschlägt. Willst Du den Pod wirklich verwerfen?</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod">Pod verwerfen</string>
     <!-- Omnipod - Preferences -->
+    <string name="omnipod_common_preferences_bolus_beeps_enabled">Bolus-Piep aktiviert</string>
+    <string name="omnipod_common_preferences_basal_beeps_enabled">Basal-Piep aktiviert</string>
+    <string name="omnipod_common_preferences_smb_beeps_enabled">SMB-Piep aktiviert</string>
+    <string name="omnipod_common_preferences_tbr_beeps_enabled">TBR-Piep aktiviert</string>
+    <string name="omnipod_common_preferences_suspend_delivery_button_enabled">Button \'Insulinabgabe unterbrechen\' im Omnipod Tab anzeigen</string>
+    <string name="omnipod_common_preferences_time_change_enabled">Sommerzeit/Zeitzonen-Erkennung aktiviert</string>
+    <string name="omnipod_common_preferences_expiration_reminder_enabled">Ablauferinnerung aktiviert</string>
+    <string name="omnipod_common_preferences_expiration_reminder_hours_before_shutdown">Stunden bis zum Podende</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_enabled">Warnung niedriger Reservoirstand aktiviert</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_units">Anzahl der Einheiten</string>
+    <string name="omnipod_common_preferences_automatically_silence_alerts">Pod-Alarme automatisch stummschalten</string>
+    <string name="omnipod_common_preferences_category_other">Andere</string>
+    <string name="omnipod_common_preferences_category_alerts">Alarme</string>
+    <string name="omnipod_common_preferences_category_confirmation_beeps">Bestätigungstöne</string>
+    <string name="omnipod_common_preferences_category_notifications">Benachrichtigungen</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Ton für unsichere TBR-Benachrichtigungen aktiviert</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Ton für unsichere SMB-Benachrichtigungen aktiviert</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Ton für unsichere Bolus-Benachrichtigungen aktiviert</string>
     <!-- Omnipod - Pod Status -->
+    <string name="omnipod_common_pod_status_no_active_pod">Kein aktiver Pod</string>
+    <string name="omnipod_common_pod_status_waiting_for_activation">Einrichtung im Gange (Warten auf Pod-Aktivierung)</string>
+    <string name="omnipod_common_pod_status_waiting_for_cannula_insertion">Einrichtung im Gang (Warten auf Setzen der Kanüle)</string>
+    <string name="omnipod_common_pod_status_running">In Betrieb</string>
+    <string name="omnipod_common_pod_status_suspended">Angehalten</string>
+    <string name="omnipod_common_pod_status_pod_fault">Pod-Fehler</string>
+    <string name="omnipod_common_pod_status_activation_time_exceeded">Aktivierungszeit überschritten</string>
+    <string name="omnipod_common_pod_status_inactive">Inaktiv</string>
+    <string name="omnipod_common_pod_status_pod_fault_description">Pod-Fehler: %1$03d %2$s</string>
     <!-- Omnipod - Commands -->
+    <string name="omnipod_common_cmd_deactivate_pod">Pod deaktivieren</string>
+    <string name="omnipod_common_cmd_discard_pod">Pod verwerfen</string>
+    <string name="omnipod_common_cmd_set_bolus">Mahlzeiten Bolus abgeben</string>
+    <string name="omnipod_common_cmd_cancel_bolus">Bolus abbrechen</string>
+    <string name="omnipod_common_cmd_set_tbr">Setze Temporäre Basalrate</string>
+    <string name="omnipod_common_cmd_cancel_tbr_by_driver">Temporäre Basalrate abbrechen (intern über den Treiber)</string>
+    <string name="omnipod_common_cmd_cancel_tbr">Temp. Basalrate abbrechen</string>
+    <string name="omnipod_common_cmd_set_basal_schedule">Basalrate festlegen</string>
+    <string name="omnipod_common_cmd_get_pod_status">Pod-Status abrufen</string>
+    <string name="omnipod_common_cmd_get_pod_info">Pod-Info abrufen</string>
+    <string name="omnipod_common_cmd_set_time">Zeit einstellen</string>
+    <string name="omnipod_common_cmd_configure_alerts">Warnungen konfigurieren</string>
+    <string name="omnipod_common_cmd_silence_alerts">Alarme stummschalten</string>
+    <string name="omnipod_common_cmd_suspend_delivery">Abgabe unterbrechen</string>
+    <string name="omnipod_common_cmd_resume_delivery">Abgabe fortsetzen</string>
+    <string name="omnipod_common_cmd_unknown_entry">Unbekannte Eingabe</string>
+    <string name="omnipod_common_cmd_initialize_pod">Pod initialisieren</string>
+    <string name="omnipod_common_cmd_insert_cannula">Kanüle setzen</string>
+    <string name="omnipod_common_cmd_read_pulse_log">Pulse-Log lesen</string>
+    <string name="omnipod_common_cmd_set_fake_suspended_tbr">Fake TBR gesetzt, da der Pod pausiert ist.</string>
+    <string name="omnipod_common_cmd_cancel_fake_suspended_tbr">Abbruch der Fake TBR. Diese wurde eingestellt, da der Pod pausiert war.</string>
+    <string name="omnipod_common_cmd_split_tbr">Temp. Basalrate wegen unbekanntem Fehler bei TBR-Abbruch aufgeteilt</string>
+    <string name="omnipod_common_cmd_beep_config">Piep-Ton Konfiguration</string>
+    <string name="omnipod_common_cmd_play_test_beep">Testton abspielen</string>
     <!-- Omnipod - Alerts -->
+    <string name="omnipod_common_alert_finish_pairing_reminder">Erinnerung Kopplung beendet</string>
+    <string name="omnipod_common_alert_finish_setup_reminder_reminder">Erinnerung Setup beendet</string>
+    <string name="omnipod_common_alert_expiration">Pod läuft in Kürze ab</string>
+    <string name="omnipod_common_alert_expiration_advisory">Pod läuft in Kürze ab</string>
+    <string name="omnipod_common_alert_shutdown_imminent">Herunterfahren steht unmittelbar bevor</string>
+    <string name="omnipod_common_alert_low_reservoir">Niedriger Reservoirstand</string>
+    <string name="omnipod_common_alert_unknown_alert">Unbekannter Alarm</string>
     <!-- Omnipod - Short status -->
+    <string name="omnipod_common_short_status_no_active_pod">Kein aktiver Pod</string>
+    <string name="omnipod_common_short_status_last_connection">Letzte Verb.: vor %1$d min</string>
+    <string name="omnipod_common_short_status_last_bolus">Letzter Bolus: %1$s @ %2$s</string>
+    <string name="omnipod_common_short_status_temp_basal">Temp: %1$s</string>
+    <string name="omnipod_common_short_status_extended_bolus">Verlängert: %1$s</string>
+    <string name="omnipod_common_short_status_reservoir">Reserv: %1$sU</string>
     <!-- Omnipod - Other -->
+    <string name="omnipod_common_yes">Ja</string>
+    <string name="omnipod_common_no">Nein</string>
+    <string name="omnipod_common_ok">OK</string>
+    <string name="omnipod_common_cancel">Abbrechen</string>
+    <string name="omnipod_common_warning">Warnung</string>
     <!-- Omnipod - Times -->
+    <string name="omnipod_common_moments_ago">gerade eben</string>
+    <string name="omnipod_common_less_than_a_minute_ago">vor weniger als einer Minute</string>
+    <string name="omnipod_common_composite_time">%1$s und %2$s</string>
+    <string name="omnipod_common_time_ago">vor %1$s</string>
+    <plurals name="omnipod_common_minutes">
+        <item quantity="one">%1$d Minute</item>
+        <item quantity="other">%1$d Minuten</item>
+    </plurals>
+    <plurals name="omnipod_common_hours">
+        <item quantity="one">%1$d Stunde</item>
+        <item quantity="other">%1$d Stunden</item>
+    </plurals>
+    <plurals name="omnipod_common_days">
+        <item quantity="one">%1$d Tag</item>
+        <item quantity="other">%1$d Tage</item>
+    </plurals>
+    <plurals name="omnipod_common_pod_alerts">
+        <item quantity="one">Pod-Alarm: %1$s</item>
+        <item quantity="other">Pod-Alarm: %1$s</item>
+    </plurals>
 </resources>
diff --git a/omnipod-common/src/main/res/values-iw-rIL/strings.xml b/omnipod-common/src/main/res/values-iw-rIL/strings.xml
index c6a43df2c2..c4ad088c4e 100644
--- a/omnipod-common/src/main/res/values-iw-rIL/strings.xml
+++ b/omnipod-common/src/main/res/values-iw-rIL/strings.xml
@@ -111,6 +111,10 @@
     <string name="omnipod_common_preferences_category_other">אחר</string>
     <string name="omnipod_common_preferences_category_alerts">התראות</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">צפצופי אימות</string>
+    <string name="omnipod_common_preferences_category_notifications">התראות</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">צליל של התראת בזאלי זמני לא ברור מאופשר</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">צליל של התראת SMB לא ברור מאופשר</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">צליל של התראת בולוס לא ברור מאופשר</string>
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">אין פוד פעיל</string>
     <string name="omnipod_common_pod_status_waiting_for_activation">התקנה בביצוע (ממתין להפעלת הפוד)</string>
diff --git a/omnipod-common/src/main/res/values-ko-rKR/strings.xml b/omnipod-common/src/main/res/values-ko-rKR/strings.xml
index e35fcaa95a..93961277b6 100644
--- a/omnipod-common/src/main/res/values-ko-rKR/strings.xml
+++ b/omnipod-common/src/main/res/values-ko-rKR/strings.xml
@@ -2,17 +2,186 @@
 <resources>
     <!-- Omnipod - Keys -->
     <!-- Omnipod - Pod Management -->
+    <string name="omnipod_common_pod_management_title">Pod 관리</string>
+    <string name="omnipod_common_pod_management_heading_actions">실행</string>
+    <string name="omnipod_common_pod_management_heading_tools">도구</string>
+    <string name="omnipod_common_pod_management_button_activate_pod">Pod 활성화</string>
+    <string name="omnipod_common_pod_management_button_deactivate_pod">Pod 비활성화</string>
+    <string name="omnipod_common_pod_management_button_discard_pod">Pod 폐기</string>
+    <string name="omnipod_common_pod_management_discard_pod_confirmation">Pod를 폐기하면, 더이상 해당 pod와 연결할 수 없습니다. Pod와의 모든 연결이 계속해서 실패할 경우에만 이를 수행하십시오. 만약 Pod와 연결이 아직 가능하다면 <b>Pod 비활성화</b>을 사용하십시오.\n\n계속해서 진행하고 싶은 경우, 반드시 Pod를 몸에서 제거하십시오!</string>
+    <string name="omnipod_common_pod_management_button_play_test_beep">테스트 신호음 작동</string>
+    <string name="omnipod_common_pod_management_button_playing_test_beep">테스트 신호음 작동 중...</string>
+    <string name="omnipod_common_pod_management_button_pod_history">Pod 이력</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_common_error_pod_not_attached">활성화된 Pod 없음</string>
+    <string name="omnipod_common_error_set_basal_failed">Basal 프로파일 설정 실패함</string>
+    <string name="omnipod_common_error_bolus_did_not_succeed">Bolus가 성공적으로 주입되지 않음</string>
+    <string name="omnipod_common_error_failed_to_set_profile_empty_profile">Basal 프로파일 설정 실패함: 내용이 없는 프로파일 수신됨. Basal 프로파일을 활성화하십시오.</string>
+    <string name="omnipod_common_error_set_initial_basal_schedule_no_profile">활성화된 프로파일 없음. Basal 프로파일을 활성화하십시오.</string>
+    <string name="omnipod_common_error_unsupported_custom_command">지원되지 않는 사용자 지정 명령: %1$s</string>
+    <string name="omnipod_common_error_failed_to_refresh_status">상태 새로고침 실패함</string>
+    <string name="omnipod_common_error_failed_to_refresh_status_on_startup">장치 시작에서 상태 새로고침 실패함</string>
+    <string name="omnipod_common_error_failed_to_silence_alerts">경고 음소거 실패함</string>
+    <string name="omnipod_common_error_failed_to_suspend_delivery">주입 중지 실패함</string>
+    <string name="omnipod_common_error_failed_to_set_time">시간 설정 실패함</string>
+    <string name="omnipod_common_error_failed_to_resume_delivery">주입 재시작 실패함</string>
+    <string name="omnipod_common_error_failed_to_initialize_pod">Pod 초기화 실패함</string>
+    <string name="omnipod_common_error_failed_to_insert_cannula">캐뉼라 삽입 실패함</string>
+    <string name="omnipod_common_error_pod_fault_activation_time_exceeded">Pod의 활성화 시간이 초과되었습니다. 이 Pod는 더 이상 사용할 수 없습니다.</string>
+    <string name="omnipod_common_error_failed_to_verify_activation_progress">활성화 과정 확인 실패함. 재시도하십시오.</string>
+    <string name="omnipod_common_error_pod_suspended">Pod 중지됨</string>
+    <string name="omnipod_common_error_failed_to_play_test_beep">테스트 신호음 작동 실패함</string>
+    <string name="omnipod_common_error_time_out_of_sync">Pod의 시간이 맞지 않습니다. Omnipod 탭에서 시간을 업데이트 하십시오.</string>
+    <string name="omnipod_common_error_unexpected_exception">예상치 못한 오류가 발생하였습니다. 보고 부탁드립니다! (%1$s: %2$s)</string>
     <!-- Omnipod - Confirmation -->
+    <string name="omnipod_common_confirmation">확인</string>
+    <string name="omnipod_common_confirmation_time_or_timezone_change">Pod에서 시간과/또는 시간대 변경됨</string>
+    <string name="omnipod_common_confirmation_expiration_alerts_updated">Pod에서 경고 설정 업데이트 됨</string>
+    <string name="omnipod_common_confirmation_time_on_pod_updated">Pod에서 시간 업데이트 됨</string>
+    <string name="omnipod_common_confirmation_suspended_delivery">인슐린 주입이 중지됨</string>
+    <string name="omnipod_common_confirmation_silenced_alerts">활성화된 경고가 음소거 됨</string>
+    <string name="omnipod_common_confirmation_delivery_resumed">인슐린 주입이 재시작됨</string>
     <!-- Omnipod - Overview -->
+    <string name="omnipod_common_overview_button_set_time">시간 설정</string>
+    <string name="omnipod_common_overview_button_suspend_delivery">중지</string>
+    <string name="omnipod_common_overview_button_resume_delivery">주입 재시작</string>
+    <string name="omnipod_common_overview_button_pod_management">Pod 관리</string>
+    <string name="omnipod_common_overview_button_silence_alerts">경고 음소거</string>
+    <string name="omnipod_common_overview_pod_status">Pod 상태</string>
+    <string name="omnipod_common_overview_total_delivered">모두 주입됨</string>
+    <string name="omnipod_common_overview_total_delivered_value">%1$.2f U</string>
+    <string name="omnipod_common_overview_pod_unique_id">고유 ID</string>
+    <string name="omnipod_common_overview_lot_number">LOT 번호</string>
+    <string name="omnipod_common_overview_pod_sequence_number">일련번호</string>
+    <string name="omnipod_common_overview_pod_expiry_date">Pod 만료됨</string>
+    <string name="omnipod_common_overview_last_connection">마지막 연결</string>
+    <string name="omnipod_common_overview_last_bolus">마지막 Bolus</string>
+    <string name="omnipod_common_overview_temp_basal_rate">임시 basal 양</string>
+    <string name="omnipod_common_overview_base_basal_rate">기본 basal 양</string>
+    <string name="omnipod_common_overview_reservoir">인슐린 잔량</string>
+    <string name="omnipod_common_overview_pod_active_alerts">Pod 경고 활성화</string>
+    <string name="omnipod_common_overview_firmware_version">펌웨어 버전</string>
+    <string name="omnipod_common_overview_time_on_pod">Pod 시간</string>
+    <string name="omnipod_common_overview_temp_basal_value">%1$.2fU/h @%2$s (%3$d/%4$d 분)</string>
+    <string name="omnipod_common_overview_reservoir_value">%1$.2f U 남음</string>
+    <string name="omnipod_common_overview_reservoir_value_over50">50 U 이상 남음</string>
+    <string name="omnipod_common_overview_errors">에러</string>
     <!-- Omnipod - Wizard Base -->
+    <string name="omnipod_common_wizard_button_cancel">취소</string>
+    <string name="omnipod_common_wizard_button_finish">종료</string>
+    <string name="omnipod_common_wizard_button_next">다음</string>
+    <string name="omnipod_common_wizard_button_retry">재시도</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Pod 비활성화</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Pod 폐기</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">모든 단계를 아직 완료하지 않았습니다. 정말 나가기를 원하십니까?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">종료</string>
     <!-- Omnipod - Pod Activation Wizard -->
+    <string name="omnipod_common_pod_activation_wizard_start_pod_activation_title">Pod 채우기</string>
+    <string name="omnipod_common_pod_activation_wizard_initialize_pod_title">Pod 초기화</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_title">Pod 부착</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_text">삽입 위치를 준비하십시오. Pod의 바늘 캡과 접착 보호필름을 제거하고 Pod를 삽입 위치에 부착하십시오.\n\n만약, 캐뉼라가 튀어 나오면, <b>취소</b>를 누르고 Pod를 폐기하십시오.\n\n <b>다음</b>을 눌러 캐뉼라를 삽입하고 basal 주입을 시작하십시오.</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_confirm_insert_cannula_text"><b>확인</b>을 누르면, 캐뉼라가 삽입될 것입니다. Pod가 삽입 부위에 부착되었는지 확인하십시오.</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_title">캐뉼라 삽입</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_text">초기 basal을 설정하고 캐뉼라를 삽입합니다. \n\n캐뉼라가 성공적으로 삽입되면, <b>다음</b>을 누릅니다.</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_title">Pod 활성화됨</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_text">새로운 Pod가 활성화되었습니다. \n\nBasal이 프로그램되었으며, 캐뉼라가 삽입되었습니다. \n\n캐뉼라가 제대로 삽입되었는지 확인하고, 만약 그렇지 않다면 Pod를 바꾸십시오.</string>
     <!-- Omnipod - Pod Deactivation Wizard -->
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_title">Pod 비활성화</string>
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_text"><b>다음</b>을 눌러 Pod를 비활성화합니다. \n\n<b>참고:</b>이는 모든 인슐린 주입을 중지하고 Pod를 비활성화할 것입니다.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_title">Pod 비활성화 중</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_text">Pod 비활성화 중. \n\n비활성화가 성공적으로 완료되면, <b>다음</b>을 누르십시오.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_title">Pod 비활성화됨</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_text">Pod는 비활성화되었습니다. \n\nPod를 몸에서 제거하고 재활용 쓰레기로 분리 배출하십시오.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_title">Pod 폐기됨</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_text">Pod는 폐기된 상태입니다. Pod가 적절하게 비활성화되지 않아 인슐린 주입은 중지되지 않았습니다! \n\nPod를 몸에서 제거하고 재활용 쓰레기로 분리 배출하십시오.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod_confirmation">Pod를 폐기하면, Pod와 더이상 연결되지 않습니다. Pod와의 모든 연결이 계속해서 실패하는 경우에만 시행하십시오. 정말로 Pod를 폐기하기 원하십니까?</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod">Pod 폐기</string>
     <!-- Omnipod - Preferences -->
+    <string name="omnipod_common_preferences_bolus_beeps_enabled">Bolus 신호음 활성화됨</string>
+    <string name="omnipod_common_preferences_basal_beeps_enabled">Basal 신호음 활성화됨</string>
+    <string name="omnipod_common_preferences_smb_beeps_enabled">SMB 신호음 활성화됨</string>
+    <string name="omnipod_common_preferences_tbr_beeps_enabled">TBR 신호음 활성화됨</string>
+    <string name="omnipod_common_preferences_suspend_delivery_button_enabled">Omnipod 탭에서 주입 중지 버튼을 나타내기</string>
+    <string name="omnipod_common_preferences_time_change_enabled">섬머타임제/시간대 감지 활성화됨</string>
+    <string name="omnipod_common_preferences_expiration_reminder_enabled">만료일 알림 활성화됨</string>
+    <string name="omnipod_common_preferences_expiration_reminder_hours_before_shutdown">종료 한 시간 전</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_enabled">인슐린 부족 알람 활성화됨</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_units">몇 단위</string>
+    <string name="omnipod_common_preferences_automatically_silence_alerts">자동으로 Pod 경고 음소거</string>
+    <string name="omnipod_common_preferences_category_other">기타</string>
+    <string name="omnipod_common_preferences_category_alerts">경고</string>
+    <string name="omnipod_common_preferences_category_confirmation_beeps">확인 신호음</string>
     <!-- Omnipod - Pod Status -->
+    <string name="omnipod_common_pod_status_no_active_pod">활성화된 Pod 없음</string>
+    <string name="omnipod_common_pod_status_waiting_for_activation">설정 진행 중 (Pod 활성화를 기다리는 중)</string>
+    <string name="omnipod_common_pod_status_waiting_for_cannula_insertion">설정 진행 중 (캐뉼라 삽입을 기다리는 중)</string>
+    <string name="omnipod_common_pod_status_running">실행 중</string>
+    <string name="omnipod_common_pod_status_suspended">중지됨</string>
+    <string name="omnipod_common_pod_status_pod_fault">Pod 결함</string>
+    <string name="omnipod_common_pod_status_activation_time_exceeded">활성화 시간 초과됨</string>
+    <string name="omnipod_common_pod_status_inactive">비활성화됨</string>
+    <string name="omnipod_common_pod_status_pod_fault_description">Pod 결함: %1$03d %2$s</string>
     <!-- Omnipod - Commands -->
+    <string name="omnipod_common_cmd_deactivate_pod">Pod 비활성화</string>
+    <string name="omnipod_common_cmd_discard_pod">Pod 폐기</string>
+    <string name="omnipod_common_cmd_set_bolus">Bolus설정</string>
+    <string name="omnipod_common_cmd_cancel_bolus">Bolus 취소</string>
+    <string name="omnipod_common_cmd_set_tbr">임시 Basal 설정</string>
+    <string name="omnipod_common_cmd_cancel_tbr_by_driver">(드라이버에서 내부적으로) 임시 basal 취소</string>
+    <string name="omnipod_common_cmd_cancel_tbr">임시 basal 취소</string>
+    <string name="omnipod_common_cmd_set_basal_schedule">Basal 스케쥴 설정</string>
+    <string name="omnipod_common_cmd_get_pod_status">Pod 상태 가져오기</string>
+    <string name="omnipod_common_cmd_get_pod_info">Pod 정보 가져오기</string>
+    <string name="omnipod_common_cmd_set_time">시간 설정</string>
+    <string name="omnipod_common_cmd_configure_alerts">경고 설정</string>
+    <string name="omnipod_common_cmd_silence_alerts">경고 음소거</string>
+    <string name="omnipod_common_cmd_suspend_delivery">주입 중지</string>
+    <string name="omnipod_common_cmd_resume_delivery">주입 재시작</string>
+    <string name="omnipod_common_cmd_unknown_entry">알려지지 않은 항목</string>
+    <string name="omnipod_common_cmd_initialize_pod">Pod 초기화</string>
+    <string name="omnipod_common_cmd_insert_cannula">캐뉼라 삽입</string>
+    <string name="omnipod_common_cmd_read_pulse_log">Pulse 로그 확인</string>
+    <string name="omnipod_common_cmd_set_fake_suspended_tbr">Pod가 중지되어 속임수 임시 basal 설정하기</string>
+    <string name="omnipod_common_cmd_cancel_fake_suspended_tbr">Pod가 중지되어 만들었던 속임수 임시 basal 취소하기</string>
+    <string name="omnipod_common_cmd_split_tbr">취소 중 명확하지 않은 실패로 인하여 임시 basal 나누기</string>
+    <string name="omnipod_common_cmd_beep_config">신호음 설정</string>
+    <string name="omnipod_common_cmd_play_test_beep">테스트 신호음 작동</string>
     <!-- Omnipod - Alerts -->
+    <string name="omnipod_common_alert_finish_pairing_reminder">연동 알림 종료</string>
+    <string name="omnipod_common_alert_finish_setup_reminder_reminder">설정 알림 종료</string>
+    <string name="omnipod_common_alert_expiration">Pod가 곧 만료됩니다.</string>
+    <string name="omnipod_common_alert_expiration_advisory">Pod가 곧 만료됩니다.</string>
+    <string name="omnipod_common_alert_shutdown_imminent">종료가 임박했습니다.</string>
+    <string name="omnipod_common_alert_low_reservoir">인슐린 부족</string>
+    <string name="omnipod_common_alert_unknown_alert">알 수 없는 경고</string>
     <!-- Omnipod - Short status -->
+    <string name="omnipod_common_short_status_no_active_pod">활성화된 Pod 없음</string>
+    <string name="omnipod_common_short_status_last_connection">마지막 연결: %1$d 분 전</string>
+    <string name="omnipod_common_short_status_last_bolus">마지막 bolus: %1$s @ %2$s</string>
+    <string name="omnipod_common_short_status_temp_basal">임시: %1$s</string>
+    <string name="omnipod_common_short_status_extended_bolus">확장: %1$s</string>
+    <string name="omnipod_common_short_status_reservoir">잔여 인슐린 양: %1$s U</string>
     <!-- Omnipod - Other -->
+    <string name="omnipod_common_yes">네</string>
+    <string name="omnipod_common_no">아니오</string>
+    <string name="omnipod_common_ok">네</string>
+    <string name="omnipod_common_cancel">취소</string>
+    <string name="omnipod_common_warning">경고</string>
     <!-- Omnipod - Times -->
+    <string name="omnipod_common_moments_ago">방금 전</string>
+    <string name="omnipod_common_less_than_a_minute_ago">1분 이내</string>
+    <string name="omnipod_common_composite_time">%1$s과 %2$s</string>
+    <string name="omnipod_common_time_ago">%1$s 전</string>
+    <plurals name="omnipod_common_minutes">
+        <item quantity="other">%1$d 분</item>
+    </plurals>
+    <plurals name="omnipod_common_hours">
+        <item quantity="other">%1$d 시간</item>
+    </plurals>
+    <plurals name="omnipod_common_days">
+        <item quantity="other">%1$d 일</item>
+    </plurals>
+    <plurals name="omnipod_common_pod_alerts">
+        <item quantity="other">Pod 경고: %1$s</item>
+    </plurals>
 </resources>
diff --git a/omnipod-common/src/main/res/values/strings.xml b/omnipod-common/src/main/res/values/strings.xml
index eb3ae323c6..040757704d 100644
--- a/omnipod-common/src/main/res/values/strings.xml
+++ b/omnipod-common/src/main/res/values/strings.xml
@@ -13,7 +13,11 @@
     <string name="key_omnipod_common_low_reservoir_alert_units" translatable="false">AAPS.Omnipod.low_reservoir_alert_units</string>
     <string name="key_omnipod_common_automatically_silence_alerts_enabled" translatable="false">AAPS.Omnipod.automatically_acknowledge_alerts_enabled</string>
     <string name="key_common_preferences_category_alerts_settings" translatable="false">common_preferences_category_alerts</string>
-
+    <string name="key_omnipod_common_preferences_category_notifications_settings"
+        translatable="false">common_preferences_category_notifications_settings</string>
+    <string name="key_omnipod_common_notification_uncertain_tbr_sound_enabled" translatable="false">AAPS.Omnipod.notification_uncertain_tbr_sound_enabled</string>
+    <string name="key_omnipod_common_notification_uncertain_smb_sound_enabled" translatable="false">AAPS.Omnipod.notification_uncertain_smb_sound_enabled</string>
+    <string name="key_omnipod_common_notification_uncertain_bolus_sound_enabled" translatable="false">AAPS.Omnipod.notification_uncertain_bolus_sound_enabled</string>
     <!-- Omnipod - Pod Management -->
     <string name="omnipod_common_pod_management_title">Pod Management</string>
     <string name="omnipod_common_pod_management_heading_actions">Actions</string>
@@ -132,6 +136,11 @@
     <string name="omnipod_common_preferences_category_other">Other</string>
     <string name="omnipod_common_preferences_category_alerts">Alerts</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">Confirmation Beeps</string>
+    <string name="omnipod_common_preferences_category_notifications">Notifications</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Sound for uncertain TBR notifications enabled</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Sound for
+        uncertain SMB notifications enabled</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Sound for uncertain bolus notifications enabled</string>
 
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">No Active Pod</string>
diff --git a/omnipod-dash/build.gradle b/omnipod-dash/build.gradle
index ed4ab0304f..b9dd868a07 100644
--- a/omnipod-dash/build.gradle
+++ b/omnipod-dash/build.gradle
@@ -3,13 +3,29 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-allopen'
 apply plugin: 'com.hiya.jacoco-android'
+apply plugin: "io.gitlab.arturbosch.detekt" // TODO move to `subprojects` section in global build.gradle
+apply plugin: "org.jlleitschuh.gradle.ktlint" // TODO move to `subprojects` section in global build.gradle
 
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
+allOpen {
+    annotation 'info.nightscout.androidaps.plugins.pump.omnipod.dash.annotations.OpenClass'
+}
+
+detekt { // TODO move to `subprojects` section in global build.gradle
+    toolVersion = "1.15.0-RC2"
+    config = files("./detekt-config.yml")  // TODO move to global space and use "../detekt-config.yml"
+}
+
 dependencies {
     implementation project(':core')
     implementation project(':omnipod-common')
-}
\ No newline at end of file
+
+    implementation "androidx.room:room-runtime:$room_version"
+    implementation "androidx.room:room-rxjava2:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
+    implementation 'com.github.guepardoapps:kulid:2.0.0.0'
+}
diff --git a/omnipod-dash/detekt-config.yml b/omnipod-dash/detekt-config.yml
new file mode 100644
index 0000000000..f0fd4930d7
--- /dev/null
+++ b/omnipod-dash/detekt-config.yml
@@ -0,0 +1,690 @@
+build:
+  maxIssues: -1
+  excludeCorrectable: false
+  weights:
+  # complexity: 2
+  # LongParameterList: 1
+  # style: 1
+  # comments: 1
+
+config:
+  validation: true
+  warningsAsErrors: false
+  # when writing own rules with new properties, exclude the property path e.g.: 'my_rule_set,.*>.*>[my_property]'
+  excludes: ''
+
+processors:
+  active: true
+  exclude:
+    - 'DetektProgressListener'
+  # - 'FunctionCountProcessor'
+  # - 'PropertyCountProcessor'
+  # - 'ClassCountProcessor'
+  # - 'PackageCountProcessor'
+  # - 'KtFileCountProcessor'
+
+console-reports:
+  active: true
+  exclude:
+    - 'ProjectStatisticsReport'
+    - 'ComplexityReport'
+    - 'NotificationReport'
+    #  - 'FindingsReport'
+    - 'FileBasedFindingsReport'
+
+output-reports:
+  active: true
+  exclude:
+  # - 'TxtOutputReport'
+  # - 'XmlOutputReport'
+  # - 'HtmlOutputReport'
+
+comments:
+  active: true
+  excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  AbsentOrWrongFileLicense:
+    active: false
+    licenseTemplateFile: 'license.template'
+  CommentOverPrivateFunction:
+    active: false
+  CommentOverPrivateProperty:
+    active: false
+  EndOfSentenceFormat:
+    active: false
+    endOfSentenceFormat: '([.?!][ \t\n\r\f<])|([.?!:]$)'
+  UndocumentedPublicClass:
+    active: false
+    searchInNestedClass: true
+    searchInInnerClass: true
+    searchInInnerObject: true
+    searchInInnerInterface: true
+  UndocumentedPublicFunction:
+    active: false
+  UndocumentedPublicProperty:
+    active: false
+
+complexity:
+  active: true
+  ComplexCondition:
+    active: true
+    threshold: 4
+  ComplexInterface:
+    active: false
+    threshold: 10
+    includeStaticDeclarations: false
+    includePrivateDeclarations: false
+  ComplexMethod:
+    active: true
+    threshold: 15
+    ignoreSingleWhenExpression: false
+    ignoreSimpleWhenEntries: false
+    ignoreNestingFunctions: false
+    nestingFunctions: [run, let, apply, with, also, use, forEach, isNotNull, ifNull]
+  LabeledExpression:
+    active: false
+    ignoredLabels: []
+  LargeClass:
+    active: true
+    threshold: 600
+  LongMethod:
+    active: true
+    threshold: 60
+  LongParameterList:
+    active: true
+    functionThreshold: 6
+    constructorThreshold: 7
+    ignoreDefaultParameters: false
+    ignoreDataClasses: true
+    ignoreAnnotated: []
+  MethodOverloading:
+    active: false
+    threshold: 6
+  NamedArguments:
+    active: false
+    threshold: 3
+  NestedBlockDepth:
+    active: true
+    threshold: 4
+  ReplaceSafeCallChainWithRun:
+    active: false
+  StringLiteralDuplication:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    threshold: 3
+    ignoreAnnotation: true
+    excludeStringsWithLessThan5Characters: true
+    ignoreStringsRegex: '$^'
+  TooManyFunctions:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    thresholdInFiles: 11
+    thresholdInClasses: 11
+    thresholdInInterfaces: 11
+    thresholdInObjects: 11
+    thresholdInEnums: 11
+    ignoreDeprecated: false
+    ignorePrivate: false
+    ignoreOverridden: false
+
+coroutines:
+  active: true
+  GlobalCoroutineUsage:
+    active: false
+  RedundantSuspendModifier:
+    active: false
+  SuspendFunWithFlowReturnType:
+    active: false
+
+empty-blocks:
+  active: true
+  EmptyCatchBlock:
+    active: true
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  EmptyClassBlock:
+    active: true
+  EmptyDefaultConstructor:
+    active: true
+  EmptyDoWhileBlock:
+    active: true
+  EmptyElseBlock:
+    active: true
+  EmptyFinallyBlock:
+    active: true
+  EmptyForBlock:
+    active: true
+  EmptyFunctionBlock:
+    active: true
+    ignoreOverridden: false
+  EmptyIfBlock:
+    active: true
+  EmptyInitBlock:
+    active: true
+  EmptyKtFile:
+    active: true
+  EmptySecondaryConstructor:
+    active: true
+  EmptyTryBlock:
+    active: true
+  EmptyWhenBlock:
+    active: true
+  EmptyWhileBlock:
+    active: true
+
+exceptions:
+  active: true
+  ExceptionRaisedInUnexpectedLocation:
+    active: false
+    methodNames: [toString, hashCode, equals, finalize]
+  InstanceOfCheckForException:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  NotImplementedDeclaration:
+    active: false
+  PrintStackTrace:
+    active: false
+  RethrowCaughtException:
+    active: false
+  ReturnFromFinally:
+    active: false
+    ignoreLabeled: false
+  SwallowedException:
+    active: false
+    ignoredExceptionTypes:
+      - InterruptedException
+      - NumberFormatException
+      - ParseException
+      - MalformedURLException
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  ThrowingExceptionFromFinally:
+    active: false
+  ThrowingExceptionInMain:
+    active: false
+  ThrowingExceptionsWithoutMessageOrCause:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    exceptions:
+      - IllegalArgumentException
+      - IllegalStateException
+      - IOException
+  ThrowingNewInstanceOfSameException:
+    active: false
+  TooGenericExceptionCaught:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    exceptionNames:
+      - ArrayIndexOutOfBoundsException
+      - Error
+      - Exception
+      - IllegalMonitorStateException
+      - NullPointerException
+      - IndexOutOfBoundsException
+      - RuntimeException
+      - Throwable
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  TooGenericExceptionThrown:
+    active: true
+    exceptionNames:
+      - Error
+      - Exception
+      - Throwable
+      - RuntimeException
+
+formatting:
+  active: true
+  android: false
+  autoCorrect: true
+  AnnotationOnSeparateLine:
+    active: false
+    autoCorrect: true
+  AnnotationSpacing:
+    active: false
+    autoCorrect: true
+  ArgumentListWrapping:
+    active: false
+    autoCorrect: true
+  ChainWrapping:
+    active: true
+    autoCorrect: true
+  CommentSpacing:
+    active: true
+    autoCorrect: true
+  EnumEntryNameCase:
+    active: false
+    autoCorrect: true
+  Filename:
+    active: true
+  FinalNewline:
+    active: true
+    autoCorrect: true
+    insertFinalNewLine: true
+  ImportOrdering:
+    active: false
+    autoCorrect: true
+    layout: 'idea'
+  Indentation:
+    active: false
+    autoCorrect: true
+    indentSize: 4
+    continuationIndentSize: 4
+  MaximumLineLength:
+    active: true
+    maxLineLength: 150
+  ModifierOrdering:
+    active: true
+    autoCorrect: true
+  MultiLineIfElse:
+    active: true
+    autoCorrect: true
+  NoBlankLineBeforeRbrace:
+    active: true
+    autoCorrect: true
+  NoConsecutiveBlankLines:
+    active: true
+    autoCorrect: true
+  NoEmptyClassBody:
+    active: true
+    autoCorrect: true
+  NoEmptyFirstLineInMethodBlock:
+    active: false
+    autoCorrect: true
+  NoLineBreakAfterElse:
+    active: true
+    autoCorrect: true
+  NoLineBreakBeforeAssignment:
+    active: true
+    autoCorrect: true
+  NoMultipleSpaces:
+    active: true
+    autoCorrect: true
+  NoSemicolons:
+    active: true
+    autoCorrect: true
+  NoTrailingSpaces:
+    active: true
+    autoCorrect: true
+  NoUnitReturn:
+    active: true
+    autoCorrect: true
+  NoUnusedImports:
+    active: true
+    autoCorrect: true
+  NoWildcardImports:
+    active: true
+  PackageName:
+    active: true
+    autoCorrect: true
+  ParameterListWrapping:
+    active: true
+    autoCorrect: true
+    indentSize: 4
+  SpacingAroundColon:
+    active: true
+    autoCorrect: true
+  SpacingAroundComma:
+    active: true
+    autoCorrect: true
+  SpacingAroundCurly:
+    active: true
+    autoCorrect: true
+  SpacingAroundDot:
+    active: true
+    autoCorrect: true
+  SpacingAroundDoubleColon:
+    active: false
+    autoCorrect: true
+  SpacingAroundKeyword:
+    active: true
+    autoCorrect: true
+  SpacingAroundOperators:
+    active: true
+    autoCorrect: true
+  SpacingAroundParens:
+    active: true
+    autoCorrect: true
+  SpacingAroundRangeOperator:
+    active: true
+    autoCorrect: true
+  SpacingBetweenDeclarationsWithAnnotations:
+    active: false
+    autoCorrect: true
+  SpacingBetweenDeclarationsWithComments:
+    active: false
+    autoCorrect: true
+  StringTemplate:
+    active: true
+    autoCorrect: true
+
+naming:
+  active: true
+  ClassNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    classPattern: '[A-Z][a-zA-Z0-9]*'
+  ConstructorParameterNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    privateParameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+  EnumNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    enumEntryPattern: '[A-Z][_a-zA-Z0-9]*'
+  ForbiddenClassName:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    forbiddenName: []
+  FunctionMaxLength:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    maximumFunctionNameLength: 30
+  FunctionMinLength:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    minimumFunctionNameLength: 3
+  FunctionNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    functionPattern: '([a-z][a-zA-Z0-9]*)|(`.*`)'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+    ignoreAnnotated: ['Composable']
+  FunctionParameterNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+  InvalidPackageDeclaration:
+    active: false
+    rootPackage: ''
+  MatchingDeclarationName:
+    active: true
+    mustBeFirst: true
+  MemberNameEqualsClassName:
+    active: true
+    ignoreOverridden: true
+  NonBooleanPropertyPrefixedWithIs:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  ObjectPropertyNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    constantPattern: '[A-Za-z][_A-Za-z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*'
+  PackageNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    packagePattern: '[a-z]+(\.[a-z][A-Za-z0-9]*)*'
+  TopLevelPropertyNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    constantPattern: '[A-Z][_A-Z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '_?[A-Za-z][_A-Za-z0-9]*'
+  VariableMaxLength:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    maximumVariableNameLength: 64
+  VariableMinLength:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    minimumVariableNameLength: 1
+  VariableNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    variablePattern: '[a-z][A-Za-z0-9]*'
+    privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+
+performance:
+  active: true
+  ArrayPrimitive:
+    active: true
+  ForEachOnRange:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  SpreadOperator:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  UnnecessaryTemporaryInstantiation:
+    active: true
+
+potential-bugs:
+  active: true
+  Deprecation:
+    active: false
+  DuplicateCaseInWhenExpression:
+    active: true
+  EqualsAlwaysReturnsTrueOrFalse:
+    active: true
+  EqualsWithHashCodeExist:
+    active: true
+  ExplicitGarbageCollectionCall:
+    active: true
+  HasPlatformType:
+    active: false
+  IgnoredReturnValue:
+    active: false
+    restrictToAnnotatedMethods: true
+    returnValueAnnotations: ['*.CheckReturnValue', '*.CheckResult']
+  ImplicitDefaultLocale:
+    active: false
+  ImplicitUnitReturnType:
+    active: false
+    allowExplicitReturnType: true
+  InvalidRange:
+    active: true
+  IteratorHasNextCallsNextMethod:
+    active: true
+  IteratorNotThrowingNoSuchElementException:
+    active: true
+  LateinitUsage:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    excludeAnnotatedProperties: []
+    ignoreOnClassesPattern: ''
+  MapGetWithNotNullAssertionOperator:
+    active: false
+  MissingWhenCase:
+    active: true
+    allowElseExpression: true
+  NullableToStringCall:
+    active: false
+  RedundantElseInWhen:
+    active: true
+  UnconditionalJumpStatementInLoop:
+    active: false
+  UnnecessaryNotNullOperator:
+    active: false
+  UnnecessarySafeCall:
+    active: false
+  UnreachableCode:
+    active: true
+  UnsafeCallOnNullableType:
+    active: true
+  UnsafeCast:
+    active: false
+  UselessPostfixExpression:
+    active: false
+  WrongEqualsTypeParameter:
+    active: true
+
+style:
+  active: true
+  ClassOrdering:
+    active: false
+  CollapsibleIfStatements:
+    active: false
+  DataClassContainsFunctions:
+    active: false
+    conversionFunctionPrefix: 'to'
+  DataClassShouldBeImmutable:
+    active: false
+  EqualsNullCall:
+    active: true
+  EqualsOnSignatureLine:
+    active: false
+  ExplicitCollectionElementAccessMethod:
+    active: false
+  ExplicitItLambdaParameter:
+    active: false
+  ExpressionBodySyntax:
+    active: false
+    includeLineWrapping: false
+  ForbiddenComment:
+    active: true
+    values: ['TODO:', 'FIXME:', 'STOPSHIP:']
+    allowedPatterns: ''
+  ForbiddenImport:
+    active: false
+    imports: []
+    forbiddenPatterns: ''
+  ForbiddenMethodCall:
+    active: false
+    methods: ['kotlin.io.println', 'kotlin.io.print']
+  ForbiddenPublicDataClass:
+    active: false
+    ignorePackages: ['*.internal', '*.internal.*']
+  ForbiddenVoid:
+    active: false
+    ignoreOverridden: false
+    ignoreUsageInGenerics: false
+  FunctionOnlyReturningConstant:
+    active: true
+    ignoreOverridableFunction: true
+    excludedFunctions: 'describeContents'
+    excludeAnnotatedFunction: ['dagger.Provides']
+  LibraryCodeMustSpecifyReturnType:
+    active: true
+  LibraryEntitiesShouldNotBePublic:
+    active: false
+  LoopWithTooManyJumpStatements:
+    active: true
+    maxJumpCount: 1
+  MagicNumber:
+    active: true
+    # TODO: re-enable omnipod-dash
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**', '**/omnipod-dash/**']
+    ignoreNumbers: ['-1', '0', '1', '2']
+    ignoreHashCodeFunction: true
+    ignorePropertyDeclaration: false
+    ignoreLocalVariableDeclaration: false
+    ignoreConstantDeclaration: true
+    ignoreCompanionObjectPropertyDeclaration: true
+    ignoreAnnotation: false
+    ignoreNamedArgument: true
+    ignoreEnums: false
+    ignoreRanges: false
+  MandatoryBracesIfStatements:
+    active: false
+  MandatoryBracesLoops:
+    active: false
+  MaxLineLength:
+    active: true
+    maxLineLength: 120
+    excludePackageStatements: true
+    excludeImportStatements: true
+    excludeCommentStatements: false
+  MayBeConst:
+    active: true
+  ModifierOrder:
+    active: true
+  NestedClassesVisibility:
+    active: false
+  NewLineAtEndOfFile:
+    active: false
+  NoTabs:
+    active: false
+  OptionalAbstractKeyword:
+    active: true
+  OptionalUnit:
+    active: false
+  OptionalWhenBraces:
+    active: false
+  PreferToOverPairSyntax:
+    active: false
+  ProtectedMemberInFinalClass:
+    active: true
+  RedundantExplicitType:
+    active: false
+  RedundantHigherOrderMapUsage:
+    active: false
+  RedundantVisibilityModifierRule:
+    active: false
+  ReturnCount:
+    active: true
+    max: 2
+    excludedFunctions: 'equals'
+    excludeLabeled: false
+    excludeReturnFromLambda: true
+    excludeGuardClauses: false
+  SafeCast:
+    active: true
+  SerialVersionUIDInSerializableClass:
+    active: false
+  SpacingBetweenPackageAndImports:
+    active: false
+  ThrowsCount:
+    active: true
+    max: 2
+  TrailingWhitespace:
+    active: false
+  UnderscoresInNumericLiterals:
+    active: false
+    acceptableDecimalLength: 5
+  UnnecessaryAbstractClass:
+    active: true
+    excludeAnnotatedClasses: ['dagger.Module']
+  UnnecessaryAnnotationUseSiteTarget:
+    active: false
+  UnnecessaryApply:
+    active: false
+  UnnecessaryInheritance:
+    active: true
+  UnnecessaryLet:
+    active: false
+  UnnecessaryParentheses:
+    active: false
+  UntilInsteadOfRangeTo:
+    active: false
+  UnusedImports:
+    active: false
+  UnusedPrivateClass:
+    active: true
+  UnusedPrivateMember:
+    active: false
+    allowedNames: '(_|ignored|expected|serialVersionUID)'
+  UseArrayLiteralsInAnnotations:
+    active: false
+  UseCheckNotNull:
+    active: false
+  UseCheckOrError:
+    active: false
+  UseDataClass:
+    active: false
+    excludeAnnotatedClasses: []
+    allowVars: false
+  UseEmptyCounterpart:
+    active: false
+  UseIfEmptyOrIfBlank:
+    active: false
+  UseIfInsteadOfWhen:
+    active: false
+  UseRequire:
+    active: false
+  UseRequireNotNull:
+    active: false
+  UselessCallOnNotNull:
+    active: true
+  UtilityClassWithPublicConstructor:
+    active: true
+  VarCouldBeVal:
+    active: false
+  WildcardImport:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    excludeImports: ['java.util.*', 'kotlinx.android.synthetic.*']
\ No newline at end of file
diff --git a/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt b/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt
new file mode 100644
index 0000000000..df9b08ef74
--- /dev/null
+++ b/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt
@@ -0,0 +1,74 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.history
+
+import android.content.Context
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.github.guepardoapps.kulid.ULID
+import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.DashHistoryDatabase
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.HistoryRecordDao
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.mapper.HistoryMapper
+import io.reactivex.schedulers.Schedulers
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class DashHistoryTest {
+
+    private lateinit var dao: HistoryRecordDao
+    private lateinit var database: DashHistoryDatabase
+    private lateinit var dashHistory: DashHistory
+
+    @get:Rule
+    val schedulerRule = RxSchedulerRule(Schedulers.trampoline())
+
+    @Before
+    fun setUp() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        database = Room.inMemoryDatabaseBuilder(
+            context,
+            DashHistoryDatabase::class.java
+        ).build()
+        dao = database.historyRecordDao()
+        dashHistory = DashHistory(dao, HistoryMapper())
+    }
+
+    @Test
+    fun testInsertionAndConverters() {
+        dashHistory.getRecords().test().apply {
+            assertValue { it.isEmpty() }
+        }
+
+        dashHistory.createRecord(commandType = OmnipodCommandType.CANCEL_BOLUS, 0L).test().apply {
+            assertValue { ULID.isValid(it) }
+        }
+
+        dashHistory.getRecords().test().apply {
+            assertValue { it.size == 1 }
+        }
+    }
+
+    @Test
+    fun testExceptionOnBolusWithoutRecord() {
+        dashHistory.getRecords().test().apply {
+            assertValue { it.isEmpty() }
+        }
+
+        dashHistory.createRecord(commandType = OmnipodCommandType.SET_BOLUS, 0L).test().apply {
+            assertError(IllegalArgumentException::class.java)
+        }
+
+        dashHistory.getRecords().test().apply {
+            assertValue { it.isEmpty() }
+        }
+    }
+
+    @After
+    fun tearDown() {
+        database.close()
+    }
+}
diff --git a/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/RxSchedulerRule.kt b/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/RxSchedulerRule.kt
new file mode 100644
index 0000000000..a649da837d
--- /dev/null
+++ b/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/RxSchedulerRule.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.history
+
+import io.reactivex.Scheduler
+import io.reactivex.android.plugins.RxAndroidPlugins
+import io.reactivex.plugins.RxJavaPlugins
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+
+// TODO: move to core before the big merge
+class RxSchedulerRule(val scheduler: Scheduler) : TestRule {
+
+    override fun apply(base: Statement, description: Description) =
+        object : Statement() {
+            override fun evaluate() {
+                RxAndroidPlugins.reset()
+                RxAndroidPlugins.setInitMainThreadSchedulerHandler { scheduler }
+                RxJavaPlugins.reset()
+                RxJavaPlugins.setIoSchedulerHandler { scheduler }
+                RxJavaPlugins.setNewThreadSchedulerHandler { scheduler }
+                RxJavaPlugins.setComputationSchedulerHandler { scheduler }
+
+                try {
+                    base.evaluate()
+                } finally {
+                    RxJavaPlugins.reset()
+                    RxAndroidPlugins.reset()
+                }
+            }
+        }
+}
diff --git a/omnipod-dash/src/debug/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/annotations/OpenForTesting.kt b/omnipod-dash/src/debug/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/annotations/OpenForTesting.kt
new file mode 100644
index 0000000000..689d6a467c
--- /dev/null
+++ b/omnipod-dash/src/debug/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/annotations/OpenForTesting.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.annotations
+
+/**
+ * This is the actual annotation that makes the class open. Don't use it directly, only through [OpenForTesting]
+ * which has a NOOP replacement in production.
+ */
+@Target(AnnotationTarget.ANNOTATION_CLASS)
+annotation class OpenClass
+
+/**
+ * Annotate a class with [OpenForTesting] if it should be extendable for testing.
+ */
+@OpenClass
+@Target(AnnotationTarget.CLASS)
+annotation class OpenForTesting
diff --git a/omnipod-dash/src/main/AndroidManifest.xml b/omnipod-dash/src/main/AndroidManifest.xml
index 25a6e46f21..180d3b98ce 100644
--- a/omnipod-dash/src/main/AndroidManifest.xml
+++ b/omnipod-dash/src/main/AndroidManifest.xml
@@ -6,4 +6,10 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+    <application>
+        <activity android:name=".ui.wizard.activation.DashPodActivationWizardActivity" />
+        <activity android:name=".ui.wizard.deactivation.DashPodDeactivationWizardActivity" />
+        <activity android:name=".ui.DashPodManagementActivity" />
+    </application>
 </manifest>
\ No newline at end of file
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/EventOmnipodDashPumpValuesChanged.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/EventOmnipodDashPumpValuesChanged.kt
new file mode 100644
index 0000000000..7aa04163dd
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/EventOmnipodDashPumpValuesChanged.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash
+
+import info.nightscout.androidaps.events.Event
+
+class EventOmnipodDashPumpValuesChanged : Event()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.java
deleted file mode 100644
index 99d9a74eef..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.jetbrains.annotations.NotNull;
-import org.json.JSONObject;
-
-import java.util.Collections;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.interfaces.Profile;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.PumpDescription;
-import info.nightscout.androidaps.interfaces.Pump;
-import info.nightscout.androidaps.interfaces.PumpPluginBase;
-import info.nightscout.androidaps.interfaces.PumpSync;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.common.ManufacturerType;
-import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
-import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.OmnipodDashOverviewFragment;
-import info.nightscout.androidaps.queue.commands.CustomCommand;
-import info.nightscout.androidaps.utils.TimeChangeType;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-
-@Singleton
-public class OmnipodDashPumpPlugin extends PumpPluginBase implements Pump {
-    private static final PumpDescription PUMP_DESCRIPTION = new PumpDescription(PumpType.OMNIPOD_DASH);
-
-    private final AAPSLogger aapsLogger;
-    private final ResourceHelper resourceHelper;
-    private final CommandQueueProvider commandQueue;
-
-    @Inject
-    public OmnipodDashPumpPlugin(HasAndroidInjector injector, AAPSLogger aapsLogger, ResourceHelper resourceHelper, CommandQueueProvider commandQueue) {
-        super(new PluginDescription() //
-                .mainType(PluginType.PUMP) //
-                .fragmentClass(OmnipodDashOverviewFragment.class.getName()) //
-                .pluginIcon(R.drawable.ic_pod_128)
-                .pluginName(R.string.omnipod_dash_name) //
-                .shortName(R.string.omnipod_dash_name_short) //
-                .preferencesId(R.xml.omnipod_dash_preferences) //
-                .description(R.string.omnipod_dash_pump_description), injector, aapsLogger, resourceHelper, commandQueue);
-        this.aapsLogger = aapsLogger;
-        this.resourceHelper = resourceHelper;
-        this.commandQueue = commandQueue;
-    }
-
-    @Override public boolean isInitialized() {
-        return false;
-    }
-
-    @Override public boolean isSuspended() {
-        return false;
-    }
-
-    @Override public boolean isBusy() {
-        return false;
-    }
-
-    @Override public boolean isConnected() {
-        return false;
-    }
-
-    @Override public boolean isConnecting() {
-        return false;
-    }
-
-    @Override public boolean isHandshakeInProgress() {
-        return false;
-    }
-
-    @Override public void finishHandshaking() {
-
-    }
-
-    @Override public void connect(@NotNull String reason) {
-
-    }
-
-    @Override public void disconnect(@NotNull String reason) {
-
-    }
-
-    @Override public void stopConnecting() {
-
-    }
-
-    @Override public void getPumpStatus(@NotNull String reason) {
-
-    }
-
-    @NotNull @Override public PumpEnactResult setNewBasalProfile(@NotNull Profile profile) {
-        return null;
-    }
-
-    @Override public boolean isThisProfileSet(@NotNull Profile profile) {
-        return false;
-    }
-
-    @Override public long lastDataTime() {
-        return 0;
-    }
-
-    @Override public double getBaseBasalRate() {
-        return 0;
-    }
-
-    @Override public double getReservoirLevel() {
-        return 0;
-    }
-
-    @Override public int getBatteryLevel() {
-        return 0;
-    }
-
-    @NotNull @Override public PumpEnactResult deliverTreatment(@NotNull DetailedBolusInfo detailedBolusInfo) {
-        return null;
-    }
-
-    @Override public void stopBolusDelivering() {
-
-    }
-
-    @NotNull @Override public PumpEnactResult setTempBasalAbsolute(double absoluteRate, int durationInMinutes, @NotNull Profile profile, boolean enforceNew, @NonNull PumpSync.TemporaryBasalType tbrType) {
-        return null;
-    }
-
-    @NotNull @Override public PumpEnactResult setTempBasalPercent(int percent, int durationInMinutes, @NotNull Profile profile, boolean enforceNew, @NonNull PumpSync.TemporaryBasalType tbrType) {
-        return null;
-    }
-
-    @NotNull @Override public PumpEnactResult setExtendedBolus(double insulin, int durationInMinutes) {
-        return null;
-    }
-
-    @NotNull @Override public PumpEnactResult cancelTempBasal(boolean enforceNew) {
-        return null;
-    }
-
-    @NotNull @Override public PumpEnactResult cancelExtendedBolus() {
-        return null;
-    }
-
-    @NotNull @Override public JSONObject getJSONStatus(@NotNull Profile profile, @NotNull String profileName, @NotNull String version) {
-        return null;
-    }
-
-    @NotNull @Override public ManufacturerType manufacturer() {
-        return getPumpDescription().getPumpType().getManufacturer();
-    }
-
-    @NotNull @Override public PumpType model() {
-        return getPumpDescription().getPumpType();
-    }
-
-    @NotNull @Override public String serialNumber() {
-        return null;
-    }
-
-    @NotNull @Override public PumpDescription getPumpDescription() {
-        return PUMP_DESCRIPTION;
-    }
-
-    @NotNull @Override public String shortStatus(boolean veryShort) {
-        return null;
-    }
-
-    @Override public boolean isFakingTempsByExtendedBoluses() {
-        return false;
-    }
-
-    @NotNull @Override public PumpEnactResult loadTDDs() {
-        return null;
-    }
-
-    @Override public boolean canHandleDST() {
-        return false;
-    }
-
-    @Override
-    public List<CustomAction> getCustomActions() {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public void executeCustomAction(@NotNull CustomActionType customActionType) {
-        aapsLogger.warn(LTag.PUMP, "Unsupported custom action: " + customActionType);
-    }
-
-    @Nullable @Override public PumpEnactResult executeCustomCommand(@NotNull CustomCommand customCommand) {
-        return null;
-    }
-
-    @Override public void timezoneOrDSTChanged(@NotNull TimeChangeType timeChangeType) {
-
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
new file mode 100644
index 0000000000..83b0796ffe
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -0,0 +1,1410 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash
+
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.activities.ErrorHelperActivity.Companion.runAlarm
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.events.EventPreferenceChange
+import info.nightscout.androidaps.events.EventProfileSwitchChanged
+import info.nightscout.androidaps.events.EventRefreshOverview
+import info.nightscout.androidaps.events.EventTempBasalChange
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.common.ManufacturerType
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
+import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.*
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.*
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.ResponseType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.CommandConfirmed
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.DashHistory
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BolusRecord
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BolusType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.TempBasalRecord
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.OmnipodDashOverviewFragment
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.mapProfileToBasalProgram
+import info.nightscout.androidaps.queue.commands.Command
+import info.nightscout.androidaps.queue.commands.CustomCommand
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.TimeChangeType
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.Completable
+import io.reactivex.Single
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxkotlin.subscribeBy
+import org.json.JSONObject
+import java.time.Duration
+import java.time.ZonedDateTime
+import java.util.*
+import java.util.concurrent.CountDownLatch
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.concurrent.thread
+import kotlin.math.ceil
+import kotlin.random.Random
+
+@Singleton
+class OmnipodDashPumpPlugin @Inject constructor(
+    private val omnipodManager: OmnipodDashManager,
+    private val podStateManager: OmnipodDashPodStateManager,
+    private val sp: SP,
+    private val profileFunction: ProfileFunction,
+    private val history: DashHistory,
+    private val pumpSync: PumpSync,
+    private val rxBus: RxBusWrapper,
+    private val context: Context,
+    private val aapsSchedulers: AapsSchedulers,
+    private val fabricPrivacy: FabricPrivacy,
+
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    resourceHelper: ResourceHelper,
+    commandQueue: CommandQueueProvider
+) : PumpPluginBase(pluginDescription, injector, aapsLogger, resourceHelper, commandQueue), Pump {
+    @Volatile var bolusCanceled = false
+    @Volatile var bolusDeliveryInProgress = false
+
+    private val handler: Handler = Handler(Looper.getMainLooper())
+    private lateinit var statusChecker: Runnable
+    var nextPodWarningCheck: Long = 0
+    @Volatile var stopConnecting: CountDownLatch? = null
+    private var disposables: CompositeDisposable = CompositeDisposable()
+
+    companion object {
+        private const val BOLUS_RETRY_INTERVAL_MS = 2000.toLong()
+        private const val BOLUS_RETRIES = 5 // number of retries for cancel/get bolus status
+        private const val STATUS_CHECK_INTERVAL_MS = (60L * 1000)
+
+        private val pluginDescription = PluginDescription()
+            .mainType(PluginType.PUMP)
+            .fragmentClass(OmnipodDashOverviewFragment::class.java.name)
+            .pluginIcon(R.drawable.ic_pod_128)
+            .pluginName(R.string.omnipod_dash_name)
+            .shortName(R.string.omnipod_dash_name_short)
+            .preferencesId(R.xml.omnipod_dash_preferences)
+            .description(R.string.omnipod_dash_pump_description)
+
+        private val pumpDescription = PumpDescription(PumpType.OMNIPOD_DASH)
+    }
+
+    init {
+        statusChecker = Runnable {
+            refreshStatusOnUnacknowledgedCommands()
+            updatePodWarnings()
+            aapsLogger.info(LTag.PUMP, "statusChecker")
+
+            createFakeTBRWhenNoActivePod()
+                .subscribeOn(aapsSchedulers.io)
+                .subscribeBy(
+                    onError = {
+                        aapsLogger.warn(LTag.PUMP, "Error on createFakeTBRWhenNoActivePod=$it")
+                    }
+                )
+            handler.postDelayed(statusChecker, STATUS_CHECK_INTERVAL_MS)
+        }
+    }
+
+    private fun createFakeTBRWhenNoActivePod(): Completable = Completable.defer {
+        if (!podStateManager.isPodRunning) {
+            val expectedState = pumpSync.expectedPumpState()
+            val tbr = expectedState.temporaryBasal
+            if (tbr == null || tbr.rate != 0.0) {
+                aapsLogger.info(LTag.PUMP, "createFakeTBRWhenNoActivePod")
+                // calling connectNewPump() here because pumpSerial could have changed(from 4241 to "n/a")
+                pumpSync.connectNewPump()
+                pumpSync.syncTemporaryBasalWithPumpId(
+                    timestamp = System.currentTimeMillis(),
+                    rate = 0.0,
+                    duration = T.mins(PodConstants.MAX_POD_LIFETIME.toMinutes()).msecs(),
+                    isAbsolute = true,
+                    type = PumpSync.TemporaryBasalType.PUMP_SUSPEND,
+                    pumpId = Random.Default.nextLong(), // we don't use this, just make sure it's unique
+                    pumpType = PumpType.OMNIPOD_DASH,
+                    pumpSerial = serialNumber()
+                )
+            }
+        }
+        Completable.complete()
+    }
+
+    private fun updatePodWarnings() {
+        if (System.currentTimeMillis() > nextPodWarningCheck) {
+            if (!podStateManager.isPodRunning) {
+                val notification =
+                    Notification(
+                        Notification.OMNIPOD_POD_NOT_ATTACHED,
+                        "Pod not activated",
+                        Notification.NORMAL
+                    )
+                rxBus.send(EventNewNotification(notification))
+            } else {
+                rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_NOT_ATTACHED))
+                if (podStateManager.isSuspended) {
+                    showNotification(
+                        Notification.OMNIPOD_POD_SUSPENDED,
+                        "Insulin delivery suspended",
+                        Notification.NORMAL,
+                        R.raw.boluserror
+                    )
+                } else {
+                    rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED))
+                    if (!podStateManager.sameTimeZone) {
+                        val notification =
+                            Notification(
+                                Notification.OMNIPOD_TIME_OUT_OF_SYNC,
+                                "Timezone on pod is different from the timezone on phone. " +
+                                    "Basal rate is incorrect" +
+                                    "Switch profile to fix",
+                                Notification.NORMAL
+                            )
+                        rxBus.send(EventNewNotification(notification))
+                    }
+                }
+            }
+            nextPodWarningCheck = DateTimeUtil.getTimeInFutureFromMinutes(15)
+        }
+    }
+
+    private fun refreshStatusOnUnacknowledgedCommands() {
+        if (podStateManager.isPodRunning &&
+            podStateManager.activeCommand != null &&
+            commandQueue.size() == 0 &&
+            commandQueue.performing() == null
+        ) {
+            commandQueue.readStatus("Unconfirmed command", null)
+        }
+    }
+
+    override fun isInitialized(): Boolean {
+        return podStateManager.isPodRunning
+    }
+
+    override fun isSuspended(): Boolean {
+        return podStateManager.isSuspended
+    }
+
+    override fun isBusy(): Boolean {
+        // prevents the queue from executing commands
+        return podStateManager.activationProgress.isBefore(ActivationProgress.COMPLETED)
+    }
+
+    override fun isConnected(): Boolean {
+
+        return !podStateManager.isPodRunning ||
+            podStateManager.bluetoothConnectionState == OmnipodDashPodStateManager.BluetoothConnectionState.CONNECTED
+    }
+
+    override fun isConnecting(): Boolean {
+        return stopConnecting != null
+    }
+
+    override fun isHandshakeInProgress(): Boolean {
+        return stopConnecting != null &&
+            podStateManager.bluetoothConnectionState == OmnipodDashPodStateManager.BluetoothConnectionState.CONNECTED
+    }
+
+    override fun finishHandshaking() {
+    }
+
+    override fun connect(reason: String) {
+        aapsLogger.info(LTag.PUMP, "connect reason=$reason")
+        podStateManager.bluetoothConnectionState = OmnipodDashPodStateManager.BluetoothConnectionState.CONNECTING
+
+        synchronized(this) {
+            stopConnecting?.let {
+                aapsLogger.warn(LTag.PUMP, "Already connecting: $stopConnecting")
+                return
+            }
+            val stop = CountDownLatch(1)
+            stopConnecting = stop
+        }
+
+        thread(
+            start = true,
+            name = "ConnectionThread",
+        ) {
+            try {
+                stopConnecting?.let {
+                    val error = omnipodManager.connect(it).ignoreElements().blockingGet()
+                    aapsLogger.info(LTag.PUMPCOMM, "connect error=$error")
+                }
+            } finally {
+                synchronized(this) {
+                    stopConnecting = null
+                }
+            }
+        }
+    }
+
+    override fun disconnect(reason: String) {
+        aapsLogger.info(LTag.PUMP, "disconnect reason=$reason")
+        stopConnecting?.countDown()
+        omnipodManager.disconnect(false)
+    }
+
+    override fun stopConnecting() {
+        aapsLogger.info(LTag.PUMP, "stopConnecting")
+        stopConnecting?.countDown()
+        omnipodManager.disconnect(true)
+    }
+
+    override fun getPumpStatus(reason: String) {
+        aapsLogger.debug(LTag.PUMP, "getPumpStatus reason=$reason")
+        if (reason != "REQUESTED BY USER" && !podStateManager.isActivationCompleted) {
+            // prevent races on BLE when the pod is not activated
+            return
+        }
+
+        val throwable = getPodStatus().blockingGet()
+        if (throwable != null) {
+            aapsLogger.error(LTag.PUMP, "Error in getPumpStatus", throwable)
+        } else {
+            aapsLogger.info(LTag.PUMP, "getPumpStatus executed with success")
+            if (!podStateManager.isActivationCompleted) {
+                val msg = podStateManager.recoverActivationFromPodStatus()
+                msg?.let {
+                    // TODO: show dialog with "try again, the pod is busy now"
+                    aapsLogger.info(LTag.PUMP, "recoverActivationFromPodStatus msg=$msg")
+                }
+            }
+        }
+    }
+
+    private fun getPodStatus(): Completable = Completable.concat(
+        listOf(
+            omnipodManager
+                .getStatus(ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE)
+                .ignoreElements(),
+            history.updateFromState(podStateManager),
+            podStateManager.updateActiveCommand()
+                .map { handleCommandConfirmation(it) }
+                .ignoreElement(),
+            checkPodKaput(),
+        )
+    )
+
+    private fun checkPodKaput(): Completable = Completable.defer {
+        val tbr = pumpSync.expectedPumpState().temporaryBasal
+        if (podStateManager.isPodKaput) {
+            if (tbr == null || tbr.rate != 0.0) {
+                pumpSync.syncTemporaryBasalWithPumpId(
+                    timestamp = System.currentTimeMillis(),
+                    rate = 0.0,
+                    duration = T.mins(PodConstants.MAX_POD_LIFETIME.toMinutes()).msecs(),
+                    isAbsolute = true,
+                    type = PumpSync.TemporaryBasalType.PUMP_SUSPEND,
+                    pumpId = Random.Default.nextLong(), // we don't use this, just make sure it's unique
+                    pumpType = PumpType.OMNIPOD_DASH,
+                    pumpSerial = serialNumber()
+                )
+            }
+            podStateManager.lastBolus?.run {
+                if (!deliveryComplete) {
+                    val deliveredUnits = markComplete()
+                    deliveryComplete = true
+                    val bolusHistoryEntry = history.getById(historyId)
+                    val sync = pumpSync.syncBolusWithPumpId(
+                        timestamp = bolusHistoryEntry.createdAt,
+                        amount = deliveredUnits,
+                        pumpId = bolusHistoryEntry.pumpId(),
+                        pumpType = PumpType.OMNIPOD_DASH,
+                        pumpSerial = serialNumber(),
+                        type = bolusType
+                    )
+                    aapsLogger.info(LTag.PUMP, "syncBolusWithPumpId on CANCEL_BOLUS returned: $sync")
+                }
+            }
+            showNotification(
+                Notification.OMNIPOD_POD_FAULT,
+                podStateManager.alarmType.toString(),
+                Notification.URGENT,
+                R.raw.boluserror
+            )
+            if (!podStateManager.alarmSynced) {
+                pumpSync.insertAnnouncement(
+                    error = podStateManager.alarmType?.toString() ?: "Unknown pod failure",
+                    pumpId = Random.Default.nextLong(),
+                    pumpType = PumpType.OMNIPOD_DASH,
+                    pumpSerial = serialNumber()
+                )
+                podStateManager.alarmSynced = true
+            }
+        }
+        Completable.complete()
+    }
+
+    override fun setNewBasalProfile(profile: Profile): PumpEnactResult {
+        if (!podStateManager.isActivationCompleted) {
+            return PumpEnactResult(injector).success(true).enacted(true)
+        }
+        aapsLogger.debug(LTag.PUMP, "setNewBasalProfile profile=$profile")
+        val basalProgram = mapProfileToBasalProgram(profile)
+        var deliverySuspended = false
+        return executeProgrammingCommand(
+            pre = suspendDeliveryIfActive().doOnComplete {
+                if (podStateManager.activeCommand == null) {
+                    // suspend delivery is confirmed
+                    deliverySuspended = true
+                }
+            },
+            historyEntry = history.createRecord(commandType = OmnipodCommandType.SET_BASAL_PROFILE),
+            activeCommandEntry = { historyId ->
+                podStateManager.createActiveCommand(historyId, basalProgram = basalProgram)
+            },
+            command = omnipodManager.setBasalProgram(basalProgram, hasBasalBeepEnabled()).ignoreElements(),
+            post = failWhenUnconfirmed(deliverySuspended),
+            // mark as failed even if it worked OK and try again vs. mark ok and deny later
+        ).toPumpEnactResult()
+    }
+
+    private fun failWhenUnconfirmed(deliverySuspended: Boolean): Completable = Completable.defer {
+        rxBus.send(EventTempBasalChange())
+        if (podStateManager.activeCommand != null) {
+            if (deliverySuspended) {
+                showNotification(
+                    Notification.FAILED_UPDATE_PROFILE,
+                    "Failed to set the new basal profile. Delivery suspended",
+                    Notification.URGENT,
+                    R.raw.boluserror
+                )
+            } else {
+                showNotification(
+                    Notification.FAILED_UPDATE_PROFILE,
+                    "Setting basal profile might have failed. Delivery might be suspended!" +
+                        " Please manually refresh the Pod status from the Omnipod tab and resume delivery if needed.",
+                    Notification.URGENT,
+                    R.raw.boluserror
+                )
+            }
+            Completable.error(java.lang.IllegalStateException("Command not confirmed"))
+        } else {
+            showNotification(Notification.PROFILE_SET_OK, "Profile set OK", Notification.INFO, null)
+
+            Completable.complete()
+        }
+    }
+
+    private fun suspendDeliveryIfActive(): Completable = Completable.defer {
+        if (podStateManager.deliveryStatus == DeliveryStatus.SUSPENDED)
+            Completable.complete()
+        else
+            executeProgrammingCommand(
+                historyEntry = history.createRecord(OmnipodCommandType.SUSPEND_DELIVERY),
+                command = omnipodManager.suspendDelivery(hasBasalBeepEnabled())
+                    .filter { podEvent -> podEvent.isCommandSent() }
+                    .map {
+                        pumpSyncTempBasal(
+                            0.0,
+                            PodConstants.MAX_POD_LIFETIME.toMinutes(),
+                            PumpSync.TemporaryBasalType.PUMP_SUSPEND
+                        )
+                        rxBus.send(EventTempBasalChange())
+                    }
+                    .ignoreElements()
+            ).doOnComplete {
+                notifyOnUnconfirmed(
+                    Notification.FAILED_UPDATE_PROFILE,
+                    "Suspend delivery is unconfirmed! " +
+                        "Please manually refresh the Pod status from the Omnipod tab and resume delivery if needed.",
+                    R.raw.boluserror,
+                )
+            }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        podStateManager.onStart()
+        handler.postDelayed(statusChecker, STATUS_CHECK_INTERVAL_MS)
+        disposables += rxBus
+            .toObservable(EventPreferenceChange::class.java)
+            .observeOn(aapsSchedulers.main)
+            .subscribe(
+                {
+                    if (it.isChanged(
+                            resourceHelper,
+                            R.string.key_omnipod_common_expiration_reminder_enabled
+                        ) ||
+                        it.isChanged(
+                                resourceHelper,
+                                R.string.key_omnipod_common_expiration_reminder_hours_before_shutdown
+                            ) ||
+                        it.isChanged(
+                                resourceHelper,
+                                R.string.key_omnipod_common_low_reservoir_alert_enabled
+                            ) ||
+                        it.isChanged(
+                                resourceHelper,
+                                R.string.key_omnipod_common_low_reservoir_alert_units
+                            )
+                    ) {
+                        commandQueue.customCommand(CommandUpdateAlertConfiguration(), null)
+                    }
+                },
+                fabricPrivacy::logException
+            )
+    }
+
+    override fun onStop() {
+        super.onStop()
+        disposables.clear()
+        handler.removeCallbacks(statusChecker)
+    }
+
+    private fun observeDeliverySuspended(): Completable = Completable.defer {
+        if (podStateManager.deliveryStatus == DeliveryStatus.SUSPENDED)
+            Completable.complete()
+        else {
+            Completable.error(java.lang.IllegalStateException("Expected suspended delivery"))
+        }
+    }
+
+    override fun isThisProfileSet(profile: Profile): Boolean {
+        if (!podStateManager.isActivationCompleted) {
+            // prevent setBasal requests
+            return true
+        }
+        // TODO: what do we have to answer here if delivery is suspended?
+        val running = podStateManager.basalProgram
+        val equal = (mapProfileToBasalProgram(profile) == running)
+        aapsLogger.info(LTag.PUMP, "set: $equal. profile=$profile, running=$running")
+        return equal
+    }
+
+    override fun lastDataTime(): Long {
+        return podStateManager.lastUpdatedSystem
+    }
+
+    override val baseBasalRate: Double
+        get() {
+            val date = Date()
+            val ret = podStateManager.basalProgram?.rateAt(date) ?: 0.0
+            aapsLogger.info(LTag.PUMP, "baseBasalRate: $ret at $date}")
+            return if (podStateManager.alarmType != null) {
+                0.0
+            } else
+                ret
+        }
+
+    override val reservoirLevel: Double
+        get() {
+            if (podStateManager.activationProgress.isBefore(ActivationProgress.COMPLETED)) {
+                return 0.0
+            }
+
+            // Omnipod only reports reservoir level when there's < 1023 pulses left
+            return podStateManager.pulsesRemaining?.let {
+                it * 0.05
+            } ?: 75.0
+        }
+
+    override val batteryLevel: Int
+        // Omnipod Dash doesn't report it's battery level. We return 0 here and hide related fields in the UI
+        get() = 0
+
+    override fun deliverTreatment(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult {
+        try {
+            bolusDeliveryInProgress = true
+            aapsLogger.info(LTag.PUMP, "Delivering treatment: $detailedBolusInfo $bolusCanceled")
+            val beepsConfigurationKey = if (detailedBolusInfo.bolusType == DetailedBolusInfo.BolusType.SMB)
+                R.string.key_omnipod_common_smb_beeps_enabled
+            else
+                R.string.key_omnipod_common_bolus_beeps_enabled
+            val bolusBeeps = sp.getBoolean(beepsConfigurationKey, false)
+            R.string.key_omnipod_common_smb_beeps_enabled
+            if (detailedBolusInfo.carbs > 0 ||
+                detailedBolusInfo.insulin == 0.0
+            ) {
+                // Accept only valid insulin requests
+                return PumpEnactResult(injector)
+                    .success(false)
+                    .enacted(false)
+                    .bolusDelivered(0.0)
+                    .comment("Invalid input")
+            }
+            val requestedBolusAmount = detailedBolusInfo.insulin
+            if (requestedBolusAmount > reservoirLevel) {
+                return PumpEnactResult(injector)
+                    .success(false)
+                    .enacted(false)
+                    .bolusDelivered(0.0)
+                    .comment("Not enough insulin in the reservoir")
+            }
+            var deliveredBolusAmount = 0.0
+
+            aapsLogger.info(
+                LTag.PUMP,
+                "deliverTreatment: requestedBolusAmount=$requestedBolusAmount"
+            )
+            val ret = executeProgrammingCommand(
+                pre = observeDeliveryNotCanceled(),
+                historyEntry = history.createRecord(
+                    commandType = OmnipodCommandType.SET_BOLUS,
+                    bolusRecord = BolusRecord(
+                        requestedBolusAmount,
+                        BolusType.fromBolusInfoBolusType(detailedBolusInfo.bolusType)
+                    )
+                ),
+                activeCommandEntry = { historyId ->
+                    podStateManager.createActiveCommand(
+                        historyId,
+                        requestedBolus = requestedBolusAmount
+                    )
+                },
+                command = omnipodManager.bolus(
+                    detailedBolusInfo.insulin,
+                    bolusBeeps,
+                    bolusBeeps
+                ).filter { podEvent -> podEvent.isCommandSent() }
+                    .map { pumpSyncBolusStart(requestedBolusAmount, detailedBolusInfo.bolusType) }
+                    .ignoreElements(),
+                post = waitForBolusDeliveryToComplete(BOLUS_RETRIES, requestedBolusAmount, detailedBolusInfo.bolusType)
+                    .map {
+                        deliveredBolusAmount = it
+                        aapsLogger.info(LTag.PUMP, "deliverTreatment: deliveredBolusAmount=$deliveredBolusAmount")
+                    }
+                    .ignoreElement()
+            ).doFinally {
+                if (detailedBolusInfo.bolusType == DetailedBolusInfo.BolusType.SMB) {
+                    notifyOnUnconfirmed(
+                        Notification.OMNIPOD_UNCERTAIN_SMB,
+                        "Unable to verify whether SMB bolus ($requestedBolusAmount U) succeeded. " +
+                            "<b>Refresh pod status to confirm or deny this command.",
+                        R.raw.boluserror
+                    )
+                } else {
+                    if (podStateManager.activeCommand != null) {
+                        val sound = if (sp.getBoolean(
+                                R.string
+                                    .key_omnipod_common_notification_uncertain_bolus_sound_enabled,
+                                true
+                            )
+                        )
+                            R.raw.boluserror
+                        else
+                            0
+
+                        showErrorDialog(
+                            "Bolus delivery status uncertain. Refresh pod status to confirm or deny.",
+                            sound
+                        )
+                    }
+                }
+            }.toSingleDefault(
+                PumpEnactResult(injector).success(true).enacted(true).bolusDelivered(deliveredBolusAmount)
+            )
+                .onErrorReturnItem(
+                    // success if canceled
+                    PumpEnactResult(injector).success(bolusCanceled).enacted(false)
+                )
+                .blockingGet()
+            aapsLogger.info(LTag.PUMP, "deliverTreatment result: $ret")
+            return ret
+        } finally {
+            bolusCanceled = false
+            bolusDeliveryInProgress = false
+        }
+    }
+
+    private fun observeDeliveryNotCanceled(): Completable = Completable.defer {
+        if (bolusCanceled) {
+            Completable.error(java.lang.IllegalStateException("Bolus canceled"))
+        } else {
+            Completable.complete()
+        }
+    }
+
+    private fun updateBolusProgressDialog(msg: String, percent: Int) {
+        val progressUpdateEvent = EventOverviewBolusProgress
+        progressUpdateEvent.status = msg
+        progressUpdateEvent.percent = percent
+        rxBus.send(progressUpdateEvent)
+    }
+
+    private fun waitForBolusDeliveryToComplete(
+        maxTries: Int,
+        requestedBolusAmount: Double,
+        bolusType: DetailedBolusInfo.BolusType
+    ): Single<Double> = Single.defer {
+
+        if (bolusCanceled && podStateManager.activeCommand != null) {
+            var errorGettingStatus: Throwable? = null
+            for (tries in 1..maxTries) {
+                errorGettingStatus = getPodStatus().blockingGet()
+                if (errorGettingStatus != null) {
+                    aapsLogger.debug(LTag.PUMP, "waitForBolusDeliveryToComplete errorGettingStatus=$errorGettingStatus")
+                    Thread.sleep(BOLUS_RETRY_INTERVAL_MS) // retry every 2 sec
+                    continue
+                }
+            }
+            if (errorGettingStatus != null) {
+                // requestedBolusAmount will be updated later, via pumpSync
+                // This state is: cancellation requested and getPodStatus failed 5 times.
+                return@defer Single.just(requestedBolusAmount)
+            }
+        }
+
+        val estimatedDeliveryTimeSeconds = estimateBolusDeliverySeconds(requestedBolusAmount)
+        aapsLogger.info(LTag.PUMP, "estimatedDeliveryTimeSeconds: $estimatedDeliveryTimeSeconds")
+        var waited = 0
+        while (waited < estimatedDeliveryTimeSeconds && !bolusCanceled) {
+            waited += 1
+            Thread.sleep(1000)
+            if (bolusType == DetailedBolusInfo.BolusType.SMB) {
+                continue
+            }
+            val percent = (waited.toFloat() / estimatedDeliveryTimeSeconds) * 100
+            updateBolusProgressDialog(
+                resourceHelper.gs(R.string.bolusdelivering, requestedBolusAmount),
+                percent.toInt()
+            )
+        }
+
+        for (tryNumber in 1..maxTries) {
+            updateBolusProgressDialog("Checking delivery status", 100)
+
+            val cmd = if (bolusCanceled)
+                cancelBolus()
+            else
+                getPodStatus()
+
+            val errorGettingStatus = cmd.blockingGet()
+            if (errorGettingStatus != null) {
+                aapsLogger.debug(LTag.PUMP, "waitForBolusDeliveryToComplete errorGettingStatus=$errorGettingStatus")
+                Thread.sleep(BOLUS_RETRY_INTERVAL_MS) // retry every 3 sec
+                continue
+            }
+            val bolusDeliveringActive = podStateManager.deliveryStatus?.bolusDeliveringActive() ?: false
+
+            if (bolusDeliveringActive) {
+                // delivery not complete yet
+                val remainingUnits = podStateManager.lastBolus!!.bolusUnitsRemaining
+                val percent = ((requestedBolusAmount - remainingUnits) / requestedBolusAmount) * 100
+                updateBolusProgressDialog(
+                    resourceHelper.gs(R.string.bolusdelivering, requestedBolusAmount),
+                    percent.toInt()
+                )
+
+                val sleepSeconds = if (bolusCanceled)
+                    BOLUS_RETRY_INTERVAL_MS
+                else
+                    estimateBolusDeliverySeconds(remainingUnits)
+                Thread.sleep(sleepSeconds * 1000.toLong())
+            } else {
+                // delivery is complete. If pod is Kaput, we are handling this in getPodStatus
+                return@defer Single.just(podStateManager.lastBolus!!.deliveredUnits()!!)
+            }
+        }
+        Single.just(requestedBolusAmount) // will be updated later!
+    }
+
+    private fun cancelBolus(): Completable {
+        val bolusBeeps = sp.getBoolean(R.string.key_omnipod_common_bolus_beeps_enabled, false)
+        return executeProgrammingCommand(
+            historyEntry = history.createRecord(commandType = OmnipodCommandType.CANCEL_BOLUS),
+            command = omnipodManager.stopBolus(bolusBeeps).ignoreElements(),
+            checkNoActiveCommand = false,
+        )
+    }
+
+    private fun estimateBolusDeliverySeconds(requestedBolusAmount: Double): Long {
+        return ceil(requestedBolusAmount / 0.05).toLong() * 2 + 3
+    }
+
+    private fun pumpSyncBolusStart(
+        requestedBolusAmount: Double,
+        bolusType: DetailedBolusInfo.BolusType
+    ): Boolean {
+        val activeCommand = podStateManager.activeCommand
+        if (activeCommand == null) {
+            throw IllegalArgumentException(
+                "No active command or illegal podEvent: " +
+                    "activeCommand=$activeCommand"
+            )
+        }
+        val historyEntry = history.getById(activeCommand.historyId)
+        val ret = pumpSync.syncBolusWithPumpId(
+            timestamp = historyEntry.createdAt,
+            amount = requestedBolusAmount,
+            type = bolusType,
+            pumpId = historyEntry.pumpId(),
+            pumpType = PumpType.OMNIPOD_DASH,
+            pumpSerial = serialNumber()
+        )
+        aapsLogger.debug(LTag.PUMP, "pumpSyncBolusStart: $ret")
+        return ret
+    }
+
+    override fun stopBolusDelivering() {
+        aapsLogger.info(LTag.PUMP, "stopBolusDelivering called")
+        if (bolusDeliveryInProgress) {
+            bolusCanceled = true
+        }
+    }
+
+    override fun setTempBasalAbsolute(
+        absoluteRate: Double,
+        durationInMinutes: Int,
+        profile: Profile,
+        enforceNew: Boolean,
+        tbrType: PumpSync.TemporaryBasalType
+    ): PumpEnactResult {
+        val tempBasalBeeps = hasTempBasalBeepEnabled()
+        aapsLogger.info(
+            LTag.PUMP,
+            "setTempBasalAbsolute: " +
+                "duration=$durationInMinutes min :: " +
+                "rate=$absoluteRate U/h :: " +
+                "enforce=$enforceNew ::" +
+                "tbrType=$tbrType"
+        )
+
+        val ret = executeProgrammingCommand(
+            pre = observeNoActiveTempBasal(true),
+            historyEntry = history.createRecord(
+                commandType = OmnipodCommandType.SET_TEMPORARY_BASAL,
+                tempBasalRecord = TempBasalRecord(duration = durationInMinutes, rate = absoluteRate)
+            ),
+            activeCommandEntry = { historyId ->
+                podStateManager.createActiveCommand(
+                    historyId,
+                    tempBasal = OmnipodDashPodStateManager.TempBasal(
+                        startTime = System.currentTimeMillis(),
+                        rate = absoluteRate,
+                        durationInMinutes = durationInMinutes.toShort(),
+                    )
+                )
+            },
+            command = omnipodManager.setTempBasal(
+                absoluteRate,
+                durationInMinutes.toShort(),
+                tempBasalBeeps
+            )
+                .filter { podEvent -> podEvent.isCommandSent() }
+                .map { pumpSyncTempBasal(absoluteRate, durationInMinutes.toLong(), tbrType) }
+                .ignoreElements(),
+        ).doOnComplete {
+            notifyOnUnconfirmed(
+                Notification.OMNIPOD_TBR_ALERTS,
+                "Setting temp basal might have basal failed. If a temp basal was previously running, " +
+                    "it has been cancelled. Please manually refresh the Pod status from the Omnipod tab.",
+                R.raw.boluserror,
+            )
+        }.toPumpEnactResult()
+
+        if (ret.success && ret.enacted) {
+            ret.isPercent(false).absolute(absoluteRate).duration(durationInMinutes)
+        }
+        aapsLogger.info(LTag.PUMP, "setTempBasalAbsolute: result=$ret")
+        return ret
+    }
+
+    private fun pumpSyncTempBasal(
+        absoluteRate: Double,
+        durationInMinutes: Long,
+        tbrType: PumpSync.TemporaryBasalType
+    ): Boolean {
+        val activeCommand = podStateManager.activeCommand
+        if (activeCommand == null) {
+            throw IllegalArgumentException(
+                "No active command: " +
+                    "activeCommand=$activeCommand"
+            )
+        }
+        val historyEntry = history.getById(activeCommand.historyId)
+        aapsLogger.debug(
+            LTag.PUMP,
+            "pumpSyncTempBasal: absoluteRate=$absoluteRate, durationInMinutes=$durationInMinutes"
+        )
+        val ret = pumpSync.syncTemporaryBasalWithPumpId(
+            timestamp = historyEntry.createdAt,
+            rate = absoluteRate,
+            duration = T.mins(durationInMinutes).msecs(),
+            isAbsolute = true,
+            type = tbrType,
+            pumpId = historyEntry.pumpId(),
+            pumpType = PumpType.OMNIPOD_DASH,
+            pumpSerial = serialNumber()
+        )
+        aapsLogger.debug(LTag.PUMP, "pumpSyncTempBasal: $ret")
+        return ret
+    }
+
+    private fun observeNoActiveTempBasal(enforceNew: Boolean): Completable {
+        return Completable.defer {
+            when {
+                podStateManager.deliveryStatus !in
+                    arrayOf(DeliveryStatus.TEMP_BASAL_ACTIVE, DeliveryStatus.BOLUS_AND_TEMP_BASAL_ACTIVE) -> {
+                    // TODO: what happens if we try to cancel nonexistent temp basal?
+                    aapsLogger.info(LTag.PUMP, "No temporary basal to cancel")
+                    Completable.complete()
+                }
+
+                !enforceNew ->
+                    Completable.error(
+                        IllegalStateException(
+                            "Temporary basal already active and enforceNew is not set."
+                        )
+                    )
+
+                else -> {
+                    // enforceNew == true
+                    aapsLogger.info(LTag.PUMP, "Canceling existing temp basal")
+                    executeProgrammingCommand(
+                        historyEntry = history.createRecord(OmnipodCommandType.CANCEL_TEMPORARY_BASAL),
+                        command = omnipodManager.stopTempBasal(hasTempBasalBeepEnabled()).ignoreElements()
+                    ).doOnComplete {
+                        notifyOnUnconfirmed(
+                            Notification.OMNIPOD_TBR_ALERTS,
+                            "Cancelling temp basal might have failed." +
+                                "If a temp basal was previously running, it might have been cancelled." +
+                                "Please manually refresh the Pod status from the Omnipod tab.", // TODO: i8n
+                            R.raw.boluserror,
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    override fun setTempBasalPercent(
+        percent: Int,
+        durationInMinutes: Int,
+        profile: Profile,
+        enforceNew: Boolean,
+        tbrType: PumpSync.TemporaryBasalType
+    ): PumpEnactResult {
+        // TODO i18n
+        return PumpEnactResult(injector).success(false).enacted(false)
+            .comment("Omnipod Dash driver does not support percentage temp basals")
+    }
+
+    override fun setExtendedBolus(insulin: Double, durationInMinutes: Int): PumpEnactResult {
+        // TODO i18n
+        return PumpEnactResult(injector).success(false).enacted(false)
+            .comment("Omnipod Dash driver does not support extended boluses")
+    }
+
+    private fun hasTempBasalBeepEnabled(): Boolean {
+        return sp.getBoolean(R.string.key_omnipod_common_tbr_beeps_enabled, false)
+    }
+
+    private fun hasBasalBeepEnabled(): Boolean {
+        return sp.getBoolean(R.string.key_omnipod_common_basal_beeps_enabled, false)
+    }
+
+    override fun cancelTempBasal(enforceNew: Boolean): PumpEnactResult {
+        if (!podStateManager.tempBasalActive &&
+            pumpSync.expectedPumpState().temporaryBasal == null
+        ) {
+            // nothing to cancel
+            return PumpEnactResult(injector).success(true).enacted(false)
+        }
+
+        return executeProgrammingCommand(
+            historyEntry = history.createRecord(OmnipodCommandType.CANCEL_TEMPORARY_BASAL),
+            command = omnipodManager.stopTempBasal(hasTempBasalBeepEnabled()).ignoreElements(),
+        ).doOnComplete {
+            notifyOnUnconfirmed(
+                Notification.OMNIPOD_TBR_ALERTS,
+                "Cancel temp basal result is uncertain", // TODO: i8n,
+                R.raw.boluserror, // TODO: add setting for this
+            )
+        }.toPumpEnactResult()
+    }
+
+    private fun notifyOnUnconfirmed(notificationId: Int, msg: String, sound: Int?) {
+        if (podStateManager.activeCommand != null) {
+            aapsLogger.debug(LTag.PUMP, "Notification for active command: ${podStateManager.activeCommand}")
+            showNotification(notificationId, msg, Notification.URGENT, sound)
+        }
+    }
+
+    private fun Completable.toPumpEnactResult(): PumpEnactResult {
+        return this.toSingleDefault(PumpEnactResult(injector).success(true).enacted(true))
+            .doOnError { throwable ->
+                aapsLogger.error(LTag.PUMP, "toPumpEnactResult, error executing command: $throwable")
+            }
+            .onErrorReturnItem(PumpEnactResult(injector).success(false).enacted(false))
+            .blockingGet()
+    }
+
+    override fun cancelExtendedBolus(): PumpEnactResult {
+        // TODO i18n
+        return PumpEnactResult(injector).success(false).enacted(false)
+            .comment("Omnipod Dash driver does not support extended boluses")
+    }
+
+    override fun getJSONStatus(profile: Profile, profileName: String, version: String): JSONObject {
+        // TODO
+        return JSONObject()
+    }
+
+    override val pumpDescription: PumpDescription = Companion.pumpDescription
+
+    override fun manufacturer(): ManufacturerType {
+        return ManufacturerType.Insulet
+    }
+
+    override fun model(): PumpType {
+        return pumpDescription.pumpType
+    }
+
+    override fun serialNumber(): String {
+        return podStateManager.uniqueId?.toString()
+            ?: "n/a" // TODO i18n
+    }
+
+    override fun shortStatus(veryShort: Boolean): String {
+        // TODO
+        return "TODO"
+    }
+
+    override val isFakingTempsByExtendedBoluses: Boolean
+        get() = false
+
+    override fun loadTDDs(): PumpEnactResult {
+        // TODO i18n
+        return PumpEnactResult(injector).success(false).enacted(false)
+            .comment("Omnipod Dash driver does not support TDD")
+    }
+
+    override fun canHandleDST(): Boolean {
+        return false
+    }
+
+    override fun getCustomActions(): List<CustomAction> {
+        return emptyList()
+    }
+
+    override fun executeCustomAction(customActionType: CustomActionType) {
+        aapsLogger.warn(LTag.PUMP, "Unsupported custom action: $customActionType")
+    }
+
+    override fun executeCustomCommand(customCommand: CustomCommand): PumpEnactResult {
+        return when (customCommand) {
+            is CommandSilenceAlerts ->
+                silenceAlerts()
+            is CommandSuspendDelivery ->
+                suspendDelivery()
+            is CommandResumeDelivery ->
+                resumeDelivery()
+            is CommandDeactivatePod ->
+                deactivatePod()
+            is CommandHandleTimeChange ->
+                handleTimeChange()
+            is CommandUpdateAlertConfiguration ->
+                updateAlertConfiguration()
+            is CommandPlayTestBeep ->
+                playTestBeep()
+
+            else -> {
+                aapsLogger.warn(LTag.PUMP, "Unsupported custom command: " + customCommand.javaClass.name)
+                PumpEnactResult(injector).success(false).enacted(false).comment(
+                    resourceHelper.gs(
+                        R.string.omnipod_common_error_unsupported_custom_command,
+                        customCommand.javaClass.name
+                    )
+                )
+            }
+        }
+    }
+
+    private fun silenceAlerts(): PumpEnactResult {
+        // TODO filter alert types
+        return podStateManager.activeAlerts?.let {
+            executeProgrammingCommand(
+                historyEntry = history.createRecord(commandType = OmnipodCommandType.ACKNOWLEDGE_ALERTS),
+                command = omnipodManager.silenceAlerts(it).ignoreElements(),
+            ).toPumpEnactResult()
+        } ?: PumpEnactResult(injector).success(false).enacted(false).comment("No active alerts") // TODO i18n
+    }
+
+    private fun suspendDelivery(): PumpEnactResult {
+        return executeProgrammingCommand(
+            historyEntry = history.createRecord(OmnipodCommandType.SUSPEND_DELIVERY),
+            command = omnipodManager.suspendDelivery(hasBasalBeepEnabled())
+                .filter { podEvent -> podEvent.isCommandSent() }
+                .map {
+                    pumpSyncTempBasal(
+                        0.0,
+                        PodConstants.MAX_POD_LIFETIME.toMinutes(),
+                        PumpSync.TemporaryBasalType.PUMP_SUSPEND
+                    )
+                }
+                .ignoreElements(),
+            pre = observeDeliveryActive(),
+        ).doFinally {
+            notifyOnUnconfirmed(
+                Notification.PUMP_ERROR,
+                "Unconfirmed suspendDelivery command. Please refresh pod status",
+                R.raw.boluserror
+            )
+        }.toPumpEnactResult()
+    }
+
+    private fun observeDeliveryActive(): Completable = Completable.defer {
+        if (podStateManager.deliveryStatus != DeliveryStatus.SUSPENDED)
+            Completable.complete()
+        else
+            Completable.error(java.lang.IllegalStateException("Expected active delivery"))
+    }
+
+    private fun resumeDelivery(): PumpEnactResult {
+        return profileFunction.getProfile()?.let {
+            executeProgrammingCommand(
+                pre = observeDeliverySuspended(),
+                historyEntry = history.createRecord(OmnipodCommandType.RESUME_DELIVERY),
+                command = omnipodManager.setBasalProgram(mapProfileToBasalProgram(it), hasBasalBeepEnabled())
+                    .ignoreElements()
+            ).doFinally {
+                notifyOnUnconfirmed(
+                    Notification.FAILED_UPDATE_PROFILE,
+                    "Unconfirmed resumeDelivery command. Please refresh pod status",
+                    R.raw.boluserror
+                )
+            }.toPumpEnactResult()
+        } ?: PumpEnactResult(injector).success(false).enacted(false).comment("No profile active") // TODO i18n
+    }
+
+    private fun deactivatePod(): PumpEnactResult {
+        val ret = executeProgrammingCommand(
+            historyEntry = history.createRecord(OmnipodCommandType.DEACTIVATE_POD),
+            command = omnipodManager.deactivatePod().ignoreElements(),
+            checkNoActiveCommand = false,
+            post = createFakeTBRWhenNoActivePod(),
+        ).doOnComplete {
+            rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_FAULT))
+        }.toPumpEnactResult()
+
+        if (podStateManager.activeCommand != null) {
+            ret.success(false)
+        }
+        return ret
+    }
+
+    private fun handleTimeChange(): PumpEnactResult {
+        // TODO
+        return PumpEnactResult(injector).success(false).enacted(false).comment("NOT IMPLEMENTED")
+    }
+
+    private fun updateAlertConfiguration(): PumpEnactResult {
+
+        val expirationReminderEnabled = sp.getBoolean(R.string.key_omnipod_common_expiration_reminder_enabled, true)
+        val expirationHours = sp.getInt(R.string.key_omnipod_common_expiration_reminder_hours_before_shutdown, 7)
+        val lowReservoirAlertEnabled = sp.getBoolean(R.string.key_omnipod_common_low_reservoir_alert_enabled, true)
+        val lowReservoirAlertUnits = sp.getInt(R.string.key_omnipod_common_low_reservoir_alert_units, 10)
+
+        if (!podStateManager.differentAlertSettings(
+                expirationReminderEnabled,
+                expirationHours,
+                lowReservoirAlertEnabled,
+                lowReservoirAlertUnits
+            )
+        ) {
+            return PumpEnactResult(injector).success(true).enacted(false)
+        }
+
+        val podLifeLeft = Duration.between(ZonedDateTime.now(), podStateManager.expiry)
+        val expiryAlertDelay = podLifeLeft.minus(Duration.ofHours(expirationHours.toLong()))
+        if (expiryAlertDelay.isNegative) {
+            aapsLogger.warn(
+                LTag.PUMPBTCOMM,
+                "updateAlertConfiguration negative " +
+                    "expiryAlertDuration=$expiryAlertDelay"
+            )
+            PumpEnactResult(injector).success(false).enacted(false)
+        }
+        val alerts = listOf(
+            AlertConfiguration(
+                AlertType.LOW_RESERVOIR,
+                enabled = lowReservoirAlertEnabled,
+                durationInMinutes = 0,
+                autoOff = false,
+                AlertTrigger.ReservoirVolumeTrigger((lowReservoirAlertUnits * 10).toShort()),
+                BeepType.FOUR_TIMES_BIP_BEEP,
+                BeepRepetitionType.XXX
+            ),
+            AlertConfiguration(
+                AlertType.USER_SET_EXPIRATION,
+                enabled = expirationReminderEnabled,
+                durationInMinutes = 0,
+                autoOff = false,
+                AlertTrigger.TimerTrigger(
+                    expiryAlertDelay.toMinutes().toShort()
+                ),
+                BeepType.FOUR_TIMES_BIP_BEEP,
+                BeepRepetitionType.XXX2
+            )
+        )
+        return executeProgrammingCommand(
+            historyEntry = history.createRecord(OmnipodCommandType.CONFIGURE_ALERTS),
+            command = omnipodManager.programAlerts(alerts).ignoreElements(),
+            post = podStateManager.updateExpirationAlertSettings(
+                expirationReminderEnabled,
+                expirationHours
+            ).andThen(
+                podStateManager.updateExpirationAlertSettings(
+                    lowReservoirAlertEnabled,
+                    lowReservoirAlertUnits
+                )
+            )
+        ).toPumpEnactResult()
+    }
+
+    private fun playTestBeep(): PumpEnactResult {
+        return executeProgrammingCommand(
+            historyEntry = history.createRecord(OmnipodCommandType.PLAY_TEST_BEEP),
+            command = omnipodManager.playBeep(BeepType.LONG_SINGLE_BEEP).ignoreElements()
+        ).toPumpEnactResult()
+    }
+
+    override fun timezoneOrDSTChanged(timeChangeType: TimeChangeType) {
+        val eventHandlingEnabled = sp.getBoolean(R.string.key_omnipod_common_time_change_event_enabled, false)
+
+        aapsLogger.info(
+            LTag.PUMP,
+            "Time, Date and/or TimeZone changed. [timeChangeType=" + timeChangeType.name + ", eventHandlingEnabled=" + eventHandlingEnabled + "]"
+        )
+
+        if (timeChangeType == TimeChangeType.TimeChanged) {
+            aapsLogger.info(LTag.PUMP, "Ignoring time change because it is not a DST or TZ change")
+            return
+        } else if (!podStateManager.isPodRunning) {
+            aapsLogger.info(LTag.PUMP, "Ignoring time change because no Pod is active")
+            return
+        }
+
+        aapsLogger.info(LTag.PUMP, "Handling time change")
+
+        commandQueue.customCommand(CommandHandleTimeChange(false), null)
+    }
+
+    private fun executeProgrammingCommand(
+        pre: Completable = Completable.complete(),
+        historyEntry: Single<String>,
+        activeCommandEntry: (historyId: String) -> Single<OmnipodDashPodStateManager.ActiveCommand> =
+            { historyId -> podStateManager.createActiveCommand(historyId) },
+        command: Completable,
+        post: Completable = Completable.complete(),
+        checkNoActiveCommand: Boolean = true
+    ): Completable {
+        return Completable.concat(
+            listOf(
+                pre,
+                if (checkNoActiveCommand)
+                    podStateManager.observeNoActiveCommand()
+                else
+                    Completable.complete(),
+                historyEntry
+                    .flatMap { activeCommandEntry(it) }
+                    .ignoreElement(),
+                command.doOnError {
+                    podStateManager.activeCommand?.sendError = it
+                    aapsLogger.error(LTag.PUMP, "Error executing command", it)
+                }.onErrorComplete(),
+                history.updateFromState(podStateManager),
+                podStateManager.updateActiveCommand()
+                    .map { handleCommandConfirmation(it) }
+                    .ignoreElement(),
+                checkPodKaput(),
+                refreshOverview(),
+                post,
+            )
+        )
+    }
+
+    private fun refreshOverview(): Completable = Completable.defer {
+        rxBus.send(EventRefreshOverview("Dash command", false))
+        Completable.complete()
+    }
+
+    private fun handleCommandConfirmation(confirmation: CommandConfirmed) {
+        val command = confirmation.command
+        val historyEntry = history.getById(command.historyId)
+        aapsLogger.debug(LTag.PUMPCOMM, "handling command confirmation: $confirmation")
+        when (historyEntry.commandType) {
+            OmnipodCommandType.CANCEL_TEMPORARY_BASAL -> {
+                if (confirmation.success) {
+                    pumpSync.syncStopTemporaryBasalWithPumpId(
+                        historyEntry.createdAt,
+                        historyEntry.pumpId(),
+                        PumpType.OMNIPOD_DASH,
+                        serialNumber()
+                    )
+                    podStateManager.tempBasal = null
+                }
+                rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS))
+            }
+            OmnipodCommandType.RESUME_DELIVERY -> {
+                // We can't invalidate this command,
+                // and this is why it is pumpSync-ed at this point
+                if (confirmation.success) {
+                    pumpSync.syncStopTemporaryBasalWithPumpId(
+                        historyEntry.createdAt,
+                        historyEntry.pumpId(),
+                        PumpType.OMNIPOD_DASH,
+                        serialNumber()
+                    )
+                    podStateManager.tempBasal = null
+                    rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED))
+                }
+                rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS))
+                rxBus.send(EventDismissNotification(Notification.OMNIPOD_TIME_OUT_OF_SYNC))
+            }
+
+            OmnipodCommandType.SET_BASAL_PROFILE -> {
+                if (confirmation.success) {
+                    podStateManager.basalProgram = command.basalProgram
+                    if (podStateManager.basalProgram == null) {
+                        aapsLogger.warn(LTag.PUMP, "Saving null basal profile")
+                    }
+                    if (!commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
+                        // we are late-confirming this command. before that, we answered with success:false
+                        rxBus.send(EventProfileSwitchChanged())
+                    }
+                    pumpSync.syncStopTemporaryBasalWithPumpId(
+                        historyEntry.createdAt,
+                        historyEntry.pumpId(),
+                        PumpType.OMNIPOD_DASH,
+                        serialNumber()
+                    )
+                    rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED))
+                    rxBus.send(EventDismissNotification(Notification.FAILED_UPDATE_PROFILE))
+                    rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS))
+                    rxBus.send(EventDismissNotification(Notification.OMNIPOD_TIME_OUT_OF_SYNC))
+                }
+            }
+
+            OmnipodCommandType.SET_TEMPORARY_BASAL -> {
+                // This treatment was synced before sending the command
+                if (!confirmation.success) {
+                    aapsLogger.info(LTag.PUMPCOMM, "temporary basal denied. PumpId: ${historyEntry.pumpId()}")
+                    pumpSync.invalidateTemporaryBasalWithPumpId(
+                        historyEntry.pumpId(),
+                        PumpType.OMNIPOD_DASH,
+                        serialNumber()
+                    )
+                } else {
+                    podStateManager.tempBasal = command.tempBasal
+                }
+                rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS))
+            }
+
+            OmnipodCommandType.SUSPEND_DELIVERY -> {
+                if (!confirmation.success) {
+                    pumpSync.invalidateTemporaryBasalWithPumpId(
+                        historyEntry.pumpId(),
+                        PumpType.OMNIPOD_DASH,
+                        serialNumber()
+                    )
+                } else {
+                    podStateManager.tempBasal = null
+                }
+            }
+
+            OmnipodCommandType.SET_BOLUS -> {
+                if (confirmation.success) {
+                    if (command.requestedBolus == null) {
+                        aapsLogger.error(LTag.PUMP, "Requested bolus not found: $command")
+                    }
+                    val record = historyEntry.record
+                    if (record !is BolusRecord) {
+                        aapsLogger.error(
+                            LTag.PUMP,
+                            "Expected SET_BOLUS history record to be a BolusRecord, found " +
+                                "$record"
+                        )
+                    }
+                    record as BolusRecord
+
+                    podStateManager.createLastBolus(
+                        record.amout,
+                        command.historyId,
+                        record.bolusType.toBolusInfoBolusType()
+                    )
+                } else {
+                    pumpSync.syncBolusWithPumpId(
+                        timestamp = historyEntry.createdAt,
+                        amount = 0.0,
+                        pumpId = historyEntry.pumpId(),
+                        pumpType = PumpType.OMNIPOD_DASH,
+                        pumpSerial = serialNumber(),
+                        type = null // TODO: set the correct bolus type here!!!
+                    )
+                }
+                rxBus.send(EventDismissNotification(Notification.OMNIPOD_UNCERTAIN_SMB))
+            }
+
+            OmnipodCommandType.CANCEL_BOLUS -> {
+                if (confirmation.success) {
+                    podStateManager.lastBolus?.run {
+                        val deliveredUnits = markComplete()
+                        val bolusHistoryEntry = history.getById(historyId)
+                        val sync = pumpSync.syncBolusWithPumpId(
+                            timestamp = bolusHistoryEntry.createdAt,
+                            amount = deliveredUnits,
+                            pumpId = bolusHistoryEntry.pumpId(),
+                            pumpType = PumpType.OMNIPOD_DASH,
+                            pumpSerial = serialNumber(),
+                            type = bolusType
+                        )
+                        aapsLogger.info(LTag.PUMP, "syncBolusWithPumpId on CANCEL_BOLUS returned: $sync")
+                    } ?: aapsLogger.error(LTag.PUMP, "Cancelled bolus that does not exist")
+                }
+            }
+
+            else ->
+                aapsLogger.warn(
+                    LTag.PUMP,
+                    "Will not sync confirmed command of type: $historyEntry and " +
+                        "success: ${confirmation.success}"
+                )
+        }
+    }
+
+    private fun showErrorDialog(message: String, sound: Int) {
+        runAlarm(context, message, resourceHelper.gs(R.string.error), sound)
+    }
+
+    private fun showNotification(id: Int, message: String, urgency: Int, sound: Int?) {
+        val notification = Notification(
+            id,
+            message,
+            urgency
+        )
+        if (sound != null && soundEnabledForNotificationType(id)) {
+            notification.soundId = sound
+        }
+        rxBus.send(EventNewNotification(notification))
+    }
+
+    private fun soundEnabledForNotificationType(notificationType: Int): Boolean {
+        return when (notificationType) {
+            Notification.OMNIPOD_TBR_ALERTS ->
+                sp.getBoolean(R.string.key_omnipod_common_notification_uncertain_tbr_sound_enabled, true)
+            Notification.OMNIPOD_UNCERTAIN_SMB ->
+                sp.getBoolean(R.string.key_omnipod_common_notification_uncertain_smb_sound_enabled, true)
+            Notification.OMNIPOD_POD_SUSPENDED ->
+                sp.getBoolean(R.string.key_omnipod_common_notification_delivery_suspended_sound_enabled, true)
+            else -> true
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashHistoryModule.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashHistoryModule.kt
new file mode 100644
index 0000000000..92c2368ee9
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashHistoryModule.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.dagger
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.DashHistory
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.DashHistoryDatabase
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.HistoryRecordDao
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.mapper.HistoryMapper
+import javax.inject.Singleton
+
+@Module
+class OmnipodDashHistoryModule {
+
+    @Provides
+    @Singleton
+    internal fun provideDatabase(context: Context): DashHistoryDatabase = DashHistoryDatabase.build(context)
+
+    @Provides
+    @Singleton
+    internal fun provideHistoryRecordDao(dashHistoryDatabase: DashHistoryDatabase): HistoryRecordDao =
+        dashHistoryDatabase.historyRecordDao()
+
+    @Provides
+    @Reusable // no state, let system decide when to reuse or create new.
+    internal fun provideHistoryMapper() = HistoryMapper()
+
+    @Provides
+    @Singleton
+    internal fun provideDashHistory(dao: HistoryRecordDao, historyMapper: HistoryMapper, logger: AAPSLogger) =
+        DashHistory(dao, historyMapper, logger)
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt
index 7003c3112b..cbd7e42804 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashModule.kt
@@ -1,7 +1,50 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.dagger
 
+import dagger.Binds
 import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.ActivityScope
+import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodWizardModule
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManagerImpl
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.OmnipodDashBleManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.OmnipodDashBleManagerImpl
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManagerImpl
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.DashPodManagementActivity
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.OmnipodDashOverviewFragment
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.DashPodActivationWizardActivity
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.DashPodDeactivationWizardActivity
 
-@Module
+@Module(includes = [OmnipodDashHistoryModule::class])
 @Suppress("unused")
-abstract class OmnipodDashModule
+abstract class OmnipodDashModule {
+    // ACTIVITIES
+
+    @ContributesAndroidInjector
+    abstract fun contributesDashPodManagementActivity(): DashPodManagementActivity
+
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [OmnipodWizardModule::class, OmnipodDashWizardViewModelsModule::class])
+    abstract fun contributesDashActivationWizardActivity(): DashPodActivationWizardActivity
+
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [OmnipodWizardModule::class, OmnipodDashWizardViewModelsModule::class])
+    abstract fun contributesDashDeactivationWizardActivity(): DashPodDeactivationWizardActivity
+
+    // FRAGMENTS
+
+    @ContributesAndroidInjector
+    abstract fun contributesOmnipodDashOverviewFragment(): OmnipodDashOverviewFragment
+
+    // MANAGERS
+
+    @Binds
+    abstract fun bindsOmnipodDashBleManagerImpl(bleManager: OmnipodDashBleManagerImpl): OmnipodDashBleManager
+
+    @Binds
+    abstract fun bindsOmnipodDashPodStateManagerImpl(podStateManager: OmnipodDashPodStateManagerImpl): OmnipodDashPodStateManager
+
+    @Binds
+    abstract fun bindsOmnipodDashManagerImpl(omnipodManager: OmnipodDashManagerImpl): OmnipodDashManager
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashWizardViewModelsModule.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashWizardViewModelsModule.kt
new file mode 100644
index 0000000000..fc0f0f4e52
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/dagger/OmnipodDashWizardViewModelsModule.kt
@@ -0,0 +1,89 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.dagger
+
+import androidx.lifecycle.ViewModel
+import dagger.Binds
+import dagger.Module
+import dagger.multibindings.IntoMap
+import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodPluginQualifier
+import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.ViewModelKey
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InitializePodViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.AttachPodViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.PodActivatedViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.StartPodActivationViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.action.DeactivatePodViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.info.PodDeactivatedViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.info.PodDiscardedViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.info.StartPodDeactivationViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.action.DashInitializePodViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.action.DashInsertCannulaViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.info.DashAttachPodViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.info.DashPodActivatedViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.info.DashStartPodActivationViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.action.DashDeactivatePodViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.info.DashPodDeactivatedViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.info.DashPodDiscardedViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.info.DashStartPodDeactivationViewModel
+
+@Module
+@Suppress("unused")
+abstract class OmnipodDashWizardViewModelsModule {
+    // #### VIEW MODELS ############################################################################
+
+    // POD ACTIVATION
+
+    @Binds
+    @IntoMap
+    @OmnipodPluginQualifier
+    @ViewModelKey(StartPodActivationViewModel::class)
+    internal abstract fun startPodActivationViewModel(viewModel: DashStartPodActivationViewModel): ViewModel
+
+    @Binds
+    @IntoMap
+    @OmnipodPluginQualifier
+    @ViewModelKey(InitializePodViewModel::class)
+    internal abstract fun initializePodViewModel(viewModel: DashInitializePodViewModel): ViewModel
+
+    @Binds
+    @IntoMap
+    @OmnipodPluginQualifier
+    @ViewModelKey(AttachPodViewModel::class)
+    internal abstract fun attachPodViewModel(viewModel: DashAttachPodViewModel): ViewModel
+
+    @Binds
+    @IntoMap
+    @OmnipodPluginQualifier
+    @ViewModelKey(InsertCannulaViewModel::class)
+    internal abstract fun insertCannulaViewModel(viewModel: DashInsertCannulaViewModel): ViewModel
+
+    @Binds
+    @IntoMap
+    @OmnipodPluginQualifier
+    @ViewModelKey(PodActivatedViewModel::class)
+    internal abstract fun podActivatedViewModel(viewModel: DashPodActivatedViewModel): ViewModel
+
+    // POD DEACTIVATION
+    @Binds
+    @IntoMap
+    @OmnipodPluginQualifier
+    @ViewModelKey(StartPodDeactivationViewModel::class)
+    internal abstract fun startPodDeactivationViewModel(viewModel: DashStartPodDeactivationViewModel): ViewModel
+
+    @Binds
+    @IntoMap
+    @OmnipodPluginQualifier
+    @ViewModelKey(DeactivatePodViewModel::class)
+    internal abstract fun deactivatePodViewModel(viewModel: DashDeactivatePodViewModel): ViewModel
+
+    @Binds
+    @IntoMap
+    @OmnipodPluginQualifier
+    @ViewModelKey(PodDeactivatedViewModel::class)
+    internal abstract fun podDeactivatedViewModel(viewModel: DashPodDeactivatedViewModel): ViewModel
+
+    @Binds
+    @IntoMap
+    @OmnipodPluginQualifier
+    @ViewModelKey(PodDiscardedViewModel::class)
+    internal abstract fun podDiscardedViewModel(viewModel: DashPodDiscardedViewModel): ViewModel
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.kt
new file mode 100644
index 0000000000..718df1597b
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.event.PodEvent
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertConfiguration
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertTrigger
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.ResponseType
+import io.reactivex.Observable
+import java.util.*
+import java.util.concurrent.CountDownLatch
+
+interface OmnipodDashManager {
+
+    fun activatePodPart1(lowReservoirAlertTrigger: AlertTrigger.ReservoirVolumeTrigger?): Observable<PodEvent>
+
+    fun activatePodPart2(basalProgram: BasalProgram, userConfiguredExpirationHours: Long?): Observable<PodEvent>
+
+    fun getStatus(type: ResponseType.StatusResponseType): Observable<PodEvent>
+
+    fun setBasalProgram(basalProgram: BasalProgram, hasBasalBeepEnabled: Boolean): Observable<PodEvent>
+
+    fun suspendDelivery(hasBasalBeepEnabled: Boolean): Observable<PodEvent>
+
+    fun setTime(): Observable<PodEvent>
+
+    fun setTempBasal(rate: Double, durationInMinutes: Short, tempBasalBeeps: Boolean): Observable<PodEvent>
+
+    fun stopTempBasal(hasTempBasalBeepEnabled: Boolean): Observable<PodEvent>
+
+    fun bolus(units: Double, confirmationBeeps: Boolean, completionBeeps: Boolean): Observable<PodEvent>
+
+    fun stopBolus(beep: Boolean): Observable<PodEvent>
+
+    fun playBeep(beepType: BeepType): Observable<PodEvent>
+
+    fun programAlerts(alertConfigurations: List<AlertConfiguration>): Observable<PodEvent>
+
+    fun silenceAlerts(alertTypes: EnumSet<AlertType>): Observable<PodEvent>
+
+    fun deactivatePod(): Observable<PodEvent>
+
+    fun disconnect(closeGatt: Boolean = false)
+
+    fun connect(stop: CountDownLatch): Observable<PodEvent>
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt
new file mode 100644
index 0000000000..d64ea2ef42
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManagerImpl.kt
@@ -0,0 +1,735 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver
+
+import android.os.SystemClock
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.OmnipodDashBleManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.event.PodEvent
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.*
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.GetVersionCommand.Companion.DEFAULT_UNIQUE_ID
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.*
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodConstants.Companion.MAX_POD_LIFETIME
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.*
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import io.reactivex.Observable
+import io.reactivex.functions.Action
+import io.reactivex.functions.Consumer
+import java.time.Duration
+import java.time.ZonedDateTime
+import java.util.*
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class OmnipodDashManagerImpl @Inject constructor(
+    private val logger: AAPSLogger,
+    private val podStateManager: OmnipodDashPodStateManager,
+    private val bleManager: OmnipodDashBleManager,
+    private val aapsSchedulers: AapsSchedulers
+) : OmnipodDashManager {
+
+    companion object {
+
+        const val NONCE = 1229869870 // The Omnipod Dash seems to use a fixed nonce
+    }
+
+    private val observePodReadyForActivationPart1: Observable<PodEvent>
+        get() = Observable.defer {
+            if (podStateManager.activationProgress.isBefore(ActivationProgress.PHASE_1_COMPLETED)) {
+                Observable.empty()
+            } else {
+                // TODO introduce specialized Exception
+                Observable.error(IllegalStateException("Pod is in an incorrect state"))
+            }
+        }
+
+    private val observePodReadyForActivationPart2: Observable<PodEvent>
+        get() = Observable.defer {
+            if (podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED) &&
+                podStateManager.activationProgress.isBefore(ActivationProgress.COMPLETED)
+            ) {
+                Observable.empty()
+            } else {
+                // TODO introduce specialized Exception
+                Observable.error(IllegalStateException("Pod is in an incorrect state"))
+            }
+        }
+
+    private val observeUniqueIdSet: Observable<PodEvent>
+        get() = Observable.defer {
+            if (podStateManager.activationProgress.isAtLeast(ActivationProgress.SET_UNIQUE_ID)) {
+                Observable.empty()
+            } else {
+                // TODO introduce specialized Exception
+                Observable.error(IllegalStateException("Pod is in an incorrect state"))
+            }
+        }
+
+    private val observePodRunning: Observable<PodEvent>
+        get() = Observable.defer {
+            if (podStateManager.activationProgress == ActivationProgress.COMPLETED && podStateManager.podStatus!!.isRunning()) {
+                Observable.empty()
+            } else {
+                // TODO introduce specialized Exception
+                Observable.error(IllegalStateException("Pod is in an incorrect state"))
+            }
+        }
+
+    override fun disconnect(closeGatt: Boolean) {
+        bleManager.disconnect(closeGatt)
+    }
+
+    override fun connect(stop: CountDownLatch): Observable<PodEvent> {
+        return observeConnectToPodWithStop(stop)
+            .interceptPodEvents()
+    }
+
+    private fun observeConnectToPodWithStop(stop: CountDownLatch): Observable<PodEvent> {
+        return Observable.defer {
+            bleManager.connect(stop)
+                .doOnError { throwable -> logger.warn(LTag.PUMPBTCOMM, "observeConnectToPodWithStop error=$throwable") }
+        }
+    }
+
+    private val observeConnectToPod: Observable<PodEvent>
+        get() = Observable.defer {
+            bleManager.connect()
+                .doOnError { throwable -> logger.warn(LTag.PUMPBTCOMM, "observeConnectToPod error=$throwable") }
+        }
+
+    private val observePairNewPod: Observable<PodEvent>
+        get() = Observable.defer {
+            bleManager.pairNewPod()
+        }
+
+    private fun observeSendProgramBolusCommand(
+        units: Double,
+        rateInEighthPulsesPerSeconds: Byte,
+        confirmationBeeps: Boolean,
+        completionBeeps: Boolean
+    ): Observable<PodEvent> {
+        return Observable.defer {
+            bleManager.sendCommand(
+                ProgramBolusCommand.Builder()
+                    .setUniqueId(podStateManager.uniqueId!!.toInt())
+                    .setSequenceNumber(podStateManager.messageSequenceNumber)
+                    .setNonce(NONCE)
+                    .setNumberOfUnits(units)
+                    .setDelayBetweenPulsesInEighthSeconds(rateInEighthPulsesPerSeconds)
+                    .setProgramReminder(ProgramReminder(confirmationBeeps, completionBeeps, 0))
+                    .build(),
+                DefaultStatusResponse::class
+            )
+        }
+    }
+
+    private fun observeSendGetPodStatusCommand(type: ResponseType.StatusResponseType = ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE): Observable<PodEvent> {
+        // TODO move somewhere else
+        val expectedResponseType = when (type) {
+            ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE -> DefaultStatusResponse::class
+            ResponseType.StatusResponseType.ALARM_STATUS -> AlarmStatusResponse::class
+
+            else -> return Observable.error(UnsupportedOperationException("No response type to class mapping for ${type.name}"))
+        }
+
+        return Observable.defer {
+            bleManager.sendCommand(
+                GetStatusCommand.Builder()
+                    .setUniqueId(podStateManager.uniqueId!!.toInt())
+                    .setSequenceNumber(podStateManager.messageSequenceNumber)
+                    .setStatusResponseType(type)
+                    .build(),
+                expectedResponseType
+            )
+        }
+    }
+
+    private val observeVerifyCannulaInsertion: Observable<PodEvent>
+        get() = Observable.concat(
+            observeSendGetPodStatusCommand(),
+            Observable.defer {
+                if (podStateManager.podStatus == PodStatus.RUNNING_ABOVE_MIN_VOLUME) {
+                    Observable.empty()
+                } else {
+                    Observable.error(IllegalStateException("Unexpected Pod status"))
+                }
+            }
+        )
+
+    private fun observeSendProgramAlertsCommand(
+        alertConfigurations: List<AlertConfiguration>,
+        multiCommandFlag: Boolean = false
+    ): Observable<PodEvent> {
+        return Observable.defer {
+            bleManager.sendCommand(
+                ProgramAlertsCommand.Builder()
+                    .setUniqueId(podStateManager.uniqueId!!.toInt())
+                    .setSequenceNumber(podStateManager.messageSequenceNumber)
+                    .setNonce(NONCE)
+                    .setAlertConfigurations(alertConfigurations)
+                    .setMultiCommandFlag(multiCommandFlag)
+                    .build(),
+                DefaultStatusResponse::class
+            )
+        }
+    }
+
+    private fun observeSendProgramBasalCommand(basalProgram: BasalProgram, hasBasalBeepEnabled: Boolean): Observable<PodEvent> {
+        return Observable.defer {
+            val currentTime = Date()
+            logger.debug(LTag.PUMPCOMM, "Programming basal. currentTime={}, basalProgram={}", currentTime, basalProgram)
+            bleManager.sendCommand(
+                ProgramBasalCommand.Builder()
+                    .setUniqueId(podStateManager.uniqueId!!.toInt())
+                    .setSequenceNumber(podStateManager.messageSequenceNumber)
+                    .setNonce(NONCE)
+                    .setProgramReminder(ProgramReminder(atStart = hasBasalBeepEnabled, atEnd = false, atInterval = 0))
+                    .setBasalProgram(basalProgram)
+                    .setCurrentTime(currentTime)
+                    .build(),
+                DefaultStatusResponse::class
+            )
+        }.doOnComplete {
+            podStateManager.timeZone = TimeZone.getDefault()
+        }
+    }
+
+    private val observeVerifyPrime: Observable<PodEvent>
+        get() = Observable.concat(
+            observeSendGetPodStatusCommand(ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE),
+            Observable.defer {
+                if (podStateManager.podStatus == PodStatus.CLUTCH_DRIVE_ENGAGED) {
+                    Observable.empty()
+                } else {
+                    Observable.error(IllegalStateException("Unexpected Pod status: got ${podStateManager.podStatus}, expected CLUTCH_DRIVE_ENGAGED"))
+                }
+            }
+        )
+
+    private val observeSendSetUniqueIdCommand: Observable<PodEvent>
+        get() = Observable.defer {
+            bleManager.sendCommand(
+                SetUniqueIdCommand.Builder()
+                    .setSequenceNumber(podStateManager.messageSequenceNumber)
+                    .setUniqueId(podStateManager.uniqueId!!.toInt())
+                    .setLotNumber(podStateManager.lotNumber!!.toInt())
+                    .setPodSequenceNumber(podStateManager.podSequenceNumber!!.toInt())
+                    .setInitializationTime(Date())
+                    .build(),
+                SetUniqueIdResponse::class
+            )
+        }
+
+    private val observeSendGetVersionCommand: Observable<PodEvent>
+        get() = Observable.defer {
+            bleManager.sendCommand(
+                GetVersionCommand.Builder()
+                    .setSequenceNumber(podStateManager.messageSequenceNumber)
+                    .setUniqueId(DEFAULT_UNIQUE_ID)
+                    .build(),
+                VersionResponse::class
+            )
+        }
+
+    override fun activatePodPart1(lowReservoirAlertTrigger: AlertTrigger.ReservoirVolumeTrigger?): Observable<PodEvent> {
+        return Observable.concat(
+            observePodReadyForActivationPart1,
+            observePairNewPod,
+            observeConnectToPod,
+            observeActivationPart1Commands(lowReservoirAlertTrigger)
+        ).doOnComplete(ActivationProgressUpdater(ActivationProgress.PHASE_1_COMPLETED))
+            .interceptPodEvents()
+    }
+
+    private fun observeActivationPart1Commands(lowReservoirAlertTrigger: AlertTrigger.ReservoirVolumeTrigger?): Observable<PodEvent> {
+        val observables = createActivationPart1Observables(lowReservoirAlertTrigger)
+
+        return if (observables.isEmpty()) {
+            Observable.empty()
+        } else {
+            Observable.concat(observables)
+        }
+    }
+
+    private fun createActivationPart1Observables(lowReservoirAlertTrigger: AlertTrigger.ReservoirVolumeTrigger?): List<Observable<PodEvent>> {
+        val observables = ArrayList<Observable<PodEvent>>()
+
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.PRIME_COMPLETED)) {
+            observables.add(
+                observeVerifyPrime.doOnComplete(ActivationProgressUpdater(ActivationProgress.PRIME_COMPLETED))
+            )
+        }
+
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.PRIMING)) {
+            observables.add(observeConnectToPod) // connection can time out while waiting
+            observables.add(
+                Observable.defer {
+                    Observable.timer(podStateManager.firstPrimeBolusVolume!!.toLong(), TimeUnit.SECONDS)
+                        .flatMap { Observable.empty() }
+                }
+            )
+            observables.add(
+                Observable.defer {
+                    bleManager.sendCommand(
+                        ProgramBolusCommand.Builder()
+                            .setUniqueId(podStateManager.uniqueId!!.toInt())
+                            .setSequenceNumber(podStateManager.messageSequenceNumber)
+                            .setNonce(NONCE)
+                            .setNumberOfUnits(podStateManager.firstPrimeBolusVolume!! * 0.05)
+                            .setDelayBetweenPulsesInEighthSeconds(podStateManager.primePulseRate!!.toByte())
+                            .setProgramReminder(ProgramReminder(atStart = false, atEnd = false, atInterval = 0))
+                            .build(),
+                        DefaultStatusResponse::class
+                    )
+                }.doOnComplete(ActivationProgressUpdater(ActivationProgress.PRIMING))
+            )
+        }
+
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.REPROGRAMMED_LUMP_OF_COAL_ALERT)) {
+            observables.add(
+                observeSendProgramAlertsCommand(
+                    listOf(
+                        AlertConfiguration(
+                            AlertType.EXPIRATION,
+                            enabled = true,
+                            durationInMinutes = 55,
+                            autoOff = false,
+                            AlertTrigger.TimerTrigger(5),
+                            BeepType.FOUR_TIMES_BIP_BEEP,
+                            BeepRepetitionType.XXX5
+                        )
+                    )
+                ).doOnComplete(ActivationProgressUpdater(ActivationProgress.REPROGRAMMED_LUMP_OF_COAL_ALERT))
+            )
+        }
+        if (lowReservoirAlertTrigger != null && podStateManager.activationProgress.isBefore(ActivationProgress.PROGRAMMED_LOW_RESERVOIR_ALERTS)) {
+            observables.add(
+                observeSendProgramAlertsCommand(
+                    listOf(
+                        AlertConfiguration(
+                            AlertType.LOW_RESERVOIR,
+                            enabled = true,
+                            durationInMinutes = 0,
+                            autoOff = false,
+                            lowReservoirAlertTrigger,
+                            BeepType.FOUR_TIMES_BIP_BEEP,
+                            BeepRepetitionType.XXX
+                        )
+                    )
+                ).doOnComplete(ActivationProgressUpdater(ActivationProgress.PROGRAMMED_LOW_RESERVOIR_ALERTS))
+            )
+        }
+
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.SET_UNIQUE_ID)) {
+            observables.add(
+                observeSendSetUniqueIdCommand.doOnComplete(ActivationProgressUpdater(ActivationProgress.SET_UNIQUE_ID))
+            )
+        }
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.GOT_POD_VERSION)) {
+            observables.add(
+                observeSendGetVersionCommand.doOnComplete(ActivationProgressUpdater(ActivationProgress.GOT_POD_VERSION))
+            )
+        }
+
+        return observables.reversed()
+    }
+
+    override fun activatePodPart2(basalProgram: BasalProgram, userConfiguredExpirationHours: Long?):
+        Observable<PodEvent> {
+        return Observable.concat(
+            observePodReadyForActivationPart2,
+            observeConnectToPod,
+            observeActivationPart2Commands(basalProgram, userConfiguredExpirationHours)
+        ).doOnComplete(ActivationProgressUpdater(ActivationProgress.COMPLETED))
+            .interceptPodEvents()
+    }
+
+    private fun observeActivationPart2Commands(basalProgram: BasalProgram, userConfiguredExpirationHours: Long?):
+        Observable<PodEvent> {
+        val observables = createActivationPart2Observables(basalProgram, userConfiguredExpirationHours)
+
+        return if (observables.isEmpty()) {
+            Observable.empty()
+        } else {
+            Observable.concat(observables)
+        }
+    }
+
+    private fun createActivationPart2Observables(
+        basalProgram: BasalProgram,
+        userConfiguredExpirationHours: Long?
+    ):
+        List<Observable<PodEvent>> {
+        val observables = ArrayList<Observable<PodEvent>>()
+
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.CANNULA_INSERTED)) {
+            observables.add(
+                observeVerifyCannulaInsertion
+                    .doOnComplete(ActivationProgressUpdater(ActivationProgress.CANNULA_INSERTED))
+            )
+        }
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.INSERTING_CANNULA)) {
+            observables.add(
+                Observable.defer {
+                    Observable.timer(podStateManager.secondPrimeBolusVolume!!.toLong(), TimeUnit.SECONDS)
+                        .flatMap { Observable.empty() }
+                }
+            )
+            observables.add(
+                observeSendProgramBolusCommand(
+                    podStateManager.secondPrimeBolusVolume!! * 0.05,
+                    podStateManager.primePulseRate!!.toByte(),
+                    confirmationBeeps = false,
+                    completionBeeps = false
+                ).doOnComplete(ActivationProgressUpdater(ActivationProgress.INSERTING_CANNULA))
+            )
+        }
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.UPDATED_EXPIRATION_ALERTS)) {
+            val podLifeLeft = Duration.between(ZonedDateTime.now(), podStateManager.expiry)
+
+            val alerts = mutableListOf(
+                AlertConfiguration(
+                    AlertType.EXPIRATION,
+                    enabled = true,
+                    durationInMinutes = TimeUnit.HOURS.toMinutes(7).toShort(),
+                    autoOff = false,
+                    AlertTrigger.TimerTrigger(
+                        TimeUnit.HOURS.toMinutes(72).toShort()
+                    ), // FIXME use activation time
+                    BeepType.FOUR_TIMES_BIP_BEEP,
+                    BeepRepetitionType.XXX3
+                ),
+                AlertConfiguration(
+                    AlertType.EXPIRATION_IMMINENT,
+                    enabled = true,
+                    durationInMinutes = 0,
+                    autoOff = false,
+                    AlertTrigger.TimerTrigger(
+                        TimeUnit.HOURS.toMinutes(79).toShort()
+                    ), // FIXME use activation time
+                    BeepType.FOUR_TIMES_BIP_BEEP,
+                    BeepRepetitionType.XXX4
+                )
+            )
+            val userExpiryAlertDelay = podLifeLeft.minus(
+                Duration.ofHours(userConfiguredExpirationHours ?: MAX_POD_LIFETIME.toHours() + 1)
+            )
+            if (userExpiryAlertDelay.isNegative) {
+                logger.warn(
+                    LTag.PUMPBTCOMM,
+                    "createActivationPart2Observables negative " +
+                        "expiryAlertDuration=$userExpiryAlertDelay"
+                )
+            } else {
+                alerts.add(
+                    AlertConfiguration(
+                        AlertType.USER_SET_EXPIRATION,
+                        enabled = true,
+                        durationInMinutes = 0,
+                        autoOff = false,
+                        AlertTrigger.TimerTrigger(
+                            userExpiryAlertDelay.toMinutes().toShort()
+                        ),
+                        BeepType.FOUR_TIMES_BIP_BEEP,
+                        BeepRepetitionType.XXX2
+                    )
+                )
+            }
+
+            observables.add(
+                observeSendProgramAlertsCommand(
+                    alerts,
+                    multiCommandFlag = true
+                ).doOnComplete(ActivationProgressUpdater(ActivationProgress.UPDATED_EXPIRATION_ALERTS))
+            )
+        }
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.PROGRAMMED_BASAL)) {
+            observables.add(
+                observeSendProgramBasalCommand(basalProgram, false)
+                    .doOnComplete(ActivationProgressUpdater(ActivationProgress.PROGRAMMED_BASAL))
+            )
+        }
+
+        return observables.reversed()
+    }
+
+    override fun getStatus(type: ResponseType.StatusResponseType): Observable<PodEvent> {
+        return Observable.concat(
+            observeUniqueIdSet,
+            observeConnectToPod,
+            observeSendGetPodStatusCommand(type)
+        ).interceptPodEvents()
+    }
+
+    override fun setBasalProgram(basalProgram: BasalProgram, hasBasalBeepEnabled: Boolean): Observable<PodEvent> {
+        return Observable.concat(
+            observePodRunning,
+            observeConnectToPod,
+            observeSendProgramBasalCommand(basalProgram, hasBasalBeepEnabled)
+        ).interceptPodEvents()
+    }
+
+    private fun observeSendStopDeliveryCommand(
+        deliveryType: StopDeliveryCommand.DeliveryType,
+        beepEnabled: Boolean
+    ): Observable<PodEvent> {
+        return Observable.defer {
+            val beepType = if (!beepEnabled)
+                BeepType.SILENT
+            else
+                BeepType.LONG_SINGLE_BEEP
+
+            bleManager.sendCommand(
+                StopDeliveryCommand.Builder()
+                    .setSequenceNumber(podStateManager.messageSequenceNumber)
+                    .setUniqueId(podStateManager.uniqueId!!.toInt())
+                    .setNonce(NONCE)
+                    .setDeliveryType(deliveryType)
+                    .setBeepType(beepType)
+                    .build(),
+                DefaultStatusResponse::class
+            )
+        }
+    }
+
+    override fun suspendDelivery(hasBasalBeepEnabled: Boolean): Observable<PodEvent> {
+        return Observable.concat(
+            observePodRunning,
+            observeConnectToPod,
+            observeSendStopDeliveryCommand(StopDeliveryCommand.DeliveryType.ALL, hasBasalBeepEnabled)
+        ).interceptPodEvents()
+    }
+
+    override fun setTime(): Observable<PodEvent> {
+        // TODO
+        logger.error(LTag.PUMPCOMM, "NOT IMPLEMENTED: setTime()")
+        return Observable.empty()
+    }
+
+    private fun observeSendProgramTempBasalCommand(rate: Double, durationInMinutes: Short, tempBasalBeeps: Boolean): Observable<PodEvent> {
+        return Observable.defer {
+            bleManager.sendCommand(
+                ProgramTempBasalCommand.Builder()
+                    .setSequenceNumber(podStateManager.messageSequenceNumber)
+                    .setUniqueId(podStateManager.uniqueId!!.toInt())
+                    .setNonce(NONCE)
+                    .setProgramReminder(ProgramReminder(tempBasalBeeps, tempBasalBeeps, 0))
+                    .setRateInUnitsPerHour(rate)
+                    .setDurationInMinutes(durationInMinutes)
+                    .build(),
+                DefaultStatusResponse::class
+            )
+        }
+    }
+
+    override fun setTempBasal(rate: Double, durationInMinutes: Short, tempBasalBeeps: Boolean): Observable<PodEvent> {
+        return Observable.concat(
+            observePodRunning,
+            observeConnectToPod,
+            observeSendProgramTempBasalCommand(rate, durationInMinutes, tempBasalBeeps)
+        ).interceptPodEvents()
+    }
+
+    override fun stopTempBasal(hasTempBasalBeepEnabled: Boolean): Observable<PodEvent> {
+        return Observable.concat(
+            observePodRunning,
+            observeConnectToPod,
+            observeSendStopDeliveryCommand(StopDeliveryCommand.DeliveryType.TEMP_BASAL, hasTempBasalBeepEnabled)
+        ).interceptPodEvents()
+    }
+
+    override fun bolus(units: Double, confirmationBeeps: Boolean, completionBeeps: Boolean): Observable<PodEvent> {
+        return Observable.concat(
+            observePodRunning,
+            observeConnectToPod,
+            observeSendProgramBolusCommand(
+                units,
+                podStateManager.pulseRate!!.toByte(),
+                confirmationBeeps,
+                completionBeeps
+            )
+        ).interceptPodEvents()
+    }
+
+    override fun stopBolus(beep: Boolean): Observable<PodEvent> {
+        return Observable.concat(
+            observePodRunning,
+            observeConnectToPod,
+            observeSendStopDeliveryCommand(StopDeliveryCommand.DeliveryType.BOLUS, beep)
+        ).interceptPodEvents()
+    }
+
+    private fun observeSendConfigureBeepsCommand(
+        basalReminder: ProgramReminder = ProgramReminder(atStart = false, atEnd = false, atInterval = 0),
+        tempBasalReminder: ProgramReminder = ProgramReminder(atStart = false, atEnd = false, atInterval = 0),
+        bolusReminder: ProgramReminder = ProgramReminder(atStart = false, atEnd = false, atInterval = 0),
+        immediateBeepType: BeepType = BeepType.SILENT
+    ): Observable<PodEvent> {
+        return Observable.defer {
+            bleManager.sendCommand(
+                ProgramBeepsCommand.Builder()
+                    .setSequenceNumber(podStateManager.messageSequenceNumber)
+                    .setUniqueId(podStateManager.uniqueId!!.toInt())
+                    .setBasalReminder(basalReminder)
+                    .setTempBasalReminder(tempBasalReminder)
+                    .setBolusReminder(bolusReminder)
+                    .setImmediateBeepType(immediateBeepType)
+                    .build(),
+                DefaultStatusResponse::class
+            )
+        }
+    }
+
+    override fun playBeep(beepType: BeepType): Observable<PodEvent> {
+        return Observable.concat(
+            observePodRunning,
+            observeConnectToPod,
+            observeSendConfigureBeepsCommand(immediateBeepType = beepType)
+        ).interceptPodEvents()
+    }
+
+    override fun programAlerts(alertConfigurations: List<AlertConfiguration>): Observable<PodEvent> {
+        return Observable.concat(
+            observePodRunning,
+            observeConnectToPod,
+            observeSendProgramAlertsCommand(alertConfigurations)
+        ).interceptPodEvents()
+    }
+
+    private fun observeSendSilenceAlertsCommand(alertTypes: EnumSet<AlertType>): Observable<PodEvent> {
+        return Observable.defer {
+            bleManager.sendCommand(
+                SilenceAlertsCommand.Builder()
+                    .setSequenceNumber(podStateManager.messageSequenceNumber)
+                    .setUniqueId(podStateManager.uniqueId!!.toInt())
+                    .setNonce(NONCE)
+                    .setAlertTypes(alertTypes)
+                    .build(),
+                DefaultStatusResponse::class
+            )
+        }
+    }
+
+    override fun silenceAlerts(alertTypes: EnumSet<AlertType>): Observable<PodEvent> {
+        return Observable.concat(
+            observePodRunning,
+            observeConnectToPod,
+            observeSendSilenceAlertsCommand(alertTypes)
+        ).interceptPodEvents()
+    }
+
+    private val observeSendDeactivateCommand: Observable<PodEvent>
+        get() = Observable.defer {
+            bleManager.sendCommand(
+                DeactivateCommand.Builder()
+                    .setSequenceNumber(podStateManager.messageSequenceNumber)
+                    .setUniqueId(podStateManager.uniqueId!!.toInt())
+                    .setNonce(NONCE)
+                    .build(),
+                DefaultStatusResponse::class
+            )
+        }
+
+    override fun deactivatePod(): Observable<PodEvent> {
+        return Observable.concat(
+            observeConnectToPod,
+            observeSendDeactivateCommand
+        ).interceptPodEvents()
+            .doOnComplete(podStateManager::reset)
+    }
+
+    inner class PodEventInterceptor : Consumer<PodEvent> {
+
+        override fun accept(event: PodEvent) {
+            logger.debug(LTag.PUMP, "Intercepted PodEvent in OmnipodDashManagerImpl: ${event.javaClass.simpleName}")
+
+            when (event) {
+                is PodEvent.AlreadyConnected -> {
+                    podStateManager.bluetoothAddress = event.bluetoothAddress
+                }
+
+                is PodEvent.BluetoothConnected -> {
+                    podStateManager.bluetoothAddress = event.bluetoothAddress
+                }
+
+                is PodEvent.Connected -> {
+                }
+
+                is PodEvent.CommandSent -> {
+                    logger.debug(LTag.PUMP, "Command sent: ${event.command.commandType}")
+                    podStateManager.activeCommand?.let {
+                        if (it.sequence == event.command.sequenceNumber) {
+                            it.sentRealtime = SystemClock.elapsedRealtime()
+                        }
+                    }
+                    podStateManager.increaseMessageSequenceNumber()
+                }
+
+                is PodEvent.CommandSendNotConfirmed -> {
+                    podStateManager.activeCommand?.let {
+                        if (it.sequence == event.command.sequenceNumber) {
+                            it.sentRealtime = SystemClock.elapsedRealtime()
+                        }
+                    }
+                    podStateManager.increaseMessageSequenceNumber()
+                }
+
+                is PodEvent.ResponseReceived -> {
+                    podStateManager.increaseMessageSequenceNumber()
+                    handleResponse(event.response)
+                }
+
+                is PodEvent.Paired -> {
+                    podStateManager.uniqueId = event.uniqueId.toLong()
+                }
+
+                else -> {
+                    // Do nothing
+                }
+            }
+        }
+
+        private fun handleResponse(response: Response) {
+            when (response) {
+                is VersionResponse -> {
+                    podStateManager.updateFromVersionResponse(response)
+                }
+
+                is SetUniqueIdResponse -> {
+                    podStateManager.updateFromSetUniqueIdResponse(response)
+                }
+
+                is DefaultStatusResponse -> {
+                    podStateManager.updateFromDefaultStatusResponse(response)
+                }
+
+                is AlarmStatusResponse -> {
+                    podStateManager.updateFromAlarmStatusResponse(response)
+                }
+            }
+        }
+    }
+
+    private fun Observable<PodEvent>.interceptPodEvents(): Observable<PodEvent> {
+        return this.doOnNext(PodEventInterceptor())
+            .doOnError(ErrorInterceptor())
+            .subscribeOn(aapsSchedulers.io)
+    }
+
+    inner class ErrorInterceptor : Consumer<Throwable> {
+
+        override fun accept(throwable: Throwable) {
+            logger.debug(LTag.PUMP, "Intercepted error in OmnipodDashManagerImpl: $throwable")
+        }
+    }
+
+    inner class ActivationProgressUpdater(private val value: ActivationProgress) : Action {
+
+        override fun run() {
+            podStateManager.activationProgress = value
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Id.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Id.kt
new file mode 100644
index 0000000000..88215ba752
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Id.kt
@@ -0,0 +1,59 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm
+
+import info.nightscout.androidaps.extensions.toHex
+import java.nio.ByteBuffer
+
+data class Id(val address: ByteArray) {
+    init {
+        require(address.size == 4)
+    }
+
+    /**
+     * Used to obtain podId from controllerId
+     * The original PDM seems to rotate over 3 Ids:
+     * controllerID+1, controllerID+2 and controllerID+3
+     */
+    fun increment(): Id {
+        val nodeId = address.copyOf()
+        nodeId[3] = (nodeId[3].toInt() and -4).toByte()
+        nodeId[3] = (nodeId[3].toInt() or PERIPHERAL_NODE_INDEX).toByte()
+        return Id(nodeId)
+    }
+
+    override fun toString(): String {
+        val asInt = ByteBuffer.wrap(address).int
+        return "$asInt/${address.toHex()}"
+    }
+
+    fun toLong(): Long {
+        return ByteBuffer.wrap(address).int.toLong() and 0xffffffffL
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as Id
+
+        if (!address.contentEquals(other.address)) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return address.contentHashCode()
+    }
+
+    companion object {
+
+        private const val PERIPHERAL_NODE_INDEX = 1
+
+        fun fromInt(v: Int): Id {
+            return Id(ByteBuffer.allocate(4).putInt(v).array())
+        }
+
+        fun fromLong(v: Long): Id {
+            return Id(ByteBuffer.allocate(8).putLong(v).array().copyOfRange(4, 8))
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Ids.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Ids.kt
new file mode 100644
index 0000000000..e22ed866db
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/Ids.kt
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.scan.PodScanner
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
+
+class Ids(podState: OmnipodDashPodStateManager) {
+    val myId = Id.fromInt(OmnipodDashBleManagerImpl.CONTROLLER_ID)
+    private val uniqueId = podState.uniqueId
+    val podId = uniqueId?.let(Id::fromLong)
+        ?: myId.increment() // pod not activated
+
+    companion object {
+        fun notActivated(): Id {
+            return Id.fromLong(
+                PodScanner
+                    .POD_ID_NOT_ACTIVATED
+            )
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManager.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManager.kt
new file mode 100644
index 0000000000..7a98a61b19
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManager.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session.Connection
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session.ConnectionState
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.event.PodEvent
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.Command
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.Response
+import io.reactivex.Observable
+import java.util.concurrent.CountDownLatch
+import kotlin.reflect.KClass
+
+interface OmnipodDashBleManager {
+
+    fun sendCommand(cmd: Command, responseType: KClass<out Response>): Observable<PodEvent>
+
+    fun getStatus(): ConnectionState
+
+    // used for sync connections
+    fun connect(timeoutMs: Long = Connection.BASE_CONNECT_TIMEOUT_MS * 3): Observable<PodEvent>
+
+    // used for async connections
+    fun connect(stopConnectionLatch: CountDownLatch): Observable<PodEvent>
+
+    fun pairNewPod(): Observable<PodEvent>
+
+    fun disconnect(closeGatt: Boolean = false)
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
new file mode 100644
index 0000000000..a70ff39266
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
@@ -0,0 +1,244 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm
+
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothManager
+import android.content.Context
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.BuildConfig
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.*
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair.LTKExchanger
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.scan.PodScanner
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session.*
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.event.PodEvent
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.Command
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.Response
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
+import io.reactivex.Observable
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.atomic.AtomicBoolean
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.reflect.KClass
+
+@Singleton
+class OmnipodDashBleManagerImpl @Inject constructor(
+    private val context: Context,
+    private val aapsLogger: AAPSLogger,
+    private val podState: OmnipodDashPodStateManager
+) : OmnipodDashBleManager {
+
+    private val busy = AtomicBoolean(false)
+    private val bluetoothManager: BluetoothManager =
+        context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
+    private val bluetoothAdapter: BluetoothAdapter = bluetoothManager.adapter
+    private var connection: Connection? = null
+    private val ids = Ids(podState)
+
+    override fun sendCommand(cmd: Command, responseType: KClass<out Response>): Observable<PodEvent> =
+        Observable.create { emitter ->
+            if (!busy.compareAndSet(false, true)) {
+                throw BusyException()
+            }
+            try {
+                val session = assertSessionEstablished()
+
+                emitter.onNext(PodEvent.CommandSending(cmd))
+            /*
+                if (Random.nextBoolean()) {
+                    // XXX use this to test "failed to confirm" commands
+                    emitter.onNext(PodEvent.CommandSendNotConfirmed(cmd))
+                    emitter.tryOnError(MessageIOException("XXX random failure to test unconfirmed commands"))
+                    return@create
+                }
+*/
+                when (session.sendCommand(cmd)) {
+                    is CommandSendErrorSending -> {
+                        emitter.tryOnError(CouldNotSendCommandException())
+                        return@create
+                    }
+
+                    is CommandSendSuccess ->
+                        emitter.onNext(PodEvent.CommandSent(cmd))
+                    is CommandSendErrorConfirming ->
+                        emitter.onNext(PodEvent.CommandSendNotConfirmed(cmd))
+                }
+                /*
+                if (Random.nextBoolean()) {
+                    // XXX use this commands confirmed with success
+                    emitter.tryOnError(MessageIOException("XXX random failure to test unconfirmed commands"))
+                    return@create
+                }*/
+                when (val readResult = session.readAndAckResponse()) {
+                    is CommandReceiveSuccess ->
+                        emitter.onNext(PodEvent.ResponseReceived(cmd, readResult.result))
+
+                    is CommandAckError ->
+                        emitter.onNext(PodEvent.ResponseReceived(cmd, readResult.result))
+
+                    is CommandReceiveError -> {
+                        emitter.tryOnError(MessageIOException("Could not read response: $readResult"))
+                        return@create
+                    }
+                }
+                emitter.onComplete()
+            } catch (ex: Exception) {
+                disconnect(false)
+                emitter.tryOnError(ex)
+            } finally {
+                busy.set(false)
+            }
+        }
+
+    private fun assertSessionEstablished(): Session {
+        val conn = assertConnected()
+        return conn.session
+            ?: throw NotConnectedException("Missing session")
+    }
+
+    override fun getStatus(): ConnectionState {
+        return connection?.connectionState()
+            ?: NotConnected
+    }
+    // used for sync connections
+    override fun connect(timeoutMs: Long): Observable<PodEvent> {
+        return connect(ConnectionWaitCondition(timeoutMs = timeoutMs))
+    }
+
+    // used for async connections
+    override fun connect(stopConnectionLatch: CountDownLatch): Observable<PodEvent> {
+        return connect(ConnectionWaitCondition(stopConnection = stopConnectionLatch))
+    }
+
+    private fun connect(connectionWaitCond: ConnectionWaitCondition): Observable<PodEvent> = Observable
+        .create {
+            emitter ->
+            if (!busy.compareAndSet(false, true)) {
+                throw BusyException()
+            }
+            try {
+                emitter.onNext(PodEvent.BluetoothConnecting)
+
+                val podAddress =
+                    podState.bluetoothAddress
+                        ?: throw FailedToConnectException("Missing bluetoothAddress, activate the pod first")
+                val podDevice = bluetoothAdapter.getRemoteDevice(podAddress)
+                val conn = connection
+                    ?: Connection(podDevice, aapsLogger, context, podState)
+                connection = conn
+                if (conn.connectionState() is Connected && conn.session != null) {
+                    emitter.onNext(PodEvent.AlreadyConnected(podAddress))
+                    emitter.onComplete()
+                    return@create
+                }
+
+                conn.connect(connectionWaitCond)
+
+                emitter.onNext(PodEvent.BluetoothConnected(podAddress))
+                emitter.onNext(PodEvent.EstablishingSession)
+                establishSession(1.toByte())
+                emitter.onNext(PodEvent.Connected)
+
+                emitter.onComplete()
+            } catch (ex: Exception) {
+                disconnect(false)
+                emitter.tryOnError(ex)
+            } finally {
+                busy.set(false)
+            }
+        }
+
+    private fun establishSession(msgSeq: Byte) {
+        val conn = assertConnected()
+
+        val ltk = assertPaired()
+
+        val eapSqn = podState.increaseEapAkaSequenceNumber()
+
+        var newSqn = conn.establishSession(ltk, msgSeq, ids, eapSqn)
+
+        if (newSqn != null) {
+            aapsLogger.info(LTag.PUMPBTCOMM, "Updating EAP SQN to: $newSqn")
+            podState.eapAkaSequenceNumber = newSqn.toLong()
+            newSqn = conn.establishSession(ltk, msgSeq, ids, podState.increaseEapAkaSequenceNumber())
+            if (newSqn != null) {
+                throw SessionEstablishmentException("Received resynchronization SQN for the second time")
+            }
+        }
+        podState.successfulConnections++
+        podState.commitEapAkaSequenceNumber()
+    }
+
+    private fun assertPaired(): ByteArray {
+        return podState.ltk
+            ?: throw FailedToConnectException("Missing LTK, activate the pod first")
+    }
+
+    private fun assertConnected(): Connection {
+        return connection
+            ?: throw FailedToConnectException("connection lost")
+    }
+
+    override fun pairNewPod(): Observable<PodEvent> = Observable.create { emitter ->
+        if (!busy.compareAndSet(false, true)) {
+            throw BusyException()
+        }
+        try {
+            if (podState.ltk != null) {
+                emitter.onNext(PodEvent.AlreadyPaired)
+                emitter.onComplete()
+                return@create
+            }
+            aapsLogger.info(LTag.PUMPBTCOMM, "Starting new pod activation")
+
+            emitter.onNext(PodEvent.Scanning)
+            val podScanner = PodScanner(aapsLogger, bluetoothAdapter)
+            val podAddress = podScanner.scanForPod(
+                PodScanner.SCAN_FOR_SERVICE_UUID,
+                PodScanner.POD_ID_NOT_ACTIVATED
+            ).scanResult.device.address
+            podState.bluetoothAddress = podAddress
+
+            emitter.onNext(PodEvent.BluetoothConnecting)
+            val podDevice = bluetoothAdapter.getRemoteDevice(podAddress)
+            val conn = Connection(podDevice, aapsLogger, context, podState)
+            connection = conn
+            conn.connect(ConnectionWaitCondition(timeoutMs = 3 * Connection.BASE_CONNECT_TIMEOUT_MS))
+            emitter.onNext(PodEvent.BluetoothConnected(podAddress))
+
+            emitter.onNext(PodEvent.Pairing)
+            val mIO = conn.msgIO ?: throw ConnectException("Connection lost")
+            val ltkExchanger = LTKExchanger(
+                aapsLogger,
+                mIO,
+                ids,
+            )
+            val pairResult = ltkExchanger.negotiateLTK()
+            emitter.onNext(PodEvent.Paired(ids.podId))
+            podState.updateFromPairing(ids.podId, pairResult)
+            if (BuildConfig.DEBUG) {
+                aapsLogger.info(LTag.PUMPCOMM, "Got LTK: ${pairResult.ltk.toHex()}")
+            }
+            emitter.onNext(PodEvent.EstablishingSession)
+            establishSession(pairResult.msgSeq)
+            podState.successfulConnections++
+            emitter.onNext(PodEvent.Connected)
+            emitter.onComplete()
+        } catch (ex: Exception) {
+            disconnect(false)
+            emitter.tryOnError(ex)
+        } finally {
+            busy.set(false)
+        }
+    }
+
+    override fun disconnect(closeGatt: Boolean) {
+        connection?.disconnect(closeGatt)
+            ?: aapsLogger.info(LTag.PUMPBTCOMM, "Trying to disconnect a null connection")
+    }
+
+    companion object {
+        const val CONTROLLER_ID = 4242 // TODO read from preferences or somewhere else.
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashCommunicationManager.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashCommunicationManager.java
deleted file mode 100644
index a53f3e2b34..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashCommunicationManager.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm;
-
-public interface OmnipodDashCommunicationManager {
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt
new file mode 100644
index 0000000000..2fc1c42704
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt
@@ -0,0 +1,66 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm
+
+import android.bluetooth.BluetoothGatt
+import android.bluetooth.BluetoothGattCharacteristic
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ConnectException
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.CharacteristicType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session.Connected
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session.Connection
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session.Connection.Companion.STOP_CONNECTING_CHECK_INTERVAL_MS
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session.ConnectionWaitCondition
+import java.math.BigInteger
+import java.util.*
+
+class ServiceDiscoverer(
+    private val logger: AAPSLogger,
+    private val gatt: BluetoothGatt,
+    private val bleCallbacks: BleCommCallbacks,
+    private val connection: Connection
+) {
+
+    /***
+     * This is first step after connection establishment
+     */
+    fun discoverServices(connectionWaitCond: ConnectionWaitCondition): Map<CharacteristicType, BluetoothGattCharacteristic> {
+        logger.debug(LTag.PUMPBTCOMM, "Discovering services")
+        bleCallbacks.startServiceDiscovery()
+        val discover = gatt.discoverServices()
+        if (!discover) {
+            throw ConnectException("Could not start discovering services`")
+        }
+        connectionWaitCond.timeoutMs?.let {
+            bleCallbacks.waitForServiceDiscovery(it)
+        }
+        connectionWaitCond.stopConnection?.let {
+            while (!bleCallbacks.waitForServiceDiscovery(STOP_CONNECTING_CHECK_INTERVAL_MS)) {
+                if (it.count == 0L || connection.connectionState() !is Connected) {
+                    throw ConnectException("stopConnecting called")
+                }
+            }
+        }
+        logger.debug(LTag.PUMPBTCOMM, "Services discovered")
+        val service = gatt.getService(SERVICE_UUID.toUuid())
+            ?: throw ConnectException("Service not found: $SERVICE_UUID")
+        val cmdChar = service.getCharacteristic(CharacteristicType.CMD.uuid)
+            ?: throw ConnectException("Characteristic not found: ${CharacteristicType.CMD.value}")
+        val dataChar = service.getCharacteristic(CharacteristicType.DATA.uuid)
+            ?: throw ConnectException("Characteristic not found: ${CharacteristicType.DATA.value}")
+        return mapOf(
+            CharacteristicType.CMD to cmdChar,
+            CharacteristicType.DATA to dataChar
+        )
+    }
+
+    private fun String.toUuid(): UUID = UUID(
+        BigInteger(replace("-", "").substring(0, 16), 16).toLong(),
+        BigInteger(replace("-", "").substring(16), 16).toLong()
+    )
+
+    companion object {
+
+        private const val SERVICE_UUID = "1a7e-4024-e3ed-4464-8b7e-751e03d0dc5f"
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt
new file mode 100644
index 0000000000..63d785e10c
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/BleCommCallbacks.kt
@@ -0,0 +1,225 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks
+
+import android.bluetooth.BluetoothGatt
+import android.bluetooth.BluetoothGattCallback
+import android.bluetooth.BluetoothGattCharacteristic
+import android.bluetooth.BluetoothGattDescriptor
+import android.bluetooth.BluetoothProfile
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.CharacteristicType.Companion.byValue
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.IncomingPackets
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session.DisconnectHandler
+import java.util.*
+import java.util.concurrent.BlockingQueue
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.LinkedBlockingQueue
+import java.util.concurrent.TimeUnit
+
+class BleCommCallbacks(
+    private val aapsLogger: AAPSLogger,
+    private val incomingPackets: IncomingPackets,
+    private val disconnectHandler: DisconnectHandler,
+) : BluetoothGattCallback() {
+
+    // Synchronized because they can be:
+    // - read from various callbacks
+    // - written from resetConnection that is called onConnectionLost
+    private var serviceDiscoveryComplete: CountDownLatch = CountDownLatch(1)
+        @Synchronized get
+        @Synchronized set
+    private var connected: CountDownLatch = CountDownLatch(1)
+        @Synchronized get
+        @Synchronized set
+    private val writeQueue: BlockingQueue<WriteConfirmation> = LinkedBlockingQueue()
+
+    override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "OnConnectionStateChange with status/state: $status/$newState")
+        super.onConnectionStateChange(gatt, status, newState)
+        if (newState == BluetoothProfile.STATE_CONNECTED && status == BluetoothGatt.GATT_SUCCESS) {
+            connected.countDown()
+        }
+        if (newState == BluetoothProfile.STATE_DISCONNECTED && status != BluetoothGatt.GATT_SUCCESS) {
+            // If status == SUCCESS, it means that we initiated the disconnect.
+            disconnectHandler.onConnectionLost(status)
+        }
+    }
+
+    override fun onServicesDiscovered(gatt: BluetoothGatt, status: Int) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "OnServicesDiscovered with status: $status")
+        super.onServicesDiscovered(gatt, status)
+        if (status == BluetoothGatt.GATT_SUCCESS) {
+            serviceDiscoveryComplete.countDown()
+        }
+    }
+
+    fun waitForConnection(timeoutMs: Long): Boolean {
+        val latch = connected
+        try {
+            latch.await(timeoutMs, TimeUnit.MILLISECONDS)
+        } catch (e: InterruptedException) {
+            aapsLogger.warn(LTag.PUMPBTCOMM, "Interrupted while waiting for Connection")
+        }
+        return latch.count == 0L
+    }
+
+    fun startServiceDiscovery() {
+        serviceDiscoveryComplete = CountDownLatch(1)
+    }
+
+    fun waitForServiceDiscovery(timeoutMs: Long): Boolean {
+        val latch = serviceDiscoveryComplete
+        try {
+            latch.await(timeoutMs, TimeUnit.MILLISECONDS)
+        } catch (e: InterruptedException) {
+            aapsLogger.warn(LTag.PUMPBTCOMM, "Interrupted while waiting for ServiceDiscovery")
+        }
+        return latch.count == 0L
+    }
+
+    fun confirmWrite(expectedPayload: ByteArray, expectedUUID: String, timeoutMs: Long): WriteConfirmation {
+        try {
+            return when (val received = writeQueue.poll(timeoutMs, TimeUnit.MILLISECONDS)) {
+                null -> WriteConfirmationError("Timeout waiting for writeConfirmation")
+                is WriteConfirmationSuccess ->
+                    if (expectedPayload.contentEquals(received.payload) &&
+                        expectedUUID == received.uuid
+                    ) {
+                        received
+                    } else {
+                        aapsLogger.warn(
+                            LTag.PUMPBTCOMM,
+                            "Could not confirm write. Got " + received.payload.toHex() +
+                                ".Excepted: " + expectedPayload.toHex()
+                        )
+                        WriteConfirmationError("Received incorrect writeConfirmation")
+                    }
+                is WriteConfirmationError ->
+                    received
+            }
+        } catch (e: InterruptedException) {
+            return WriteConfirmationError("Interrupted waiting for confirmation")
+        }
+    }
+
+    override fun onCharacteristicWrite(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, status: Int) {
+        aapsLogger.debug(
+            LTag.PUMPBTCOMM,
+            "OnCharacteristicWrite with char/status " +
+                "${characteristic.uuid} /" +
+                "$status"
+        )
+        super.onCharacteristicWrite(gatt, characteristic, status)
+
+        onWrite(status, characteristic.uuid, characteristic.value)
+    }
+
+    override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic) {
+        super.onCharacteristicChanged(gatt, characteristic)
+
+        val payload = characteristic.value
+        val characteristicType = byValue(characteristic.uuid.toString())
+
+        aapsLogger.debug(
+            LTag.PUMPBTCOMM,
+            "OnCharacteristicChanged with char/value " +
+                characteristicType + "/" +
+                payload.toHex()
+        )
+
+        val insertResult = incomingPackets.byCharacteristicType(characteristicType).add(payload)
+        if (!insertResult) {
+            aapsLogger.warn(LTag.PUMPBTCOMM, "Could not insert read data to the incoming queue: $characteristicType")
+        }
+    }
+
+    override fun onDescriptorWrite(gatt: BluetoothGatt, descriptor: BluetoothGattDescriptor, status: Int) {
+        super.onDescriptorWrite(gatt, descriptor, status)
+
+        aapsLogger.debug(
+            LTag.PUMPBTCOMM,
+            "OnDescriptorWrite with descriptor/status " +
+                descriptor.uuid.toString() + "/" +
+                status + "/"
+        )
+
+        onWrite(status, descriptor.uuid, descriptor.value)
+    }
+
+    override fun onMtuChanged(gatt: BluetoothGatt?, mtu: Int, status: Int) {
+        super.onMtuChanged(gatt, mtu, status)
+        aapsLogger.debug(
+            LTag.PUMPBTCOMM,
+            "onMtuChanged with MTU/status: $mtu/$status "
+        )
+    }
+
+    override fun onReadRemoteRssi(gatt: BluetoothGatt?, rssi: Int, status: Int) {
+        super.onReadRemoteRssi(gatt, rssi, status)
+        aapsLogger.debug(
+            LTag.PUMPBTCOMM,
+            "onReadRemoteRssi with rssi/status: $rssi/$status "
+        )
+    }
+
+    override fun onPhyUpdate(gatt: BluetoothGatt?, txPhy: Int, rxPhy: Int, status: Int) {
+        super.onPhyUpdate(gatt, txPhy, rxPhy, status)
+        aapsLogger.debug(
+            LTag.PUMPBTCOMM,
+            "onPhyUpdate with txPhy/rxPhy/status: $txPhy/$rxPhy/$status "
+        )
+    }
+
+    private fun onWrite(status: Int, uuid: UUID?, value: ByteArray?) {
+        val writeConfirmation = when {
+            uuid == null || value == null ->
+                WriteConfirmationError("onWrite received Null: UUID=$uuid, value=${value?.toHex()} status=$status")
+
+            status == BluetoothGatt.GATT_SUCCESS -> {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "OnWrite value " + value.toHex())
+                WriteConfirmationSuccess(uuid.toString(), value)
+            }
+
+            else -> WriteConfirmationError("onDescriptorWrite status is not success: $status")
+        }
+
+        try {
+            flushConfirmationQueue()
+            val offered = writeQueue.offer(
+                writeConfirmation,
+                WRITE_CONFIRM_TIMEOUT_MS.toLong(),
+                TimeUnit.MILLISECONDS
+            )
+            if (!offered) {
+                aapsLogger.warn(LTag.PUMPBTCOMM, "Received delayed write confirmation")
+            }
+        } catch (e: InterruptedException) {
+            aapsLogger.warn(LTag.PUMPBTCOMM, "Interrupted while sending write confirmation")
+        }
+    }
+
+    fun flushConfirmationQueue() {
+        if (writeQueue.size > 0) {
+            aapsLogger.warn(
+                LTag.PUMPBTCOMM,
+                "Write queue should be empty, found: ${writeQueue.size}"
+            )
+            writeQueue.clear()
+        }
+    }
+
+    fun resetConnection() {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Reset connection")
+        connected.countDown()
+        serviceDiscoveryComplete.countDown()
+        connected = CountDownLatch(1)
+        serviceDiscoveryComplete = CountDownLatch(1)
+        flushConfirmationQueue()
+    }
+
+    companion object {
+
+        private const val WRITE_CONFIRM_TIMEOUT_MS = 10 // the confirmation queue should be empty anyway
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/WriteConfirmation.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/WriteConfirmation.kt
new file mode 100644
index 0000000000..776639d3e8
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/callbacks/WriteConfirmation.kt
@@ -0,0 +1,10 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks
+
+sealed class WriteConfirmation
+
+data class WriteConfirmationSuccess(val uuid: String, val payload: ByteArray) : WriteConfirmation()
+
+data class WriteConfirmationError(
+    val msg: String,
+    val status: Int = 0
+) : WriteConfirmation()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommand.kt
new file mode 100644
index 0000000000..4ad00e75b4
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommand.kt
@@ -0,0 +1,98 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command
+
+import info.nightscout.androidaps.extensions.toHex
+import java.nio.ByteBuffer
+
+object BleCommandRTS : BleCommand(BleCommandType.RTS)
+
+object BleCommandCTS : BleCommand(BleCommandType.CTS)
+
+object BleCommandAbort : BleCommand(BleCommandType.ABORT)
+
+object BleCommandSuccess : BleCommand(BleCommandType.SUCCESS)
+
+object BleCommandFail : BleCommand(BleCommandType.FAIL)
+
+data class BleCommandNack(val idx: Byte) : BleCommand(BleCommandType.NACK, byteArrayOf(idx)) {
+    companion object {
+
+        fun parse(payload: ByteArray): BleCommand {
+            return when {
+                payload.size < 2 ->
+                    BleCommandIncorrect("Incorrect NACK payload", payload)
+                payload[0] != BleCommandType.NACK.value ->
+                    BleCommandIncorrect("Incorrect NACK header", payload)
+                else ->
+                    BleCommandNack(payload[1])
+            }
+        }
+    }
+}
+
+data class BleCommandHello(private val controllerId: Int) : BleCommand(
+    BleCommandType.HELLO,
+    ByteBuffer.allocate(6)
+        .put(1.toByte()) // TODO find the meaning of this constant
+        .put(4.toByte()) // TODO find the meaning of this constant
+        .putInt(controllerId).array()
+)
+
+data class BleCommandIncorrect(val msg: String, val payload: ByteArray) : BleCommand(BleCommandType.INCORRECT)
+
+sealed class BleCommand(val data: ByteArray) {
+
+    constructor(type: BleCommandType) : this(byteArrayOf(type.value))
+
+    constructor(type: BleCommandType, payload: ByteArray) : this(
+        byteArrayOf(type.value) + payload
+    )
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is BleCommand) return false
+
+        if (!data.contentEquals(other.data)) return false
+
+        return true
+    }
+
+    override fun toString(): String {
+        return "Raw command: [${data.toHex()}]"
+    }
+
+    override fun hashCode(): Int {
+        return data.contentHashCode()
+    }
+
+    companion object {
+
+        fun parse(payload: ByteArray): BleCommand {
+            if (payload.isEmpty()) {
+                return BleCommandIncorrect("Incorrect command: empty payload", payload)
+            }
+
+            return try {
+                when (BleCommandType.byValue(payload[0])) {
+                    BleCommandType.RTS ->
+                        BleCommandRTS
+                    BleCommandType.CTS ->
+                        BleCommandCTS
+                    BleCommandType.NACK ->
+                        BleCommandNack.parse(payload)
+                    BleCommandType.ABORT ->
+                        BleCommandAbort
+                    BleCommandType.SUCCESS ->
+                        BleCommandSuccess
+                    BleCommandType.FAIL ->
+                        BleCommandFail
+                    BleCommandType.HELLO ->
+                        BleCommandIncorrect("Incorrect hello command received", payload)
+                    BleCommandType.INCORRECT ->
+                        BleCommandIncorrect("Incorrect command received", payload)
+                }
+            } catch (e: IllegalArgumentException) {
+                BleCommandIncorrect("Incorrect command payload", payload)
+            }
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandType.kt
new file mode 100644
index 0000000000..ae0873c15c
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandType.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command
+
+enum class BleCommandType(val value: Byte) {
+    RTS(0x00.toByte()),
+    CTS(0x01.toByte()),
+    NACK(0x02.toByte()),
+    ABORT(0x03.toByte()),
+    SUCCESS(0x04.toByte()),
+    FAIL(0x05.toByte()),
+    HELLO(0x06.toByte()),
+    INCORRECT(0x09.toByte());
+
+    companion object {
+
+        fun byValue(value: Byte): BleCommandType =
+            values().firstOrNull { it.value == value }
+                ?: throw IllegalArgumentException("Unknown BleCommandType: $value")
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecrypt.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecrypt.kt
new file mode 100644
index 0000000000..4bda483106
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecrypt.kt
@@ -0,0 +1,66 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecrypt
+
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessagePacket
+import org.spongycastle.crypto.engines.AESEngine
+import org.spongycastle.crypto.modes.CCMBlockCipher
+import org.spongycastle.crypto.params.AEADParameters
+import org.spongycastle.crypto.params.KeyParameter
+
+class EnDecrypt(private val aapsLogger: AAPSLogger, private val nonce: Nonce, private val ck: ByteArray) {
+
+    val engine = AESEngine()
+    val cipher = CCMBlockCipher(engine)
+
+    fun decrypt(msg: MessagePacket): MessagePacket {
+        val payload = msg.payload
+        val header = msg.asByteArray().copyOfRange(0, 16)
+
+        val n = nonce.increment(false)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Decrypt header ${header.toHex()} payload: ${payload.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Decrypt NONCE ${n.toHex()}")
+        cipher.init(
+            false,
+            AEADParameters(
+                KeyParameter(ck),
+                MAC_SIZE * 8, // in bits
+                n,
+                header
+            )
+        )
+        val decryptedPayload = ByteArray(payload.size - MAC_SIZE)
+        cipher.processPacket(payload, 0, payload.size, decryptedPayload, 0)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Decrypted payload ${decryptedPayload.toHex()}")
+        return msg.copy(payload = decryptedPayload)
+    }
+
+    fun encrypt(headerMessage: MessagePacket): MessagePacket {
+        val payload = headerMessage.payload
+        val header = headerMessage.asByteArray(true).copyOfRange(0, 16)
+
+        val n = nonce.increment(true)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Encrypt header ${header.toHex()} payload: ${payload.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Encrypt NONCE ${n.toHex()}")
+        val encryptedPayload = ByteArray(payload.size + MAC_SIZE)
+
+        cipher.init(
+            true,
+            AEADParameters(
+                KeyParameter(ck),
+                MAC_SIZE * 8, // in bits
+                n,
+                header
+            )
+        )
+        cipher.processPacket(payload, 0, payload.size, encryptedPayload, 0)
+
+        return headerMessage.copy(payload = encryptedPayload)
+    }
+
+    companion object {
+
+        private const val MAC_SIZE = 8
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/Nonce.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/Nonce.kt
new file mode 100644
index 0000000000..0f53731ba0
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/Nonce.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecrypt
+
+import java.nio.ByteBuffer
+
+data class Nonce(val prefix: ByteArray, var sqn: Long) {
+    init {
+        require(prefix.size == 8) { "Nonce prefix should be 8 bytes long" }
+    }
+
+    fun increment(podReceiving: Boolean): ByteArray {
+        sqn++
+        val ret = ByteBuffer.allocate(8)
+            .putLong(sqn)
+            .array()
+            .copyOfRange(3, 8)
+        if (podReceiving) {
+            ret[0] = (ret[0].toInt() and 127).toByte()
+        } else {
+            ret[0] = (ret[0].toInt() or 128).toByte()
+        }
+        return prefix + ret
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/BusyException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/BusyException.kt
new file mode 100644
index 0000000000..d96b371a9b
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/BusyException.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
+
+class BusyException : Exception("Bluetooth busy")
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ConnectException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ConnectException.kt
new file mode 100644
index 0000000000..2ccd7fb72a
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ConnectException.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
+
+class ConnectException(val msg: String) : Exception(msg)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseMessageException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseMessageException.kt
new file mode 100644
index 0000000000..73d4eb1d42
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseMessageException.kt
@@ -0,0 +1,6 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
+
+import info.nightscout.androidaps.extensions.toHex
+
+class CouldNotParseMessageException(val payload: ByteArray) :
+    Exception("Could not parse message payload: ${payload.toHex()}")
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseResponseException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseResponseException.kt
new file mode 100644
index 0000000000..15308e4f66
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotParseResponseException.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
+
+class CouldNotParseResponseException(message: String?) : Exception(message)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotReadResponse.kt
similarity index 58%
rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.java
rename to omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotReadResponse.kt
index a23de9bcf0..98d81b66cf 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/OmnipodDashManager.java
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotReadResponse.kt
@@ -1,4 +1,3 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver;
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
 
-public interface OmnipodDashManager {
-}
+class CouldNotReadResponse
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotSendCommandException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotSendCommandException.kt
new file mode 100644
index 0000000000..2299843aa4
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/CouldNotSendCommandException.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
+
+class CouldNotSendCommandException(val msg: String = "Could not send command") : Exception(msg)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/FailedToConnectException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/FailedToConnectException.kt
new file mode 100644
index 0000000000..b0b16a611d
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/FailedToConnectException.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
+
+open class FailedToConnectException(message: String? = null) : Exception("Failed to connect: ${message ?: ""}")
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/MessageIOException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/MessageIOException.kt
new file mode 100644
index 0000000000..eca2f077c9
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/MessageIOException.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
+
+class MessageIOException : Exception {
+    constructor(msg: String) : super(msg)
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/NotConnectedException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/NotConnectedException.kt
new file mode 100644
index 0000000000..067091ed78
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/NotConnectedException.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
+
+class NotConnectedException(val msg: String) : Exception(msg)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/PairingException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/PairingException.kt
new file mode 100644
index 0000000000..624f1bb121
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/PairingException.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
+
+class PairingException(val msg: String) : Exception(msg)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanException.kt
new file mode 100644
index 0000000000..4640eba00e
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanException.kt
@@ -0,0 +1,6 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
+
+open class ScanException : Exception {
+    constructor(message: String) : super(message)
+    constructor(errorCode: Int) : super("errorCode$errorCode")
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailFoundTooManyException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailFoundTooManyException.kt
new file mode 100644
index 0000000000..c88528b3f0
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/ScanFailFoundTooManyException.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.scan.BleDiscoveredDevice
+import java.util.*
+
+class ScanFailFoundTooManyException(devices: List<BleDiscoveredDevice>) : ScanException("Found more than one Pod") {
+
+    private val devices: List<BleDiscoveredDevice> = ArrayList(devices)
+    val discoveredDevices: List<BleDiscoveredDevice>
+        get() = Collections.unmodifiableList(devices)
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/SessionEstablishmentException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/SessionEstablishmentException.kt
new file mode 100644
index 0000000000..70d713d7c5
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/exceptions/SessionEstablishmentException.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions
+
+class SessionEstablishmentException(val msg: String) : Exception(msg)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt
new file mode 100644
index 0000000000..a91d645339
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt
@@ -0,0 +1,143 @@
+@file:Suppress("WildcardImport")
+
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io
+
+import android.bluetooth.BluetoothGatt
+import android.bluetooth.BluetoothGattCharacteristic
+import android.bluetooth.BluetoothGattDescriptor
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.WriteConfirmationError
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.WriteConfirmationSuccess
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command.BleCommandRTS
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.*
+import java.util.concurrent.BlockingQueue
+import java.util.concurrent.TimeUnit
+
+sealed class BleSendResult
+
+object BleSendSuccess : BleSendResult()
+data class BleSendErrorSending(val msg: String, val cause: Throwable? = null) : BleSendResult()
+data class BleSendErrorConfirming(val msg: String, val cause: Throwable? = null) : BleSendResult()
+
+open class BleIO(
+    private val aapsLogger: AAPSLogger,
+    var characteristic: BluetoothGattCharacteristic,
+    private val incomingPackets: BlockingQueue<ByteArray>,
+    private val gatt: BluetoothGatt,
+    private val bleCommCallbacks: BleCommCallbacks,
+    private val type: CharacteristicType
+) {
+
+    /***
+     *
+     * @param characteristic where to read from(CMD or DATA)
+     * @return a byte array with the received data or error
+     */
+    fun receivePacket(timeoutMs: Long = DEFAULT_IO_TIMEOUT_MS): ByteArray? {
+        return try {
+            val packet = incomingPackets.poll(timeoutMs, TimeUnit.MILLISECONDS)
+            if (packet == null) {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "Timeout reading $type packet")
+            }
+            packet
+        } catch (e: InterruptedException) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Interrupted while reading packet: $e")
+            null
+        }
+    }
+
+    /***
+     *
+     * @param characteristic where to write to(CMD or DATA)
+     * @param payload the data to send
+     */
+    @Suppress("ReturnCount")
+    fun sendAndConfirmPacket(payload: ByteArray): BleSendResult {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "BleIO: Sending on $type: ${payload.toHex()}")
+        val set = characteristic.setValue(payload)
+        if (!set) {
+            return BleSendErrorSending("Could set setValue on $type")
+        }
+        bleCommCallbacks.flushConfirmationQueue()
+        val sent = gatt.writeCharacteristic(characteristic)
+        if (!sent) {
+            return BleSendErrorSending("Could not writeCharacteristic on $type")
+        }
+
+        return when (
+            val confirmation = bleCommCallbacks.confirmWrite(
+                payload,
+                type.value,
+                DEFAULT_IO_TIMEOUT_MS
+            )
+        ) {
+            is WriteConfirmationError ->
+                BleSendErrorConfirming(confirmation.msg)
+            is WriteConfirmationSuccess ->
+                BleSendSuccess
+        }
+    }
+
+    /**
+     * Called before sending a new message.
+     * The incoming queues should be empty, so we log when they are not.
+     */
+    open fun flushIncomingQueue(): Boolean {
+        var foundRTS = false
+        do {
+            val found = incomingPackets.poll()?.also {
+                aapsLogger.warn(LTag.PUMPBTCOMM, "BleIO: queue not empty, flushing: ${it.toHex()}")
+                if (it.isNotEmpty() && it[0] == BleCommandRTS.data[0]) {
+                    foundRTS = true
+                }
+            }
+        } while (found != null)
+        return foundRTS
+    }
+
+    /**
+     * Enable intentions on the characteristic
+     * This will signal the pod it can start sending back data
+     * @return
+     */
+    fun readyToRead(): BleSendResult {
+        gatt.setCharacteristicNotification(characteristic, true)
+            .assertTrue("enable notifications")
+
+        val descriptors = characteristic.descriptors
+        if (descriptors.size != 1) {
+            throw ConnectException("Expecting one descriptor, found: ${descriptors.size}")
+        }
+        val descriptor = descriptors[0]
+        descriptor.value = BluetoothGattDescriptor.ENABLE_INDICATION_VALUE
+        gatt.writeDescriptor(descriptor)
+            .assertTrue("enable indications on descriptor")
+
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Enabling indications for $type")
+        val confirmation = bleCommCallbacks.confirmWrite(
+            BluetoothGattDescriptor.ENABLE_INDICATION_VALUE,
+            descriptor.uuid.toString(),
+            DEFAULT_IO_TIMEOUT_MS
+        )
+        return when (confirmation) {
+            is WriteConfirmationError ->
+                throw ConnectException(confirmation.msg)
+            is WriteConfirmationSuccess ->
+                BleSendSuccess
+        }
+    }
+
+    companion object {
+
+        const val DEFAULT_IO_TIMEOUT_MS = 1000.toLong()
+    }
+}
+
+private fun Boolean.assertTrue(operation: String) {
+    if (!this) {
+        throw ConnectException("Could not $operation")
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CharacteristicType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CharacteristicType.kt
new file mode 100644
index 0000000000..c5d60d5a30
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CharacteristicType.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io
+
+import java.math.BigInteger
+import java.util.*
+
+enum class CharacteristicType(val value: String) {
+    CMD("1a7e2441-e3ed-4464-8b7e-751e03d0dc5f"), DATA("1a7e2442-e3ed-4464-8b7e-751e03d0dc5f");
+
+    val uuid: UUID
+        get() = UUID(
+            BigInteger(value.replace("-", "").substring(0, 16), 16).toLong(),
+            BigInteger(value.replace("-", "").substring(16), 16).toLong()
+        )
+
+    companion object {
+
+        fun byValue(value: String): CharacteristicType =
+            values().firstOrNull { it.value == value }
+                ?: throw IllegalArgumentException("Unknown Characteristic Type: $value")
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CmdBleIO.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CmdBleIO.kt
new file mode 100644
index 0000000000..8421a6f1d3
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/CmdBleIO.kt
@@ -0,0 +1,48 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io
+
+import android.bluetooth.BluetoothGatt
+import android.bluetooth.BluetoothGattCharacteristic
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.OmnipodDashBleManagerImpl
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command.BleCommand
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command.BleCommandHello
+import java.util.concurrent.BlockingQueue
+
+sealed class BleConfirmResult
+
+object BleConfirmSuccess : BleConfirmResult()
+data class BleConfirmIncorrectData(val payload: ByteArray) : BleConfirmResult()
+data class BleConfirmError(val msg: String) : BleConfirmResult()
+
+class CmdBleIO(
+    logger: AAPSLogger,
+    characteristic: BluetoothGattCharacteristic,
+    private val incomingPackets: BlockingQueue<ByteArray>,
+    gatt: BluetoothGatt,
+    bleCommCallbacks: BleCommCallbacks
+) : BleIO(
+    logger,
+    characteristic,
+    incomingPackets,
+    gatt,
+    bleCommCallbacks,
+    CharacteristicType.CMD
+) {
+
+    fun peekCommand(): ByteArray? {
+        return incomingPackets.peek()
+    }
+
+    fun hello() = sendAndConfirmPacket(BleCommandHello(OmnipodDashBleManagerImpl.CONTROLLER_ID).data)
+
+    fun expectCommandType(expected: BleCommand, timeoutMs: Long = DEFAULT_IO_TIMEOUT_MS): BleConfirmResult {
+        return receivePacket(timeoutMs)?.let {
+            if (it.isNotEmpty() && it[0] == expected.data[0])
+                BleConfirmSuccess
+            else
+                BleConfirmIncorrectData(it)
+        }
+            ?: BleConfirmError("Error reading packet")
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/DataBleIO.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/DataBleIO.kt
new file mode 100644
index 0000000000..39b1798c6c
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/DataBleIO.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io
+
+import android.bluetooth.BluetoothGatt
+import android.bluetooth.BluetoothGattCharacteristic
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks
+import java.util.concurrent.BlockingQueue
+
+class DataBleIO(
+    logger: AAPSLogger,
+    characteristic: BluetoothGattCharacteristic,
+    incomingPackets: BlockingQueue<ByteArray>,
+    gatt: BluetoothGatt,
+    bleCommCallbacks: BleCommCallbacks
+) : BleIO(
+    logger,
+    characteristic,
+    incomingPackets,
+    gatt,
+    bleCommCallbacks,
+    CharacteristicType.DATA
+)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/IncomingPackets.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/IncomingPackets.kt
new file mode 100644
index 0000000000..ae8bb034fe
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/IncomingPackets.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io
+
+import java.util.concurrent.BlockingQueue
+import java.util.concurrent.LinkedBlockingDeque
+
+class IncomingPackets {
+
+    val cmdQueue: BlockingQueue<ByteArray> = LinkedBlockingDeque()
+    val dataQueue: BlockingQueue<ByteArray> = LinkedBlockingDeque()
+
+    fun byCharacteristicType(char: CharacteristicType): BlockingQueue<ByteArray> {
+        return when (char) {
+            CharacteristicType.DATA -> dataQueue
+            CharacteristicType.CMD -> cmdQueue
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt
new file mode 100644
index 0000000000..6515fd5a75
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/CrcMismatchException.kt
@@ -0,0 +1,6 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
+
+import info.nightscout.androidaps.extensions.toHex
+
+class CrcMismatchException(val expected: Long, val actual: Long, val payload: ByteArray) :
+    Exception("CRC mismatch. Actual: $actual. Expected: $expected. Payload: ${payload.toHex()}")
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/IncorrectPacketException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/IncorrectPacketException.kt
new file mode 100644
index 0000000000..049e8fa5d2
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/IncorrectPacketException.kt
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
+
+import info.nightscout.androidaps.extensions.toHex
+
+class IncorrectPacketException(
+    val payload: ByteArray,
+    val expectedIndex: Byte? = null
+) : Exception("Invalid payload: ${payload.toHex()}. Expected index: $expectedIndex")
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt
new file mode 100644
index 0000000000..6e750069bc
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageIO.kt
@@ -0,0 +1,231 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
+
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command.*
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.*
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.BlePacket
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadJoiner
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadSplitter
+
+sealed class MessageSendResult
+object MessageSendSuccess : MessageSendResult()
+data class MessageSendErrorSending(val msg: String, val cause: Throwable? = null) : MessageSendResult() {
+    constructor(e: BleSendResult) : this("Could not send packet: $e")
+}
+
+data class MessageSendErrorConfirming(val msg: String, val cause: Throwable? = null) : MessageSendResult() {
+    constructor(e: BleSendResult) : this("Could not confirm packet: $e")
+}
+
+sealed class PacketReceiveResult
+data class PacketReceiveSuccess(val payload: ByteArray) : PacketReceiveResult()
+data class PacketReceiveError(val msg: String) : PacketReceiveResult()
+
+class MessageIO(
+    private val aapsLogger: AAPSLogger,
+    private val cmdBleIO: CmdBleIO,
+    private val dataBleIO: DataBleIO,
+) {
+
+    val receivedOutOfOrder = LinkedHashMap<Byte, ByteArray>()
+    var maxMessageReadTries = 3
+    var messageReadTries = 0
+
+    @Suppress("ReturnCount")
+    fun sendMessage(msg: MessagePacket): MessageSendResult {
+        val foundRTS = cmdBleIO.flushIncomingQueue()
+        if (foundRTS) {
+            val receivedMessage = receiveMessage(false)
+            aapsLogger.warn(LTag.PUMPBTCOMM, "sendMessage received message=$receivedMessage")
+            throw IllegalStateException("Received message while trying to send")
+        }
+        dataBleIO.flushIncomingQueue()
+
+        val rtsSendResult = cmdBleIO.sendAndConfirmPacket(BleCommandRTS.data)
+        if (rtsSendResult is BleSendErrorSending) {
+            return MessageSendErrorSending(rtsSendResult)
+        }
+        val expectCTS = cmdBleIO.expectCommandType(BleCommandCTS)
+        if (expectCTS !is BleConfirmSuccess) {
+            return MessageSendErrorSending(expectCTS.toString())
+        }
+
+        val payload = msg.asByteArray()
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Sending message: ${payload.toHex()}")
+        val splitter = PayloadSplitter(payload)
+        val packets = splitter.splitInPackets()
+
+        for ((index, packet) in packets.withIndex()) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Sending DATA: ${packet.toByteArray().toHex()}")
+            val sendResult = dataBleIO.sendAndConfirmPacket(packet.toByteArray())
+            val ret = handleSendResult(sendResult, index, packets)
+            if (ret !is MessageSendSuccess) {
+                return ret
+            }
+            val peek = peekForNack(index, packets)
+            if (peek !is MessageSendSuccess) {
+                return if (index == packets.size - 1)
+                    MessageSendErrorConfirming(peek.toString())
+                else
+                    MessageSendErrorSending(peek.toString())
+            }
+        }
+
+        return when (val expectSuccess = cmdBleIO.expectCommandType(BleCommandSuccess)) {
+            is BleConfirmSuccess ->
+                MessageSendSuccess
+            is BleConfirmError ->
+                MessageSendErrorConfirming("Error reading message confirmation: $expectSuccess")
+            is BleConfirmIncorrectData ->
+                when (val received = (BleCommand.parse((expectSuccess.payload)))) {
+                    is BleCommandFail ->
+                        // this can happen if CRC does not match
+                        MessageSendErrorSending("Received FAIL after sending message")
+                    else ->
+                        MessageSendErrorConfirming("Received confirmation message: $received")
+                }
+        }
+    }
+
+    @Suppress("ReturnCount")
+    fun receiveMessage(readRTS: Boolean = true): MessagePacket? {
+        if (readRTS) {
+            val expectRTS = cmdBleIO.expectCommandType(BleCommandRTS, MESSAGE_READ_TIMEOUT_MS)
+            if (expectRTS !is BleConfirmSuccess) {
+                aapsLogger.warn(LTag.PUMPBTCOMM, "Error reading RTS: $expectRTS")
+                return null
+            }
+        }
+
+        val sendResult = cmdBleIO.sendAndConfirmPacket(BleCommandCTS.data)
+        if (sendResult !is BleSendSuccess) {
+            aapsLogger.warn(LTag.PUMPBTCOMM, "Error sending CTS: $sendResult")
+            return null
+        }
+        readReset()
+        var expected: Byte = 0
+        try {
+            val firstPacket = expectBlePacket(0)
+            if (firstPacket !is PacketReceiveSuccess) {
+                aapsLogger.warn(LTag.PUMPBTCOMM, "Error reading first packet:$firstPacket")
+                return null
+            }
+            val joiner = PayloadJoiner(firstPacket.payload)
+            maxMessageReadTries = joiner.fullFragments * 2 + 2
+            for (i in 1 until joiner.fullFragments + 1) {
+                expected++
+                val nackOnTimeout = !joiner.oneExtraPacket && i == joiner.fullFragments // last packet
+                val packet = expectBlePacket(expected, nackOnTimeout)
+                if (packet !is PacketReceiveSuccess) {
+                    aapsLogger.warn(LTag.PUMPBTCOMM, "Error reading packet:$packet")
+                    return null
+                }
+                joiner.accumulate(packet.payload)
+            }
+            if (joiner.oneExtraPacket) {
+                expected++
+                val packet = expectBlePacket(expected, true)
+                if (packet !is PacketReceiveSuccess) {
+                    aapsLogger.warn(LTag.PUMPBTCOMM, "Error reading packet:$packet")
+                    return null
+                }
+                joiner.accumulate(packet.payload)
+            }
+            val fullPayload = joiner.finalize()
+            cmdBleIO.sendAndConfirmPacket(BleCommandSuccess.data)
+            return MessagePacket.parse(fullPayload)
+        } catch (e: IncorrectPacketException) {
+            aapsLogger.warn(LTag.PUMPBTCOMM, "Received incorrect packet: $e")
+            cmdBleIO.sendAndConfirmPacket(BleCommandAbort.data)
+            return null
+        } catch (e: CrcMismatchException) {
+            aapsLogger.warn(LTag.PUMPBTCOMM, "CRC mismatch: $e")
+            cmdBleIO.sendAndConfirmPacket(BleCommandFail.data)
+            return null
+        } finally {
+            readReset()
+        }
+    }
+
+    private fun handleSendResult(sendResult: BleSendResult, index: Int, packets: List<BlePacket>): MessageSendResult {
+        return when {
+            sendResult is BleSendSuccess ->
+                MessageSendSuccess
+            index == packets.size - 1 && sendResult is BleSendErrorConfirming ->
+                MessageSendErrorConfirming("Error confirming last DATA packet $sendResult")
+            else ->
+                MessageSendErrorSending("Error sending DATA: $sendResult")
+        }
+    }
+
+    private fun peekForNack(index: Int, packets: List<BlePacket>): MessageSendResult {
+        val peekCmd = cmdBleIO.peekCommand()
+            ?: return MessageSendSuccess
+
+        return when (val receivedCmd = BleCommand.parse(peekCmd)) {
+            is BleCommandNack -> {
+                // // Consume NACK
+                val received = cmdBleIO.receivePacket()
+                if (received == null) {
+                    MessageSendErrorSending(received.toString())
+                } else {
+                    val sendResult = dataBleIO.sendAndConfirmPacket(packets[receivedCmd.idx.toInt()].toByteArray())
+                    handleSendResult(sendResult, index, packets)
+                }
+            }
+
+            BleCommandSuccess -> {
+                if (index == packets.size - 1)
+                    MessageSendSuccess
+                else
+                    MessageSendErrorSending("Received SUCCESS before sending all the data. $index")
+            }
+
+            else ->
+                MessageSendErrorSending("Received unexpected command: ${peekCmd.toHex()}")
+        }
+    }
+
+    @Suppress("ReturnCount")
+    private fun expectBlePacket(index: Byte, nackOnTimeout: Boolean = false): PacketReceiveResult {
+        receivedOutOfOrder[index]?.let {
+            return PacketReceiveSuccess(it)
+        }
+        var packetTries = 0
+        while (messageReadTries < maxMessageReadTries && packetTries < MAX_PACKET_READ_TRIES) {
+            messageReadTries++
+            packetTries++
+            val received = dataBleIO.receivePacket()
+            if (received == null || received.isEmpty()) {
+                if (nackOnTimeout)
+                    cmdBleIO.sendAndConfirmPacket(BleCommandNack(index).data)
+                aapsLogger.info(
+                    LTag.PUMPBTCOMM,
+                    "Error reading index: $index. Received: $received. NackOnTimeout: " +
+                        "$nackOnTimeout"
+                )
+                continue
+            }
+            if (received[0] == index) {
+                return PacketReceiveSuccess(received)
+            }
+            receivedOutOfOrder[received[0]] = received
+            cmdBleIO.sendAndConfirmPacket(BleCommandNack(index).data)
+        }
+        return PacketReceiveError("Reached the maximum number tries to read a packet")
+    }
+
+    private fun readReset() {
+        maxMessageReadTries = 3
+        messageReadTries = 0
+        receivedOutOfOrder.clear()
+    }
+
+    companion object {
+
+        private const val MAX_PACKET_READ_TRIES = 4
+        private const val MESSAGE_READ_TIMEOUT_MS = 5000.toLong()
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacket.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacket.kt
new file mode 100644
index 0000000000..5506703311
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacket.kt
@@ -0,0 +1,152 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Id
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.CouldNotParseMessageException
+import java.nio.ByteBuffer
+
+/***
+ * MessagePacket contains header and raw payload for a message
+ */
+data class MessagePacket(
+    val type: MessageType,
+    val source: Id,
+    val destination: Id,
+    val payload: ByteArray,
+    val sequenceNumber: Byte,
+    val ack: Boolean = false,
+    val ackNumber: Byte = 0.toByte(),
+    val eqos: Short = 0.toShort(),
+    val priority: Boolean = false,
+    val lastMessage: Boolean = false,
+    val gateway: Boolean = false,
+    val sas: Boolean = true, // TODO: understand, seems to always be true
+    val tfs: Boolean = false, // TODO: understand, seems to be false
+    val version: Short = 0.toShort()
+) {
+
+    fun asByteArray(forEncryption: Boolean = false): ByteArray {
+        val bb = ByteBuffer.allocate(16 + payload.size)
+        bb.put(MAGIC_PATTERN.toByteArray())
+
+        val f1 = Flag()
+        f1.set(0, this.version.toInt() and 4 != 0)
+        f1.set(1, this.version.toInt() and 2 != 0)
+        f1.set(2, this.version.toInt() and 1 != 0)
+        f1.set(3, this.sas)
+        f1.set(4, this.tfs)
+        f1.set(5, this.eqos.toInt() and 4 != 0)
+        f1.set(6, this.eqos.toInt() and 2 != 0)
+        f1.set(7, this.eqos.toInt() and 1 != 0)
+
+        val f2 = Flag()
+        f2.set(0, this.ack)
+        f2.set(1, this.priority)
+        f2.set(2, this.lastMessage)
+        f2.set(3, this.gateway)
+        f2.set(4, this.type.value.toInt() and 8 != 0)
+        f2.set(5, this.type.value.toInt() and 4 != 0)
+        f2.set(6, this.type.value.toInt() and 2 != 0)
+        f2.set(7, this.type.value.toInt() and 1 != 0)
+
+        bb.put(f1.value.toByte())
+        bb.put(f2.value.toByte())
+        bb.put(this.sequenceNumber)
+        bb.put(this.ackNumber)
+        val size = payload.size -
+            if (type == MessageType.ENCRYPTED && !forEncryption) 8 else 0
+        bb.put((size ushr 3).toByte())
+        bb.put((size shl 5).toByte())
+
+        bb.put(this.source.address)
+        bb.put(this.destination.address)
+
+        bb.put(this.payload)
+
+        val ret = ByteArray(bb.position())
+        bb.flip()
+        bb.get(ret)
+
+        return ret
+    }
+
+    companion object {
+
+        private const val MAGIC_PATTERN = "TW" // all messages start with this string
+        private const val HEADER_SIZE = 16
+
+        fun parse(payload: ByteArray): MessagePacket {
+            payload.assertSizeAtLeast(HEADER_SIZE)
+
+            if (payload.copyOfRange(0, 2).decodeToString() != MAGIC_PATTERN) {
+                throw CouldNotParseMessageException(payload)
+            }
+            val f1 = Flag(payload[2].toInt())
+            val sas = f1.get(3) != 0
+            val tfs = f1.get(4) != 0
+            val version = ((f1.get(0) shl 2) or (f1.get(1) shl 1) or (f1.get(2) shl 0)).toShort()
+            val eqos = (f1.get(7) or (f1.get(6) shl 1) or (f1.get(5) shl 2)).toShort()
+
+            val f2 = Flag(payload[3].toInt())
+            val ack = f2.get(0) != 0
+            val priority = f2.get(1) != 0
+            val lastMessage = f2.get(2) != 0
+            val gateway = f2.get(3) != 0
+            val type =
+                MessageType.byValue((f1.get(7) or (f1.get(6) shl 1) or (f1.get(5) shl 2) or (f1.get(4) shl 3)).toByte())
+            if (version.toInt() != 0) {
+                throw CouldNotParseMessageException(payload)
+            }
+            val sequenceNumber = payload[4]
+            val ackNumber = payload[5]
+            val size = (payload[6].toInt() shl 3) or (payload[7].toUnsignedInt() ushr 5)
+            payload.assertSizeAtLeast(size + HEADER_SIZE)
+
+            val payloadEnd = 16 + size +
+                if (type == MessageType.ENCRYPTED) 8 // TAG
+                else 0
+
+            return MessagePacket(
+                type = type,
+                ack = ack,
+                eqos = eqos,
+                priority = priority,
+                lastMessage = lastMessage,
+                gateway = gateway,
+                sas = sas,
+                tfs = tfs,
+                version = version,
+                sequenceNumber = sequenceNumber,
+                ackNumber = ackNumber,
+                source = Id(payload.copyOfRange(8, 12)),
+                destination = Id(payload.copyOfRange(12, 16)),
+                payload = payload.copyOfRange(16, payloadEnd)
+            )
+        }
+    }
+}
+
+private class Flag(var value: Int = 0) {
+
+    fun set(idx: Byte, set: Boolean) {
+        val mask = 1 shl (7 - idx)
+        if (!set)
+            return
+        value = value or mask
+    }
+
+    fun get(idx: Byte): Int {
+        val mask = 1 shl (7 - idx)
+        if (value and mask == 0) {
+            return 0
+        }
+        return 1
+    }
+}
+
+internal fun Byte.toUnsignedInt() = this.toInt() and 0xff
+
+private fun ByteArray.assertSizeAtLeast(size: Int) {
+    if (this.size < size) {
+        throw CouldNotParseMessageException(this)
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageType.kt
new file mode 100644
index 0000000000..3f33cc52f7
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessageType.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
+
+enum class MessageType(val value: Byte) {
+    CLEAR(0),
+    ENCRYPTED(1),
+    SESSION_ESTABLISHMENT(2),
+    PAIRING(3);
+
+    companion object {
+
+        fun byValue(value: Byte): MessageType =
+            MessageType.values().firstOrNull { it.value == value }
+                ?: throw IllegalArgumentException("Unknown MessageType: $value")
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncoding.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncoding.kt
new file mode 100644
index 0000000000..f3c5d58e27
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncoding.kt
@@ -0,0 +1,68 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
+
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.MessageIOException
+import java.nio.ByteBuffer
+
+/***
+ *  String prefix and length encoding and decoding. Example message:
+ */
+class StringLengthPrefixEncoding private constructor() {
+
+    companion object {
+
+        private const val LENGTH_BYTES = 2
+
+        fun parseKeys(keys: Array<String>, payload: ByteArray): Array<ByteArray> {
+            val ret = Array(keys.size) { ByteArray(0) }
+            var remaining = payload
+            for ((index, key) in keys.withIndex()) {
+                remaining.assertSizeAtLeast(key.length)
+                when {
+                    remaining.copyOfRange(0, key.length).decodeToString() != key ->
+                        throw MessageIOException("Key not found: $key in ${payload.toHex()}")
+                    // last key can be empty, no length
+                    index == keys.size - 1 && remaining.size == key.length ->
+                        return ret
+                }
+                remaining.assertSizeAtLeast(key.length + LENGTH_BYTES)
+
+                remaining = remaining.copyOfRange(key.length, remaining.size)
+                val length = (remaining[0].toUnsignedInt() shl 1) or remaining[1].toUnsignedInt()
+                remaining.assertSizeAtLeast(length)
+                ret[index] = remaining.copyOfRange(LENGTH_BYTES, LENGTH_BYTES + length)
+                remaining = remaining.copyOfRange(LENGTH_BYTES + length, remaining.size)
+            }
+            return ret
+        }
+
+        fun formatKeys(keys: Array<String>, payloads: Array<ByteArray>): ByteArray {
+            val payloadTotalSize = payloads.fold(0) { acc, i -> acc + i.size }
+            val keyTotalSize = keys.fold(0) { acc, i -> acc + i.length }
+            val zeros = payloads.fold(0) { acc, i -> acc + if (i.size == 0) 1 else 0 }
+
+            val bb = ByteBuffer.allocate(2 * (keys.size - zeros) + keyTotalSize + payloadTotalSize)
+            for (idx in keys.indices) {
+                val k = keys[idx]
+                val payload = payloads[idx]
+                bb.put(k.toByteArray())
+                if (payload.isNotEmpty()) {
+                    bb.putShort(payload.size.toShort())
+                    bb.put(payload)
+                }
+            }
+
+            val ret = ByteArray(bb.position())
+            bb.flip()
+            bb.get(ret)
+
+            return ret
+        }
+    }
+}
+
+private fun ByteArray.assertSizeAtLeast(size: Int) {
+    if (this.size < size) {
+        throw MessageIOException("Payload too short: ${this.toHex()}")
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/BlePacket.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/BlePacket.kt
new file mode 100644
index 0000000000..116d5f8221
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/BlePacket.kt
@@ -0,0 +1,202 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.IncorrectPacketException
+import java.nio.ByteBuffer
+
+sealed class BlePacket {
+
+    abstract val payload: ByteArray
+    abstract fun toByteArray(): ByteArray
+
+    companion object {
+
+        const val MAX_SIZE = 20
+    }
+}
+
+data class FirstBlePacket(
+    val fullFragments: Int,
+    override val payload: ByteArray,
+    val size: Byte? = null,
+    val crc32: Long? = null,
+    val oneExtraPacket: Boolean = false
+) : BlePacket() {
+
+    override fun toByteArray(): ByteArray {
+        val bb = ByteBuffer
+            .allocate(MAX_SIZE)
+            .put(0) // index
+            .put(fullFragments.toByte()) // # of fragments except FirstBlePacket and LastOptionalPlusOneBlePacket
+        crc32?.let {
+            bb.putInt(crc32.toInt())
+        }
+        size?.let {
+            bb.put(size)
+        }
+        bb.put(payload)
+
+        val pos = bb.position()
+        val ret = ByteArray(MAX_SIZE)
+        bb.flip()
+        bb.get(ret, 0, pos)
+
+        return ret
+    }
+
+    companion object {
+
+        fun parse(payload: ByteArray): FirstBlePacket {
+            payload.assertSizeAtLeast(HEADER_SIZE_WITH_MIDDLE_PACKETS, 0)
+
+            if (payload[0].toInt() != 0) {
+                // most likely we lost the first packet.
+                throw IncorrectPacketException(payload, 0)
+            }
+            val fullFragments = payload[1].toInt()
+            require(fullFragments < MAX_FRAGMENTS) { "Received more than $MAX_FRAGMENTS fragments" }
+
+            payload.assertSizeAtLeast(HEADER_SIZE_WITHOUT_MIDDLE_PACKETS, 0)
+
+            return when {
+
+                fullFragments == 0 -> {
+                    val rest = payload[6]
+                    val end = Integer.min(rest + HEADER_SIZE_WITHOUT_MIDDLE_PACKETS, payload.size)
+                    payload.assertSizeAtLeast(end, 0)
+                    FirstBlePacket(
+                        fullFragments = fullFragments,
+                        payload = payload.copyOfRange(HEADER_SIZE_WITHOUT_MIDDLE_PACKETS, end),
+                        crc32 = ByteBuffer.wrap(payload.copyOfRange(2, 6)).int.toUnsignedLong(),
+                        size = rest,
+                        oneExtraPacket = rest + HEADER_SIZE_WITHOUT_MIDDLE_PACKETS > end
+                    )
+                }
+
+                // With middle packets
+                payload.size < MAX_SIZE ->
+                    throw IncorrectPacketException(payload, 0)
+
+                else -> {
+                    FirstBlePacket(
+                        fullFragments = fullFragments,
+                        payload = payload.copyOfRange(HEADER_SIZE_WITH_MIDDLE_PACKETS, MAX_SIZE)
+                    )
+                }
+            }
+        }
+
+        private const val HEADER_SIZE_WITHOUT_MIDDLE_PACKETS = 7 // we are using all fields
+        private const val HEADER_SIZE_WITH_MIDDLE_PACKETS = 2
+
+        internal const val CAPACITY_WITHOUT_MIDDLE_PACKETS =
+            MAX_SIZE - HEADER_SIZE_WITHOUT_MIDDLE_PACKETS // we are using all fields
+        internal const val CAPACITY_WITH_MIDDLE_PACKETS =
+            MAX_SIZE - HEADER_SIZE_WITH_MIDDLE_PACKETS // we are not using crc32 or size
+        internal const val CAPACITY_WITH_THE_OPTIONAL_PLUS_ONE_PACKET = 18
+
+        private const val MAX_FRAGMENTS = 15 // 15*20=300 bytes
+    }
+}
+
+data class MiddleBlePacket(val index: Byte, override val payload: ByteArray) : BlePacket() {
+
+    override fun toByteArray(): ByteArray {
+        return byteArrayOf(index) + payload
+    }
+
+    companion object {
+
+        fun parse(payload: ByteArray): MiddleBlePacket {
+            payload.assertSizeAtLeast(MAX_SIZE)
+            return MiddleBlePacket(
+                index = payload[0],
+                payload.copyOfRange(1, MAX_SIZE)
+            )
+        }
+
+        internal const val CAPACITY = 19
+    }
+}
+
+data class LastBlePacket(
+    val index: Byte,
+    val size: Byte,
+    override val payload: ByteArray,
+    val crc32: Long,
+    val oneExtraPacket: Boolean = false
+) : BlePacket() {
+
+    override fun toByteArray(): ByteArray {
+        val bb = ByteBuffer
+            .allocate(MAX_SIZE)
+            .put(index)
+            .put(size)
+            .putInt(crc32.toInt())
+            .put(payload)
+        val pos = bb.position()
+        val ret = ByteArray(MAX_SIZE)
+        bb.flip()
+        bb.get(ret, 0, pos)
+        return ret
+    }
+
+    companion object {
+
+        fun parse(payload: ByteArray): LastBlePacket {
+            payload.assertSizeAtLeast(HEADER_SIZE)
+
+            val rest = payload[1]
+            val end = Integer.min(rest + HEADER_SIZE, payload.size)
+
+            payload.assertSizeAtLeast(end)
+
+            return LastBlePacket(
+                index = payload[0],
+                crc32 = ByteBuffer.wrap(payload.copyOfRange(2, 6)).int.toUnsignedLong(),
+                oneExtraPacket = rest + HEADER_SIZE > end,
+                size = rest,
+                payload = payload.copyOfRange(HEADER_SIZE, end)
+            )
+        }
+
+        private const val HEADER_SIZE = 6
+        internal const val CAPACITY = MAX_SIZE - HEADER_SIZE
+    }
+}
+
+data class LastOptionalPlusOneBlePacket(
+    val index: Byte,
+    override val payload: ByteArray,
+    val size: Byte
+) : BlePacket() {
+
+    override fun toByteArray(): ByteArray {
+        return byteArrayOf(index, size) + payload + ByteArray(MAX_SIZE - payload.size - 2)
+    }
+
+    companion object {
+
+        fun parse(payload: ByteArray): LastOptionalPlusOneBlePacket {
+            payload.assertSizeAtLeast(2)
+            val size = payload[1].toInt()
+            payload.assertSizeAtLeast(HEADER_SIZE + size)
+
+            return LastOptionalPlusOneBlePacket(
+                index = payload[0],
+                payload = payload.copyOfRange(
+                    HEADER_SIZE,
+                    HEADER_SIZE + size
+                ),
+                size = size.toByte(),
+            )
+        }
+
+        private const val HEADER_SIZE = 2
+    }
+}
+
+private fun ByteArray.assertSizeAtLeast(size: Int, index: Byte? = null) {
+    if (this.size < size) {
+        throw IncorrectPacketException(this, index)
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/PayloadJoiner.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/PayloadJoiner.kt
new file mode 100644
index 0000000000..766a19cf5e
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/PayloadJoiner.kt
@@ -0,0 +1,69 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.CrcMismatchException
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.IncorrectPacketException
+import java.nio.ByteBuffer
+import java.util.*
+
+class PayloadJoiner(private val firstPacket: ByteArray) {
+
+    var oneExtraPacket: Boolean
+    val fullFragments: Int
+    var crc: Long = 0
+    private var expectedIndex = 0
+    private val fragments: MutableList<BlePacket> = LinkedList<BlePacket>()
+
+    init {
+        val firstPacket = FirstBlePacket.parse(firstPacket)
+        fragments.add(firstPacket)
+        fullFragments = firstPacket.fullFragments
+        crc = firstPacket.crc32 ?: 0
+        oneExtraPacket = firstPacket.oneExtraPacket
+    }
+
+    fun accumulate(packet: ByteArray) {
+        if (packet.size < 3) { // idx, size, at least 1 byte of payload
+            throw IncorrectPacketException(packet, (expectedIndex + 1).toByte())
+        }
+        val idx = packet[0].toInt()
+        if (idx != expectedIndex + 1) {
+            throw IncorrectPacketException(packet, (expectedIndex + 1).toByte())
+        }
+        expectedIndex++
+        when {
+            idx < fullFragments -> {
+                fragments.add(MiddleBlePacket.parse(packet))
+            }
+
+            idx == fullFragments -> {
+                val lastPacket = LastBlePacket.parse(packet)
+                fragments.add(lastPacket)
+                crc = lastPacket.crc32
+                oneExtraPacket = lastPacket.oneExtraPacket
+            }
+
+            idx == fullFragments + 1 && oneExtraPacket -> {
+                fragments.add(LastOptionalPlusOneBlePacket.parse(packet))
+            }
+
+            idx > fullFragments -> {
+                throw IncorrectPacketException(packet, idx.toByte())
+            }
+        }
+    }
+
+    fun finalize(): ByteArray {
+        val payloads = fragments.map { x -> x.payload }
+        val totalLen = payloads.fold(0, { acc, elem -> acc + elem.size })
+        val bb = ByteBuffer.allocate(totalLen)
+        payloads.map { p -> bb.put(p) }
+        bb.flip()
+        val bytes = bb.array()
+        if (bytes.crc32() != crc) {
+            throw CrcMismatchException(bytes.crc32(), crc, bytes)
+        }
+        return bytes.copyOfRange(0, bytes.size)
+    }
+}
+
+internal fun Int.toUnsignedLong() = this.toLong() and 0xffffffffL
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/PayloadSplitter.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/PayloadSplitter.kt
new file mode 100644
index 0000000000..148202d8d9
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/packet/PayloadSplitter.kt
@@ -0,0 +1,96 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet
+
+import java.lang.Integer.min
+import java.util.zip.CRC32
+
+internal class PayloadSplitter(private val payload: ByteArray) {
+
+    fun splitInPackets(): List<BlePacket> {
+        if (payload.size <= FirstBlePacket.CAPACITY_WITH_THE_OPTIONAL_PLUS_ONE_PACKET) {
+            return splitInOnePacket()
+        }
+        val ret = ArrayList<BlePacket>()
+        val crc32 = payload.crc32()
+        val middleFragments = (payload.size - FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS) / MiddleBlePacket.CAPACITY
+        val rest =
+            (
+                (payload.size - middleFragments * MiddleBlePacket.CAPACITY) -
+                    FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS
+                ).toByte()
+        ret.add(
+            FirstBlePacket(
+                fullFragments = middleFragments + 1,
+                payload = payload.copyOfRange(0, FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS)
+            )
+        )
+        for (i in 1..middleFragments) {
+            val p = payload.copyOfRange(
+                FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + (i - 1) * MiddleBlePacket.CAPACITY,
+                FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + i * MiddleBlePacket.CAPACITY
+            )
+            ret.add(
+                MiddleBlePacket(
+                    index = i.toByte(),
+                    payload = p
+                )
+            )
+        }
+        val end = min(LastBlePacket.CAPACITY, rest.toInt())
+        ret.add(
+            LastBlePacket(
+                index = (middleFragments + 1).toByte(),
+                size = rest,
+                payload = payload.copyOfRange(
+                    middleFragments * MiddleBlePacket.CAPACITY + FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS,
+                    middleFragments * MiddleBlePacket.CAPACITY + FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS + end
+                ),
+                crc32 = crc32
+            )
+        )
+        if (rest > LastBlePacket.CAPACITY) {
+            ret.add(
+                LastOptionalPlusOneBlePacket(
+                    index = (middleFragments + 2).toByte(),
+                    size = (rest - LastBlePacket.CAPACITY).toByte(),
+                    payload = payload.copyOfRange(
+                        middleFragments * MiddleBlePacket.CAPACITY +
+                            FirstBlePacket.CAPACITY_WITH_MIDDLE_PACKETS +
+                            LastBlePacket.CAPACITY,
+                        payload.size
+                    )
+                )
+            )
+        }
+        return ret
+    }
+
+    private fun splitInOnePacket(): List<BlePacket> {
+        val ret = ArrayList<BlePacket>()
+        val crc32 = payload.crc32()
+        val end = min(FirstBlePacket.CAPACITY_WITHOUT_MIDDLE_PACKETS, payload.size)
+        ret.add(
+            FirstBlePacket(
+                fullFragments = 0,
+                payload = payload.copyOfRange(0, end),
+                size = payload.size.toByte(),
+                crc32 = crc32
+            )
+        )
+        if (payload.size > FirstBlePacket.CAPACITY_WITHOUT_MIDDLE_PACKETS) {
+            ret.add(
+                LastOptionalPlusOneBlePacket(
+                    index = 1,
+                    payload = payload.copyOfRange(end, payload.size),
+                    size = (payload.size - end).toByte()
+                )
+            )
+        }
+        return ret
+    }
+}
+
+internal fun ByteArray.crc32(): Long {
+    val crc = CRC32()
+    crc.update(this)
+    return crc.value
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt
new file mode 100644
index 0000000000..28071a06fe
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchange.kt
@@ -0,0 +1,124 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair
+
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.BuildConfig
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.MessageIOException
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.RandomByteGenerator
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.X25519KeyGenerator
+import org.spongycastle.crypto.engines.AESEngine
+import org.spongycastle.crypto.macs.CMac
+import org.spongycastle.crypto.params.KeyParameter
+
+class KeyExchange(
+    private val aapsLogger: AAPSLogger,
+    private val x25519: X25519KeyGenerator,
+    randomByteGenerator: RandomByteGenerator
+) {
+
+    val pdmNonce: ByteArray = randomByteGenerator.nextBytes(NONCE_SIZE)
+    val pdmPrivate: ByteArray = x25519.generatePrivateKey()
+    val pdmPublic = x25519.publicFromPrivate(pdmPrivate)
+
+    var podPublic = ByteArray(PUBLIC_KEY_SIZE)
+        private set
+    var podNonce: ByteArray = ByteArray(NONCE_SIZE)
+
+    val podConf = ByteArray(CMAC_SIZE)
+    val pdmConf = ByteArray(CMAC_SIZE)
+
+    var ltk = ByteArray(CMAC_SIZE)
+
+    fun updatePodPublicData(payload: ByteArray) {
+        if (payload.size != PUBLIC_KEY_SIZE + NONCE_SIZE) {
+            throw MessageIOException("Invalid payload size")
+        }
+        podPublic = payload.copyOfRange(0, PUBLIC_KEY_SIZE)
+        podNonce = payload.copyOfRange(PUBLIC_KEY_SIZE, PUBLIC_KEY_SIZE + NONCE_SIZE)
+        generateKeys()
+    }
+
+    fun validatePodConf(payload: ByteArray) {
+        if (!podConf.contentEquals(payload)) {
+            aapsLogger.warn(
+                LTag.PUMPBTCOMM,
+                "Received invalid podConf. Expected: ${podConf.toHex()}. Got: ${payload.toHex()}"
+            )
+            throw MessageIOException("Invalid podConf value received")
+        }
+    }
+
+    private fun generateKeys() {
+        val curveLTK = x25519.computeSharedSecret(pdmPrivate, podPublic)
+
+        val firstKey = podPublic.copyOfRange(podPublic.size - 4, podPublic.size) +
+            pdmPublic.copyOfRange(pdmPublic.size - 4, pdmPublic.size) +
+            podNonce.copyOfRange(podNonce.size - 4, podNonce.size) +
+            pdmNonce.copyOfRange(pdmNonce.size - 4, pdmNonce.size)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "First key for LTK: ${firstKey.toHex()}")
+
+        val intermediateKey = ByteArray(CMAC_SIZE)
+        aesCmac(firstKey, curveLTK, intermediateKey)
+
+        val ltkData = byteArrayOf(2.toByte()) +
+            INTERMEDIARY_KEY_MAGIC_STRING +
+            podNonce +
+            pdmNonce +
+            byteArrayOf(0.toByte(), 1.toByte())
+        aesCmac(intermediateKey, ltkData, ltk)
+
+        val confData = byteArrayOf(1.toByte()) +
+            INTERMEDIARY_KEY_MAGIC_STRING +
+            podNonce +
+            pdmNonce +
+            byteArrayOf(0.toByte(), 1.toByte())
+        val confKey = ByteArray(CMAC_SIZE)
+        aesCmac(intermediateKey, confData, confKey)
+
+        val pdmConfData = PDM_CONF_MAGIC_PREFIX +
+            pdmNonce +
+            podNonce
+        aesCmac(confKey, pdmConfData, pdmConf)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "pdmConf: ${pdmConf.toHex()}")
+
+        val podConfData = POD_CONF_MAGIC_PREFIX +
+            podNonce +
+            pdmNonce
+        aesCmac(confKey, podConfData, podConf)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "podConf: ${podConf.toHex()}")
+
+        if (BuildConfig.DEBUG) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "pdmPrivate: ${pdmPrivate.toHex()}")
+            aapsLogger.debug(LTag.PUMPBTCOMM, "pdmPublic: ${pdmPublic.toHex()}")
+            aapsLogger.debug(LTag.PUMPBTCOMM, "podPublic: ${podPublic.toHex()}")
+            aapsLogger.debug(LTag.PUMPBTCOMM, "pdmNonce: ${pdmNonce.toHex()}")
+            aapsLogger.debug(LTag.PUMPBTCOMM, "podNonce: ${podNonce.toHex()}")
+
+            aapsLogger.debug(LTag.PUMPBTCOMM, "LTK, donna key: ${curveLTK.toHex()}")
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Intermediate key: ${intermediateKey.toHex()}")
+            aapsLogger.debug(LTag.PUMPBTCOMM, "LTK: ${ltk.toHex()}")
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Conf KEY: ${confKey.toHex()}")
+        }
+    }
+
+    companion object {
+
+        private const val PUBLIC_KEY_SIZE = 32
+        private const val NONCE_SIZE = 16
+
+        const val CMAC_SIZE = 16
+
+        private val INTERMEDIARY_KEY_MAGIC_STRING = "TWIt".toByteArray()
+        private val PDM_CONF_MAGIC_PREFIX = "KC_2_U".toByteArray()
+        private val POD_CONF_MAGIC_PREFIX = "KC_2_V".toByteArray()
+    }
+}
+
+private fun aesCmac(key: ByteArray, data: ByteArray, result: ByteArray) {
+    val aesEngine = AESEngine()
+    val mac = CMac(aesEngine)
+    mac.init(KeyParameter(key))
+    mac.update(data, 0, data.size)
+    mac.doFinal(result, 0)
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt
new file mode 100644
index 0000000000..543d3a0d7c
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt
@@ -0,0 +1,146 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair
+
+import info.nightscout.androidaps.extensions.hexStringToByteArray
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Ids
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.MessageIOException
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.PairingException
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessageIO
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessagePacket
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessageSendSuccess
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.StringLengthPrefixEncoding.Companion.parseKeys
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.RandomByteGenerator
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.X25519KeyGenerator
+
+internal class LTKExchanger(
+    private val aapsLogger: AAPSLogger,
+    private val msgIO: MessageIO,
+    private val ids: Ids,
+) {
+    private val podAddress = Ids.notActivated()
+    private val keyExchange = KeyExchange(aapsLogger, X25519KeyGenerator(), RandomByteGenerator())
+    private var seq: Byte = 1
+
+    @Throws(PairingException::class)
+    fun negotiateLTK(): PairResult {
+        val sp1sp2 = PairMessage(
+            sequenceNumber = seq,
+            source = ids.myId,
+            destination = podAddress,
+            keys = arrayOf(SP1, SP2),
+            payloads = arrayOf(ids.podId.address, sp2())
+        )
+        throwOnSendError(sp1sp2.messagePacket, SP1 + SP2)
+
+        seq++
+        val sps1 = PairMessage(
+            sequenceNumber = seq,
+            source = ids.myId,
+            destination = podAddress,
+            keys = arrayOf(SPS1),
+            payloads = arrayOf(keyExchange.pdmPublic + keyExchange.pdmNonce)
+        )
+        throwOnSendError(sps1.messagePacket, SPS1)
+
+        val podSps1 = msgIO.receiveMessage() ?: throw PairingException("Could not read SPS1")
+        processSps1FromPod(podSps1)
+        // now we have all the data to generate: confPod, confPdm, ltk and noncePrefix
+
+        seq++
+        val sps2 = PairMessage(
+            sequenceNumber = seq,
+            source = ids.myId,
+            destination = podAddress,
+            keys = arrayOf(SPS2),
+            payloads = arrayOf(keyExchange.pdmConf)
+        )
+        throwOnSendError(sps2.messagePacket, SPS2)
+
+        val podSps2 = msgIO.receiveMessage() ?: throw PairingException("Could not read SPS2")
+        validatePodSps2(podSps2)
+        // No exception throwing after this point. It is possible that the pod saved the LTK
+
+        seq++
+        // send SP0GP0
+        val sp0gp0 = PairMessage(
+            sequenceNumber = seq,
+            source = ids.myId,
+            destination = podAddress,
+            keys = arrayOf(SP0GP0),
+            payloads = arrayOf(ByteArray(0))
+        )
+        val result = msgIO.sendMessage(sp0gp0.messagePacket)
+        if (result !is MessageSendSuccess) {
+            aapsLogger.warn(LTag.PUMPBTCOMM, "Error sending SP0GP0: $result")
+        }
+
+        msgIO.receiveMessage()
+            ?.let { validateP0(it) }
+            ?: aapsLogger.warn(LTag.PUMPBTCOMM, "Could not read P0")
+
+        return PairResult(
+            ltk = keyExchange.ltk,
+            msgSeq = seq
+        )
+    }
+
+    @Throws(PairingException::class)
+    private fun throwOnSendError(msg: MessagePacket, msgType: String) {
+        val result = msgIO.sendMessage(msg)
+        if (result !is MessageSendSuccess) {
+            throw PairingException("Could not send or confirm $msgType: $result")
+        }
+    }
+
+    private fun processSps1FromPod(msg: MessagePacket) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Received SPS1 from pod: ${msg.payload.toHex()}")
+
+        val payload = parseKeys(arrayOf(SPS1), msg.payload)[0]
+        keyExchange.updatePodPublicData(payload)
+    }
+
+    private fun validatePodSps2(msg: MessagePacket) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Received SPS2 from pod: ${msg.payload.toHex()}")
+
+        val payload = parseKeys(arrayOf(SPS2), msg.payload)[0]
+        aapsLogger.debug(LTag.PUMPBTCOMM, "SPS2 payload from pod: ${payload.toHex()}")
+
+        if (payload.size != KeyExchange.CMAC_SIZE) {
+            throw MessageIOException("Invalid payload size")
+        }
+        keyExchange.validatePodConf(payload)
+    }
+
+    private fun sp2(): ByteArray {
+        // This is GetPodStatus command, with page 0 parameter.
+        // We could replace that in the future with the serialized GetPodStatus()
+        return GET_POD_STATUS_HEX_COMMAND.hexStringToByteArray()
+    }
+
+    private fun validateP0(msg: MessagePacket) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Received P0 from pod: ${msg.payload.toHex()}")
+
+        val payload = parseKeys(arrayOf(P0), msg.payload)[0]
+        aapsLogger.debug(LTag.PUMPBTCOMM, "P0 payload from pod: ${payload.toHex()}")
+        if (!payload.contentEquals(UNKNOWN_P0_PAYLOAD)) {
+            aapsLogger.warn(LTag.PUMPBTCOMM, "Received invalid P0 payload: ${payload.toHex()}")
+        }
+    }
+
+    companion object {
+
+        private const val GET_POD_STATUS_HEX_COMMAND =
+            "ffc32dbd08030e0100008a"
+        // This is the binary representation of "GetPodStatus command"
+
+        private const val SP1 = "SP1="
+        private const val SP2 = ",SP2="
+        private const val SPS1 = "SPS1="
+        private const val SPS2 = "SPS2="
+        private const val SP0GP0 = "SP0,GP0"
+        private const val P0 = "P0="
+        private val UNKNOWN_P0_PAYLOAD = byteArrayOf(0xa5.toByte())
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairMessage.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairMessage.kt
new file mode 100644
index 0000000000..864cd2777a
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairMessage.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Id
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessagePacket
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessageType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.StringLengthPrefixEncoding
+
+data class PairMessage(
+    val sequenceNumber: Byte,
+    val source: Id,
+    val destination: Id,
+    private val keys: Array<String>,
+    private val payloads: Array<ByteArray>,
+    val messagePacket: MessagePacket = MessagePacket(
+        type = MessageType.PAIRING,
+        source = source,
+        destination = destination,
+        payload = StringLengthPrefixEncoding.formatKeys(
+            keys,
+            payloads,
+        ),
+        sequenceNumber = sequenceNumber,
+        sas = true // TODO: understand why this is true for PairMessages
+    )
+)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairResult.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairResult.kt
new file mode 100644
index 0000000000..135a7820b9
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/PairResult.kt
@@ -0,0 +1,9 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair
+
+import info.nightscout.androidaps.extensions.toHex
+
+data class PairResult(val ltk: ByteArray, val msgSeq: Byte) {
+    init {
+        require(ltk.size == 16) { "LTK length must be 16 bytes. Received LTK: ${ltk.toHex()}" }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/BleDiscoveredDevice.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/BleDiscoveredDevice.kt
new file mode 100644
index 0000000000..07a207dad5
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/BleDiscoveredDevice.kt
@@ -0,0 +1,90 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.scan
+
+import android.bluetooth.le.ScanRecord
+import android.bluetooth.le.ScanResult
+import android.os.ParcelUuid
+
+class BleDiscoveredDevice(val scanResult: ScanResult, private val scanRecord: ScanRecord, private val podId: Long) {
+
+    private val sequenceNo: Int
+    private val lotNo: Long
+
+    @Throws(DiscoveredInvalidPodException::class)
+    private fun validateServiceUUIDs() {
+        val serviceUuids = scanRecord.serviceUuids
+        if (serviceUuids.size != 9) {
+            throw DiscoveredInvalidPodException("Expected 9 service UUIDs, got" + serviceUuids.size, serviceUuids)
+        }
+        if (extractUUID16(serviceUuids[0]) != MAIN_SERVICE_UUID) {
+            // this is the service that we filtered for
+            throw DiscoveredInvalidPodException(
+                "The first exposed service UUID should be 4024, got " + extractUUID16(
+                    serviceUuids[0]
+                ),
+                serviceUuids
+            )
+        }
+        // TODO understand what is serviceUUIDs[1]. 0x2470. Alarms?
+        if (extractUUID16(serviceUuids[2]) != UNKNOWN_THIRD_SERVICE_UUID) {
+            // constant?
+            throw DiscoveredInvalidPodException(
+                "The third exposed service UUID should be 000a, got " + serviceUuids[2],
+                serviceUuids
+            )
+        }
+    }
+
+    @Throws(DiscoveredInvalidPodException::class)
+    private fun validatePodId() {
+        val serviceUUIDs = scanRecord.serviceUuids
+        val hexPodId = extractUUID16(serviceUUIDs[3]) + extractUUID16(serviceUUIDs[4])
+        val podId = hexPodId.toLong(16)
+        if (this.podId != podId) {
+            throw DiscoveredInvalidPodException(
+                "This is not the POD we are looking for: ${this.podId} . Found: $podId/$hexPodId",
+                serviceUUIDs
+            )
+        }
+    }
+
+    private fun parseLotNo(): Long {
+        val serviceUUIDs = scanRecord.serviceUuids
+        val lotSeq = extractUUID16(serviceUUIDs[5]) +
+            extractUUID16(serviceUUIDs[6]) +
+            extractUUID16(serviceUUIDs[7])
+        return lotSeq.substring(0, 10).toLong(16)
+    }
+
+    private fun parseSeqNo(): Int {
+        val serviceUUIDs = scanRecord.serviceUuids
+        val lotSeq = extractUUID16(serviceUUIDs[7]) +
+            extractUUID16(serviceUUIDs[8])
+        return lotSeq.substring(2).toInt(16)
+    }
+
+    override fun toString(): String {
+        return "BleDiscoveredDevice{" +
+            "scanRecord=" + scanRecord +
+            ", podID=" + podId +
+            "scanResult=" + scanResult +
+            ", sequenceNo=" + sequenceNo +
+            ", lotNo=" + lotNo +
+            '}'
+    }
+
+    companion object {
+
+        const val MAIN_SERVICE_UUID = "4024"
+        const val UNKNOWN_THIRD_SERVICE_UUID = "000a" // FIXME: why is this 000a?
+        private fun extractUUID16(uuid: ParcelUuid): String {
+            return uuid.toString().substring(4, 8)
+        }
+    }
+
+    init {
+        validateServiceUUIDs()
+        validatePodId()
+        lotNo = parseLotNo()
+        sequenceNo = parseSeqNo()
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/DiscoveredInvalidPodException.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/DiscoveredInvalidPodException.kt
new file mode 100644
index 0000000000..54cf638c69
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/DiscoveredInvalidPodException.kt
@@ -0,0 +1,6 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.scan
+
+import android.os.ParcelUuid
+
+class DiscoveredInvalidPodException(message: String, serviceUUIds: List<ParcelUuid?>) :
+    Exception("$message service UUIDs: $serviceUUIds")
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt
new file mode 100644
index 0000000000..bbb8d720ab
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/PodScanner.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.scan
+
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.le.ScanFilter
+import android.bluetooth.le.ScanSettings
+import android.os.ParcelUuid
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ScanException
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ScanFailFoundTooManyException
+import java.util.*
+
+class PodScanner(private val logger: AAPSLogger, private val bluetoothAdapter: BluetoothAdapter) {
+
+    @Throws(InterruptedException::class, ScanException::class)
+    fun scanForPod(serviceUUID: String?, podID: Long): BleDiscoveredDevice {
+        val scanner = bluetoothAdapter.bluetoothLeScanner
+        val filter = ScanFilter.Builder()
+            .setServiceUuid(ParcelUuid.fromString(serviceUUID))
+            .build()
+        val scanSettings = ScanSettings.Builder()
+            .setLegacy(false)
+            .setCallbackType(ScanSettings.CALLBACK_TYPE_ALL_MATCHES)
+            .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY)
+            .build()
+        val scanCollector = ScanCollector(logger, podID)
+        logger.debug(LTag.PUMPBTCOMM, "Scanning with filters: $filter settings$scanSettings")
+        scanner.startScan(Arrays.asList(filter), scanSettings, scanCollector)
+        Thread.sleep(SCAN_DURATION_MS.toLong())
+        scanner.flushPendingScanResults(scanCollector)
+        scanner.stopScan(scanCollector)
+        val collected = scanCollector.collect()
+        if (collected.isEmpty()) {
+            throw ScanException("Not found")
+        } else if (collected.size > 1) {
+            throw ScanFailFoundTooManyException(collected)
+        }
+        return collected[0]
+    }
+
+    companion object {
+
+        const val SCAN_FOR_SERVICE_UUID = "00004024-0000-1000-8000-00805F9B34FB"
+        const val POD_ID_NOT_ACTIVATED = 0xFFFFFFFEL
+        private const val SCAN_DURATION_MS = 5000
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt
new file mode 100644
index 0000000000..a6acdb4f40
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.scan
+
+import android.bluetooth.le.ScanCallback
+import android.bluetooth.le.ScanResult
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ScanException
+import java.util.*
+import java.util.concurrent.ConcurrentHashMap
+
+class ScanCollector(private val logger: AAPSLogger, private val podID: Long) : ScanCallback() {
+
+    // there could be different threads calling the onScanResult callback
+    private val found: ConcurrentHashMap<String, ScanResult> = ConcurrentHashMap()
+    private var scanFailed = 0
+    override fun onScanResult(callbackType: Int, result: ScanResult) {
+        // callbackType will be ALL
+        logger.debug(LTag.PUMPBTCOMM, "Scan found: $result")
+        found[result.device.address] = result
+    }
+
+    override fun onScanFailed(errorCode: Int) {
+        logger.warn(LTag.PUMPBTCOMM, "Scan failed with errorCode: $errorCode")
+        super.onScanFailed(errorCode)
+    }
+
+    @Throws(ScanException::class) fun collect(): List<BleDiscoveredDevice> {
+        val ret: MutableList<BleDiscoveredDevice> = ArrayList()
+        if (scanFailed != 0) {
+            throw ScanException(scanFailed)
+        }
+        logger.debug(LTag.PUMPBTCOMM, "ScanCollector looking for podID: $podID")
+        for (result in found.values) {
+            try {
+                result.scanRecord?.let {
+                    val device = BleDiscoveredDevice(result, it, podID)
+                    ret.add(device)
+                    logger.debug(LTag.PUMPBTCOMM, "ScanCollector found: " + result.toString() + "Pod ID: " + podID)
+                }
+            } catch (e: DiscoveredInvalidPodException) {
+                logger.debug(LTag.PUMPBTCOMM, "ScanCollector: pod not matching$e")
+                // this is not the POD we are looking for
+            }
+        }
+        return Collections.unmodifiableList(ret)
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt
new file mode 100644
index 0000000000..c2e1a848b4
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Connection.kt
@@ -0,0 +1,201 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
+
+import android.bluetooth.BluetoothDevice
+import android.bluetooth.BluetoothGatt
+import android.bluetooth.BluetoothManager
+import android.bluetooth.BluetoothProfile
+import android.content.Context
+import android.os.SystemClock
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.BuildConfig
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Ids
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.ServiceDiscoverer
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecrypt.EnDecrypt
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ConnectException
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.FailedToConnectException
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.CharacteristicType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.CmdBleIO
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.DataBleIO
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.IncomingPackets
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessageIO
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
+import java.lang.IllegalArgumentException
+import java.util.concurrent.CountDownLatch
+
+sealed class ConnectionState
+
+object Connecting : ConnectionState()
+object Connected : ConnectionState()
+object NotConnected : ConnectionState()
+
+data class ConnectionWaitCondition(var timeoutMs: Long? = null, val stopConnection: CountDownLatch? = null) {
+    init {
+        if (timeoutMs == null && stopConnection == null) {
+            throw IllegalArgumentException("One of timeoutMs or stopConnection has to be non null")
+        }
+        if (timeoutMs != null && stopConnection != null) {
+            throw IllegalArgumentException("One of timeoutMs or stopConnection has to be null")
+        }
+    }
+}
+
+class Connection(
+    private val podDevice: BluetoothDevice,
+    private val aapsLogger: AAPSLogger,
+    private val context: Context,
+    private val podState: OmnipodDashPodStateManager
+) : DisconnectHandler {
+
+    private val incomingPackets = IncomingPackets()
+    private val bleCommCallbacks = BleCommCallbacks(aapsLogger, incomingPackets, this)
+    private var gattConnection: BluetoothGatt? = null
+
+    private val bluetoothManager: BluetoothManager =
+        context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
+
+    @Volatile
+    var session: Session? = null
+
+    @Volatile
+    var msgIO: MessageIO? = null
+
+    fun connect(connectionWaitCond: ConnectionWaitCondition) {
+        aapsLogger.debug("Connecting connectionWaitCond=$connectionWaitCond")
+        podState.connectionAttempts++
+        podState.bluetoothConnectionState = OmnipodDashPodStateManager.BluetoothConnectionState.CONNECTING
+        val autoConnect = false
+        val gatt = gattConnection
+            ?: podDevice.connectGatt(context, autoConnect, bleCommCallbacks, BluetoothDevice.TRANSPORT_LE)
+        gattConnection = gatt
+        if (!gatt.connect()) {
+            throw FailedToConnectException("connect() returned false")
+        }
+        val before = SystemClock.elapsedRealtime()
+        if (waitForConnection(connectionWaitCond) !is Connected) {
+            podState.bluetoothConnectionState = OmnipodDashPodStateManager.BluetoothConnectionState.DISCONNECTED
+            throw FailedToConnectException(podDevice.address)
+        }
+        val waitedMs = SystemClock.elapsedRealtime() - before
+        val timeoutMs = connectionWaitCond.timeoutMs
+        if (timeoutMs != null) {
+            var newTimeout = timeoutMs - waitedMs
+            if (newTimeout < MIN_DISCOVERY_TIMEOUT_MS) {
+                newTimeout = MIN_DISCOVERY_TIMEOUT_MS
+            }
+            connectionWaitCond.timeoutMs = newTimeout
+        }
+        podState.bluetoothConnectionState = OmnipodDashPodStateManager.BluetoothConnectionState.CONNECTED
+
+        val discoverer = ServiceDiscoverer(aapsLogger, gatt, bleCommCallbacks, this)
+        val discovered = discoverer.discoverServices(connectionWaitCond)
+        val cmdBleIO = CmdBleIO(
+            aapsLogger,
+            discovered[CharacteristicType.CMD]!!,
+            incomingPackets
+                .cmdQueue,
+            gatt,
+            bleCommCallbacks
+        )
+        val dataBleIO = DataBleIO(
+            aapsLogger,
+            discovered[CharacteristicType.DATA]!!,
+            incomingPackets
+                .dataQueue,
+            gatt,
+            bleCommCallbacks
+        )
+        msgIO = MessageIO(aapsLogger, cmdBleIO, dataBleIO)
+        //  val ret = gattConnection.requestConnectionPriority(BluetoothGatt.CONNECTION_PRIORITY_HIGH)
+        // aapsLogger.info(LTag.PUMPBTCOMM, "requestConnectionPriority: $ret")
+        cmdBleIO.hello()
+        cmdBleIO.readyToRead()
+        dataBleIO.readyToRead()
+    }
+
+    fun disconnect(closeGatt: Boolean) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Disconnecting closeGatt=$closeGatt")
+        podState.bluetoothConnectionState = OmnipodDashPodStateManager.BluetoothConnectionState.DISCONNECTED
+        if (closeGatt) {
+            gattConnection?.close()
+            gattConnection = null
+        } else {
+            gattConnection?.disconnect()
+        }
+        bleCommCallbacks.resetConnection()
+        session = null
+        msgIO = null
+    }
+
+    private fun waitForConnection(connectionWaitCond: ConnectionWaitCondition): ConnectionState {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "waitForConnection connectionWaitCond=$connectionWaitCond")
+        try {
+            connectionWaitCond.timeoutMs?.let {
+                bleCommCallbacks.waitForConnection(it)
+            }
+            connectionWaitCond.stopConnection?.let {
+                while (!bleCommCallbacks.waitForConnection(STOP_CONNECTING_CHECK_INTERVAL_MS)) {
+                    if (it.count == 0L) {
+                        throw ConnectException("stopConnecting called")
+                    }
+                }
+            }
+        } catch (e: InterruptedException) {
+            // We are still going to check if connection was successful
+            aapsLogger.info(LTag.PUMPBTCOMM, "Interrupted while waiting for connection")
+        }
+        return connectionState()
+    }
+
+    fun connectionState(): ConnectionState {
+        val connectionState = bluetoothManager.getConnectionState(podDevice, BluetoothProfile.GATT)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "GATT connection state: $connectionState")
+        if (connectionState != BluetoothProfile.STATE_CONNECTED) {
+            return NotConnected
+        }
+        return Connected
+    }
+
+    fun establishSession(ltk: ByteArray, msgSeq: Byte, ids: Ids, eapSqn: ByteArray): EapSqn? {
+        val mIO = msgIO ?: throw ConnectException("Connection lost")
+
+        val eapAkaExchanger = SessionEstablisher(aapsLogger, mIO, ltk, eapSqn, ids, msgSeq)
+        return when (val keys = eapAkaExchanger.negotiateSessionKeys()) {
+            is SessionNegotiationResynchronization -> {
+                if (BuildConfig.DEBUG) {
+                    aapsLogger.info(LTag.PUMPCOMM, "EAP AKA resynchronization: ${keys.synchronizedEapSqn}")
+                }
+                keys.synchronizedEapSqn
+            }
+
+            is SessionKeys -> {
+                if (BuildConfig.DEBUG) {
+                    aapsLogger.info(LTag.PUMPCOMM, "CK: ${keys.ck.toHex()}")
+                    aapsLogger.info(LTag.PUMPCOMM, "msgSequenceNumber: ${keys.msgSequenceNumber}")
+                    aapsLogger.info(LTag.PUMPCOMM, "Nonce: ${keys.nonce}")
+                }
+                val enDecrypt = EnDecrypt(
+                    aapsLogger,
+                    keys.nonce,
+                    keys.ck
+                )
+                session = Session(aapsLogger, mIO, ids, sessionKeys = keys, enDecrypt = enDecrypt)
+                null
+            }
+        }
+    }
+
+    // This will be called from a different thread !!!
+    override fun onConnectionLost(status: Int) {
+        aapsLogger.info(LTag.PUMPBTCOMM, "Lost connection with status: $status")
+        disconnect(false)
+    }
+
+    companion object {
+        const val BASE_CONNECT_TIMEOUT_MS = 10000L
+        const val MIN_DISCOVERY_TIMEOUT_MS = 10000L
+        const val STOP_CONNECTING_CHECK_INTERVAL_MS = 500L
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ConnectionStateChangeHandler.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ConnectionStateChangeHandler.kt
new file mode 100644
index 0000000000..8396850d70
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ConnectionStateChangeHandler.kt
@@ -0,0 +1,6 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
+
+interface ConnectionStateChangeHandler {
+
+    fun onConnectionStateChange(status: Int, newState: Int)
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/DisconnectHandler.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/DisconnectHandler.kt
new file mode 100644
index 0000000000..9b86447123
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/DisconnectHandler.kt
@@ -0,0 +1,6 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
+
+interface DisconnectHandler {
+
+    fun onConnectionLost(status: Int)
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapAkaAttribute.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapAkaAttribute.kt
new file mode 100644
index 0000000000..b81d5c1216
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapAkaAttribute.kt
@@ -0,0 +1,218 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
+
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.MessageIOException
+import java.util.*
+
+enum class EapAkaAttributeType(val type: Byte) {
+    AT_RAND(1),
+    AT_AUTN(2),
+    AT_RES(3),
+    AT_AUTS(4),
+    AT_CLIENT_ERROR_CODE(22),
+    AT_CUSTOM_IV(126);
+
+    companion object {
+
+        fun byValue(value: Byte): EapAkaAttributeType =
+            EapAkaAttributeType.values().firstOrNull { it.type == value }
+                ?: throw IllegalArgumentException("Unknown EAP-AKA attribute type: $value")
+    }
+}
+
+sealed class EapAkaAttribute {
+
+    abstract fun toByteArray(): ByteArray
+
+    companion object {
+
+        const val SIZE_MULTIPLIER = 4 // The length for EAP-AKA attributes is a multiple of 4
+
+        fun parseAttributes(payload: ByteArray): List<EapAkaAttribute> {
+            var tail = payload
+            val ret = LinkedList<EapAkaAttribute>()
+            while (tail.isNotEmpty()) {
+                if (tail.size < 2) {
+                    throw MessageIOException("Could not parse EAP attributes: ${payload.toHex()}")
+                }
+                val size = SIZE_MULTIPLIER * tail[1].toInt()
+                if (tail.size < size) {
+                    throw MessageIOException("Could not parse EAP attributes: ${payload.toHex()}")
+                }
+                val type = EapAkaAttributeType.byValue(tail[0])
+                when (type) {
+                    EapAkaAttributeType.AT_RES ->
+                        ret.add(EapAkaAttributeRes.parse(tail.copyOfRange(2, EapAkaAttributeRes.SIZE)))
+                    EapAkaAttributeType.AT_CUSTOM_IV ->
+                        ret.add(EapAkaAttributeCustomIV.parse(tail.copyOfRange(2, EapAkaAttributeCustomIV.SIZE)))
+                    EapAkaAttributeType.AT_AUTN ->
+                        ret.add(EapAkaAttributeAutn.parse(tail.copyOfRange(2, EapAkaAttributeAutn.SIZE)))
+                    EapAkaAttributeType.AT_AUTS ->
+                        ret.add(EapAkaAttributeAuts.parse(tail.copyOfRange(2, EapAkaAttributeAuts.SIZE)))
+                    EapAkaAttributeType.AT_RAND ->
+                        ret.add(EapAkaAttributeRand.parse(tail.copyOfRange(2, EapAkaAttributeRand.SIZE)))
+                    EapAkaAttributeType.AT_CLIENT_ERROR_CODE ->
+                        ret.add(
+                            EapAkaAttributeClientErrorCode.parse(
+                                tail.copyOfRange(
+                                    2,
+                                    EapAkaAttributeClientErrorCode.SIZE
+                                )
+                            )
+                        )
+                }
+                tail = tail.copyOfRange(size, tail.size)
+            }
+            return ret
+        }
+    }
+}
+
+data class EapAkaAttributeRand(val payload: ByteArray) : EapAkaAttribute() {
+
+    init {
+        require(payload.size == 16) { "AT_RAND payload size has to be 16 bytes. Payload: ${payload.toHex()}" }
+    }
+
+    override fun toByteArray(): ByteArray {
+        return byteArrayOf(EapAkaAttributeType.AT_RAND.type, (SIZE / SIZE_MULTIPLIER).toByte(), 0, 0) + payload
+    }
+
+    companion object {
+
+        fun parse(payload: ByteArray): EapAkaAttribute {
+            if (payload.size < 2 + 16) {
+                throw MessageIOException("Could not parse RAND attribute: ${payload.toHex()}")
+            }
+            return EapAkaAttributeRand(payload.copyOfRange(2, 2 + 16))
+        }
+
+        const val SIZE = 20 // type, size, 2 reserved bytes, payload=16
+    }
+}
+
+data class EapAkaAttributeAutn(val payload: ByteArray) : EapAkaAttribute() {
+
+    init {
+        require(payload.size == 16) { "AT_AUTN payload size has to be 16 bytes. Payload: ${payload.toHex()}" }
+    }
+
+    override fun toByteArray(): ByteArray {
+        return byteArrayOf(EapAkaAttributeType.AT_AUTN.type, (SIZE / SIZE_MULTIPLIER).toByte(), 0, 0) + payload
+    }
+
+    companion object {
+
+        fun parse(payload: ByteArray): EapAkaAttribute {
+            if (payload.size < 2 + 16) {
+                throw MessageIOException("Could not parse AUTN attribute: ${payload.toHex()}")
+            }
+            return EapAkaAttributeAutn(payload.copyOfRange(2, 2 + 16))
+        }
+
+        const val SIZE = 20 // type, size, 2 reserved bytes, payload=16
+    }
+}
+
+data class EapAkaAttributeAuts(val payload: ByteArray) : EapAkaAttribute() {
+
+    init {
+        require(payload.size == 14) { "AT_AUTS payload size has to be 14 bytes. Payload: ${payload.toHex()}" }
+    }
+
+    override fun toByteArray(): ByteArray {
+        return byteArrayOf(EapAkaAttributeType.AT_AUTS.type, (SIZE / SIZE_MULTIPLIER).toByte(), 0, 0) + payload
+    }
+
+    companion object {
+
+        fun parse(payload: ByteArray): EapAkaAttribute {
+            if (payload.size < SIZE - 2) {
+                throw MessageIOException("Could not parse AUTS attribute: ${payload.toHex()}")
+            }
+            return EapAkaAttributeAuts(payload)
+        }
+
+        const val SIZE = 16 // type, size, 2 reserved bytes, payload=16
+    }
+}
+
+data class EapAkaAttributeRes(val payload: ByteArray) : EapAkaAttribute() {
+
+    init {
+        require(payload.size == 8) { "AT_RES payload size has to be 8 bytes. Payload: ${payload.toHex()}" }
+    }
+
+    override fun toByteArray(): ByteArray {
+        return byteArrayOf(
+            EapAkaAttributeType.AT_RES.type,
+            (SIZE / SIZE_MULTIPLIER).toByte(),
+            0,
+            PAYLOAD_SIZE_BITS
+        ) + payload
+    }
+
+    companion object {
+
+        fun parse(payload: ByteArray): EapAkaAttributeRes {
+            if (payload.size < 2 + 8) {
+                throw MessageIOException("Could not parse RES attribute: ${payload.toHex()}")
+            }
+            return EapAkaAttributeRes(payload.copyOfRange(2, 2 + 8))
+        }
+
+        const val SIZE = 12 // type, size, len in bits=2, payload=8
+        private const val PAYLOAD_SIZE_BITS = 64.toByte() // type, size, 2 reserved bytes, payload
+    }
+}
+
+data class EapAkaAttributeCustomIV(val payload: ByteArray) : EapAkaAttribute() {
+
+    init {
+        require(payload.size == 4) { "CUSTOM_IV payload size has to be 4 bytes. Payload: ${payload.toHex()}" }
+    }
+
+    override fun toByteArray(): ByteArray {
+        return byteArrayOf(EapAkaAttributeType.AT_CUSTOM_IV.type, (SIZE / SIZE_MULTIPLIER).toByte(), 0, 0) + payload
+    }
+
+    companion object {
+
+        fun parse(payload: ByteArray): EapAkaAttributeCustomIV {
+            if (payload.size < 2 + 4) {
+                throw MessageIOException("Could not parse CUSTOM_IV attribute: ${payload.toHex()}")
+            }
+            return EapAkaAttributeCustomIV(payload.copyOfRange(2, 2 + 4))
+        }
+
+        const val SIZE = 8 // type, size, 2 reserved bytes, payload=4
+    }
+}
+
+data class EapAkaAttributeClientErrorCode(val payload: ByteArray) : EapAkaAttribute() {
+
+    init {
+        require(payload.size == 2) { "Error code hast to be 2 bytes. Payload: ${payload.toHex()}" }
+    }
+
+    override fun toByteArray(): ByteArray {
+        return byteArrayOf(
+            EapAkaAttributeType.AT_CLIENT_ERROR_CODE.type,
+            (SIZE / SIZE_MULTIPLIER).toByte(),
+            0,
+            0
+        ) + payload
+    }
+
+    companion object {
+
+        fun parse(payload: ByteArray): EapAkaAttributeClientErrorCode {
+            if (payload.size < 2 + 2) {
+                throw MessageIOException("Could not parse CLIENT_ERROR_CODE attribute: ${payload.toHex()}")
+            }
+            return EapAkaAttributeClientErrorCode(payload.copyOfRange(2, 4))
+        }
+
+        const val SIZE = 4 // type, size=1, payload:2
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessage.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessage.kt
new file mode 100644
index 0000000000..2b6bcd81f0
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessage.kt
@@ -0,0 +1,96 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
+
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.MessageIOException
+import java.nio.ByteBuffer
+
+enum class EapCode(val code: Byte) {
+    REQUEST(1),
+    RESPONSE(2),
+    SUCCESS(3),
+    FAILURE(4);
+
+    companion object {
+
+        fun byValue(value: Byte): EapCode =
+            EapCode.values().firstOrNull { it.code == value }
+                ?: throw IllegalArgumentException("Unknown EAP-AKA attribute type: $value")
+    }
+}
+
+data class EapMessage(
+    val code: EapCode,
+    val identifier: Byte,
+    val subType: Byte = 0,
+    val attributes: Array<EapAkaAttribute>
+) {
+
+    fun toByteArray(): ByteArray {
+
+        val serializedAttributes = attributes.flatMap { it.toByteArray().asIterable() }
+        val joinedAttributes = serializedAttributes.toTypedArray().toByteArray()
+
+        val attrSize = joinedAttributes.size
+        if (attrSize == 0) {
+            return byteArrayOf(code.code, identifier, 0, 4)
+        }
+        val totalSize = HEADER_SIZE + attrSize
+
+        var bb = ByteBuffer
+            .allocate(totalSize)
+            .put(code.code)
+            .put(identifier)
+            .put(((totalSize ushr 8) and 0XFF).toByte())
+            .put((totalSize and 0XFF).toByte())
+            .put(AKA_PACKET_TYPE)
+            .put(SUBTYPE_AKA_CHALLENGE)
+            .put(byteArrayOf(0, 0))
+            .put(joinedAttributes)
+
+        val ret = bb.array()
+        return ret.copyOfRange(0, ret.size)
+    }
+
+    companion object {
+
+        private const val HEADER_SIZE = 8
+        private const val SUBTYPE_AKA_CHALLENGE = 1.toByte()
+        const val SUBTYPE_SYNCRONIZATION_FAILURE = 4.toByte()
+
+        private const val AKA_PACKET_TYPE = 0x17.toByte()
+
+        fun parse(aapsLogger: AAPSLogger, payload: ByteArray): EapMessage {
+            payload.assertSizeAtLeast(4)
+
+            val totalSize = (payload[2].toInt() shl 8) or payload[3].toInt()
+            payload.assertSizeAtLeast(totalSize)
+
+            if (payload.size == 4) { // SUCCESS/FAILURE
+                return EapMessage(
+                    code = EapCode.byValue(payload[0]),
+                    identifier = payload[1],
+                    attributes = arrayOf()
+                )
+            }
+            if (totalSize > 0 && payload[4] != AKA_PACKET_TYPE) {
+                throw MessageIOException("Invalid eap payload. Expected AKA packet type: ${payload.toHex()}")
+            }
+            val attributesPayload = payload.copyOfRange(8, totalSize)
+            aapsLogger.debug(LTag.PUMPBTCOMM, "parsing EAP payload: ${payload.toHex()}")
+            return EapMessage(
+                code = EapCode.byValue(payload[0]),
+                identifier = payload[1],
+                attributes = EapAkaAttribute.parseAttributes(attributesPayload).toTypedArray(),
+                subType = payload[5],
+            )
+        }
+    }
+}
+
+private fun ByteArray.assertSizeAtLeast(size: Int) {
+    if (this.size < size) {
+        throw MessageIOException("Payload too short: ${this.toHex()}")
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapSqn.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapSqn.kt
new file mode 100644
index 0000000000..8190f7ebb9
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapSqn.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
+
+import java.nio.ByteBuffer
+
+class EapSqn(val value: ByteArray) {
+    constructor(v: Long) : this(fromLong(v))
+
+    init {
+        require(value.size == SIZE) { "Eap SQN is $SIZE bytes long" }
+    }
+
+    fun increment(): EapSqn {
+        return EapSqn(toLong() + 1)
+    }
+
+    fun toLong(): Long {
+        return ByteBuffer.wrap(
+            byteArrayOf(0x00, 0x00) +
+                value
+        ).long
+    }
+
+    override fun toString(): String {
+        return "EapSqn(value=${toLong()})"
+    }
+
+    companion object {
+
+        private const val SIZE = 6
+        private fun fromLong(v: Long): ByteArray {
+            return ByteBuffer.allocate(8).putLong(v).array().copyOfRange(2, 8)
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt
new file mode 100644
index 0000000000..6eab46d2c6
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Milenage.kt
@@ -0,0 +1,137 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
+
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import org.spongycastle.util.encoders.Hex
+import java.security.SecureRandom
+import javax.crypto.Cipher
+import javax.crypto.spec.SecretKeySpec
+
+class Milenage(
+    private val aapsLogger: AAPSLogger,
+    private val k: ByteArray,
+    val sqn: ByteArray,
+    randParam: ByteArray? = null,
+    val auts: ByteArray = ByteArray(AUTS_SIZE),
+    val amf: ByteArray = MILENAGE_AMF,
+) {
+
+    init {
+        require(k.size == KEY_SIZE) { "Milenage key has to be $KEY_SIZE bytes long. Received: ${k.toHex()}" }
+        require(sqn.size == SQN) { "Milenage SQN has to be $SQN long. Received: ${sqn.toHex()}" }
+        require(auts.size == AUTS_SIZE) { "Milenage AUTS has to be $AUTS_SIZE long. Received: ${auts.toHex()}" }
+        require(amf.size == MILENAGE_AMF.size) {
+            "Milenage AMF has to be ${MILENAGE_AMF.size} long." +
+                "Received: ${amf.toHex()}"
+        }
+    }
+
+    private val secretKeySpec = SecretKeySpec(k, "AES")
+    private val cipher: Cipher = Cipher.getInstance("AES/ECB/NoPadding")
+
+    init {
+        cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec)
+    }
+
+    val rand = randParam ?: ByteArray(KEY_SIZE)
+
+    init {
+        if (randParam == null) {
+            val random = SecureRandom()
+            random.nextBytes(rand)
+        }
+    }
+
+    private val opc = cipher.doFinal(MILENAGE_OP) xor MILENAGE_OP
+    private val randOpcEncrypted = cipher.doFinal(rand xor opc)
+    private val randOpcEncryptedXorOpc = randOpcEncrypted xor opc
+    private val resAkInput = randOpcEncryptedXorOpc.copyOfRange(0, KEY_SIZE)
+
+    init {
+        resAkInput[15] = (resAkInput[15].toInt() xor 1).toByte()
+    }
+
+    private val resAk = cipher.doFinal(resAkInput) xor opc
+
+    val res = resAk.copyOfRange(8, 16)
+    private val ak = resAk.copyOfRange(0, 6)
+
+    private val ckInput = ByteArray(KEY_SIZE)
+
+    init {
+        for (i in 0..15) {
+            ckInput[(i + 12) % 16] = randOpcEncryptedXorOpc[i]
+        }
+        ckInput[15] = (ckInput[15].toInt() xor 2).toByte()
+    }
+
+    val ck = cipher.doFinal(ckInput) xor opc
+
+    private val sqnAmf = sqn + amf + sqn + amf
+    private val sqnAmfXorOpc = sqnAmf xor opc
+    private val macAInput = ByteArray(KEY_SIZE)
+
+    init {
+        for (i in 0..15) {
+            macAInput[(i + 8) % 16] = sqnAmfXorOpc[i]
+        }
+    }
+
+    private val macAFull = cipher.doFinal(macAInput xor randOpcEncrypted) xor opc
+    private val macA = macAFull.copyOfRange(0, 8)
+    val macS = macAFull.copyOfRange(8, 16)
+
+    val autn = (ak xor sqn) + amf + macA
+
+    // Used for re-synchronisation AUTS = SQN^AK || MAC-S
+    private val akStarInput = ByteArray(KEY_SIZE)
+
+    init {
+        for (i in 0..15) {
+            akStarInput[(i + 4) % 16] = randOpcEncryptedXorOpc[i]
+        }
+        akStarInput[15] = (akStarInput[15].toInt() xor 8).toByte()
+    }
+
+    private val akStarFull = cipher.doFinal(akStarInput) xor opc
+    private val akStar = akStarFull.copyOfRange(0, 6)
+
+    private val seqXorAkStar = auts.copyOfRange(0, 6)
+    val synchronizationSqn = akStar xor seqXorAkStar
+    val receivedMacS = auts.copyOfRange(6, 14)
+
+    init {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Milenage K: ${k.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Milenage RAND: ${rand.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Milenage SQN: ${sqn.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Milenage CK: ${ck.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Milenage AUTN: ${autn.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Milenage RES: ${res.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Milenage AK: ${ak.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Milenage AK STAR: ${akStar.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Milenage OPC: ${opc.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Milenage FullMAC: ${macAFull.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Milenage MacA: ${macA.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Milenage MacS: ${macS.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Milenage AUTS: ${auts.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Milenage synchronizationSqn: ${synchronizationSqn.toHex()}")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Milenage receivedMacS: ${receivedMacS.toHex()}")
+    }
+
+    companion object {
+
+        val RESYNC_AMF = Hex.decode("0000")
+        private val MILENAGE_OP = Hex.decode("cdc202d5123e20f62b6d676ac72cb318")
+        private val MILENAGE_AMF = Hex.decode("b9b9")
+        const val KEY_SIZE = 16
+        const val AUTS_SIZE = 14
+        private const val SQN = 6
+    }
+}
+
+private infix fun ByteArray.xor(other: ByteArray): ByteArray {
+    val out = ByteArray(size)
+    for (i in indices) out[i] = (this[i].toInt() xor other[i].toInt()).toByte()
+    return out
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ResponseUtil.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ResponseUtil.kt
new file mode 100644
index 0000000000..794ee39b08
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/ResponseUtil.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.CouldNotParseResponseException
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.*
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.byValue
+
+object ResponseUtil {
+
+    @Throws(CouldNotParseResponseException::class, UnsupportedOperationException::class)
+    fun parseResponse(payload: ByteArray): Response {
+        return when (byValue(payload[0], ResponseType.UNKNOWN)) {
+            ResponseType.ACTIVATION_RESPONSE -> parseActivationResponse(payload)
+            ResponseType.DEFAULT_STATUS_RESPONSE -> DefaultStatusResponse(payload)
+            ResponseType.ADDITIONAL_STATUS_RESPONSE -> parseAdditionalStatusResponse(payload)
+            ResponseType.NAK_RESPONSE -> NakResponse(payload)
+            ResponseType.UNKNOWN -> throw CouldNotParseResponseException("Unrecognized message type: ${payload[0]}")
+        }
+    }
+
+    @Throws(CouldNotParseResponseException::class)
+    private fun parseActivationResponse(payload: ByteArray): Response {
+        return when (byValue(payload[1], ResponseType.ActivationResponseType.UNKNOWN)) {
+            ResponseType.ActivationResponseType.GET_VERSION_RESPONSE -> VersionResponse(payload)
+            ResponseType.ActivationResponseType.SET_UNIQUE_ID_RESPONSE -> SetUniqueIdResponse(payload)
+            ResponseType.ActivationResponseType.UNKNOWN -> throw CouldNotParseResponseException("Unrecognized activation response type: ${payload[1]}")
+        }
+    }
+
+    @Throws(CouldNotParseResponseException::class, UnsupportedOperationException::class)
+    private fun parseAdditionalStatusResponse(payload: ByteArray): Response {
+        return when (byValue(payload[2], ResponseType.StatusResponseType.UNKNOWN)) {
+            ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE -> DefaultStatusResponse(payload) // Unreachable; this response type is only used for requesting a default status response
+            ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_1 -> throw UnsupportedOperationException("Status response page 1 is not (yet) implemented")
+            ResponseType.StatusResponseType.ALARM_STATUS -> AlarmStatusResponse(payload)
+            ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_3 -> throw UnsupportedOperationException("Status response page 3 is not (yet) implemented")
+            ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_5 -> throw UnsupportedOperationException("Status response page 5 is not (yet) implemented")
+            ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_6 -> throw UnsupportedOperationException("Status response page 6 is not (yet) implemented")
+            ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_70 -> throw UnsupportedOperationException("Status response page 70 is not (yet) implemented")
+            ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_80 -> throw UnsupportedOperationException("Status response page 80 is not (yet) implemented")
+            ResponseType.StatusResponseType.STATUS_RESPONSE_PAGE_81 -> throw UnsupportedOperationException("Status response page 81 is not (yet) implemented")
+            ResponseType.StatusResponseType.UNKNOWN -> throw CouldNotParseResponseException("Unrecognized additional status response type: ${payload[2]}")
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Session.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Session.kt
new file mode 100644
index 0000000000..5ae607b1b5
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/Session.kt
@@ -0,0 +1,163 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
+
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Ids
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecrypt.EnDecrypt
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.CouldNotParseResponseException
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.*
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessageType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.StringLengthPrefixEncoding.Companion.parseKeys
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.Command
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.Response
+
+sealed class CommandSendResult
+object CommandSendSuccess : CommandSendResult()
+data class CommandSendErrorSending(val msg: String) : CommandSendResult()
+
+// This error marks the undefined state
+data class CommandSendErrorConfirming(val msg: String) : CommandSendResult()
+
+sealed class CommandReceiveResult
+data class CommandReceiveSuccess(val result: Response) : CommandReceiveResult()
+data class CommandReceiveError(val msg: String) : CommandReceiveResult()
+data class CommandAckError(val result: Response, val msg: String) : CommandReceiveResult()
+
+class Session(
+    private val aapsLogger: AAPSLogger,
+    private val msgIO: MessageIO,
+    private val ids: Ids,
+    val sessionKeys: SessionKeys,
+    val enDecrypt: EnDecrypt
+) {
+
+    fun sendCommand(cmd: Command): CommandSendResult {
+        sessionKeys.msgSequenceNumber++
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Sending command: ${cmd.encoded.toHex()} in packet $cmd")
+
+        val msg = getCmdMessage(cmd)
+        for (i in 0..MAX_TRIES) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Sending command(wrapped): ${msg.payload.toHex()}")
+
+            when (val sendResult = msgIO.sendMessage(msg)) {
+                is MessageSendSuccess ->
+                    return CommandSendSuccess
+
+                is MessageSendErrorConfirming -> {
+                    aapsLogger.debug(LTag.PUMPBTCOMM, "Error confirming command: $sendResult")
+                    return CommandSendErrorConfirming(sendResult.msg)
+                }
+
+                is MessageSendErrorSending ->
+                    aapsLogger.debug(LTag.PUMPBTCOMM, "Error sending command: $sendResult")
+            }
+        }
+
+        val errMsg = "Maximum number of tries reached. Could not send command"
+        return CommandSendErrorSending(errMsg)
+    }
+
+    @Suppress("ReturnCount")
+    fun readAndAckResponse(): CommandReceiveResult {
+        var responseMsgPacket: MessagePacket? = null
+        for (i in 0..MAX_TRIES) {
+            val responseMsg = msgIO.receiveMessage()
+            if (responseMsg != null) {
+                responseMsgPacket = responseMsg
+                break
+            }
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Error receiving response: $responseMsg")
+        }
+
+        responseMsgPacket
+            ?: return CommandReceiveError("Could not read response")
+
+        val decrypted = enDecrypt.decrypt(responseMsgPacket)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Received response: $decrypted")
+
+        val response = parseResponse(decrypted)
+
+        /*if (!responseType.isInstance(response)) {
+            if (response is AlarmStatusResponse) {
+                throw PodAlarmException(response)
+            }
+            if (response is NakResponse) {
+                throw NakResponseException(response)
+            }
+            throw IllegalResponseException(responseType, response)
+        }
+
+         */
+
+        sessionKeys.msgSequenceNumber++
+        val ack = getAck(responseMsgPacket)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Sending ACK: ${ack.payload.toHex()} in packet $ack")
+        val sendResult = msgIO.sendMessage(ack)
+        if (sendResult !is MessageSendSuccess) {
+            return CommandAckError(response, "Could not ACK the response: $sendResult")
+        }
+        return CommandReceiveSuccess(response)
+    }
+
+    @Throws(CouldNotParseResponseException::class, UnsupportedOperationException::class)
+    private fun parseResponse(decrypted: MessagePacket): Response {
+
+        val data = parseKeys(arrayOf(RESPONSE_PREFIX), decrypted.payload)[0]
+        aapsLogger.info(LTag.PUMPBTCOMM, "Received decrypted response: ${data.toHex()} in packet: $decrypted")
+
+        // TODO verify length
+
+        // val uniqueId = data.copyOfRange(0, 4)
+        // val lenghtAndSequenceNumber = data.copyOfRange(4, 6)
+        val payload = data.copyOfRange(6, data.size - 2)
+        // val crc = data.copyOfRange(data.size - 2, data.size)
+
+        // TODO validate uniqueId, sequenceNumber and crc
+
+        return ResponseUtil.parseResponse(payload)
+    }
+
+    private fun getAck(response: MessagePacket): MessagePacket {
+        val msg = MessagePacket(
+            type = MessageType.ENCRYPTED,
+            sequenceNumber = sessionKeys.msgSequenceNumber,
+            source = ids.myId,
+            destination = ids.podId,
+            payload = ByteArray(0),
+            eqos = 0,
+            ack = true,
+            ackNumber = response.sequenceNumber.inc()
+        )
+        return enDecrypt.encrypt((msg))
+    }
+
+    private fun getCmdMessage(cmd: Command): MessagePacket {
+        val wrapped = StringLengthPrefixEncoding.formatKeys(
+            arrayOf(COMMAND_PREFIX, COMMAND_SUFFIX),
+            arrayOf(cmd.encoded, ByteArray(0))
+        )
+
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Sending command: ${wrapped.toHex()}")
+
+        val msg = MessagePacket(
+            type = MessageType.ENCRYPTED,
+            sequenceNumber = sessionKeys.msgSequenceNumber,
+            source = ids.myId,
+            destination = ids.podId,
+            payload = wrapped,
+            eqos = 1
+        )
+
+        return enDecrypt.encrypt(msg)
+    }
+
+    companion object {
+
+        private const val COMMAND_PREFIX = "S0.0="
+        private const val COMMAND_SUFFIX = ",G0.0"
+        private const val RESPONSE_PREFIX = "0.0="
+
+        private const val MAX_TRIES = 4
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionEstablisher.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionEstablisher.kt
new file mode 100644
index 0000000000..e1e3968f18
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionEstablisher.kt
@@ -0,0 +1,202 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
+
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Ids
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecrypt.Nonce
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.SessionEstablishmentException
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessageIO
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessagePacket
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessageSendSuccess
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessageType
+import java.security.SecureRandom
+import java.util.*
+
+class SessionEstablisher(
+    private val aapsLogger: AAPSLogger,
+    private val msgIO: MessageIO,
+    private val ltk: ByteArray,
+    private val eapSqn: ByteArray,
+    private val ids: Ids,
+    private var msgSeq: Byte
+) {
+
+    private val controllerIV = ByteArray(IV_SIZE)
+    private var nodeIV = ByteArray(IV_SIZE)
+    private val identifier = Random().nextInt().toByte()
+    private val milenage = Milenage(aapsLogger, ltk, eapSqn)
+
+    init {
+        require(eapSqn.size == 6) { "EAP-SQN has to be 6 bytes long" }
+        require(ltk.size == 16) { "LTK has to be 16 bytes long" }
+
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Starting EAP-AKA")
+        val random = SecureRandom()
+        random.nextBytes(controllerIV)
+    }
+
+    fun negotiateSessionKeys(): SessionNegotiationResponse {
+        msgSeq++
+        var challenge = eapAkaChallenge()
+        val sendResult = msgIO.sendMessage(challenge)
+        if (sendResult !is MessageSendSuccess) {
+            throw SessionEstablishmentException("Could not send the EAP AKA challenge: $sendResult")
+        }
+        val challengeResponse = msgIO.receiveMessage()
+            ?: throw SessionEstablishmentException("Could not establish session")
+
+        val newSqn = processChallengeResponse(challengeResponse)
+        if (newSqn != null) {
+            return SessionNegotiationResynchronization(
+                synchronizedEapSqn = newSqn,
+                msgSequenceNumber = msgSeq
+            )
+        }
+
+        msgSeq++
+        var success = eapSuccess()
+        msgIO.sendMessage(success)
+
+        return SessionKeys(
+            ck = milenage.ck,
+            nonce = Nonce(
+                prefix = controllerIV + nodeIV,
+                sqn = 0
+            ),
+            msgSequenceNumber = msgSeq
+        )
+    }
+
+    private fun eapAkaChallenge(): MessagePacket {
+        val attributes = arrayOf(
+            EapAkaAttributeAutn(milenage.autn),
+            EapAkaAttributeRand(milenage.rand),
+            EapAkaAttributeCustomIV(controllerIV)
+        )
+
+        val eapMsg = EapMessage(
+            code = EapCode.REQUEST,
+            identifier = identifier,
+            attributes = attributes
+        )
+        return MessagePacket(
+            type = MessageType.SESSION_ESTABLISHMENT,
+            sequenceNumber = msgSeq,
+            source = ids.myId,
+            destination = ids.podId,
+            payload = eapMsg.toByteArray()
+        )
+    }
+
+    private fun assertIdentifier(msg: EapMessage) {
+        if (msg.identifier != identifier) {
+            aapsLogger.debug(
+                LTag.PUMPBTCOMM,
+                "EAP-AKA: got incorrect identifier ${msg.identifier} expected: $identifier"
+            )
+            throw SessionEstablishmentException("Received incorrect EAP identifier: ${msg.identifier}")
+        }
+    }
+
+    private fun processChallengeResponse(challengeResponse: MessagePacket): EapSqn? {
+        val eapMsg = EapMessage.parse(aapsLogger, challengeResponse.payload)
+
+        assertIdentifier(eapMsg)
+
+        val eapSqn = isResynchronization(eapMsg)
+        if (eapSqn != null) {
+            return eapSqn
+        }
+
+        assertValidAkaMessage(eapMsg)
+
+        for (attr in eapMsg.attributes) {
+            when (attr) {
+                is EapAkaAttributeRes ->
+                    if (!milenage.res.contentEquals(attr.payload)) {
+                        throw SessionEstablishmentException(
+                            "RES mismatch." +
+                                "Expected: ${milenage.res.toHex()}." +
+                                "Actual: ${attr.payload.toHex()}."
+                        )
+                    }
+                is EapAkaAttributeCustomIV ->
+                    nodeIV = attr.payload.copyOfRange(0, IV_SIZE)
+                else ->
+                    throw SessionEstablishmentException("Unknown attribute received: $attr")
+            }
+        }
+        return null
+    }
+
+    private fun assertValidAkaMessage(eapMsg: EapMessage) {
+        if (eapMsg.attributes.size != 2) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "EAP-AKA: got incorrect: $eapMsg")
+            if (eapMsg.attributes.size == 1 && eapMsg.attributes[0] is EapAkaAttributeClientErrorCode) {
+                throw SessionEstablishmentException(
+                    "Received CLIENT_ERROR_CODE for EAP-AKA challenge: ${
+                    eapMsg.attributes[0].toByteArray().toHex()
+                    }"
+                )
+            }
+            throw SessionEstablishmentException("Expecting two attributes, got: ${eapMsg.attributes.size}")
+        }
+    }
+
+    private fun isResynchronization(eapMsg: EapMessage): EapSqn? {
+        if (eapMsg.subType != EapMessage.SUBTYPE_SYNCRONIZATION_FAILURE ||
+            eapMsg.attributes.size != 1 ||
+            eapMsg.attributes[0] !is EapAkaAttributeAuts
+        )
+            return null
+
+        val auts = eapMsg.attributes[0] as EapAkaAttributeAuts
+        val autsMilenage = Milenage(
+            aapsLogger = aapsLogger,
+            k = ltk,
+            sqn = eapSqn,
+            randParam = milenage.rand,
+            auts = auts.payload
+        )
+
+        val newSqnMilenage = Milenage(
+            aapsLogger = aapsLogger,
+            k = ltk,
+            sqn = autsMilenage.synchronizationSqn,
+            randParam = milenage.rand,
+            auts = auts.payload,
+            amf = Milenage.RESYNC_AMF,
+        )
+
+        if (!newSqnMilenage.macS.contentEquals(newSqnMilenage.receivedMacS)) {
+            throw SessionEstablishmentException(
+                "MacS mismatch. " +
+                    "Expected: ${newSqnMilenage.macS.toHex()}. " +
+                    "Received: ${newSqnMilenage.receivedMacS.toHex()}"
+            )
+        }
+        return EapSqn(autsMilenage.synchronizationSqn)
+    }
+
+    private fun eapSuccess(): MessagePacket {
+        val eapMsg = EapMessage(
+            code = EapCode.SUCCESS,
+            attributes = arrayOf(),
+            identifier = identifier.toByte()
+        )
+
+        return MessagePacket(
+            type = MessageType.SESSION_ESTABLISHMENT,
+            sequenceNumber = msgSeq,
+            source = ids.myId,
+            destination = ids.podId,
+            payload = eapMsg.toByteArray()
+        )
+    }
+
+    companion object {
+
+        private const val IV_SIZE = 4
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionKeys.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionKeys.kt
new file mode 100644
index 0000000000..cd6ca1d2f1
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/SessionKeys.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecrypt.Nonce
+
+sealed class SessionNegotiationResponse
+
+data class SessionKeys(
+    val ck: ByteArray,
+    val nonce: Nonce,
+    var msgSequenceNumber: Byte
+) : SessionNegotiationResponse() {
+
+    init {
+        require(ck.size == 16) { "CK has to be 16 bytes long" }
+    }
+}
+
+data class SessionNegotiationResynchronization(
+    val synchronizedEapSqn: EapSqn,
+    val msgSequenceNumber: Byte
+) : SessionNegotiationResponse()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/event/PodEvent.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/event/PodEvent.kt
new file mode 100644
index 0000000000..a3e7bb25cf
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/event/PodEvent.kt
@@ -0,0 +1,72 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.event
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Id
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.Command
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.Response
+
+sealed class PodEvent {
+
+    /* BT connection events */
+    class AlreadyConnected(val bluetoothAddress: String) : PodEvent() {
+
+        override fun toString(): String {
+            return "AlreadyConnected(bluetoothAddress='$bluetoothAddress')"
+        }
+    }
+
+    object AlreadyPaired : PodEvent()
+    object Scanning : PodEvent()
+    object BluetoothConnecting : PodEvent()
+    class BluetoothConnected(val bluetoothAddress: String) : PodEvent() {
+
+        override fun toString(): String {
+            return "BluetoothConnected(bluetoothAddress='$bluetoothAddress')"
+        }
+    }
+
+    object Pairing : PodEvent()
+    class Paired(val uniqueId: Id) : PodEvent() {
+
+        override fun toString(): String {
+            return "Paired(uniqueId=$uniqueId)"
+        }
+    }
+
+    object EstablishingSession : PodEvent()
+    object Connected : PodEvent()
+
+    /* Message exchange events */
+    class CommandSending(val command: Command) : PodEvent() {
+
+        override fun toString(): String {
+            return "CommandSending(command=$command)"
+        }
+    }
+
+    class CommandSent(val command: Command) : PodEvent() {
+
+        override fun toString(): String {
+            return "CommandSent(command=$command)"
+        }
+    }
+
+    class CommandSendNotConfirmed(val command: Command) : PodEvent() {
+        override fun toString(): String {
+            return "CommandSentNotConfirmed(command=$command)"
+        }
+    }
+
+    class ResponseReceived(
+        val command: Command,
+        val response: Response
+    ) : PodEvent() {
+
+        override fun toString(): String {
+            return "ResponseReceived(command=$command, response=$response)"
+        }
+    }
+
+    fun isCommandSent(): Boolean {
+        return this is CommandSent || this is CommandSendNotConfirmed
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.java
deleted file mode 100644
index c9c96fbebc..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import androidx.annotation.NonNull;
-
-import java.nio.ByteBuffer;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.NonceEnabledCommand;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.NonceEnabledCommandBuilder;
-
-public final class DeactivateCommand extends NonceEnabledCommand {
-    private static final short LENGTH = 6;
-    private static final byte BODY_LENGTH = 4;
-
-    DeactivateCommand(int uniqueId, short sequenceNumber, boolean multiCommandFlag, int nonce) {
-        super(CommandType.DEACTIVATE, uniqueId, sequenceNumber, multiCommandFlag, nonce);
-    }
-
-    @Override public byte[] getEncoded() {
-        return appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
-                .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
-                .put(commandType.getValue()) //
-                .put(BODY_LENGTH) //
-                .putInt(nonce) //
-                .array());
-    }
-
-    @Override @NonNull public String toString() {
-        return "DeactivateCommand{" +
-                "nonce=" + nonce +
-                ", commandType=" + commandType +
-                ", uniqueId=" + uniqueId +
-                ", sequenceNumber=" + sequenceNumber +
-                ", multiCommandFlag=" + multiCommandFlag +
-                '}';
-    }
-
-    public static final class Builder extends NonceEnabledCommandBuilder<Builder, DeactivateCommand> {
-        @Override protected final DeactivateCommand buildCommand() {
-            return new DeactivateCommand(uniqueId, sequenceNumber, multiCommandFlag, nonce);
-        }
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.kt
new file mode 100644
index 0000000000..2acf111497
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommand.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.NonceEnabledCommand
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.NonceEnabledCommandBuilder
+import java.nio.ByteBuffer
+
+class DeactivateCommand private constructor(
+    uniqueId: Int,
+    sequenceNumber: Short,
+    multiCommandFlag: Boolean,
+    nonce: Int
+) : NonceEnabledCommand(CommandType.DEACTIVATE, uniqueId, sequenceNumber, multiCommandFlag, nonce) {
+
+    override val encoded: ByteArray
+        get() = appendCrc(
+            ByteBuffer.allocate(LENGTH + HEADER_LENGTH)
+                .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag))
+                .put(commandType.value)
+                .put(BODY_LENGTH)
+                .putInt(nonce)
+                .array()
+        )
+
+    override fun toString(): String = "DeactivateCommand{" +
+        "nonce=" + nonce +
+        ", commandType=" + commandType +
+        ", uniqueId=" + uniqueId +
+        ", sequenceNumber=" + sequenceNumber +
+        ", multiCommandFlag=" + multiCommandFlag +
+        '}'
+
+    class Builder : NonceEnabledCommandBuilder<Builder, DeactivateCommand>() {
+
+        override fun buildCommand(): DeactivateCommand =
+            DeactivateCommand(
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                nonce!!
+            ) // TODO this might crash if not all are set
+    }
+
+    companion object {
+
+        private const val LENGTH: Short = 6
+        private const val BODY_LENGTH: Byte = 4
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommand.kt
new file mode 100644
index 0000000000..f77caea43d
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommand.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.HeaderEnabledCommand
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.HeaderEnabledCommandBuilder
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.ResponseType
+import java.nio.ByteBuffer
+
+class GetStatusCommand private constructor(
+    uniqueId: Int,
+    sequenceNumber: Short,
+    multiCommandFlag: Boolean,
+    private val statusResponseType: ResponseType.StatusResponseType
+) : HeaderEnabledCommand(CommandType.GET_STATUS, uniqueId, sequenceNumber, multiCommandFlag) {
+
+    override val encoded: ByteArray
+        get() = appendCrc(
+            ByteBuffer.allocate(LENGTH + HEADER_LENGTH)
+                .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag))
+                .put(commandType.value)
+                .put(BODY_LENGTH)
+                .put(statusResponseType.value)
+                .array()
+        )
+
+    class Builder : HeaderEnabledCommandBuilder<Builder, GetStatusCommand>() {
+
+        private var statusResponseType: ResponseType.StatusResponseType? = null
+
+        fun setStatusResponseType(statusResponseType: ResponseType.StatusResponseType): Builder {
+            this.statusResponseType = statusResponseType
+            return this
+        }
+
+        override fun buildCommand(): GetStatusCommand {
+            requireNotNull(statusResponseType) { "immediateBeepType can not be null" }
+
+            return GetStatusCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag, statusResponseType!!)
+        }
+    }
+
+    companion object {
+
+        private const val LENGTH: Short = 3
+        private const val BODY_LENGTH: Byte = 1
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.java
deleted file mode 100644
index 20330549d9..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import androidx.annotation.NonNull;
-
-import java.nio.ByteBuffer;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.HeaderEnabledCommand;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.HeaderEnabledCommandBuilder;
-
-public final class GetVersionCommand extends HeaderEnabledCommand {
-    public static final int DEFAULT_UNIQUE_ID = -1; // FIXME move
-
-    private static final short LENGTH = 6;
-    private static final byte BODY_LENGTH = 4;
-
-    GetVersionCommand(int uniqueId, short sequenceNumber, boolean multiCommandFlag) {
-        super(CommandType.GET_VERSION, uniqueId, sequenceNumber, multiCommandFlag);
-    }
-
-    @Override public byte[] getEncoded() {
-        return appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
-                .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
-                .put(commandType.getValue()) //
-                .put(BODY_LENGTH) //
-                .putInt(uniqueId) //
-                .array());
-    }
-
-    @Override @NonNull public String toString() {
-        return "GetVersionCommand{" +
-                "commandType=" + commandType +
-                ", uniqueId=" + uniqueId +
-                ", sequenceNumber=" + sequenceNumber +
-                ", multiCommandFlag=" + multiCommandFlag +
-                '}';
-    }
-
-    public static final class Builder extends HeaderEnabledCommandBuilder<Builder, GetVersionCommand> {
-        @Override protected final GetVersionCommand buildCommand() {
-            return new GetVersionCommand(uniqueId, sequenceNumber, multiCommandFlag);
-        }
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.kt
new file mode 100644
index 0000000000..551631129f
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommand.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.HeaderEnabledCommand
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.HeaderEnabledCommandBuilder
+import java.nio.ByteBuffer
+
+class GetVersionCommand private constructor(
+    uniqueId: Int,
+    sequenceNumber: Short,
+    multiCommandFlag: Boolean
+) : HeaderEnabledCommand(CommandType.GET_VERSION, uniqueId, sequenceNumber, multiCommandFlag) {
+
+    override val encoded: ByteArray
+        get() = appendCrc(
+            ByteBuffer.allocate(LENGTH + HEADER_LENGTH)
+                .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag))
+                .put(commandType.value)
+                .put(BODY_LENGTH)
+                .putInt(uniqueId)
+                .array()
+        )
+
+    override fun toString(): String {
+        return "GetVersionCommand{" +
+            "commandType=" + commandType +
+            ", uniqueId=" + uniqueId +
+            ", sequenceNumber=" + sequenceNumber +
+            ", multiCommandFlag=" + multiCommandFlag +
+            '}'
+    }
+
+    class Builder : HeaderEnabledCommandBuilder<Builder, GetVersionCommand>() {
+
+        override fun buildCommand(): GetVersionCommand {
+            return GetVersionCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag)
+        }
+    }
+
+    companion object {
+
+        const val DEFAULT_UNIQUE_ID = -1 // FIXME move
+        private const val LENGTH: Short = 6
+        private const val BODY_LENGTH: Byte = 4
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.java
deleted file mode 100644
index 39e850736a..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.NonceEnabledCommand;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.NonceEnabledCommandBuilder;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertConfiguration;
-
-public final class ProgramAlertsCommand extends NonceEnabledCommand {
-    private final List<AlertConfiguration> alertConfigurations;
-
-    ProgramAlertsCommand(int uniqueId, short sequenceNumber, boolean multiCommandFlag, List<AlertConfiguration> alertConfigurations, int nonce) {
-        super(CommandType.PROGRAM_ALERTS, uniqueId, sequenceNumber, multiCommandFlag, nonce);
-        this.alertConfigurations = new ArrayList<>(alertConfigurations);
-    }
-
-    @Override public byte[] getEncoded() {
-        ByteBuffer byteBuffer = ByteBuffer.allocate(getLength() + HEADER_LENGTH) //
-                .put(encodeHeader(uniqueId, sequenceNumber, getLength(), multiCommandFlag)) //
-                .put(commandType.getValue()) //
-                .put(getBodyLength()) //
-                .putInt(nonce);
-        for (AlertConfiguration configuration : alertConfigurations) {
-            byteBuffer.put(configuration.getEncoded());
-        }
-        return appendCrc(byteBuffer.array());
-    }
-
-    private short getLength() {
-        return (short) (alertConfigurations.size() * 6 + 6);
-    }
-
-    private byte getBodyLength() {
-        return (byte) (alertConfigurations.size() * 6 + 4);
-    }
-
-    @Override public String toString() {
-        return "ProgramAlertsCommand{" +
-                "alertConfigurations=" + alertConfigurations +
-                ", nonce=" + nonce +
-                ", commandType=" + commandType +
-                ", uniqueId=" + uniqueId +
-                ", sequenceNumber=" + sequenceNumber +
-                ", multiCommandFlag=" + multiCommandFlag +
-                '}';
-    }
-
-    public static final class Builder extends NonceEnabledCommandBuilder<Builder, ProgramAlertsCommand> {
-        private List<AlertConfiguration> alertConfigurations;
-
-        public Builder setAlertConfigurations(List<AlertConfiguration> alertConfigurations) {
-            this.alertConfigurations = alertConfigurations;
-            return this;
-        }
-
-        @Override protected final ProgramAlertsCommand buildCommand() {
-            if (this.alertConfigurations == null) {
-                throw new IllegalArgumentException("alertConfigurations can not be null");
-            }
-            return new ProgramAlertsCommand(uniqueId, sequenceNumber, multiCommandFlag, alertConfigurations, nonce);
-        }
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.kt
new file mode 100644
index 0000000000..b13ed65498
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommand.kt
@@ -0,0 +1,70 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.NonceEnabledCommand
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.NonceEnabledCommandBuilder
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertConfiguration
+import java.nio.ByteBuffer
+import java.util.*
+
+class ProgramAlertsCommand private constructor(
+    uniqueId: Int,
+    sequenceNumber: Short,
+    multiCommandFlag: Boolean,
+    alertConfigurations: List<AlertConfiguration>,
+    nonce: Int
+) : NonceEnabledCommand(CommandType.PROGRAM_ALERTS, uniqueId, sequenceNumber, multiCommandFlag, nonce) {
+
+    private val alertConfigurations: List<AlertConfiguration>
+
+    private fun getLength(): Short {
+        return (alertConfigurations.size * 6 + 6).toShort()
+    }
+
+    private fun getBodyLength(): Byte {
+        return (alertConfigurations.size * 6 + 4).toByte()
+    }
+
+    override val encoded: ByteArray
+        get() {
+            val byteBuffer: ByteBuffer = ByteBuffer.allocate(getLength() + HEADER_LENGTH)
+                .put(encodeHeader(uniqueId, sequenceNumber, getLength(), multiCommandFlag))
+                .put(commandType.value)
+                .put(getBodyLength())
+                .putInt(nonce)
+            for (configuration in alertConfigurations) {
+                byteBuffer.put(configuration.encoded)
+            }
+            return appendCrc(byteBuffer.array())
+        }
+
+    override fun toString(): String {
+        return "ProgramAlertsCommand{" +
+            "alertConfigurations=" + alertConfigurations +
+            ", nonce=" + nonce +
+            ", commandType=" + commandType +
+            ", uniqueId=" + uniqueId +
+            ", sequenceNumber=" + sequenceNumber +
+            ", multiCommandFlag=" + multiCommandFlag +
+            '}'
+    }
+
+    class Builder : NonceEnabledCommandBuilder<Builder, ProgramAlertsCommand>() {
+
+        private var alertConfigurations: List<AlertConfiguration>? = null
+
+        fun setAlertConfigurations(alertConfigurations: List<AlertConfiguration>): Builder {
+            this.alertConfigurations = alertConfigurations
+            return this
+        }
+
+        override fun buildCommand(): ProgramAlertsCommand {
+            requireNotNull(alertConfigurations) { "alertConfigurations can not be null" }
+            return ProgramAlertsCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag, alertConfigurations!!, nonce!!)
+        }
+    }
+
+    init {
+        this.alertConfigurations = ArrayList(alertConfigurations)
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommand.java
deleted file mode 100644
index a79f7b7374..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommand.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.HeaderEnabledCommand;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.NonceEnabledCommandBuilder;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.BasalInsulinProgramElement;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.CurrentBasalInsulinProgramElement;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.CurrentSlot;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.ShortInsulinProgramElement;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.util.ProgramBasalUtil;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ProgramReminder;
-
-// Always preceded by 0x1a ProgramInsulinCommand
-public final class ProgramBasalCommand extends HeaderEnabledCommand {
-    private final ProgramInsulinCommand interlockCommand;
-    private final List<BasalInsulinProgramElement> insulinProgramElements;
-    private final ProgramReminder programReminder;
-    private final byte currentInsulinProgramElementIndex;
-    private final short remainingTenthPulsesInCurrentInsulinProgramElement;
-    private final int delayUntilNextTenthPulseInUsec;
-
-    ProgramBasalCommand(ProgramInsulinCommand interlockCommand, int uniqueId, short sequenceNumber, boolean multiCommandFlag, List<BasalInsulinProgramElement> insulinProgramElements, ProgramReminder programReminder, byte currentInsulinProgramElementIndex, short remainingTenthPulsesInCurrentInsulinProgramElement, int delayUntilNextTenthPulseInUsec) {
-        super(CommandType.PROGRAM_BASAL, uniqueId, sequenceNumber, multiCommandFlag);
-
-        this.interlockCommand = interlockCommand;
-        this.insulinProgramElements = new ArrayList<>(insulinProgramElements);
-        this.programReminder = programReminder;
-        this.currentInsulinProgramElementIndex = currentInsulinProgramElementIndex;
-        this.remainingTenthPulsesInCurrentInsulinProgramElement = remainingTenthPulsesInCurrentInsulinProgramElement;
-        this.delayUntilNextTenthPulseInUsec = delayUntilNextTenthPulseInUsec;
-    }
-
-    short getLength() {
-        return (short) (insulinProgramElements.size() * 6 + 10);
-    }
-
-    byte getBodyLength() {
-        return (byte) (insulinProgramElements.size() * 6 + 8);
-    }
-
-    @Override public byte[] getEncoded() {
-        ByteBuffer buffer = ByteBuffer.allocate(getLength()) //
-                .put(getCommandType().getValue()) //
-                .put(getBodyLength()) //
-                .put(programReminder.getEncoded()) //
-                .put(currentInsulinProgramElementIndex) //
-                .putShort(remainingTenthPulsesInCurrentInsulinProgramElement) //
-                .putInt(delayUntilNextTenthPulseInUsec);
-        for (BasalInsulinProgramElement insulinProgramElement : insulinProgramElements) {
-            buffer.put(insulinProgramElement.getEncoded());
-        }
-
-        byte[] basalCommand = buffer.array();
-        byte[] interlockCommand = this.interlockCommand.getEncoded();
-        byte[] header = encodeHeader(uniqueId, sequenceNumber, (short) (basalCommand.length + interlockCommand.length), multiCommandFlag);
-
-        return appendCrc(ByteBuffer.allocate(basalCommand.length + interlockCommand.length + header.length) //
-                .put(header) //
-                .put(interlockCommand) //
-                .put(basalCommand) //
-                .array());
-    }
-
-    @Override public String toString() {
-        return "ProgramBasalCommand{" +
-                "interlockCommand=" + interlockCommand +
-                ", insulinProgramElements=" + insulinProgramElements +
-                ", programReminder=" + programReminder +
-                ", currentInsulinProgramElementIndex=" + currentInsulinProgramElementIndex +
-                ", remainingTenthPulsesInCurrentInsulinProgramElement=" + remainingTenthPulsesInCurrentInsulinProgramElement +
-                ", delayUntilNextTenthPulseInUsec=" + delayUntilNextTenthPulseInUsec +
-                ", commandType=" + commandType +
-                ", uniqueId=" + uniqueId +
-                ", sequenceNumber=" + sequenceNumber +
-                ", multiCommandFlag=" + multiCommandFlag +
-                '}';
-    }
-
-    public static final class Builder extends NonceEnabledCommandBuilder<Builder, ProgramBasalCommand> {
-        private BasalProgram basalProgram;
-        private ProgramReminder programReminder;
-        private Date currentTime;
-
-        public Builder setBasalProgram(BasalProgram basalProgram) {
-            this.basalProgram = basalProgram;
-            return this;
-        }
-
-        public Builder setProgramReminder(ProgramReminder programReminder) {
-            this.programReminder = programReminder;
-            return this;
-        }
-
-        public Builder setCurrentTime(Date currentTime) {
-            this.currentTime = currentTime;
-            return this;
-        }
-
-        @Override protected ProgramBasalCommand buildCommand() {
-            if (basalProgram == null) {
-                throw new IllegalArgumentException("basalProgram can not be null");
-            }
-            if (programReminder == null) {
-                throw new IllegalArgumentException("programReminder can not be null");
-            }
-            if (currentTime == null) {
-                throw new IllegalArgumentException("currentTime can not be null");
-            }
-
-            short[] pulsesPerSlot = ProgramBasalUtil.mapBasalProgramToPulsesPerSlot(basalProgram);
-            CurrentSlot currentSlot = ProgramBasalUtil.calculateCurrentSlot(pulsesPerSlot, currentTime);
-            short checksum = ProgramBasalUtil.calculateChecksum(pulsesPerSlot, currentSlot);
-            List<BasalInsulinProgramElement> longInsulinProgramElements = ProgramBasalUtil.mapTenthPulsesPerSlotToLongInsulinProgramElements(ProgramBasalUtil.mapBasalProgramToTenthPulsesPerSlot(basalProgram));
-            List<ShortInsulinProgramElement> shortInsulinProgramElements = ProgramBasalUtil.mapPulsesPerSlotToShortInsulinProgramElements(pulsesPerSlot);
-            CurrentBasalInsulinProgramElement currentBasalInsulinProgramElement = ProgramBasalUtil.calculateCurrentLongInsulinProgramElement(longInsulinProgramElements, currentTime);
-
-            ProgramInsulinCommand interlockCommand = new ProgramInsulinCommand(uniqueId, sequenceNumber, multiCommandFlag, nonce,
-                    shortInsulinProgramElements, checksum, currentSlot.getIndex(), currentSlot.getEighthSecondsRemaining(),
-                    currentSlot.getPulsesRemaining(), ProgramInsulinCommand.DeliveryType.BASAL);
-
-            return new ProgramBasalCommand(interlockCommand, uniqueId, sequenceNumber, multiCommandFlag,
-                    longInsulinProgramElements, programReminder, currentBasalInsulinProgramElement.getIndex(),
-                    currentBasalInsulinProgramElement.getRemainingTenthPulses(), currentBasalInsulinProgramElement.getDelayUntilNextTenthPulseInUsec());
-        }
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommand.kt
new file mode 100644
index 0000000000..aeb12e5953
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommand.kt
@@ -0,0 +1,147 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.HeaderEnabledCommand
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.NonceEnabledCommandBuilder
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.BasalInsulinProgramElement
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.util.ProgramBasalUtil
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.util.ProgramTempBasalUtil.mapTenthPulsesPerSlotToLongInsulinProgramElements
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ProgramReminder
+import java.nio.ByteBuffer
+import java.util.*
+
+// Always preceded by 0x1a ProgramInsulinCommand
+class ProgramBasalCommand private constructor(
+    private val interlockCommand: ProgramInsulinCommand,
+    uniqueId: Int,
+    sequenceNumber: Short,
+    multiCommandFlag: Boolean,
+    insulinProgramElements: List<BasalInsulinProgramElement>,
+    programReminder: ProgramReminder,
+    currentInsulinProgramElementIndex: Byte,
+    remainingTenthPulsesInCurrentInsulinProgramElement: Short,
+    delayUntilNextTenthPulseInUsec: Int
+) : HeaderEnabledCommand(CommandType.PROGRAM_BASAL, uniqueId, sequenceNumber, multiCommandFlag) {
+
+    private val insulinProgramElements: List<BasalInsulinProgramElement>
+    private val programReminder: ProgramReminder
+    private val currentInsulinProgramElementIndex: Byte
+    private val remainingTenthPulsesInCurrentInsulinProgramElement: Short
+    private val delayUntilNextTenthPulseInUsec: Int
+    val length: Short
+        get() = (insulinProgramElements.size * 6 + 10).toShort()
+    private val bodyLength: Byte
+        get() = (insulinProgramElements.size * 6 + 8).toByte()
+
+    override val encoded: ByteArray
+        get() {
+            val buffer = ByteBuffer.allocate(length.toInt())
+                .put(commandType.value)
+                .put(bodyLength)
+                .put(programReminder.encoded)
+                .put(currentInsulinProgramElementIndex)
+                .putShort(remainingTenthPulsesInCurrentInsulinProgramElement)
+                .putInt(delayUntilNextTenthPulseInUsec)
+            for (insulinProgramElement in insulinProgramElements) {
+                buffer.put(insulinProgramElement.encoded)
+            }
+            val basalCommand = buffer.array()
+            val interlockCommand = interlockCommand.encoded
+            val header: ByteArray = encodeHeader(
+                uniqueId,
+                sequenceNumber,
+                (basalCommand.size + interlockCommand.size).toShort(),
+                multiCommandFlag
+            )
+            return appendCrc(
+                ByteBuffer.allocate(basalCommand.size + interlockCommand.size + header.size)
+                    .put(header)
+                    .put(interlockCommand)
+                    .put(basalCommand)
+                    .array()
+            )
+        }
+
+    override fun toString(): String {
+        return "ProgramBasalCommand{" +
+            "interlockCommand=" + interlockCommand +
+            ", insulinProgramElements=" + insulinProgramElements +
+            ", programReminder=" + programReminder +
+            ", currentInsulinProgramElementIndex=" + currentInsulinProgramElementIndex +
+            ", remainingTenthPulsesInCurrentInsulinProgramElement=" + remainingTenthPulsesInCurrentInsulinProgramElement +
+            ", delayUntilNextTenthPulseInUsec=" + delayUntilNextTenthPulseInUsec +
+            ", commandType=" + commandType +
+            ", uniqueId=" + uniqueId +
+            ", sequenceNumber=" + sequenceNumber +
+            ", multiCommandFlag=" + multiCommandFlag +
+            '}'
+    }
+
+    class Builder : NonceEnabledCommandBuilder<Builder, ProgramBasalCommand>() {
+
+        private var basalProgram: BasalProgram? = null
+        private var programReminder: ProgramReminder? = null
+        private var currentTime: Date? = null
+
+        fun setBasalProgram(basalProgram: BasalProgram): Builder {
+            this.basalProgram = basalProgram
+            return this
+        }
+
+        fun setProgramReminder(programReminder: ProgramReminder): Builder {
+            this.programReminder = programReminder
+            return this
+        }
+
+        fun setCurrentTime(currentTime: Date): Builder {
+            this.currentTime = currentTime
+            return this
+        }
+
+        override fun buildCommand(): ProgramBasalCommand {
+            val program = requireNotNull(basalProgram) { "basalProgram can not be null" }
+            val reminder = requireNotNull(programReminder) { "programReminder can not be null" }
+            val time = requireNotNull(currentTime) { "currentTime can not be null" }
+
+            val pulsesPerSlot = ProgramBasalUtil.mapBasalProgramToPulsesPerSlot(program)
+            val currentSlot = ProgramBasalUtil.calculateCurrentSlot(pulsesPerSlot, time)
+            val checksum = ProgramBasalUtil.calculateChecksum(pulsesPerSlot, currentSlot)
+            val longInsulinProgramElements: List<BasalInsulinProgramElement> =
+                mapTenthPulsesPerSlotToLongInsulinProgramElements(
+                    ProgramBasalUtil.mapBasalProgramToTenthPulsesPerSlot(program)
+                )
+            val shortInsulinProgramElements = ProgramBasalUtil.mapPulsesPerSlotToShortInsulinProgramElements(
+                pulsesPerSlot
+            )
+            val currentBasalInsulinProgramElement = ProgramBasalUtil.calculateCurrentLongInsulinProgramElement(
+                longInsulinProgramElements,
+                time
+            )
+            val interlockCommand = ProgramInsulinCommand(
+                uniqueId!!, sequenceNumber!!, multiCommandFlag, nonce!!,
+                shortInsulinProgramElements, checksum, currentSlot.index, currentSlot.eighthSecondsRemaining,
+                currentSlot.pulsesRemaining, ProgramInsulinCommand.DeliveryType.BASAL
+            )
+            return ProgramBasalCommand(
+                interlockCommand,
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                longInsulinProgramElements,
+                reminder,
+                currentBasalInsulinProgramElement.index,
+                currentBasalInsulinProgramElement.remainingTenthPulses,
+                currentBasalInsulinProgramElement.delayUntilNextTenthPulseInUsec
+            )
+        }
+    }
+
+    init {
+        this.insulinProgramElements = ArrayList(insulinProgramElements)
+        this.programReminder = programReminder
+        this.currentInsulinProgramElementIndex = currentInsulinProgramElementIndex
+        this.remainingTenthPulsesInCurrentInsulinProgramElement = remainingTenthPulsesInCurrentInsulinProgramElement
+        this.delayUntilNextTenthPulseInUsec = delayUntilNextTenthPulseInUsec
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommand.kt
new file mode 100644
index 0000000000..e2e8b09de4
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommand.kt
@@ -0,0 +1,83 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.HeaderEnabledCommand
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.HeaderEnabledCommandBuilder
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ProgramReminder
+import java.nio.ByteBuffer
+
+class ProgramBeepsCommand private constructor(
+    uniqueId: Int,
+    sequenceNumber: Short,
+    multiCommandFlag: Boolean,
+    private val immediateBeepType: BeepType,
+    private val basalReminder: ProgramReminder,
+    private val tempBasalReminder: ProgramReminder,
+    private val bolusReminder: ProgramReminder
+) : HeaderEnabledCommand(CommandType.PROGRAM_BEEPS, uniqueId, sequenceNumber, multiCommandFlag) {
+
+    override val encoded: ByteArray
+        get() = appendCrc(
+            ByteBuffer.allocate(LENGTH + HEADER_LENGTH)
+                .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag))
+                .put(commandType.value)
+                .put(BODY_LENGTH)
+                .put(immediateBeepType.value)
+                .put(basalReminder.encoded)
+                .put(tempBasalReminder.encoded)
+                .put(bolusReminder.encoded)
+                .array()
+        )
+
+    class Builder : HeaderEnabledCommandBuilder<Builder, ProgramBeepsCommand>() {
+
+        private var immediateBeepType: BeepType? = null
+        private var basalReminder: ProgramReminder? = null
+        private var tempBasalReminder: ProgramReminder? = null
+        private var bolusReminder: ProgramReminder? = null
+
+        fun setImmediateBeepType(beepType: BeepType): Builder {
+            this.immediateBeepType = beepType
+            return this
+        }
+
+        fun setBasalReminder(programReminder: ProgramReminder): Builder {
+            this.basalReminder = programReminder
+            return this
+        }
+
+        fun setTempBasalReminder(programReminder: ProgramReminder): Builder {
+            this.tempBasalReminder = programReminder
+            return this
+        }
+
+        fun setBolusReminder(programReminder: ProgramReminder): Builder {
+            this.bolusReminder = programReminder
+            return this
+        }
+
+        override fun buildCommand(): ProgramBeepsCommand {
+            requireNotNull(immediateBeepType) { "immediateBeepType can not be null" }
+            requireNotNull(basalReminder) { "basalReminder can not be null" }
+            requireNotNull(tempBasalReminder) { "tempBasalReminder can not be null" }
+            requireNotNull(bolusReminder) { "bolusReminder can not be null" }
+
+            return ProgramBeepsCommand(
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                immediateBeepType!!,
+                basalReminder!!,
+                tempBasalReminder!!,
+                bolusReminder!!
+            )
+        }
+    }
+
+    companion object {
+
+        private const val LENGTH: Short = 6
+        private const val BODY_LENGTH: Byte = 4
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommand.java
deleted file mode 100644
index 7c1e4a80bd..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommand.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import java.nio.ByteBuffer;
-import java.util.Collections;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.HeaderEnabledCommand;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.NonceEnabledCommandBuilder;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.BolusShortInsulinProgramElement;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ProgramReminder;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.MessageUtil;
-
-// NOT SUPPORTED: extended bolus
-public final class ProgramBolusCommand extends HeaderEnabledCommand {
-    private static final short LENGTH = 15;
-    private static final byte BODY_LENGTH = 13;
-
-    private final ProgramInsulinCommand interlockCommand;
-    private final ProgramReminder programReminder;
-    private final short numberOfTenthPulses;
-    private final int delayUntilFirstTenthPulseInUsec;
-
-    ProgramBolusCommand(ProgramInsulinCommand interlockCommand, int uniqueId, short sequenceNumber, boolean multiCommandFlag, ProgramReminder programReminder, short numberOfTenthPulses, int delayUntilFirstTenthPulseInUsec) {
-        super(CommandType.PROGRAM_BOLUS, uniqueId, sequenceNumber, multiCommandFlag);
-        this.interlockCommand = interlockCommand;
-        this.programReminder = programReminder;
-        this.numberOfTenthPulses = numberOfTenthPulses;
-        this.delayUntilFirstTenthPulseInUsec = delayUntilFirstTenthPulseInUsec;
-    }
-
-    @Override public byte[] getEncoded() {
-        byte[] bolusCommand = ByteBuffer.allocate(LENGTH) //
-                .put(commandType.getValue()) //
-                .put(BODY_LENGTH) //
-                .put(programReminder.getEncoded()) //
-                .putShort(numberOfTenthPulses) //
-                .putInt(delayUntilFirstTenthPulseInUsec) //
-                .putShort((short) 0) // Extended bolus pulses
-                .putInt(0) // Delay between tenth extended pulses in usec
-                .array();
-
-        byte[] interlockCommand = this.interlockCommand.getEncoded();
-        byte[] header = encodeHeader(uniqueId, sequenceNumber, (short) (bolusCommand.length + interlockCommand.length), multiCommandFlag);
-
-        return appendCrc(ByteBuffer.allocate(header.length + interlockCommand.length + bolusCommand.length) //
-                .put(header) //
-                .put(interlockCommand) //
-                .put(bolusCommand) //
-                .array());
-    }
-
-    @Override public String toString() {
-        return "ProgramBolusCommand{" +
-                "interlockCommand=" + interlockCommand +
-                ", programReminder=" + programReminder +
-                ", numberOfTenthPulses=" + numberOfTenthPulses +
-                ", delayUntilFirstTenthPulseInUsec=" + delayUntilFirstTenthPulseInUsec +
-                ", commandType=" + commandType +
-                ", uniqueId=" + uniqueId +
-                ", sequenceNumber=" + sequenceNumber +
-                ", multiCommandFlag=" + multiCommandFlag +
-                '}';
-    }
-
-    public static final class Builder extends NonceEnabledCommandBuilder<Builder, ProgramBolusCommand> {
-        private Double numberOfUnits;
-        private Byte delayBetweenPulsesInEighthSeconds;
-        private ProgramReminder programReminder;
-
-        public Builder setNumberOfUnits(double numberOfUnits) {
-            if (numberOfUnits <= 0.0D) {
-                throw new IllegalArgumentException("Number of units should be greater than zero");
-            }
-            if ((int) (numberOfUnits * 1000) % 50 != 0) {
-                throw new IllegalArgumentException("Number of units must be dividable by 0.05");
-            }
-            this.numberOfUnits = ((int) (numberOfUnits * 100)) / 100.0d;
-            return this;
-        }
-
-        public Builder setDelayBetweenPulsesInEighthSeconds(byte delayBetweenPulsesInEighthSeconds) {
-            this.delayBetweenPulsesInEighthSeconds = delayBetweenPulsesInEighthSeconds;
-            return this;
-        }
-
-        public Builder setProgramReminder(ProgramReminder programReminder) {
-            this.programReminder = programReminder;
-            return this;
-        }
-
-        @Override protected ProgramBolusCommand buildCommand() {
-            if (numberOfUnits == null) {
-                throw new IllegalArgumentException("numberOfUnits can not be null");
-            }
-            if (delayBetweenPulsesInEighthSeconds == null) {
-                throw new IllegalArgumentException("delayBetweenPulsesInEighthSeconds can not be null");
-            }
-            if (programReminder == null) {
-                throw new IllegalArgumentException("programReminder can not be null");
-            }
-
-            short numberOfPulses = (short) Math.round(numberOfUnits * 20);
-            short byte10And11 = (short) (numberOfPulses * delayBetweenPulsesInEighthSeconds);
-
-            ProgramInsulinCommand interlockCommand = new ProgramInsulinCommand(uniqueId, sequenceNumber, multiCommandFlag, nonce,
-                    Collections.singletonList(new BolusShortInsulinProgramElement(numberOfPulses)), calculateChecksum((byte) 0x01, byte10And11, numberOfPulses),
-                    (byte) 0x01, byte10And11, (short) numberOfPulses, ProgramInsulinCommand.DeliveryType.BOLUS);
-
-            int delayUntilFirstTenthPulseInUsec = delayBetweenPulsesInEighthSeconds / 8 * 100_000;
-
-            return new ProgramBolusCommand(interlockCommand, uniqueId, sequenceNumber, multiCommandFlag, programReminder, (short) (numberOfPulses * 10), delayUntilFirstTenthPulseInUsec);
-        }
-    }
-
-    private static short calculateChecksum(byte numberOfSlots, short byte10And11, short numberOfPulses) {
-        return MessageUtil.calculateChecksum(ByteBuffer.allocate(7) //
-                .put(numberOfSlots) //
-                .putShort(byte10And11) //
-                .putShort(numberOfPulses) //
-                .putShort(numberOfPulses) //
-                .array());
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommand.kt
new file mode 100644
index 0000000000..2eda700754
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommand.kt
@@ -0,0 +1,132 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.HeaderEnabledCommand
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.NonceEnabledCommandBuilder
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.BolusShortInsulinProgramElement
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ProgramReminder
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.MessageUtil
+import java.nio.ByteBuffer
+
+// NOT SUPPORTED: extended bolus
+class ProgramBolusCommand private constructor(
+    private val interlockCommand: ProgramInsulinCommand,
+    uniqueId: Int,
+    sequenceNumber: Short,
+    multiCommandFlag: Boolean,
+    private val programReminder: ProgramReminder,
+    private val numberOfTenthPulses: Short,
+    private val delayUntilFirstTenthPulseInUsec: Int
+) : HeaderEnabledCommand(CommandType.PROGRAM_BOLUS, uniqueId, sequenceNumber, multiCommandFlag) {
+
+    override val encoded: ByteArray
+        get() {
+            val bolusCommand = ByteBuffer.allocate(LENGTH.toInt())
+                .put(commandType.value)
+                .put(BODY_LENGTH)
+                .put(programReminder.encoded)
+                .putShort(numberOfTenthPulses)
+                .putInt(delayUntilFirstTenthPulseInUsec)
+                .putShort(0.toShort()) // Extended bolus pulses
+                .putInt(0) // Delay between tenth extended pulses in usec
+                .array()
+            val interlockCommand = interlockCommand.encoded
+            val header: ByteArray = encodeHeader(
+                uniqueId,
+                sequenceNumber,
+                (bolusCommand.size + interlockCommand.size).toShort(),
+                multiCommandFlag
+            )
+            return appendCrc(
+                ByteBuffer.allocate(header.size + interlockCommand.size + bolusCommand.size)
+                    .put(header)
+                    .put(interlockCommand)
+                    .put(bolusCommand)
+                    .array()
+            )
+        }
+
+    override fun toString(): String {
+        return "ProgramBolusCommand{" +
+            "interlockCommand=" + interlockCommand +
+            ", programReminder=" + programReminder +
+            ", numberOfTenthPulses=" + numberOfTenthPulses +
+            ", delayUntilFirstTenthPulseInUsec=" + delayUntilFirstTenthPulseInUsec +
+            ", commandType=" + commandType +
+            ", uniqueId=" + uniqueId +
+            ", sequenceNumber=" + sequenceNumber +
+            ", multiCommandFlag=" + multiCommandFlag +
+            '}'
+    }
+
+    class Builder : NonceEnabledCommandBuilder<Builder, ProgramBolusCommand>() {
+
+        private var numberOfUnits: Double? = null
+        private var delayBetweenPulsesInEighthSeconds: Byte? = null
+        private var programReminder: ProgramReminder? = null
+
+        fun setNumberOfUnits(numberOfUnits: Double): Builder {
+            require(numberOfUnits > 0.0) { "Number of units should be greater than zero" }
+            require((numberOfUnits * 1000).toInt() % 50 == 0) { "Number of units must be dividable by 0.05" }
+            this.numberOfUnits = (numberOfUnits * 100).toInt() / 100.0
+            return this
+        }
+
+        fun setDelayBetweenPulsesInEighthSeconds(delayBetweenPulsesInEighthSeconds: Byte): Builder {
+            this.delayBetweenPulsesInEighthSeconds = delayBetweenPulsesInEighthSeconds
+            return this
+        }
+
+        fun setProgramReminder(programReminder: ProgramReminder): Builder {
+            this.programReminder = programReminder
+            return this
+        }
+
+        override fun buildCommand(): ProgramBolusCommand {
+            requireNotNull(numberOfUnits) { "numberOfUnits can not be null" }
+            requireNotNull(delayBetweenPulsesInEighthSeconds) { "delayBetweenPulsesInEighthSeconds can not be null" }
+            requireNotNull(programReminder) { "programReminder can not be null" }
+
+            val numberOfPulses = Math.round(numberOfUnits!! * 20).toShort()
+            val byte10And11 = (numberOfPulses * delayBetweenPulsesInEighthSeconds!!).toShort()
+            val interlockCommand = ProgramInsulinCommand(
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                nonce!!,
+                listOf(BolusShortInsulinProgramElement(numberOfPulses)),
+                calculateChecksum(0x01.toByte(), byte10And11, numberOfPulses),
+                0x01.toByte(),
+                byte10And11,
+                numberOfPulses,
+                ProgramInsulinCommand.DeliveryType.BOLUS
+            )
+            val delayUntilFirstTenthPulseInUsec = delayBetweenPulsesInEighthSeconds!! / 8 * 100000
+            return ProgramBolusCommand(
+                interlockCommand,
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                programReminder!!,
+                (numberOfPulses * 10).toShort(),
+                delayUntilFirstTenthPulseInUsec
+            )
+        }
+    }
+
+    companion object {
+
+        private const val LENGTH: Short = 15
+        private const val BODY_LENGTH: Byte = 13
+        private fun calculateChecksum(numberOfSlots: Byte, byte10And11: Short, numberOfPulses: Short): Short {
+            return MessageUtil.calculateChecksum(
+                ByteBuffer.allocate(7)
+                    .put(numberOfSlots)
+                    .putShort(byte10And11)
+                    .putShort(numberOfPulses)
+                    .putShort(numberOfPulses)
+                    .array()
+            )
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramInsulinCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramInsulinCommand.java
deleted file mode 100644
index ce060000cc..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramInsulinCommand.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.NonceEnabledCommand;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.ShortInsulinProgramElement;
-
-// Always followed by one of: 0x13, 0x16, 0x17
-final class ProgramInsulinCommand extends NonceEnabledCommand {
-    private final List<ShortInsulinProgramElement> insulinProgramElements;
-    private final short checksum;
-    private final byte byte9;
-    private final short byte10And11;
-    private final short byte12And13;
-    private final DeliveryType deliveryType;
-
-    ProgramInsulinCommand(int uniqueId, short sequenceNumber, boolean multiCommandFlag, int nonce, List<ShortInsulinProgramElement> insulinProgramElements, short checksum, byte byte9, short byte10And11, short byte12And13, DeliveryType deliveryType) {
-        super(CommandType.PROGRAM_INSULIN, uniqueId, sequenceNumber, multiCommandFlag, nonce);
-        this.insulinProgramElements = new ArrayList<>(insulinProgramElements);
-        this.checksum = checksum;
-        this.byte9 = byte9;
-        this.byte10And11 = byte10And11;
-        this.byte12And13 = byte12And13;
-        this.deliveryType = deliveryType;
-    }
-
-    public short getLength() {
-        return (short) (insulinProgramElements.size() * 2 + 14);
-    }
-
-    public byte getBodyLength() {
-        return (byte) (insulinProgramElements.size() * 2 + 12);
-    }
-
-    @Override public byte[] getEncoded() {
-        ByteBuffer buffer = ByteBuffer.allocate(this.getLength()) //
-                .put(commandType.getValue()) //
-                .put(getBodyLength()) //
-                .putInt(nonce) //
-                .put(deliveryType.getValue()) //
-                .putShort(checksum) //
-                .put(byte9) // BASAL: currentSlot // BOLUS: number of ShortInsulinProgramElements
-                .putShort(byte10And11) // BASAL: remainingEighthSecondsInCurrentSlot // BOLUS: immediate pulses multiplied by delay between pulses in eighth seconds
-                .putShort(byte12And13); // BASAL: remainingPulsesInCurrentSlot // BOLUS: immediate pulses
-
-        for (ShortInsulinProgramElement element : insulinProgramElements) {
-            buffer.put(element.getEncoded());
-        }
-
-        return buffer.array();
-    }
-
-    enum DeliveryType {
-        BASAL((byte) 0x00),
-        TEMP_BASAL((byte) 0x01),
-        BOLUS((byte) 0x02);
-
-        private final byte value;
-
-        DeliveryType(byte value) {
-            this.value = value;
-        }
-
-        public byte getValue() {
-            return value;
-        }
-    }
-
-    public short calculateChecksum(byte[] bytes) {
-        short sum = 0;
-        for (byte b : bytes) {
-            sum += (short) (b & 0xff);
-        }
-        return sum;
-    }
-
-    @Override public String toString() {
-        return "ProgramInsulinCommand{" +
-                "insulinProgramElements=" + insulinProgramElements +
-                ", checksum=" + checksum +
-                ", byte9=" + byte9 +
-                ", byte10And11=" + byte10And11 +
-                ", byte12And13=" + byte12And13 +
-                ", deliveryType=" + deliveryType +
-                ", nonce=" + nonce +
-                ", commandType=" + commandType +
-                ", uniqueId=" + uniqueId +
-                ", sequenceNumber=" + sequenceNumber +
-                ", multiCommandFlag=" + multiCommandFlag +
-                '}';
-    }
-
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramInsulinCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramInsulinCommand.kt
new file mode 100644
index 0000000000..930f376ec7
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramInsulinCommand.kt
@@ -0,0 +1,70 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.NonceEnabledCommand
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.ShortInsulinProgramElement
+import java.nio.ByteBuffer
+import java.util.*
+
+// Always followed by one of: 0x13, 0x16, 0x17
+class ProgramInsulinCommand internal constructor(
+    uniqueId: Int,
+    sequenceNumber: Short,
+    multiCommandFlag: Boolean,
+    nonce: Int,
+    insulinProgramElements:
+        List<ShortInsulinProgramElement>,
+    private val checksum: Short,
+    private val byte9: Byte,
+    private val byte10And11: Short,
+    private val byte12And13: Short,
+    private val deliveryType: DeliveryType
+) : NonceEnabledCommand(CommandType.PROGRAM_INSULIN, uniqueId, sequenceNumber, multiCommandFlag, nonce) {
+
+    private val insulinProgramElements: List<ShortInsulinProgramElement> = ArrayList(insulinProgramElements)
+
+    fun getLength(): Short = (insulinProgramElements.size * 2 + 14).toShort()
+
+    fun getBodyLength(): Byte = (insulinProgramElements.size * 2 + 12).toByte()
+
+    enum class DeliveryType(private val value: Byte) {
+        BASAL(0x00.toByte()), TEMP_BASAL(0x01.toByte()), BOLUS(0x02.toByte());
+
+        fun getValue(): Byte {
+            return value
+        }
+    }
+
+    override val encoded: ByteArray
+        get() {
+            val buffer = ByteBuffer.allocate(getLength().toInt())
+                .put(commandType.value)
+                .put(getBodyLength())
+                .putInt(nonce)
+                .put(deliveryType.getValue())
+                .putShort(checksum)
+                .put(byte9) // BASAL: currentSlot // BOLUS: number of ShortInsulinProgramElements
+                .putShort(byte10And11) // BASAL: remainingEighthSecondsInCurrentSlot // BOLUS: immediate pulses multiplied by delay between pulses in eighth seconds
+                .putShort(byte12And13) // BASAL: remainingPulsesInCurrentSlot // BOLUS: immediate pulses
+            for (element in insulinProgramElements) {
+                buffer.put(element.encoded)
+            }
+            return buffer.array()
+        }
+
+    override fun toString(): String {
+        return "ProgramInsulinCommand{" +
+            "insulinProgramElements=" + insulinProgramElements +
+            ", checksum=" + checksum +
+            ", byte9=" + byte9 +
+            ", byte10And11=" + byte10And11 +
+            ", byte12And13=" + byte12And13 +
+            ", deliveryType=" + deliveryType +
+            ", nonce=" + nonce +
+            ", commandType=" + commandType +
+            ", uniqueId=" + uniqueId +
+            ", sequenceNumber=" + sequenceNumber +
+            ", multiCommandFlag=" + multiCommandFlag +
+            '}'
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommand.java
deleted file mode 100644
index 9d4f1f547a..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommand.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.HeaderEnabledCommand;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.NonceEnabledCommandBuilder;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.BasalInsulinProgramElement;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.ShortInsulinProgramElement;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.util.ProgramBasalUtil;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.util.ProgramTempBasalUtil;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ProgramReminder;
-
-// NOT SUPPORTED: percentage temp basal
-public final class ProgramTempBasalCommand extends HeaderEnabledCommand {
-    private final ProgramInsulinCommand interlockCommand;
-    private final ProgramReminder programReminder;
-    private final List<BasalInsulinProgramElement> insulinProgramElements;
-
-    protected ProgramTempBasalCommand(ProgramInsulinCommand interlockCommand, int uniqueId, short sequenceNumber, boolean multiCommandFlag,
-                                      ProgramReminder programReminder, List<BasalInsulinProgramElement> insulinProgramElements) {
-        super(CommandType.PROGRAM_TEMP_BASAL, uniqueId, sequenceNumber, multiCommandFlag);
-        this.interlockCommand = interlockCommand;
-        this.programReminder = programReminder;
-        this.insulinProgramElements = new ArrayList<>(insulinProgramElements);
-    }
-
-    public byte getBodyLength() {
-        return (byte) (insulinProgramElements.size() * 6 + 8);
-    }
-
-    public short getLength() {
-        return (short) (getBodyLength() + 2);
-    }
-
-    @Override public byte[] getEncoded() {
-        BasalInsulinProgramElement firstProgramElement = insulinProgramElements.get(0);
-
-        short remainingTenthPulsesInFirstElement;
-        int delayUntilNextTenthPulseInUsec;
-
-        if (firstProgramElement.getTotalTenthPulses() == 0) {
-            remainingTenthPulsesInFirstElement = firstProgramElement.getNumberOfSlots();
-            delayUntilNextTenthPulseInUsec = ProgramBasalUtil.MAX_DELAY_BETWEEN_TENTH_PULSES_IN_USEC_AND_USECS_IN_BASAL_SLOT;
-        } else {
-            remainingTenthPulsesInFirstElement = firstProgramElement.getTotalTenthPulses();
-            delayUntilNextTenthPulseInUsec = (int) ((long) firstProgramElement.getNumberOfSlots() * 1_800.0d / remainingTenthPulsesInFirstElement * 1_000_000);
-        }
-
-        ByteBuffer buffer = ByteBuffer.allocate(getLength()) //
-                .put(commandType.getValue()) //
-                .put(getBodyLength()) //
-                .put(programReminder.getEncoded()) //
-                .put((byte) 0x00) // Current slot index
-                .putShort(remainingTenthPulsesInFirstElement) //
-                .putInt(delayUntilNextTenthPulseInUsec);
-
-        for (BasalInsulinProgramElement element : insulinProgramElements) {
-            buffer.put(element.getEncoded());
-        }
-
-        byte[] tempBasalCommand = buffer.array();
-        byte[] interlockCommand = this.interlockCommand.getEncoded();
-        byte[] header = encodeHeader(uniqueId, sequenceNumber, (short) (tempBasalCommand.length + interlockCommand.length), multiCommandFlag);
-
-        return appendCrc(ByteBuffer.allocate(header.length + interlockCommand.length + tempBasalCommand.length) //
-                .put(header) //
-                .put(interlockCommand) //
-                .put(tempBasalCommand) //
-                .array());
-    }
-
-    public static class Builder extends NonceEnabledCommandBuilder<Builder, ProgramTempBasalCommand> {
-        private ProgramReminder programReminder;
-        private Double rateInUnitsPerHour;
-        private Short durationInMinutes;
-
-        public Builder setProgramReminder(ProgramReminder programReminder) {
-            this.programReminder = programReminder;
-            return this;
-        }
-
-        public Builder setRateInUnitsPerHour(double rateInUnitsPerHour) {
-            this.rateInUnitsPerHour = rateInUnitsPerHour;
-            return this;
-        }
-
-        public Builder setDurationInMinutes(short durationInMinutes) {
-            if (durationInMinutes % 30 != 0) {
-                throw new IllegalArgumentException("durationInMinutes must be dividable by 30");
-            }
-            this.durationInMinutes = durationInMinutes;
-            return this;
-        }
-
-        @Override protected ProgramTempBasalCommand buildCommand() {
-            if (programReminder == null) {
-                throw new IllegalArgumentException("programReminder can not be null");
-            }
-            if (rateInUnitsPerHour == null) {
-                throw new IllegalArgumentException("rateInUnitsPerHour can not be null");
-            }
-            if (durationInMinutes == null) {
-                throw new IllegalArgumentException("durationInMinutes can not be null");
-            }
-
-            byte durationInSlots = (byte) (durationInMinutes / 30);
-            short[] pulsesPerSlot = ProgramTempBasalUtil.mapTempBasalToPulsesPerSlot(durationInSlots, rateInUnitsPerHour);
-            short[] tenthPulsesPerSlot = ProgramTempBasalUtil.mapTempBasalToTenthPulsesPerSlot(durationInSlots, rateInUnitsPerHour);
-
-            List<ShortInsulinProgramElement> shortInsulinProgramElements = ProgramTempBasalUtil.mapPulsesPerSlotToShortInsulinProgramElements(pulsesPerSlot);
-            List<BasalInsulinProgramElement> insulinProgramElements = ProgramTempBasalUtil.mapTenthPulsesPerSlotToLongInsulinProgramElements(tenthPulsesPerSlot);
-
-            ProgramInsulinCommand interlockCommand = new ProgramInsulinCommand(uniqueId, sequenceNumber, multiCommandFlag, nonce, shortInsulinProgramElements,
-                    ProgramTempBasalUtil.calculateChecksum(durationInSlots, pulsesPerSlot[0], pulsesPerSlot), durationInSlots,
-                    (short) 0x3840, pulsesPerSlot[0], ProgramInsulinCommand.DeliveryType.TEMP_BASAL);
-
-            return new ProgramTempBasalCommand(interlockCommand, uniqueId, sequenceNumber, multiCommandFlag, programReminder, insulinProgramElements);
-        }
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommand.kt
new file mode 100644
index 0000000000..bd6b7e2b1c
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommand.kt
@@ -0,0 +1,132 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.HeaderEnabledCommand
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.NonceEnabledCommandBuilder
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.BasalInsulinProgramElement
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.util.ProgramBasalUtil
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.util.ProgramTempBasalUtil
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ProgramReminder
+import java.nio.ByteBuffer
+import java.util.*
+
+// NOT SUPPORTED: percentage temp basal
+class ProgramTempBasalCommand private constructor(
+    private val interlockCommand: ProgramInsulinCommand,
+    uniqueId: Int,
+    sequenceNumber: Short,
+    multiCommandFlag: Boolean,
+    private val programReminder: ProgramReminder,
+    insulinProgramElements: List<BasalInsulinProgramElement>
+) : HeaderEnabledCommand(CommandType.PROGRAM_TEMP_BASAL, uniqueId, sequenceNumber, multiCommandFlag) {
+
+    private val insulinProgramElements: List<BasalInsulinProgramElement> = ArrayList(insulinProgramElements)
+
+    private fun getBodyLength(): Byte = (insulinProgramElements.size * 6 + 8).toByte()
+
+    private fun getLength(): Short = (getBodyLength() + 2).toShort()
+
+    class Builder : NonceEnabledCommandBuilder<Builder, ProgramTempBasalCommand>() {
+
+        private var programReminder: ProgramReminder? = null
+        private var rateInUnitsPerHour: Double? = null
+        private var durationInMinutes: Short? = null
+
+        fun setProgramReminder(programReminder: ProgramReminder): Builder {
+            this.programReminder = programReminder
+            return this
+        }
+
+        fun setRateInUnitsPerHour(rateInUnitsPerHour: Double): Builder {
+            this.rateInUnitsPerHour = rateInUnitsPerHour
+            return this
+        }
+
+        fun setDurationInMinutes(durationInMinutes: Short): Builder {
+            require(durationInMinutes % 30 == 0) { "durationInMinutes must be dividable by 30" }
+
+            this.durationInMinutes = durationInMinutes
+            return this
+        }
+
+        override fun buildCommand(): ProgramTempBasalCommand {
+            requireNotNull(programReminder) { "programReminder can not be null" }
+            requireNotNull(rateInUnitsPerHour) { "rateInUnitsPerHour can not be null" }
+            requireNotNull(durationInMinutes) { "durationInMinutes can not be null" }
+
+            val durationInSlots = (durationInMinutes!! / 30).toByte()
+            val pulsesPerSlot = ProgramTempBasalUtil.mapTempBasalToPulsesPerSlot(durationInSlots, rateInUnitsPerHour!!)
+            val tenthPulsesPerSlot = ProgramTempBasalUtil.mapTempBasalToTenthPulsesPerSlot(
+                durationInSlots.toInt(),
+                rateInUnitsPerHour!!
+            )
+            val shortInsulinProgramElements = ProgramTempBasalUtil.mapPulsesPerSlotToShortInsulinProgramElements(
+                pulsesPerSlot
+            )
+            val insulinProgramElements = ProgramTempBasalUtil.mapTenthPulsesPerSlotToLongInsulinProgramElements(
+                tenthPulsesPerSlot
+            )
+            val interlockCommand = ProgramInsulinCommand(
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                nonce!!,
+                shortInsulinProgramElements,
+                ProgramTempBasalUtil.calculateChecksum(durationInSlots, pulsesPerSlot[0], pulsesPerSlot),
+                durationInSlots,
+                0x3840.toShort(),
+                pulsesPerSlot[0],
+                ProgramInsulinCommand.DeliveryType.TEMP_BASAL
+            )
+            return ProgramTempBasalCommand(
+                interlockCommand,
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                programReminder!!,
+                insulinProgramElements
+            )
+        }
+    }
+
+    override val encoded: ByteArray
+        get() {
+            val firstProgramElement = insulinProgramElements[0]
+            val remainingTenthPulsesInFirstElement: Short
+            val delayUntilNextTenthPulseInUsec: Int
+            if (firstProgramElement.totalTenthPulses.toInt() == 0) {
+                remainingTenthPulsesInFirstElement = firstProgramElement.numberOfSlots.toShort()
+                delayUntilNextTenthPulseInUsec =
+                    ProgramBasalUtil.MAX_DELAY_BETWEEN_TENTH_PULSES_IN_USEC_AND_USECS_IN_BASAL_SLOT
+            } else {
+                remainingTenthPulsesInFirstElement = firstProgramElement.totalTenthPulses
+                delayUntilNextTenthPulseInUsec =
+                    (firstProgramElement.numberOfSlots.toLong() * 1800.0 / remainingTenthPulsesInFirstElement * 1000000).toInt()
+            }
+            val buffer = ByteBuffer.allocate(getLength().toInt())
+                .put(commandType.value)
+                .put(getBodyLength())
+                .put(programReminder.encoded)
+                .put(0x00.toByte()) // Current slot index
+                .putShort(remainingTenthPulsesInFirstElement)
+                .putInt(delayUntilNextTenthPulseInUsec)
+            for (element in insulinProgramElements) {
+                buffer.put(element.encoded)
+            }
+            val tempBasalCommand = buffer.array()
+            val interlockCommand = interlockCommand.encoded
+            val header: ByteArray = encodeHeader(
+                uniqueId,
+                sequenceNumber,
+                (tempBasalCommand.size + interlockCommand.size).toShort(),
+                multiCommandFlag
+            )
+            return appendCrc(
+                ByteBuffer.allocate(header.size + interlockCommand.size + tempBasalCommand.size)
+                    .put(header)
+                    .put(interlockCommand)
+                    .put(tempBasalCommand)
+                    .array()
+            )
+        }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.java
deleted file mode 100644
index d43a5fb4be..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import java.nio.ByteBuffer;
-import java.util.Calendar;
-import java.util.Date;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.HeaderEnabledCommand;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.HeaderEnabledCommandBuilder;
-
-public final class SetUniqueIdCommand extends HeaderEnabledCommand {
-    private static final int DEFAULT_UNIQUE_ID = -1;
-    private static final short LENGTH = 21;
-    private static final byte BODY_LENGTH = 19;
-
-    private final int lotNumber;
-    private final int podSequenceNumber;
-    private final Date initializationTime;
-
-    SetUniqueIdCommand(int uniqueId, short sequenceNumber, boolean multiCommandFlag, int lotNumber, int podSequenceNumber, Date initializationTime) {
-        super(CommandType.SET_UNIQUE_ID, uniqueId, sequenceNumber, multiCommandFlag);
-        this.lotNumber = lotNumber;
-        this.podSequenceNumber = podSequenceNumber;
-        this.initializationTime = initializationTime;
-    }
-
-    @Override public byte[] getEncoded() {
-        return appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
-                .put(encodeHeader(DEFAULT_UNIQUE_ID, sequenceNumber, LENGTH, multiCommandFlag)) //
-                .put(commandType.getValue()) //
-                .put(BODY_LENGTH) //
-                .putInt(uniqueId) //
-                .put((byte) 0x14) // FIXME ??
-                .put((byte) 0x04) // FIXME ??
-                .put(encodeInitializationTime(initializationTime)) //
-                .putInt(lotNumber) //
-                .putInt(podSequenceNumber) //
-                .array());
-    }
-
-    private static byte[] encodeInitializationTime(Date date) {
-        Calendar instance = Calendar.getInstance();
-        instance.setTime(date);
-
-        return new byte[]{ //
-                (byte) (instance.get(Calendar.MONTH) + 1), //
-                (byte) instance.get(Calendar.DATE), //
-                (byte) (instance.get(Calendar.YEAR) % 100), //
-                (byte) instance.get(Calendar.HOUR_OF_DAY), //
-                (byte) instance.get(Calendar.MINUTE) //
-        };
-    }
-
-    @Override public String toString() {
-        return "SetUniqueIdCommand{" +
-                "lotNumber=" + lotNumber +
-                ", podSequenceNumber=" + podSequenceNumber +
-                ", initializationTime=" + initializationTime +
-                ", commandType=" + commandType +
-                ", uniqueId=" + uniqueId +
-                ", sequenceNumber=" + sequenceNumber +
-                ", multiCommandFlag=" + multiCommandFlag +
-                '}';
-    }
-
-    public static final class Builder extends HeaderEnabledCommandBuilder<Builder, SetUniqueIdCommand> {
-        private Integer lotNumber;
-        private Integer podSequenceNumber;
-        private Date initializationTime;
-
-        public Builder setLotNumber(int lotNumber) {
-            this.lotNumber = lotNumber;
-            return this;
-        }
-
-        public Builder setPodSequenceNumber(int podSequenceNumber) {
-            this.podSequenceNumber = podSequenceNumber;
-            return this;
-        }
-
-        public Builder setInitializationTime(Date initializationTime) {
-            this.initializationTime = initializationTime;
-            return this;
-        }
-
-        @Override protected final SetUniqueIdCommand buildCommand() {
-            if (lotNumber == null) {
-                throw new IllegalArgumentException("lotNumber can not be null");
-            }
-            if (podSequenceNumber == null) {
-                throw new IllegalArgumentException("podSequenceNumber can not be null");
-            }
-            if (initializationTime == null) {
-                throw new IllegalArgumentException("initializationTime can not be null");
-            }
-            return new SetUniqueIdCommand(uniqueId, sequenceNumber, multiCommandFlag, lotNumber, podSequenceNumber, initializationTime);
-        }
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.kt
new file mode 100644
index 0000000000..3ef7114c7b
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommand.kt
@@ -0,0 +1,98 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.HeaderEnabledCommand
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.HeaderEnabledCommandBuilder
+import java.nio.ByteBuffer
+import java.util.*
+
+class SetUniqueIdCommand private constructor(
+    uniqueId: Int,
+    sequenceNumber: Short,
+    multiCommandFlag: Boolean,
+    private val lotNumber: Int,
+    private val podSequenceNumber: Int,
+    private val initializationTime: Date
+) : HeaderEnabledCommand(CommandType.SET_UNIQUE_ID, uniqueId, sequenceNumber, multiCommandFlag) {
+
+    override val encoded: ByteArray
+        get() = appendCrc(
+            ByteBuffer.allocate(LENGTH + HEADER_LENGTH)
+                .put(encodeHeader(DEFAULT_UNIQUE_ID, sequenceNumber, LENGTH, multiCommandFlag))
+                .put(commandType.value)
+                .put(BODY_LENGTH)
+                .putInt(uniqueId)
+                .put(0x14.toByte()) // FIXME ??
+                .put(0x04.toByte()) // FIXME ??
+                .put(encodeInitializationTime(initializationTime))
+                .putInt(lotNumber)
+                .putInt(podSequenceNumber)
+                .array()
+        )
+
+    override fun toString(): String {
+        return "SetUniqueIdCommand{" +
+            "lotNumber=" + lotNumber +
+            ", podSequenceNumber=" + podSequenceNumber +
+            ", initializationTime=" + initializationTime +
+            ", commandType=" + commandType +
+            ", uniqueId=" + uniqueId +
+            ", sequenceNumber=" + sequenceNumber +
+            ", multiCommandFlag=" + multiCommandFlag +
+            '}'
+    }
+
+    class Builder : HeaderEnabledCommandBuilder<Builder, SetUniqueIdCommand>() {
+
+        private var lotNumber: Int? = null
+        private var podSequenceNumber: Int? = null
+        private var initializationTime: Date? = null
+
+        fun setLotNumber(lotNumber: Int): Builder {
+            this.lotNumber = lotNumber
+            return this
+        }
+
+        fun setPodSequenceNumber(podSequenceNumber: Int): Builder {
+            this.podSequenceNumber = podSequenceNumber
+            return this
+        }
+
+        fun setInitializationTime(initializationTime: Date): Builder {
+            this.initializationTime = initializationTime
+            return this
+        }
+
+        override fun buildCommand(): SetUniqueIdCommand {
+            requireNotNull(lotNumber) { "lotNumber can not be null" }
+            requireNotNull(podSequenceNumber) { "podSequenceNumber can not be null" }
+            requireNotNull(initializationTime) { "initializationTime can not be null" }
+            return SetUniqueIdCommand(
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                lotNumber!!,
+                podSequenceNumber!!,
+                initializationTime!!
+            )
+        }
+    }
+
+    companion object {
+
+        private const val DEFAULT_UNIQUE_ID = -1
+        private const val LENGTH: Short = 21
+        private const val BODY_LENGTH: Byte = 19
+        private fun encodeInitializationTime(date: Date): ByteArray {
+            val instance = Calendar.getInstance()
+            instance.time = date
+            return byteArrayOf(
+                (instance[Calendar.MONTH] + 1).toByte(),
+                instance[Calendar.DATE].toByte(),
+                (instance[Calendar.YEAR] % 100).toByte(),
+                instance[Calendar.HOUR_OF_DAY].toByte(),
+                instance[Calendar.MINUTE].toByte()
+            )
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.java
deleted file mode 100644
index 77341967fa..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import java.nio.ByteBuffer;
-import java.util.BitSet;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.NonceEnabledCommand;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.NonceEnabledCommandBuilder;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.Encodable;
-
-public final class SilenceAlertsCommand extends NonceEnabledCommand {
-    private static final short LENGTH = (short) 7;
-    private static final byte BODY_LENGTH = (byte) 5;
-
-    private final SilenceAlertCommandParameters parameters;
-
-    SilenceAlertsCommand(int uniqueId, short sequenceNumber, boolean multiCommandFlag, SilenceAlertCommandParameters parameters, int nonce) {
-        super(CommandType.SILENCE_ALERTS, uniqueId, sequenceNumber, multiCommandFlag, nonce);
-        this.parameters = parameters;
-    }
-
-    @Override public byte[] getEncoded() {
-        return appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
-                .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
-                .put(commandType.getValue()) //
-                .put(BODY_LENGTH) //
-                .putInt(nonce) //
-                .put(parameters.getEncoded()) //
-                .array());
-    }
-
-    @Override public String toString() {
-        return "SilenceAlertsCommand{" +
-                "parameters=" + parameters +
-                ", nonce=" + nonce +
-                ", commandType=" + commandType +
-                ", uniqueId=" + uniqueId +
-                ", sequenceNumber=" + sequenceNumber +
-                ", multiCommandFlag=" + multiCommandFlag +
-                '}';
-    }
-
-    private static final class SilenceAlertCommandParameters implements Encodable {
-        private final boolean silenceAutoOffAlert;
-        private final boolean silenceMultiCommandAlert;
-        private final boolean silenceExpirationImminentAlert;
-        private final boolean silenceUserSetExpirationAlert;
-        private final boolean silenceLowReservoirAlert;
-        private final boolean silenceSuspendInProgressAlert;
-        private final boolean silenceSuspendEndedAlert;
-        private final boolean silencePodExpirationAlert;
-
-        private SilenceAlertCommandParameters(boolean silenceAutoOffAlert, boolean silenceMultiCommandAlert, boolean silenceExpirationImminentAlert, boolean silenceUserSetExpirationAlert, boolean silenceLowReservoirAlert, boolean silenceSuspendInProgressAlert, boolean silenceSuspendEndedAlert, boolean silencePodExpirationAlert) {
-            this.silenceAutoOffAlert = silenceAutoOffAlert;
-            this.silenceMultiCommandAlert = silenceMultiCommandAlert;
-            this.silenceExpirationImminentAlert = silenceExpirationImminentAlert;
-            this.silenceUserSetExpirationAlert = silenceUserSetExpirationAlert;
-            this.silenceLowReservoirAlert = silenceLowReservoirAlert;
-            this.silenceSuspendInProgressAlert = silenceSuspendInProgressAlert;
-            this.silenceSuspendEndedAlert = silenceSuspendEndedAlert;
-            this.silencePodExpirationAlert = silencePodExpirationAlert;
-        }
-
-        @Override
-        public byte[] getEncoded() {
-            BitSet bitSet = new BitSet(8);
-            bitSet.set(0, this.silenceAutoOffAlert);
-            bitSet.set(1, this.silenceMultiCommandAlert);
-            bitSet.set(2, this.silenceExpirationImminentAlert);
-            bitSet.set(3, this.silenceUserSetExpirationAlert);
-            bitSet.set(4, this.silenceLowReservoirAlert);
-            bitSet.set(5, this.silenceSuspendInProgressAlert);
-            bitSet.set(6, this.silenceSuspendEndedAlert);
-            bitSet.set(7, this.silencePodExpirationAlert);
-            return bitSet.toByteArray();
-        }
-    }
-
-    public static class Builder extends NonceEnabledCommandBuilder<Builder, SilenceAlertsCommand> {
-        private boolean silenceAutoOffAlert;
-        private boolean silenceMultiCommandAlert;
-        private boolean silenceExpirationImminentAlert;
-        private boolean silenceUserSetExpirationAlert;
-        private boolean silenceLowReservoirAlert;
-        private boolean silenceSuspendInProgressAlert;
-        private boolean silenceSuspendEndedAlert;
-        private boolean silencePodExpirationAlert;
-
-        public Builder setSilenceAutoOffAlert(boolean silenceAutoOffAlert) {
-            this.silenceAutoOffAlert = silenceAutoOffAlert;
-            return this;
-        }
-
-        public Builder setSilenceMultiCommandAlert(boolean silenceMultiCommandAlert) {
-            this.silenceMultiCommandAlert = silenceMultiCommandAlert;
-            return this;
-        }
-
-        public Builder setSilenceExpirationImminentAlert(boolean silenceExpirationImminentAlert) {
-            this.silenceExpirationImminentAlert = silenceExpirationImminentAlert;
-            return this;
-        }
-
-        public Builder setSilenceUserSetExpirationAlert(boolean silenceUserSetExpirationAlert) {
-            this.silenceUserSetExpirationAlert = silenceUserSetExpirationAlert;
-            return this;
-        }
-
-        public Builder setSilenceLowReservoirAlert(boolean silenceLowReservoirAlert) {
-            this.silenceLowReservoirAlert = silenceLowReservoirAlert;
-            return this;
-        }
-
-        public Builder setSilenceSuspendInProgressAlert(boolean silenceSuspendInProgressAlert) {
-            this.silenceSuspendInProgressAlert = silenceSuspendInProgressAlert;
-            return this;
-        }
-
-        public Builder setSilenceSuspendEndedAlert(boolean silenceSuspendEndedAlert) {
-            this.silenceSuspendEndedAlert = silenceSuspendEndedAlert;
-            return this;
-        }
-
-        public Builder setSilencePodExpirationAlert(boolean silencePodExpirationAlert) {
-            this.silencePodExpirationAlert = silencePodExpirationAlert;
-            return this;
-        }
-
-        @Override protected final SilenceAlertsCommand buildCommand() {
-            return new SilenceAlertsCommand(uniqueId, sequenceNumber, multiCommandFlag, new SilenceAlertCommandParameters(silenceAutoOffAlert, silenceMultiCommandAlert, silenceExpirationImminentAlert, silenceUserSetExpirationAlert, silenceLowReservoirAlert, silenceSuspendInProgressAlert, silenceSuspendEndedAlert, silencePodExpirationAlert), nonce);
-        }
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.kt
new file mode 100644
index 0000000000..fad537e6b8
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommand.kt
@@ -0,0 +1,62 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.NonceEnabledCommand
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.NonceEnabledCommandBuilder
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.AlertUtil
+import java.nio.ByteBuffer
+import java.util.*
+
+class SilenceAlertsCommand private constructor(
+    uniqueId: Int,
+    sequenceNumber: Short,
+    multiCommandFlag: Boolean,
+    private val alertTypes: EnumSet<AlertType>,
+    nonce: Int
+) : NonceEnabledCommand(CommandType.SILENCE_ALERTS, uniqueId, sequenceNumber, multiCommandFlag, nonce) {
+
+    override val encoded: ByteArray
+        get() =
+            appendCrc(
+                ByteBuffer.allocate(LENGTH + HEADER_LENGTH)
+                    .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag))
+                    .put(commandType.value)
+                    .put(BODY_LENGTH)
+                    .putInt(nonce)
+                    .put(AlertUtil.encodeAlertSet(alertTypes))
+                    .array()
+            )
+
+    override fun toString(): String {
+        return "SilenceAlertsCommand{" +
+            "alertTypes=" + alertTypes +
+            ", nonce=" + nonce +
+            ", commandType=" + commandType +
+            ", uniqueId=" + uniqueId +
+            ", sequenceNumber=" + sequenceNumber +
+            ", multiCommandFlag=" + multiCommandFlag +
+            '}'
+    }
+
+    class Builder : NonceEnabledCommandBuilder<Builder, SilenceAlertsCommand>() {
+
+        private var alertTypes: EnumSet<AlertType>? = null
+
+        fun setAlertTypes(alertTypes: EnumSet<AlertType>): Builder {
+            this.alertTypes = alertTypes
+            return this
+        }
+
+        override fun buildCommand(): SilenceAlertsCommand {
+            requireNotNull(alertTypes) { "alertTypes can not be null" }
+            return SilenceAlertsCommand(uniqueId!!, sequenceNumber!!, multiCommandFlag, alertTypes!!, nonce!!)
+        }
+    }
+
+    companion object {
+
+        private const val LENGTH = 7.toShort()
+        private const val BODY_LENGTH = 5.toByte()
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.java
deleted file mode 100644
index 9c539c3b4a..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import java.nio.ByteBuffer;
-import java.util.BitSet;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.NonceEnabledCommand;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.NonceEnabledCommandBuilder;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.Encodable;
-
-public final class StopDeliveryCommand extends NonceEnabledCommand {
-    private static final short LENGTH = 7;
-    private static final byte BODY_LENGTH = 5;
-
-    private final DeliveryType deliveryType;
-    private final BeepType beepType;
-
-    StopDeliveryCommand(int uniqueId, short sequenceNumber, boolean multiCommandFlag, DeliveryType deliveryType, BeepType beepType, int nonce) {
-        super(CommandType.STOP_DELIVERY, uniqueId, sequenceNumber, multiCommandFlag, nonce);
-        this.deliveryType = deliveryType;
-        this.beepType = beepType;
-    }
-
-    @Override public byte[] getEncoded() {
-        return appendCrc(ByteBuffer.allocate(LENGTH + HEADER_LENGTH) //
-                .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag)) //
-                .put(commandType.getValue()) //
-                .put(BODY_LENGTH) //
-                .putInt(nonce) //
-                .put((byte) ((beepType.getValue() << 4) | deliveryType.getEncoded()[0])) //
-                .array());
-    }
-
-    @Override public String toString() {
-        return "StopDeliveryCommand{" +
-                "deliveryType=" + deliveryType +
-                ", beepType=" + beepType +
-                ", nonce=" + nonce +
-                ", commandType=" + commandType +
-                ", uniqueId=" + uniqueId +
-                ", sequenceNumber=" + sequenceNumber +
-                ", multiCommandFlag=" + multiCommandFlag +
-                '}';
-    }
-
-    public enum DeliveryType implements Encodable {
-        BASAL(true, false, false),
-        TEMP_BASAL(false, true, false),
-        BOLUS(false, false, true),
-        ALL(true, true, true);
-
-        private final boolean basal;
-        private final boolean tempBasal;
-        private final boolean bolus;
-
-        DeliveryType(boolean basal, boolean tempBasal, boolean bolus) {
-            this.basal = basal;
-            this.tempBasal = tempBasal;
-            this.bolus = bolus;
-        }
-
-        @Override public byte[] getEncoded() {
-            BitSet bitSet = new BitSet(8);
-            bitSet.set(0, this.basal);
-            bitSet.set(1, this.tempBasal);
-            bitSet.set(2, this.bolus);
-            return bitSet.toByteArray();
-        }
-    }
-
-    public static final class Builder extends NonceEnabledCommandBuilder<Builder, StopDeliveryCommand> {
-        private DeliveryType deliveryType;
-        private BeepType beepType = BeepType.LONG_SINGLE_BEEP;
-
-        public Builder setDeliveryType(DeliveryType deliveryType) {
-            this.deliveryType = deliveryType;
-            return this;
-        }
-
-        public Builder setBeepType(BeepType beepType) {
-            this.beepType = beepType;
-            return this;
-        }
-
-        @Override protected final StopDeliveryCommand buildCommand() {
-            if (deliveryType == null) {
-                throw new IllegalArgumentException("deliveryType can not be null");
-            }
-            if (beepType == null) {
-                throw new IllegalArgumentException("beepType can not be null");
-            }
-            return new StopDeliveryCommand(uniqueId, sequenceNumber, multiCommandFlag, deliveryType, beepType, nonce);
-        }
-    }
-
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.kt
new file mode 100644
index 0000000000..c5187c3446
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommand.kt
@@ -0,0 +1,98 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.CommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.NonceEnabledCommand
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder.NonceEnabledCommandBuilder
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.Encodable
+import java.nio.ByteBuffer
+import java.util.*
+
+class StopDeliveryCommand private constructor(
+    uniqueId: Int,
+    sequenceNumber: Short,
+    multiCommandFlag: Boolean,
+    private val deliveryType: DeliveryType,
+    private val beepType: BeepType,
+    nonce: Int
+) : NonceEnabledCommand(CommandType.STOP_DELIVERY, uniqueId, sequenceNumber, multiCommandFlag, nonce) {
+
+    override val encoded: ByteArray
+        get() {
+            return appendCrc(
+                ByteBuffer.allocate(LENGTH + HEADER_LENGTH)
+                    .put(encodeHeader(uniqueId, sequenceNumber, LENGTH, multiCommandFlag))
+                    .put(commandType.value)
+                    .put(BODY_LENGTH)
+                    .putInt(nonce)
+                    .put((beepType.value.toInt() shl 4 or deliveryType.encoded[0].toInt()).toByte())
+                    .array()
+            )
+        }
+
+    override fun toString(): String {
+        return "StopDeliveryCommand{" +
+            "deliveryType=" + deliveryType +
+            ", beepType=" + beepType +
+            ", nonce=" + nonce +
+            ", commandType=" + commandType +
+            ", uniqueId=" + uniqueId +
+            ", sequenceNumber=" + sequenceNumber +
+            ", multiCommandFlag=" + multiCommandFlag +
+            '}'
+    }
+
+    enum class DeliveryType(
+        private val basal: Boolean,
+        private val tempBasal: Boolean,
+        private val bolus: Boolean
+    ) : Encodable {
+
+        BASAL(true, false, false), TEMP_BASAL(false, true, false), BOLUS(false, false, true), ALL(true, true, true);
+
+        override val encoded: ByteArray
+            get() {
+                val bitSet = BitSet(8)
+                bitSet[0] = basal
+                bitSet[1] = tempBasal
+                bitSet[2] = bolus
+                return bitSet.toByteArray()
+            }
+    }
+
+    class Builder : NonceEnabledCommandBuilder<Builder, StopDeliveryCommand>() {
+
+        private var deliveryType: DeliveryType? = null
+        private var beepType: BeepType? = BeepType.LONG_SINGLE_BEEP
+
+        fun setDeliveryType(deliveryType: DeliveryType): Builder {
+            this.deliveryType = deliveryType
+            return this
+        }
+
+        fun setBeepType(beepType: BeepType): Builder {
+            this.beepType = beepType
+            return this
+        }
+
+        override fun buildCommand(): StopDeliveryCommand {
+            requireNotNull(deliveryType) { "deliveryType can not be null" }
+            requireNotNull(beepType) { "beepType can not be null" }
+
+            return StopDeliveryCommand(
+                uniqueId!!,
+                sequenceNumber!!,
+                multiCommandFlag,
+                deliveryType!!,
+                beepType!!,
+                nonce!!
+            )
+        }
+    }
+
+    companion object {
+
+        private const val LENGTH: Short = 7
+        private const val BODY_LENGTH: Byte = 5
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/Command.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/Command.java
deleted file mode 100644
index 27f311c394..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/Command.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.Encodable;
-
-public interface Command extends Encodable {
-    CommandType getCommandType();
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/Command.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/Command.kt
new file mode 100644
index 0000000000..11f0836ab8
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/Command.kt
@@ -0,0 +1,10 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.Encodable
+import java.io.Serializable
+
+interface Command : Encodable, Serializable {
+
+    val commandType: CommandType
+    val sequenceNumber: Short
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/CommandType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/CommandType.java
deleted file mode 100644
index bd785e573d..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/CommandType.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base;
-
-public enum CommandType {
-    SET_UNIQUE_ID((byte) 0x03),
-    GET_VERSION((byte) 0x07),
-    GET_STATUS((byte) 0x0e),
-    SILENCE_ALERTS((byte) 0x11),
-    PROGRAM_BASAL((byte) 0x13), // Always preceded by 0x1a
-    PROGRAM_TEMP_BASAL((byte) 0x16), // Always preceded by 0x1a
-    PROGRAM_BOLUS((byte) 0x17), // Always preceded by 0x1a
-    PROGRAM_ALERTS((byte) 0x19),
-    PROGRAM_INSULIN((byte) 0x1a), // Always followed by one of: 0x13, 0x16, 0x17
-    DEACTIVATE((byte) 0x1c),
-    PROGRAM_BEEPS((byte) 0x1e),
-    STOP_DELIVERY((byte) 0x1f);
-
-    byte value;
-
-    CommandType(byte value) {
-        this.value = value;
-    }
-
-    public byte getValue() {
-        return value;
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/CommandType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/CommandType.kt
new file mode 100644
index 0000000000..1cbcf8ae97
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/CommandType.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base
+
+enum class CommandType(val value: Byte) {
+
+    SET_UNIQUE_ID(0x03.toByte()),
+    GET_VERSION(0x07.toByte()),
+    GET_STATUS(0x0e.toByte()),
+    SILENCE_ALERTS(0x11.toByte()),
+    PROGRAM_BASAL(0x13.toByte()), // Always preceded by 0x1a
+    PROGRAM_TEMP_BASAL(0x16.toByte()), // Always preceded by 0x1a
+    PROGRAM_BOLUS(0x17.toByte()), // Always preceded by 0x1a
+    PROGRAM_ALERTS(0x19.toByte()),
+    PROGRAM_INSULIN(0x1a.toByte()), // Always followed by one of: 0x13, 0x16, 0x17
+    DEACTIVATE(0x1c.toByte()),
+    PROGRAM_BEEPS(0x1e.toByte()),
+    STOP_DELIVERY(0x1f.toByte());
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/HeaderEnabledCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/HeaderEnabledCommand.java
deleted file mode 100644
index 0a4cc03007..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/HeaderEnabledCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base;
-
-import java.nio.ByteBuffer;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.MessageUtil;
-
-public abstract class HeaderEnabledCommand implements Command {
-    protected static final short HEADER_LENGTH = 6;
-
-    protected final CommandType commandType;
-    protected final int uniqueId;
-    protected final short sequenceNumber;
-    protected final boolean multiCommandFlag;
-
-    protected HeaderEnabledCommand(CommandType commandType, int uniqueId, short sequenceNumber, boolean multiCommandFlag) {
-        this.commandType = commandType;
-        this.uniqueId = uniqueId;
-        this.sequenceNumber = sequenceNumber;
-        this.multiCommandFlag = multiCommandFlag;
-    }
-
-    @Override public CommandType getCommandType() {
-        return commandType;
-    }
-
-    protected static byte[] appendCrc(byte[] command) {
-        return ByteBuffer.allocate(command.length + 2) //
-                .put(command) //
-                .putShort(MessageUtil.createCrc(command)) //
-                .array();
-    }
-
-    protected static byte[] encodeHeader(int uniqueId, short sequenceNumber, short length, boolean multiCommandFlag) {
-        return ByteBuffer.allocate(6) //
-                .putInt(uniqueId) //
-                .putShort((short) (((sequenceNumber & 0x0f) << 10) | length | ((multiCommandFlag ? 1 : 0) << 15))) //
-                .array();
-    }
-
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/HeaderEnabledCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/HeaderEnabledCommand.kt
new file mode 100644
index 0000000000..c921424883
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/HeaderEnabledCommand.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.MessageUtil
+import java.nio.ByteBuffer
+
+abstract class HeaderEnabledCommand protected constructor(
+    override val commandType: CommandType,
+    protected val uniqueId: Int,
+    override val sequenceNumber: Short,
+    protected val multiCommandFlag: Boolean
+) : Command {
+
+    companion object {
+
+        internal fun appendCrc(command: ByteArray): ByteArray =
+            ByteBuffer.allocate(command.size + 2)
+                .put(command)
+                .putShort(MessageUtil.createCrc(command))
+                .array()
+
+        internal fun encodeHeader(
+            uniqueId: Int,
+            sequenceNumber: Short,
+            length: Short,
+            multiCommandFlag: Boolean
+        ): ByteArray =
+            ByteBuffer.allocate(6)
+                .putInt(uniqueId)
+                .putShort((sequenceNumber.toInt() and 0x0f shl 10 or length.toInt() or ((if (multiCommandFlag) 1 else 0) shl 15)).toShort())
+                .array()
+
+        internal const val HEADER_LENGTH: Short = 6
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/NonceEnabledCommand.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/NonceEnabledCommand.java
deleted file mode 100644
index 744f7eb1e9..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/NonceEnabledCommand.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base;
-
-public abstract class NonceEnabledCommand extends HeaderEnabledCommand {
-    protected final int nonce;
-
-    protected NonceEnabledCommand(CommandType commandType, int uniqueId, short sequenceNumber, boolean multiCommandFlag, int nonce) {
-        super(commandType, uniqueId, sequenceNumber, multiCommandFlag);
-        this.nonce = nonce;
-    }
-
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/NonceEnabledCommand.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/NonceEnabledCommand.kt
new file mode 100644
index 0000000000..5d943a777f
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/NonceEnabledCommand.kt
@@ -0,0 +1,9 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base
+
+abstract class NonceEnabledCommand protected constructor(
+    commandType: CommandType,
+    uniqueId: Int,
+    sequenceNumber: Short,
+    multiCommandFlag: Boolean,
+    protected val nonce: Int
+) : HeaderEnabledCommand(commandType, uniqueId, sequenceNumber, multiCommandFlag)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/CommandBuilder.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/CommandBuilder.java
deleted file mode 100644
index 3b4ca66ca0..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/CommandBuilder.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.Command;
-
-public interface CommandBuilder<R extends Command> {
-    R build();
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/ShortInsulinProgramElement.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/CommandBuilder.kt
similarity index 51%
rename from omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/ShortInsulinProgramElement.java
rename to omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/CommandBuilder.kt
index 04a5c39864..3e7aa921de 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/ShortInsulinProgramElement.java
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/CommandBuilder.kt
@@ -1,6 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program;
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder
 
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.Encodable;
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.Command
 
-public interface ShortInsulinProgramElement extends Encodable {
+interface CommandBuilder<R : Command> {
+
+    fun build(): R
 }
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/HeaderEnabledCommandBuilder.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/HeaderEnabledCommandBuilder.java
deleted file mode 100644
index 30dc425cb8..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/HeaderEnabledCommandBuilder.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.Command;
-
-public abstract class HeaderEnabledCommandBuilder<T extends HeaderEnabledCommandBuilder<T, R>, R extends Command> implements CommandBuilder<R> {
-    protected Integer uniqueId;
-    protected Short sequenceNumber;
-    protected boolean multiCommandFlag = false;
-
-    public R build() {
-        if (uniqueId == null) {
-            throw new IllegalArgumentException("uniqueId can not be null");
-        }
-        if (sequenceNumber == null) {
-            throw new IllegalArgumentException("sequenceNumber can not be null");
-        }
-        return buildCommand();
-    }
-
-    public final T setUniqueId(int uniqueId) {
-        this.uniqueId = uniqueId;
-        return (T) this;
-    }
-
-    public final T setSequenceNumber(short sequenceNumber) {
-        this.sequenceNumber = sequenceNumber;
-        return (T) this;
-    }
-
-    public final T setMultiCommandFlag(boolean multiCommandFlag) {
-        this.multiCommandFlag = multiCommandFlag;
-        return (T) this;
-    }
-
-    protected abstract R buildCommand();
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/HeaderEnabledCommandBuilder.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/HeaderEnabledCommandBuilder.kt
new file mode 100644
index 0000000000..046d990b5e
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/HeaderEnabledCommandBuilder.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.Command
+
+@Suppress("UNCHECKED_CAST")
+abstract class HeaderEnabledCommandBuilder<T : HeaderEnabledCommandBuilder<T, R>, R : Command> : CommandBuilder<R> {
+
+    protected var uniqueId: Int? = null
+    protected var sequenceNumber: Short? = null
+    protected var multiCommandFlag = false
+
+    override fun build(): R {
+        requireNotNull(uniqueId) { "uniqueId can not be null" }
+        requireNotNull(sequenceNumber) { "sequenceNumber can not be null" }
+        return buildCommand()
+    }
+
+    fun setUniqueId(uniqueId: Int): T {
+        this.uniqueId = uniqueId
+        return this as T
+    }
+
+    fun setSequenceNumber(sequenceNumber: Short): T {
+        this.sequenceNumber = sequenceNumber
+        return this as T
+    }
+
+    fun setMultiCommandFlag(multiCommandFlag: Boolean): T {
+        this.multiCommandFlag = multiCommandFlag
+        return this as T
+    }
+
+    protected abstract fun buildCommand(): R
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/NonceEnabledCommandBuilder.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/NonceEnabledCommandBuilder.java
deleted file mode 100644
index 806eda8965..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/NonceEnabledCommandBuilder.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.Command;
-
-public abstract class NonceEnabledCommandBuilder<T extends NonceEnabledCommandBuilder<T, R>, R extends Command> extends HeaderEnabledCommandBuilder<T, R> {
-    protected Integer nonce;
-
-    public final R build() {
-        if (nonce == null) {
-            throw new IllegalArgumentException("nonce can not be null");
-        }
-        return super.build();
-    }
-
-    public final T setNonce(int nonce) {
-        this.nonce = nonce;
-        return (T) this;
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/NonceEnabledCommandBuilder.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/NonceEnabledCommandBuilder.kt
new file mode 100644
index 0000000000..04e14ac856
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/base/builder/NonceEnabledCommandBuilder.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.builder
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.base.Command
+
+@Suppress("UNCHECKED_CAST")
+abstract class NonceEnabledCommandBuilder<T : NonceEnabledCommandBuilder<T, R>, R : Command> : HeaderEnabledCommandBuilder<T, R>() {
+
+    protected var nonce: Int? = null
+    override fun build(): R {
+        requireNotNull(nonce) { "nonce can not be null" }
+        return super.build()
+    }
+
+    fun setNonce(nonce: Int): T {
+        this.nonce = nonce
+        return this as T
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalInsulinProgramElement.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalInsulinProgramElement.java
deleted file mode 100644
index 4ddcc6347a..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalInsulinProgramElement.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program;
-
-import java.nio.ByteBuffer;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.Encodable;
-
-import static info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.util.ProgramBasalUtil.MAX_DELAY_BETWEEN_TENTH_PULSES_IN_USEC_AND_USECS_IN_BASAL_SLOT;
-
-public class BasalInsulinProgramElement implements Encodable {
-    private final byte startSlotIndex;
-    private final byte numberOfSlots;
-    private final short totalTenthPulses;
-
-    public BasalInsulinProgramElement(byte startSlotIndex, byte numberOfSlots, short totalTenthPulses) {
-        this.startSlotIndex = startSlotIndex;
-        this.numberOfSlots = numberOfSlots;
-        this.totalTenthPulses = totalTenthPulses;
-    }
-
-    @Override public byte[] getEncoded() {
-        return ByteBuffer.allocate(6) //
-                .putShort(totalTenthPulses) //
-                .putInt(totalTenthPulses == 0 ? Integer.MIN_VALUE | getDelayBetweenTenthPulsesInUsec() : getDelayBetweenTenthPulsesInUsec()) //
-                .array();
-    }
-
-    public byte getStartSlotIndex() {
-        return startSlotIndex;
-    }
-
-    public byte getNumberOfSlots() {
-        return numberOfSlots;
-    }
-
-    public short getDurationInSeconds() {
-        return (short) (numberOfSlots * 1_800);
-    }
-
-    public short getTotalTenthPulses() {
-        return totalTenthPulses;
-    }
-
-    public int getDelayBetweenTenthPulsesInUsec() {
-        if (totalTenthPulses == 0) {
-            return MAX_DELAY_BETWEEN_TENTH_PULSES_IN_USEC_AND_USECS_IN_BASAL_SLOT;
-        }
-        return (int) (((long) MAX_DELAY_BETWEEN_TENTH_PULSES_IN_USEC_AND_USECS_IN_BASAL_SLOT * numberOfSlots) / (double) totalTenthPulses);
-    }
-
-    @Override public String toString() {
-        return "LongInsulinProgramElement{" +
-                "startSlotIndex=" + startSlotIndex +
-                ", numberOfSlots=" + numberOfSlots +
-                ", totalTenthPulses=" + totalTenthPulses +
-                ", delayBetweenTenthPulsesInUsec=" + getDelayBetweenTenthPulsesInUsec() +
-                '}';
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalInsulinProgramElement.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalInsulinProgramElement.kt
new file mode 100644
index 0000000000..8b41b721af
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalInsulinProgramElement.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.util.ProgramBasalUtil
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.Encodable
+import java.io.Serializable
+import java.nio.ByteBuffer
+
+open class BasalInsulinProgramElement(
+    val startSlotIndex: Byte,
+    val numberOfSlots: Byte,
+    val totalTenthPulses: Short
+) : Encodable, Serializable {
+
+    override val encoded: ByteArray
+        get() = ByteBuffer.allocate(6)
+            .putShort(totalTenthPulses)
+            .putInt(if (totalTenthPulses.toInt() == 0) Int.MIN_VALUE or delayBetweenTenthPulsesInUsec else delayBetweenTenthPulsesInUsec)
+            .array()
+    val durationInSeconds: Short
+        get() = (numberOfSlots * 1800).toShort()
+    val delayBetweenTenthPulsesInUsec: Int
+        get() = if (totalTenthPulses.toInt() == 0) {
+            ProgramBasalUtil.MAX_DELAY_BETWEEN_TENTH_PULSES_IN_USEC_AND_USECS_IN_BASAL_SLOT
+        } else (ProgramBasalUtil.MAX_DELAY_BETWEEN_TENTH_PULSES_IN_USEC_AND_USECS_IN_BASAL_SLOT.toLong() * numberOfSlots / totalTenthPulses.toDouble()).toInt()
+
+    override fun toString(): String {
+        return "LongInsulinProgramElement{" +
+            "startSlotIndex=" + startSlotIndex +
+            ", numberOfSlots=" + numberOfSlots +
+            ", totalTenthPulses=" + totalTenthPulses +
+            ", delayBetweenTenthPulsesInUsec=" + delayBetweenTenthPulsesInUsec +
+            '}'
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalShortInsulinProgramElement.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalShortInsulinProgramElement.java
deleted file mode 100644
index 9a8983f8f3..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalShortInsulinProgramElement.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program;
-
-import java.nio.ByteBuffer;
-
-public class BasalShortInsulinProgramElement implements ShortInsulinProgramElement {
-    private final byte numberOfSlots; // 4 bits
-    private final short pulsesPerSlot; // 10 bits
-    private final boolean extraAlternatePulse;
-
-    public BasalShortInsulinProgramElement(byte numberOfSlots, short pulsesPerSlot, boolean extraAlternatePulse) {
-        this.numberOfSlots = numberOfSlots;
-        this.pulsesPerSlot = pulsesPerSlot;
-        this.extraAlternatePulse = extraAlternatePulse;
-    }
-
-    @Override public byte[] getEncoded() {
-        byte firstByte = (byte) ((((numberOfSlots - 1) & 0x0f) << 4) //
-                | ((extraAlternatePulse ? 1 : 0) << 3) //
-                | ((pulsesPerSlot >>> 8) & 0x03));
-
-        return ByteBuffer.allocate(2) //
-                .put(firstByte) //
-                .put((byte) (pulsesPerSlot & 0xff)) //
-                .array();
-    }
-
-    @Override public String toString() {
-        return "ShortInsulinProgramElement{" +
-                "numberOfSlotsMinusOne=" + numberOfSlots +
-                ", pulsesPerSlot=" + pulsesPerSlot +
-                ", extraAlternatePulse=" + extraAlternatePulse +
-                '}';
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalShortInsulinProgramElement.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalShortInsulinProgramElement.kt
new file mode 100644
index 0000000000..39b5e65c6e
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BasalShortInsulinProgramElement.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program
+
+import java.nio.ByteBuffer
+import kotlin.experimental.and
+
+class BasalShortInsulinProgramElement(
+    private val numberOfSlots: Byte, // 4 bits
+    private val pulsesPerSlot: Short, // 10 bits
+    private val extraAlternatePulse: Boolean
+) : ShortInsulinProgramElement {
+
+    override val encoded: ByteArray
+        get() {
+            val firstByte = (
+                numberOfSlots - 1 and 0x0f shl 4
+                    or ((if (extraAlternatePulse) 1 else 0) shl 3)
+                    or (pulsesPerSlot.toInt() ushr 8 and 0x03)
+                ).toByte()
+            return ByteBuffer.allocate(2)
+                .put(firstByte)
+                .put((pulsesPerSlot and 0xff).toByte())
+                .array()
+        }
+
+    override fun toString(): String {
+        return "ShortInsulinProgramElement{" +
+            "numberOfSlotsMinusOne=" + numberOfSlots +
+            ", pulsesPerSlot=" + pulsesPerSlot +
+            ", extraAlternatePulse=" + extraAlternatePulse +
+            '}'
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.java
deleted file mode 100644
index 7e80cc70b4..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program;
-
-import java.nio.ByteBuffer;
-
-public class BolusShortInsulinProgramElement implements ShortInsulinProgramElement {
-    private final short numberOfPulses;
-
-    public BolusShortInsulinProgramElement(short numberOfPulses) {
-        this.numberOfPulses = numberOfPulses;
-    }
-
-    public short getNumberOfPulses() {
-        return numberOfPulses;
-    }
-
-    @Override public byte[] getEncoded() {
-        return ByteBuffer.allocate(2).putShort(numberOfPulses).array();
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.kt
new file mode 100644
index 0000000000..6527662b3c
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/BolusShortInsulinProgramElement.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program
+
+import java.nio.ByteBuffer
+
+class BolusShortInsulinProgramElement(
+    private val numberOfPulses: Short
+) : ShortInsulinProgramElement {
+
+    override val encoded: ByteArray
+        get() = ByteBuffer.allocate(2).putShort(numberOfPulses).array()
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentBasalInsulinProgramElement.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentBasalInsulinProgramElement.java
deleted file mode 100644
index fb7bcd3215..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentBasalInsulinProgramElement.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program;
-
-public class CurrentBasalInsulinProgramElement {
-    private final byte index;
-    private final int delayUntilNextTenthPulseInUsec;
-    private final short remainingTenthPulses;
-
-    public CurrentBasalInsulinProgramElement(byte index, int delayUntilNextTenthPulseInUsec, short remainingTenthPulses) {
-        this.index = index;
-        this.delayUntilNextTenthPulseInUsec = delayUntilNextTenthPulseInUsec;
-        this.remainingTenthPulses = remainingTenthPulses;
-    }
-
-    public byte getIndex() {
-        return index;
-    }
-
-    public int getDelayUntilNextTenthPulseInUsec() {
-        return delayUntilNextTenthPulseInUsec;
-    }
-
-    public short getRemainingTenthPulses() {
-        return remainingTenthPulses;
-    }
-
-    @Override public String toString() {
-        return "CurrentLongInsulinProgramElement{" +
-                "index=" + index +
-                ", delayUntilNextTenthPulseInUsec=" + delayUntilNextTenthPulseInUsec +
-                ", remainingTenthPulses=" + remainingTenthPulses +
-                '}';
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentBasalInsulinProgramElement.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentBasalInsulinProgramElement.kt
new file mode 100644
index 0000000000..66d8efe3d7
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentBasalInsulinProgramElement.kt
@@ -0,0 +1,16 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program
+
+import java.io.Serializable
+
+class CurrentBasalInsulinProgramElement(
+    val index: Byte,
+    val delayUntilNextTenthPulseInUsec: Int,
+    val remainingTenthPulses: Short
+) : Serializable {
+
+    override fun toString(): String = "CurrentLongInsulinProgramElement{" +
+        "index=" + index +
+        ", delayUntilNextTenthPulseInUsec=" + delayUntilNextTenthPulseInUsec +
+        ", remainingTenthPulses=" + remainingTenthPulses +
+        '}'
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentSlot.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentSlot.java
deleted file mode 100644
index 1468370b01..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentSlot.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program;
-
-public class CurrentSlot {
-    private final byte index;
-    private final short eighthSecondsRemaining;
-    private final short pulsesRemaining;
-
-    public CurrentSlot(byte index, short eighthSecondsRemaining, short pulsesRemaining) {
-        this.index = index;
-        this.eighthSecondsRemaining = eighthSecondsRemaining;
-        this.pulsesRemaining = pulsesRemaining;
-    }
-
-    public byte getIndex() {
-        return index;
-    }
-
-    public short getEighthSecondsRemaining() {
-        return eighthSecondsRemaining;
-    }
-
-    public short getPulsesRemaining() {
-        return pulsesRemaining;
-    }
-
-    @Override public String toString() {
-        return "CurrentSlot{" +
-                "index=" + index +
-                ", eighthSecondsRemaining=" + eighthSecondsRemaining +
-                ", pulsesRemaining=" + pulsesRemaining +
-                '}';
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentSlot.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentSlot.kt
new file mode 100644
index 0000000000..077318299d
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/CurrentSlot.kt
@@ -0,0 +1,16 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program
+
+import java.io.Serializable
+
+class CurrentSlot(
+    val index: Byte,
+    val eighthSecondsRemaining: Short,
+    val pulsesRemaining: Short
+) : Serializable {
+
+    override fun toString(): String = "CurrentSlot{" +
+        "index=" + index +
+        ", eighthSecondsRemaining=" + eighthSecondsRemaining +
+        ", pulsesRemaining=" + pulsesRemaining +
+        '}'
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/ShortInsulinProgramElement.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/ShortInsulinProgramElement.kt
new file mode 100644
index 0000000000..ac7e66a81a
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/ShortInsulinProgramElement.kt
@@ -0,0 +1,6 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.Encodable
+import java.io.Serializable
+
+interface ShortInsulinProgramElement : Encodable, Serializable
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/TempBasalInsulinProgramElement.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/TempBasalInsulinProgramElement.java
deleted file mode 100644
index b43b148ea3..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/TempBasalInsulinProgramElement.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program;
-
-import java.nio.ByteBuffer;
-
-public class TempBasalInsulinProgramElement extends BasalInsulinProgramElement {
-    public TempBasalInsulinProgramElement(byte startSlotIndex, byte numberOfSlots, short totalTenthPulses) {
-        super(startSlotIndex, numberOfSlots, totalTenthPulses);
-    }
-
-    @Override public byte[] getEncoded() {
-        ByteBuffer buffer = ByteBuffer.allocate(6);
-        if (getTotalTenthPulses() == 0) {
-            int i = ((int) ((((double) getDurationInSeconds()) * 1_000_000.0d) / ((double) getNumberOfSlots()))) | Integer.MIN_VALUE;
-            buffer.putShort(getNumberOfSlots()) //
-                    .putInt(i);
-        } else {
-            buffer.putShort(getTotalTenthPulses()) //
-                    .putInt(getDelayBetweenTenthPulsesInUsec());
-        }
-        return buffer.array();
-    }
-
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/TempBasalInsulinProgramElement.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/TempBasalInsulinProgramElement.kt
new file mode 100644
index 0000000000..5bd8ca3b62
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/TempBasalInsulinProgramElement.kt
@@ -0,0 +1,24 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program
+
+import java.nio.ByteBuffer
+
+class TempBasalInsulinProgramElement(
+    startSlotIndex: Byte,
+    numberOfSlots: Byte,
+    totalTenthPulses: Short
+) : BasalInsulinProgramElement(startSlotIndex, numberOfSlots, totalTenthPulses) {
+
+    override val encoded: ByteArray
+        get() {
+            val buffer = ByteBuffer.allocate(6)
+            if (totalTenthPulses.toInt() == 0) {
+                val i = (durationInSeconds.toDouble() * 1000000.0 / numberOfSlots.toDouble()).toInt() or Int.MIN_VALUE
+                buffer.putShort(numberOfSlots.toShort())
+                    .putInt(i)
+            } else {
+                buffer.putShort(totalTenthPulses)
+                    .putInt(delayBetweenTenthPulsesInUsec)
+            }
+            return buffer.array()
+        }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramBasalUtil.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramBasalUtil.java
deleted file mode 100644
index 0c02799d02..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramBasalUtil.java
+++ /dev/null
@@ -1,257 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.util;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.BasalInsulinProgramElement;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.BasalShortInsulinProgramElement;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.CurrentBasalInsulinProgramElement;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.CurrentSlot;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.ShortInsulinProgramElement;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.MessageUtil;
-
-public final class ProgramBasalUtil {
-    public static final int MAX_DELAY_BETWEEN_TENTH_PULSES_IN_USEC_AND_USECS_IN_BASAL_SLOT = 1_800_000_000;
-
-    public static final byte NUMBER_OF_BASAL_SLOTS = 48;
-    public static final byte MAX_NUMBER_OF_SLOTS_IN_INSULIN_PROGRAM_ELEMENT = 16;
-
-    private ProgramBasalUtil() {
-    }
-
-    public interface BasalInsulinProgramElementFactory<T extends BasalInsulinProgramElement> {
-        T create(byte startSlotIndex, byte numberOfSlots, short totalTenthPulses);
-    }
-
-    public static List<BasalInsulinProgramElement> mapTenthPulsesPerSlotToLongInsulinProgramElements(short[] tenthPulsesPerSlot) {
-        return mapTenthPulsesPerSlotToLongInsulinProgramElements(tenthPulsesPerSlot, BasalInsulinProgramElement::new);
-    }
-
-    public static <T extends BasalInsulinProgramElement> List<BasalInsulinProgramElement> mapTenthPulsesPerSlotToLongInsulinProgramElements(short[] tenthPulsesPerSlot, BasalInsulinProgramElementFactory<T> insulinProgramElementFactory) {
-        if (tenthPulsesPerSlot.length > NUMBER_OF_BASAL_SLOTS) {
-            throw new IllegalArgumentException("Basal program must contain at most 48 slots");
-        }
-
-        List<BasalInsulinProgramElement> elements = new ArrayList<>();
-        long previousTenthPulsesPerSlot = 0;
-        byte numberOfSlotsInCurrentElement = 0;
-        byte startSlotIndex = 0;
-
-        for (int i = 0; i < tenthPulsesPerSlot.length; i++) {
-            if (i == 0) {
-                previousTenthPulsesPerSlot = tenthPulsesPerSlot[i];
-                numberOfSlotsInCurrentElement = 1;
-            } else if (previousTenthPulsesPerSlot != tenthPulsesPerSlot[i] || (numberOfSlotsInCurrentElement + 1) * previousTenthPulsesPerSlot > 65_534) {
-                elements.add(insulinProgramElementFactory.create(startSlotIndex, numberOfSlotsInCurrentElement, (short) (previousTenthPulsesPerSlot * numberOfSlotsInCurrentElement)));
-
-                previousTenthPulsesPerSlot = tenthPulsesPerSlot[i];
-                numberOfSlotsInCurrentElement = 1;
-                startSlotIndex += numberOfSlotsInCurrentElement;
-            } else {
-                numberOfSlotsInCurrentElement++;
-            }
-        }
-        elements.add(insulinProgramElementFactory.create(startSlotIndex, numberOfSlotsInCurrentElement, (short) (previousTenthPulsesPerSlot * numberOfSlotsInCurrentElement)));
-
-        return elements;
-    }
-
-    public static List<ShortInsulinProgramElement> mapPulsesPerSlotToShortInsulinProgramElements(short[] pulsesPerSlot) {
-        if (pulsesPerSlot.length > NUMBER_OF_BASAL_SLOTS) {
-            throw new IllegalArgumentException("Basal program must contain at most 48 slots");
-        }
-
-        List<ShortInsulinProgramElement> elements = new ArrayList<>();
-        boolean extraAlternatePulse = false;
-        short previousPulsesPerSlot = 0;
-        byte numberOfSlotsInCurrentElement = 0;
-        byte currentTotalNumberOfSlots = 0;
-
-        while (currentTotalNumberOfSlots < pulsesPerSlot.length) {
-            if (currentTotalNumberOfSlots == 0) {
-                // First slot
-
-                previousPulsesPerSlot = pulsesPerSlot[0];
-                currentTotalNumberOfSlots++;
-                numberOfSlotsInCurrentElement = 1;
-            } else if (pulsesPerSlot[currentTotalNumberOfSlots] == previousPulsesPerSlot) {
-                // Subsequent slot in element (same pulses per slot as previous slot)
-
-                if (numberOfSlotsInCurrentElement < MAX_NUMBER_OF_SLOTS_IN_INSULIN_PROGRAM_ELEMENT) {
-                    numberOfSlotsInCurrentElement++;
-                } else {
-                    elements.add(new BasalShortInsulinProgramElement(numberOfSlotsInCurrentElement, previousPulsesPerSlot, extraAlternatePulse));
-                    previousPulsesPerSlot = pulsesPerSlot[currentTotalNumberOfSlots];
-                    numberOfSlotsInCurrentElement = 1;
-                    extraAlternatePulse = false;
-                }
-
-                currentTotalNumberOfSlots++;
-            } else if (numberOfSlotsInCurrentElement == 1 && pulsesPerSlot[currentTotalNumberOfSlots] == previousPulsesPerSlot + 1) {
-                // Second slot of segment with extra alternate pulse
-
-                boolean expectAlternatePulseForNextSegment = false;
-                currentTotalNumberOfSlots++;
-                numberOfSlotsInCurrentElement++;
-                extraAlternatePulse = true;
-                while (currentTotalNumberOfSlots < pulsesPerSlot.length) {
-                    // Loop rest alternate pulse segment
-
-                    if (pulsesPerSlot[currentTotalNumberOfSlots] == previousPulsesPerSlot + (expectAlternatePulseForNextSegment ? 1 : 0)) {
-                        // Still in alternate pulse segment
-
-                        currentTotalNumberOfSlots++;
-                        expectAlternatePulseForNextSegment = !expectAlternatePulseForNextSegment;
-
-                        if (numberOfSlotsInCurrentElement < MAX_NUMBER_OF_SLOTS_IN_INSULIN_PROGRAM_ELEMENT) {
-                            numberOfSlotsInCurrentElement++;
-                        } else {
-                            // End of alternate pulse segment (no slots left in element)
-
-                            elements.add(new BasalShortInsulinProgramElement(numberOfSlotsInCurrentElement, previousPulsesPerSlot, extraAlternatePulse));
-                            previousPulsesPerSlot = pulsesPerSlot[currentTotalNumberOfSlots];
-                            numberOfSlotsInCurrentElement = 1;
-                            extraAlternatePulse = false;
-                            break;
-                        }
-                    } else {
-                        // End of alternate pulse segment (new number of pulses per slot)
-
-                        elements.add(new BasalShortInsulinProgramElement(numberOfSlotsInCurrentElement, previousPulsesPerSlot, extraAlternatePulse));
-                        previousPulsesPerSlot = pulsesPerSlot[currentTotalNumberOfSlots];
-                        numberOfSlotsInCurrentElement = 1;
-                        extraAlternatePulse = false;
-                        currentTotalNumberOfSlots++;
-                        break;
-                    }
-                }
-            } else if (previousPulsesPerSlot != pulsesPerSlot[currentTotalNumberOfSlots]) {
-                // End of segment (new number of pulses per slot)
-                elements.add(new BasalShortInsulinProgramElement(numberOfSlotsInCurrentElement, previousPulsesPerSlot, extraAlternatePulse));
-
-                previousPulsesPerSlot = pulsesPerSlot[currentTotalNumberOfSlots];
-                currentTotalNumberOfSlots++;
-                extraAlternatePulse = false;
-                numberOfSlotsInCurrentElement = 1;
-            } else {
-                throw new IllegalStateException("Reached illegal point in mapBasalProgramToShortInsulinProgramElements");
-            }
-        }
-
-        elements.add(new BasalShortInsulinProgramElement(numberOfSlotsInCurrentElement, previousPulsesPerSlot, extraAlternatePulse));
-
-        return elements;
-    }
-
-    public static short[] mapBasalProgramToTenthPulsesPerSlot(BasalProgram basalProgram) {
-        short[] tenthPulsesPerSlot = new short[NUMBER_OF_BASAL_SLOTS];
-        for (BasalProgram.Segment segment : basalProgram.getSegments()) {
-            for (int i = segment.getStartSlotIndex(); i < segment.getEndSlotIndex(); i++) {
-                tenthPulsesPerSlot[i] = (short) (roundToHalf(segment.getPulsesPerHour() / 2.0d) * 10);
-            }
-        }
-
-        return tenthPulsesPerSlot;
-    }
-
-    private static double roundToHalf(double d) {
-        return (double) (short) ((short) (int) (d * 10.0d) / 5 * 5) / 10.0d;
-    }
-
-    public static short[] mapBasalProgramToPulsesPerSlot(BasalProgram basalProgram) {
-        short[] pulsesPerSlot = new short[NUMBER_OF_BASAL_SLOTS];
-        for (BasalProgram.Segment segment : basalProgram.getSegments()) {
-            boolean remainingPulse = false;
-            for (int i = segment.getStartSlotIndex(); i < segment.getEndSlotIndex(); i++) {
-                pulsesPerSlot[i] = (short) (segment.getPulsesPerHour() / 2);
-                if (segment.getPulsesPerHour() % 2 == 1) { // Do extra alternate pulse
-                    if (remainingPulse) {
-                        pulsesPerSlot[i] += 1;
-                    }
-                    remainingPulse = !remainingPulse;
-                }
-            }
-        }
-
-        return pulsesPerSlot;
-    }
-
-    public static CurrentSlot calculateCurrentSlot(short[] pulsesPerSlot, Date currentTime) {
-        Calendar instance = Calendar.getInstance();
-        instance.setTime(currentTime);
-
-        int hourOfDay = instance.get(Calendar.HOUR_OF_DAY);
-        int minuteOfHour = instance.get(Calendar.MINUTE);
-        int secondOfMinute = instance.get(Calendar.SECOND);
-
-        byte index = (byte) ((hourOfDay * 60 + minuteOfHour) / 30);
-        int secondOfDay = secondOfMinute + hourOfDay * 3_600 + minuteOfHour * 60;
-
-        short secondsRemaining = (short) ((index + 1) * 1_800 - secondOfDay);
-        short pulsesRemaining = (short) ((double) pulsesPerSlot[index] * secondsRemaining / 1_800);
-
-        return new CurrentSlot(index, (short) (secondsRemaining * 8), pulsesRemaining);
-    }
-
-    public static CurrentBasalInsulinProgramElement calculateCurrentLongInsulinProgramElement(List<BasalInsulinProgramElement> elements, Date currentTime) {
-        Calendar instance = Calendar.getInstance();
-        instance.setTime(currentTime);
-
-        int hourOfDay = instance.get(Calendar.HOUR_OF_DAY);
-        int minuteOfHour = instance.get(Calendar.MINUTE);
-        int secondOfMinute = instance.get(Calendar.SECOND);
-
-        int secondOfDay = secondOfMinute + hourOfDay * 3_600 + minuteOfHour * 60;
-        int startSlotIndex = 0;
-
-        byte index = 0;
-        for (BasalInsulinProgramElement element : elements) {
-            int startTimeInSeconds = startSlotIndex * 1_800;
-            int endTimeInSeconds = startTimeInSeconds + element.getNumberOfSlots() * 1_800;
-
-            if (secondOfDay >= startTimeInSeconds && secondOfDay < endTimeInSeconds) {
-                long totalNumberOfTenThousandthPulsesInSlot = element.getTotalTenthPulses() * 1_000;
-                if (totalNumberOfTenThousandthPulsesInSlot == 0) {
-                    totalNumberOfTenThousandthPulsesInSlot = element.getNumberOfSlots() * 1_000;
-                }
-
-                int durationInSeconds = endTimeInSeconds - startTimeInSeconds;
-                int secondsPassedInCurrentSlot = secondOfDay - startTimeInSeconds;
-                long remainingTenThousandthPulses = (long) ((durationInSeconds - secondsPassedInCurrentSlot) / (double) durationInSeconds * totalNumberOfTenThousandthPulsesInSlot);
-                int delayBetweenTenthPulsesInUsec = (int) (durationInSeconds * 1_000_000L * 1_000 / totalNumberOfTenThousandthPulsesInSlot);
-                int secondsRemaining = secondsPassedInCurrentSlot % 1_800;
-                int delayUntilNextTenthPulseInUsec = delayBetweenTenthPulsesInUsec;
-                for (int i = 0; i < secondsRemaining; i++) {
-                    delayUntilNextTenthPulseInUsec = delayUntilNextTenthPulseInUsec - 1_000_000;
-                    while (delayUntilNextTenthPulseInUsec <= 0) {
-                        delayUntilNextTenthPulseInUsec += delayBetweenTenthPulsesInUsec;
-                    }
-                }
-                short remainingTenthPulses = (short) ((remainingTenThousandthPulses % 1_000 != 0 ? 1 : 0) + remainingTenThousandthPulses / 1_000);
-
-                return new CurrentBasalInsulinProgramElement(index, delayUntilNextTenthPulseInUsec, remainingTenthPulses);
-            }
-
-            index++;
-            startSlotIndex += element.getNumberOfSlots();
-        }
-        throw new IllegalStateException("Could not determine current long insulin program element");
-    }
-
-    public static short calculateChecksum(short[] pulsesPerSlot, CurrentSlot currentSlot) {
-        ByteBuffer buffer = ByteBuffer.allocate(1 + 2 + 2 + NUMBER_OF_BASAL_SLOTS * 2) //
-                .put(currentSlot.getIndex()) //
-                .putShort(currentSlot.getPulsesRemaining()) //
-                .putShort(currentSlot.getEighthSecondsRemaining());
-
-        for (short pulses : pulsesPerSlot) {
-            buffer.putShort(pulses);
-        }
-
-        return MessageUtil.calculateChecksum(buffer.array());
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramBasalUtil.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramBasalUtil.kt
new file mode 100644
index 0000000000..5e6e00d015
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramBasalUtil.kt
@@ -0,0 +1,260 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.util
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.BasalInsulinProgramElement
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.BasalShortInsulinProgramElement
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.CurrentBasalInsulinProgramElement
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.CurrentSlot
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.ShortInsulinProgramElement
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.MessageUtil
+import java.nio.ByteBuffer
+import java.util.*
+
+object ProgramBasalUtil {
+
+    const val MAX_DELAY_BETWEEN_TENTH_PULSES_IN_USEC_AND_USECS_IN_BASAL_SLOT = 1800000000
+    private const val NUMBER_OF_BASAL_SLOTS: Byte = 48
+    private const val MAX_NUMBER_OF_SLOTS_IN_INSULIN_PROGRAM_ELEMENT: Byte = 16
+
+    fun mapTenthPulsesPerSlotToLongInsulinProgramElements(
+        tenthPulsesPerSlot: ShortArray,
+        insulinProgramElementFactory: (Byte, Byte, Short) -> BasalInsulinProgramElement = ::BasalInsulinProgramElement
+    ): List<BasalInsulinProgramElement> {
+        require(tenthPulsesPerSlot.size <= NUMBER_OF_BASAL_SLOTS) { "Basal program must contain at most 48 slots" }
+        val elements: MutableList<BasalInsulinProgramElement> = ArrayList()
+        var previousTenthPulsesPerSlot: Short = 0
+        var numberOfSlotsInCurrentElement: Byte = 0
+        var startSlotIndex: Byte = 0
+        for (i in tenthPulsesPerSlot.indices) {
+            if (i == 0) {
+                previousTenthPulsesPerSlot = tenthPulsesPerSlot[i]
+                numberOfSlotsInCurrentElement = 1
+            } else if (previousTenthPulsesPerSlot != tenthPulsesPerSlot[i] || (numberOfSlotsInCurrentElement + 1) * previousTenthPulsesPerSlot > 65534) {
+                elements.add(
+                    insulinProgramElementFactory(
+                        startSlotIndex,
+                        numberOfSlotsInCurrentElement,
+                        (previousTenthPulsesPerSlot * numberOfSlotsInCurrentElement).toShort()
+                    )
+                )
+                previousTenthPulsesPerSlot = tenthPulsesPerSlot[i]
+                numberOfSlotsInCurrentElement = 1
+                startSlotIndex = (numberOfSlotsInCurrentElement + startSlotIndex).toByte()
+            } else {
+                numberOfSlotsInCurrentElement++
+            }
+        }
+        elements.add(
+            insulinProgramElementFactory(
+                startSlotIndex,
+                numberOfSlotsInCurrentElement,
+                (previousTenthPulsesPerSlot * numberOfSlotsInCurrentElement).toShort()
+            )
+        )
+        return elements
+    }
+
+    fun mapPulsesPerSlotToShortInsulinProgramElements(pulsesPerSlot: ShortArray?): List<ShortInsulinProgramElement> {
+        require(pulsesPerSlot!!.size <= NUMBER_OF_BASAL_SLOTS) { "Basal program must contain at most 48 slots" }
+
+        val elements: MutableList<ShortInsulinProgramElement> = ArrayList()
+        var extraAlternatePulse = false
+        var previousPulsesPerSlot: Short = 0
+        var numberOfSlotsInCurrentElement: Byte = 0
+        var currentTotalNumberOfSlots: Byte = 0
+        while (currentTotalNumberOfSlots < pulsesPerSlot.size) {
+            if (currentTotalNumberOfSlots.toInt() == 0) {
+                // First slot
+                previousPulsesPerSlot = pulsesPerSlot[0]
+                currentTotalNumberOfSlots++
+                numberOfSlotsInCurrentElement = 1
+            } else if (pulsesPerSlot[currentTotalNumberOfSlots.toInt()] == previousPulsesPerSlot) {
+                // Subsequent slot in element (same pulses per slot as previous slot)
+                if (numberOfSlotsInCurrentElement < MAX_NUMBER_OF_SLOTS_IN_INSULIN_PROGRAM_ELEMENT) {
+                    numberOfSlotsInCurrentElement++
+                } else {
+                    elements.add(
+                        BasalShortInsulinProgramElement(
+                            numberOfSlotsInCurrentElement,
+                            previousPulsesPerSlot,
+                            extraAlternatePulse
+                        )
+                    )
+                    previousPulsesPerSlot = pulsesPerSlot[currentTotalNumberOfSlots.toInt()]
+                    numberOfSlotsInCurrentElement = 1
+                    extraAlternatePulse = false
+                }
+                currentTotalNumberOfSlots++
+            } else if (numberOfSlotsInCurrentElement.toInt() == 1 && !extraAlternatePulse && pulsesPerSlot[currentTotalNumberOfSlots.toInt()].toInt() == previousPulsesPerSlot + 1) {
+                // Second slot of segment with extra alternate pulse
+                var expectAlternatePulseForNextSegment = false
+                currentTotalNumberOfSlots++
+                numberOfSlotsInCurrentElement++
+                extraAlternatePulse = true
+                while (currentTotalNumberOfSlots < pulsesPerSlot.size) {
+                    // Loop rest alternate pulse segment
+                    if (pulsesPerSlot[currentTotalNumberOfSlots.toInt()].toInt() == previousPulsesPerSlot + (if (expectAlternatePulseForNextSegment) 1 else 0)) {
+                        // Still in alternate pulse segment
+                        expectAlternatePulseForNextSegment = !expectAlternatePulseForNextSegment
+                        if (numberOfSlotsInCurrentElement < MAX_NUMBER_OF_SLOTS_IN_INSULIN_PROGRAM_ELEMENT) {
+                            numberOfSlotsInCurrentElement++
+                            currentTotalNumberOfSlots++
+                        } else {
+                            // End of alternate pulse segment (no slots left in element)
+                            elements.add(
+                                BasalShortInsulinProgramElement(
+                                    numberOfSlotsInCurrentElement,
+                                    previousPulsesPerSlot,
+                                    extraAlternatePulse
+                                )
+                            )
+                            previousPulsesPerSlot = pulsesPerSlot[currentTotalNumberOfSlots.toInt()]
+                            numberOfSlotsInCurrentElement = 1
+                            extraAlternatePulse = false
+                            currentTotalNumberOfSlots++
+                            break
+                        }
+                    } else {
+                        // End of alternate pulse segment (new number of pulses per slot)
+                        elements.add(
+                            BasalShortInsulinProgramElement(
+                                numberOfSlotsInCurrentElement,
+                                previousPulsesPerSlot,
+                                extraAlternatePulse
+                            )
+                        )
+                        previousPulsesPerSlot = pulsesPerSlot[currentTotalNumberOfSlots.toInt()]
+                        numberOfSlotsInCurrentElement = 1
+                        extraAlternatePulse = false
+                        currentTotalNumberOfSlots++
+                        break
+                    }
+                }
+            } else if (previousPulsesPerSlot != pulsesPerSlot[currentTotalNumberOfSlots.toInt()]) {
+                // End of segment (new number of pulses per slot)
+                elements.add(
+                    BasalShortInsulinProgramElement(
+                        numberOfSlotsInCurrentElement,
+                        previousPulsesPerSlot,
+                        extraAlternatePulse
+                    )
+                )
+                previousPulsesPerSlot = pulsesPerSlot[currentTotalNumberOfSlots.toInt()]
+                currentTotalNumberOfSlots++
+                extraAlternatePulse = false
+                numberOfSlotsInCurrentElement = 1
+            } else {
+                throw IllegalStateException("Reached illegal point in mapBasalProgramToShortInsulinProgramElements")
+            }
+        }
+        elements.add(
+            BasalShortInsulinProgramElement(
+                numberOfSlotsInCurrentElement,
+                previousPulsesPerSlot,
+                extraAlternatePulse
+            )
+        )
+        return elements
+    }
+
+    fun mapBasalProgramToTenthPulsesPerSlot(basalProgram: BasalProgram): ShortArray {
+        val tenthPulsesPerSlot = ShortArray(NUMBER_OF_BASAL_SLOTS.toInt())
+        for (segment in basalProgram.segments) {
+            for (i in segment.startSlotIndex until segment.endSlotIndex) {
+                tenthPulsesPerSlot[i] = (roundToHalf(segment.getPulsesPerHour() / 2.0) * 10).toInt()
+                    .toShort() // TODO Adrian: int conversion ok?
+            }
+        }
+        return tenthPulsesPerSlot
+    }
+
+    private fun roundToHalf(d: Double): Double {
+        return ((d * 10.0).toInt().toShort() / 5 * 5).toShort().toDouble() / 10.0
+    }
+
+    fun mapBasalProgramToPulsesPerSlot(basalProgram: BasalProgram): ShortArray {
+        val pulsesPerSlot = ShortArray(NUMBER_OF_BASAL_SLOTS.toInt())
+        for (segment in basalProgram.segments) {
+            var remainingPulse = false
+            for (i in segment.startSlotIndex until segment.endSlotIndex) {
+                pulsesPerSlot[i] = (segment.getPulsesPerHour() / 2).toShort()
+                if (segment.getPulsesPerHour() % 2 == 1) { // Do extra alternate pulse
+                    if (remainingPulse) {
+                        pulsesPerSlot[i] = (pulsesPerSlot[i] + 1).toShort()
+                    }
+                    remainingPulse = !remainingPulse
+                }
+            }
+        }
+        return pulsesPerSlot
+    }
+
+    fun calculateCurrentSlot(pulsesPerSlot: ShortArray?, currentTime: Date): CurrentSlot {
+        val instance = Calendar.getInstance()
+        instance.time = currentTime
+        val hourOfDay = instance[Calendar.HOUR_OF_DAY]
+        val minuteOfHour = instance[Calendar.MINUTE]
+        val secondOfMinute = instance[Calendar.SECOND]
+
+        val index = ((hourOfDay * 60 + minuteOfHour) / 30).toByte()
+        val secondOfDay = secondOfMinute + hourOfDay * 3600 + minuteOfHour * 60
+        val secondsRemaining = ((index + 1) * 1800 - secondOfDay).toShort()
+        val pulsesRemaining = (pulsesPerSlot!![index.toInt()].toDouble() * secondsRemaining / 1800).toInt().toShort()
+        return CurrentSlot(index, (secondsRemaining * 8).toShort(), pulsesRemaining)
+    }
+
+    fun calculateCurrentLongInsulinProgramElement(
+        elements: List<BasalInsulinProgramElement>,
+        currentTime: Date
+    ): CurrentBasalInsulinProgramElement {
+        val instance = Calendar.getInstance()
+        instance.time = currentTime
+        val hourOfDay = instance[Calendar.HOUR_OF_DAY]
+        val minuteOfHour = instance[Calendar.MINUTE]
+        val secondOfMinute = instance[Calendar.SECOND]
+        val secondOfDay = secondOfMinute + hourOfDay * 3600 + minuteOfHour * 60
+        var startSlotIndex = 0
+        var index: Byte = 0
+        for (element in elements) {
+            val startTimeInSeconds = startSlotIndex * 1800
+            val endTimeInSeconds = startTimeInSeconds + element.numberOfSlots * 1800
+            if (secondOfDay in startTimeInSeconds until endTimeInSeconds) { // TODO Adrian Range check ok
+                var totalNumberOfTenThousandthPulsesInSlot = (element.totalTenthPulses * 1000).toLong()
+                if (totalNumberOfTenThousandthPulsesInSlot == 0L) {
+                    totalNumberOfTenThousandthPulsesInSlot = (element.numberOfSlots * 1000).toLong()
+                }
+                val durationInSeconds = endTimeInSeconds - startTimeInSeconds
+                val secondsPassedInCurrentSlot = secondOfDay - startTimeInSeconds
+                val remainingTenThousandthPulses =
+                    ((durationInSeconds - secondsPassedInCurrentSlot) / durationInSeconds.toDouble() * totalNumberOfTenThousandthPulsesInSlot).toLong()
+                val delayBetweenTenthPulsesInUsec =
+                    (durationInSeconds * 1000000L * 1000 / totalNumberOfTenThousandthPulsesInSlot).toInt()
+                val secondsRemaining = secondsPassedInCurrentSlot % 1800
+                var delayUntilNextTenthPulseInUsec = delayBetweenTenthPulsesInUsec
+                for (i in 0 until secondsRemaining) {
+                    delayUntilNextTenthPulseInUsec -= 1000000
+                    while (delayUntilNextTenthPulseInUsec <= 0) {
+                        delayUntilNextTenthPulseInUsec += delayBetweenTenthPulsesInUsec
+                    }
+                }
+                val remainingTenthPulses =
+                    ((if (remainingTenThousandthPulses % 1000 != 0L) 1 else 0) + remainingTenThousandthPulses / 1000).toShort()
+                return CurrentBasalInsulinProgramElement(index, delayUntilNextTenthPulseInUsec, remainingTenthPulses)
+            }
+            index++
+            startSlotIndex += element.numberOfSlots.toInt()
+        }
+        throw IllegalStateException("Could not determine current long insulin program element")
+    }
+
+    fun calculateChecksum(pulsesPerSlot: ShortArray?, currentSlot: CurrentSlot): Short {
+        val buffer = ByteBuffer.allocate(1 + 2 + 2 + NUMBER_OF_BASAL_SLOTS * 2)
+            .put(currentSlot.index)
+            .putShort(currentSlot.pulsesRemaining)
+            .putShort(currentSlot.eighthSecondsRemaining)
+        for (pulses in pulsesPerSlot!!) {
+            buffer.putShort(pulses)
+        }
+        return MessageUtil.calculateChecksum(buffer.array())
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramTempBasalUtil.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramTempBasalUtil.java
deleted file mode 100644
index f60a5b3e8e..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramTempBasalUtil.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.util;
-
-import java.nio.ByteBuffer;
-import java.util.List;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.BasalInsulinProgramElement;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.ShortInsulinProgramElement;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.TempBasalInsulinProgramElement;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.MessageUtil;
-
-public final class ProgramTempBasalUtil {
-    private ProgramTempBasalUtil() {
-    }
-
-    public static List<BasalInsulinProgramElement> mapTenthPulsesPerSlotToLongInsulinProgramElements(short[] tenthPulsesPerSlot) {
-        return ProgramBasalUtil.mapTenthPulsesPerSlotToLongInsulinProgramElements(tenthPulsesPerSlot, TempBasalInsulinProgramElement::new);
-    }
-
-    public static short[] mapTempBasalToTenthPulsesPerSlot(int durationInSlots, double rateInUnitsPerHour) {
-        short pulsesPerHour = (short) Math.round(rateInUnitsPerHour * 20);
-
-        short[] tenthPulsesPerSlot = new short[durationInSlots];
-        for (int i = 0; durationInSlots > i; i++) {
-            tenthPulsesPerSlot[i] = (short) (roundToHalf(pulsesPerHour / 2.0d) * 10);
-        }
-
-        return tenthPulsesPerSlot;
-    }
-
-    private static double roundToHalf(double d) {
-        return (double) (short) ((short) (int) (d * 10.0d) / 5 * 5) / 10.0d;
-    }
-
-    public static short[] mapTempBasalToPulsesPerSlot(byte durationInSlots, double rateInUnitsPerHour) {
-        short pulsesPerHour = (short) Math.round(rateInUnitsPerHour * 20);
-        short[] pulsesPerSlot = new short[durationInSlots];
-
-        boolean remainingPulse = false;
-
-        for (int i = 0; durationInSlots > i; i++) {
-            pulsesPerSlot[i] = (short) (pulsesPerHour / 2);
-            if (pulsesPerHour % 2 == 1) { // Do extra alternate pulse
-                if (remainingPulse) {
-                    pulsesPerSlot[i] += 1;
-                }
-                remainingPulse = !remainingPulse;
-            }
-        }
-
-        return pulsesPerSlot;
-    }
-
-    public static short calculateChecksum(byte totalNumberOfSlots, short pulsesInFirstSlot, short[] pulsesPerSlot) {
-        ByteBuffer buffer = ByteBuffer.allocate(1 + 2 + 2 + 2 * pulsesPerSlot.length) //
-                .put(totalNumberOfSlots) //
-                .putShort((short) 0x3840) //
-                .putShort(pulsesInFirstSlot);
-        for (short pulses : pulsesPerSlot) {
-            buffer.putShort(pulses);
-        }
-
-        return MessageUtil.calculateChecksum(buffer.array());
-    }
-
-    public static List<ShortInsulinProgramElement> mapPulsesPerSlotToShortInsulinProgramElements(short[] pulsesPerSlot) {
-        return ProgramBasalUtil.mapPulsesPerSlotToShortInsulinProgramElements(pulsesPerSlot);
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramTempBasalUtil.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramTempBasalUtil.kt
new file mode 100644
index 0000000000..fcb83b64de
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/insulin/program/util/ProgramTempBasalUtil.kt
@@ -0,0 +1,68 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.util
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.BasalInsulinProgramElement
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.ShortInsulinProgramElement
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command.insulin.program.TempBasalInsulinProgramElement
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.MessageUtil
+import java.nio.ByteBuffer
+import kotlin.math.roundToInt
+
+object ProgramTempBasalUtil {
+
+    fun mapTenthPulsesPerSlotToLongInsulinProgramElements(tenthPulsesPerSlot: ShortArray): List<BasalInsulinProgramElement> {
+        return ProgramBasalUtil.mapTenthPulsesPerSlotToLongInsulinProgramElements(tenthPulsesPerSlot) { startSlotIndex: Byte, numberOfSlots: Byte, totalTenthPulses: Short ->
+            TempBasalInsulinProgramElement(
+                startSlotIndex,
+                numberOfSlots,
+                totalTenthPulses
+            )
+        }
+    }
+
+    fun mapTempBasalToTenthPulsesPerSlot(durationInSlots: Int, rateInUnitsPerHour: Double): ShortArray {
+        val pulsesPerHour = (rateInUnitsPerHour * 20).roundToInt().toShort()
+        val tenthPulsesPerSlot = ShortArray(durationInSlots)
+        var i = 0
+        while (durationInSlots > i) {
+            tenthPulsesPerSlot[i] = (roundToHalf(pulsesPerHour / 2.0) * 10).toInt().toShort()
+            i++
+        }
+        return tenthPulsesPerSlot
+    }
+
+    private fun roundToHalf(d: Double): Double {
+        return ((d * 10.0).toInt().toShort() / 5 * 5).toShort().toDouble() / 10.0
+    }
+
+    fun mapTempBasalToPulsesPerSlot(durationInSlots: Byte, rateInUnitsPerHour: Double): ShortArray {
+        val pulsesPerHour = (rateInUnitsPerHour * 20).roundToInt().toShort()
+        val pulsesPerSlot = ShortArray(durationInSlots.toInt())
+        var remainingPulse = false
+        var i = 0
+        while (durationInSlots > i) {
+            pulsesPerSlot[i] = (pulsesPerHour / 2).toShort()
+            if (pulsesPerHour % 2 == 1) { // Do extra alternate pulse
+                if (remainingPulse) {
+                    pulsesPerSlot[i] = (pulsesPerSlot[i] + 1).toShort()
+                }
+                remainingPulse = !remainingPulse
+            }
+            i++
+        }
+        return pulsesPerSlot
+    }
+
+    fun calculateChecksum(totalNumberOfSlots: Byte, pulsesInFirstSlot: Short, pulsesPerSlot: ShortArray?): Short {
+        val buffer = ByteBuffer.allocate(1 + 2 + 2 + 2 * pulsesPerSlot!!.size)
+            .put(totalNumberOfSlots)
+            .putShort(0x3840.toShort())
+            .putShort(pulsesInFirstSlot)
+        for (pulses in pulsesPerSlot) {
+            buffer.putShort(pulses)
+        }
+        return MessageUtil.calculateChecksum(buffer.array())
+    }
+
+    fun mapPulsesPerSlotToShortInsulinProgramElements(pulsesPerSlot: ShortArray?): List<ShortInsulinProgramElement> =
+        ProgramBasalUtil.mapPulsesPerSlotToShortInsulinProgramElements(pulsesPerSlot)
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ActivationProgress.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ActivationProgress.kt
new file mode 100644
index 0000000000..fc7f1f33fc
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ActivationProgress.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition
+
+enum class ActivationProgress {
+    NOT_STARTED,
+    GOT_POD_VERSION,
+    SET_UNIQUE_ID,
+    PROGRAMMED_LOW_RESERVOIR_ALERTS,
+    REPROGRAMMED_LUMP_OF_COAL_ALERT,
+    PRIMING,
+    PRIME_COMPLETED,
+    PHASE_1_COMPLETED,
+    PROGRAMMED_BASAL,
+    UPDATED_EXPIRATION_ALERTS,
+    INSERTING_CANNULA,
+    CANNULA_INSERTED,
+    COMPLETED;
+
+    fun isBefore(other: ActivationProgress): Boolean = ordinal < other.ordinal
+
+    fun isAtLeast(other: ActivationProgress): Boolean = ordinal >= other.ordinal
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.java
deleted file mode 100644
index db41aa1653..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition;
-
-public enum AlarmType {
-    NONE((byte) 0x00),
-    ALARM_PW_FLASH_ERASE((byte) 0x01),
-    ALARM_PW_FLASH_WRITE((byte) 0x02),
-    ALARM_BASAL_CKSUM((byte) 0x03),
-    ALARM_BASAL_PPULSE((byte) 0x04),
-    ALARM_BASAL_STEP((byte) 0x05),
-    ALARM_AUTO_WAKEUP_TIMEOUT((byte) 0x06),
-    ALARM_WIRE_OVERDRIVEN((byte) 0x07),
-    ALARM_BEEP_REP_INVALID_INDEX((byte) 0x08),
-    ALARM_INVALID_REP_PATTERN((byte) 0x09),
-    ALARM_TEMP_BASAL_STEP((byte) 0x0a),
-    ALARM_TEMP_BASAL_CKSUM((byte) 0x0b),
-    ALARM_BOLUS_OVERFLOW((byte) 0x0c),
-    ALARM_COP_RESET((byte) 0x0d),
-    ALARM_ILOP_RESET((byte) 0x0e),
-    ALARM_ILAD_RESET((byte) 0x0f),
-    ALARM_SAWCOP_RESET((byte) 0x10),
-    ALARM_BOLUS_STEP((byte) 0x11),
-    ALARM_LVD_RESET((byte) 0x12),
-    ALARM_INVALID_RF_MSG_LENGTH((byte) 0x13),
-    ALARM_OCCLUDED((byte) 0x14),
-    ALARM_BOLUSPROG_CHKSUM((byte) 0x15),
-    ALARM_BOLUS_LOG((byte) 0x16),
-    ALARM_CRITICAL_VAR((byte) 0x17),
-    ALARM_EMPTY_RESERVOIR((byte) 0x18),
-    ALARM_LOADERR((byte) 0x19),
-    ALARM_PSA_FAILURE((byte) 0x1a),
-    ALARM_TICKCNT_NOT_CLEARED((byte) 0x1b),
-    ALARM_PUMP_EXPIRED((byte) 0x1c),
-    ALARM_COMD_BIT_NOT_SET((byte) 0x1d),
-    ALARM_INVALID_COMD_SET((byte) 0x1e),
-    ALARM_ALERTS_ARRAY_CKSM((byte) 0x1f),
-    ALARM_UNIT_TEST((byte) 0x20),
-    ALARM_TICK_TIME_ERROR((byte) 0x21),
-    ALARM_CRITICAL_HAZARD((byte) 0x22),
-    ALARM_PIEZO_FREQ((byte) 0x23),
-    ALARM_TICKCNT_ERROR_RTC((byte) 0x24),
-    ALARM_TICK_FAILURE((byte) 0x25),
-    ALARM_INVALID((byte) 0x26),
-    ALARM_LUMP_ALERT_PROGRAM((byte) 0x27),
-    ALARM_INVALID_PASS_CODE((byte) 0x28),
-    ALARM_ALERT0((byte) 0x29),
-    ALARM_ALERT1((byte) 0x2a),
-    ALARM_ALERT2((byte) 0x2b),
-    ALARM_ALERT3((byte) 0x2c),
-    ALARM_ALERT4((byte) 0x2d),
-    ALARM_ALERT5((byte) 0x2e),
-    ALARM_ALERT6((byte) 0x2f),
-    ALARM_ALERT7((byte) 0x30),
-    ALARM_ILLEGAL_PUMP_STATE((byte) 0x31),
-    ALARM_COP_TEST_FAILURE((byte) 0x32),
-    ALARM_MCTF((byte) 0x33),
-    ALARM_ILLEGAL_RESET((byte) 0x34),
-    ALARM_VETO_NOT_SET((byte) 0x35),
-    ALARM_ILLEGAL_PIN_RESET((byte) 0x36),
-    ALARM_INVALID_BEEP_PATTERN((byte) 0x37),
-    ALARM_WIRE_STATE_MACHINE((byte) 0x38),
-    ALARM_VETO_TEST_DEFAULT((byte) 0x39),
-    ALARM_ALERT_INVALID_INDEX((byte) 0x3a),
-    ALARM_SAWCOP_TEST_FAIL((byte) 0x3b),
-    ALARM_MCUCOP_TEST_FAIL((byte) 0x3c),
-    ALARM_STEP_SENSOR_SHORTED((byte) 0x3d),
-    ALARM_FLASH_FAILURE((byte) 0x3e),
-    ALARM_SPARE63((byte) 0x3f),
-    ALARM_SS_OPEN_CNT_EXCEEDED((byte) 0x40),
-    ALARM_SS_EXCESSIVE_SUMMED((byte) 0x41),
-    ALARM_SS_MIN_PULSE_TRANSITION((byte) 0x42),
-    ALARM_SS_DEFAULT((byte) 0x43),
-    ALARM_OPEN_WIRE1((byte) 0x44),
-    ALARM_OPEN_WIRE2((byte) 0x45),
-    ALARM_LOADERR_FAILURE((byte) 0x46),
-    ALARM_SAW_VETO_FAILURE((byte) 0x47),
-    ALARM_BAD_RFM_CLOCK((byte) 0x48),
-    ALARM_BAD_TICK_HIGH((byte) 0x49),
-    ALARM_BAD_TICK_PERIOD((byte) 0x4a),
-    ALARM_BAD_TRIM_VALUE((byte) 0x4b),
-    ALARM_BAD_BUS_CLOCK((byte) 0x4c),
-    ALARM_BAD_CAL_MODE((byte) 0x4d),
-    ALARM_SAW_TRIM_ERROR((byte) 0x4e),
-    ALARM_RFM_CRYSTAL_ERROR((byte) 0x4f),
-    ALARM_CALST_TIMEOUT((byte) 0x50),
-    ALARM_TICKCNT_ERROR((byte) 0x51),
-    ALARM_BAD_RFM_XTAL_START((byte) 0x52),
-    ALARM_BAD_RX_SENSENSITIVITY((byte) 0x53),
-    ALARM_BAD_TX_PKT_SIZE((byte) 0x54),
-    ALARM_TICK_LOW_PHASE_EXCEEDED((byte) 0x55),
-    ALARM_TICK_HIGH_PHASE_EXCEEDED((byte) 0x56),
-    ALARM_OCCL_CRITVAR_FAIL((byte) 0x57),
-    ALARM_OCCL_PARAM((byte) 0x58),
-    ALARM_PROG_OCCL_FAIL((byte) 0x59),
-    ALARM_PW_TO_HIGH_FOR_OCCL_DET((byte) 0x5a),
-    ALARM_OCCL_CSUM((byte) 0x5b),
-    ALARM_PRIME_OPEN_CNT_TO_LOW((byte) 0x5c),
-    ALARM_BAD_RF_CDTHR((byte) 0x5d),
-    ALARM_FLASH_NOT_SECURE((byte) 0x5e),
-    ALARM_WIRE_TEST_OPEN_GROUND((byte) 0x5f),
-    ALARM_OCCL_STARTUP1((byte) 0x60),
-    ALARM_OCCL_STARTUP2((byte) 0x61),
-    ALARM_OCCL_EXCESS_TIMEOUTS1((byte) 0x62),
-    ALARM_SPARE99((byte) 0x63),
-    ALARM_SPARE100((byte) 0x64),
-    ALARM_SPARE101((byte) 0x65),
-    ALARM_OCCL_EXCESS_TIMEOUTS2((byte) 0x66),
-    ALARM_OCCL_EXCESS_TIMEOUTS3((byte) 0x67),
-    ALARM_OCCL_NOISY_PULSE_WIDTHS((byte) 0x68),
-    ALARM_OCCL_AT_BOLUS_END((byte) 0x69),
-    ALARM_OCCL_ABOVE_THRESHOLD((byte) 0x6a),
-    ALARM_BASAL_UNDERINFUSION((byte) 0x80),
-    ALARM_BASAL_OVERINFUSION((byte) 0x81),
-    ALARM_TEMP_UNDERINFUSION((byte) 0x82),
-    ALARM_TEMP_OVERINFUSION((byte) 0x83),
-    ALARM_BOLUS_UNDERINFUSION((byte) 0x84),
-    ALARM_BOLUS_OVERINFUSION((byte) 0x85),
-    ALARM_BASAL_OVERINFUSION_PULSE((byte) 0x86),
-    ALARM_TEMP_OVERINFUSION_PULSE((byte) 0x87),
-    ALARM_BOLUS_OVERINFUSION_PULSE((byte) 0x88),
-    ALARM_IMMBOLUS_UNDERINFUSION_PULSE((byte) 0x89),
-    ALARM_EXTBOLUS_OVERINFUSION_PULSE((byte) 0x8a),
-    ALARM_PROGRAM_CSUM((byte) 0x8b),
-    ALARM_UNUSED_140((byte) 0x8c),
-    ALARM_UNRECOGNIZED_PULSE((byte) 0x8d),
-    ALARM_SYNC_WITHOUT_TEMP_ACTIVE((byte) 0x8e),
-    ALARM_INTERLOCK_LOAD((byte) 0x8f),
-    ALARM_ILLEGAL_CHAN_PARAM((byte) 0x90),
-    ALARM_BASAL_PULSE_CHAN_INACTIVE((byte) 0x91),
-    ALARM_TEMP_PULSE_CHAN_INACTIVE((byte) 0x92),
-    ALARM_BOLUS_PULSE_CHAN_INACTIVE((byte) 0x93),
-    ALARM_INT_SEMAPHORE_NOT_SET((byte) 0x94),
-    ALARM_ILLEGAL_INTERLOCK_CHAN((byte) 0x95),
-    ALARM_TERMINATE_BOLUS((byte) 0x96),
-    ALARM_OPEN_TRANSITIONS_COUNT((byte) 0x97),
-    ALARM_BLE_TO((byte) 0xa0),
-    ALARM_BLE_INITIATED((byte) 0xa1),
-    ALARM_BLE_UNK_ALARM((byte) 0xa2),
-    ALARM_UNUSED_163((byte) 0xa3),
-    ALARM_UNUSED_164((byte) 0xa4),
-    ALARM_UNUSED_165((byte) 0xa5),
-    ALARM_BLE_IAAS((byte) 0xa6),
-    ALARM_UNUSED_167((byte) 0xa7),
-    ALARM_CRC_FAILURE((byte) 0xa8),
-    ALARM_BLE_WD_PING_TIMEOUT((byte) 0xa9),
-    ALARM_BLE_EXCESSIVE_RESETS((byte) 0xaa),
-    ALARM_BLE_NAK_ERROR((byte) 0xab),
-    ALARM_BLE_REQ_HIGH_TIMEOUT((byte) 0xac),
-    ALARM_BLE_UNKNOWN_RESP((byte) 0xad),
-    ALARM_BLE_UNUSED_174((byte) 0xae),
-    ALARM_BLE_REQ_STUCK_HIGH((byte) 0xaf),
-    ALARM_BLE_STATE_MACHINE_1((byte) 0xb1),
-    ALARM_BLE_STATE_MACHINE_2((byte) 0xb2),
-    ALARM_BLE_UNUSED_179((byte) 0xb3),
-    ALARM_BLE_ARB_LOST((byte) 0xb4),
-    ALARM_BLE_ER48_DUAL_NACK((byte) 0xc0),
-    ALARM_BLE_QN_EXCEED_MAX_RETRY((byte) 0xc1),
-    ALARM_BLE_QN_CRIT_VAR_FAIL((byte) 0xc2),
-    UNKNOWN((byte) 0xff);
-
-    private final byte value;
-
-    AlarmType(byte value) {
-        this.value = value;
-    }
-
-    public static AlarmType byValue(byte value) {
-        for (AlarmType type : values()) {
-            if (type.value == value) {
-                return type;
-            }
-        }
-        return UNKNOWN;
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.kt
new file mode 100644
index 0000000000..fdb6729124
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlarmType.kt
@@ -0,0 +1,162 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.HasValue
+
+enum class AlarmType(override val value: Byte) : HasValue {
+
+    NONE(0x00.toByte()),
+    ALARM_PW_FLASH_ERASE(0x01.toByte()),
+    ALARM_PW_FLASH_WRITE(0x02.toByte()),
+    ALARM_BASAL_CKSUM(0x03.toByte()),
+    ALARM_BASAL_PPULSE(0x04.toByte()),
+    ALARM_BASAL_STEP(0x05.toByte()),
+    ALARM_AUTO_WAKEUP_TIMEOUT(0x06.toByte()),
+    ALARM_WIRE_OVERDRIVEN(0x07.toByte()),
+    ALARM_BEEP_REP_INVALID_INDEX(0x08.toByte()),
+    ALARM_INVALID_REP_PATTERN(0x09.toByte()),
+    ALARM_TEMP_BASAL_STEP(0x0a.toByte()),
+    ALARM_TEMP_BASAL_CKSUM(0x0b.toByte()),
+    ALARM_BOLUS_OVERFLOW(0x0c.toByte()),
+    ALARM_COP_RESET(0x0d.toByte()),
+    ALARM_ILOP_RESET(0x0e.toByte()),
+    ALARM_ILAD_RESET(0x0f.toByte()),
+    ALARM_SAWCOP_RESET(0x10.toByte()),
+    ALARM_BOLUS_STEP(0x11.toByte()),
+    ALARM_LVD_RESET(0x12.toByte()),
+    ALARM_INVALID_RF_MSG_LENGTH(0x13.toByte()),
+    ALARM_OCCLUDED(0x14.toByte()),
+    ALARM_BOLUSPROG_CHKSUM(0x15.toByte()),
+    ALARM_BOLUS_LOG(0x16.toByte()),
+    ALARM_CRITICAL_VAR(0x17.toByte()),
+    ALARM_EMPTY_RESERVOIR(0x18.toByte()),
+    ALARM_LOADERR(0x19.toByte()),
+    ALARM_PSA_FAILURE(0x1a.toByte()),
+    ALARM_TICKCNT_NOT_CLEARED(0x1b.toByte()),
+    ALARM_PUMP_EXPIRED(0x1c.toByte()),
+    ALARM_COMD_BIT_NOT_SET(0x1d.toByte()),
+    ALARM_INVALID_COMD_SET(0x1e.toByte()),
+    ALARM_ALERTS_ARRAY_CKSM(0x1f.toByte()),
+    ALARM_UNIT_TEST(0x20.toByte()),
+    ALARM_TICK_TIME_ERROR(0x21.toByte()),
+    ALARM_CRITICAL_HAZARD(0x22.toByte()),
+    ALARM_PIEZO_FREQ(0x23.toByte()),
+    ALARM_TICKCNT_ERROR_RTC(0x24.toByte()),
+    ALARM_TICK_FAILURE(0x25.toByte()),
+    ALARM_INVALID(0x26.toByte()),
+    ALARM_LUMP_ALERT_PROGRAM(0x27.toByte()),
+    ALARM_INVALID_PASS_CODE(0x28.toByte()),
+    ALARM_ALERT0(0x29.toByte()),
+    ALARM_ALERT1(0x2a.toByte()),
+    ALARM_ALERT2(0x2b.toByte()),
+    ALARM_ALERT3(0x2c.toByte()),
+    ALARM_ALERT4(0x2d.toByte()),
+    ALARM_ALERT5(0x2e.toByte()),
+    ALARM_ALERT6(0x2f.toByte()),
+    ALARM_ALERT7(0x30.toByte()),
+    ALARM_ILLEGAL_PUMP_STATE(0x31.toByte()),
+    ALARM_COP_TEST_FAILURE(0x32.toByte()),
+    ALARM_MCTF(0x33.toByte()),
+    ALARM_ILLEGAL_RESET(0x34.toByte()),
+    ALARM_VETO_NOT_SET(0x35.toByte()),
+    ALARM_ILLEGAL_PIN_RESET(0x36.toByte()),
+    ALARM_INVALID_BEEP_PATTERN(0x37.toByte()),
+    ALARM_WIRE_STATE_MACHINE(0x38.toByte()),
+    ALARM_VETO_TEST_DEFAULT(0x39.toByte()),
+    ALARM_ALERT_INVALID_INDEX(0x3a.toByte()),
+    ALARM_SAWCOP_TEST_FAIL(0x3b.toByte()),
+    ALARM_MCUCOP_TEST_FAIL(0x3c.toByte()),
+    ALARM_STEP_SENSOR_SHORTED(0x3d.toByte()),
+    ALARM_FLASH_FAILURE(0x3e.toByte()),
+    ALARM_SPARE63(0x3f.toByte()),
+    ALARM_SS_OPEN_CNT_EXCEEDED(0x40.toByte()),
+    ALARM_SS_EXCESSIVE_SUMMED(0x41.toByte()),
+    ALARM_SS_MIN_PULSE_TRANSITION(0x42.toByte()),
+    ALARM_SS_DEFAULT(0x43.toByte()),
+    ALARM_OPEN_WIRE1(0x44.toByte()),
+    ALARM_OPEN_WIRE2(0x45.toByte()),
+    ALARM_LOADERR_FAILURE(0x46.toByte()),
+    ALARM_SAW_VETO_FAILURE(0x47.toByte()),
+    ALARM_BAD_RFM_CLOCK(0x48.toByte()),
+    ALARM_BAD_TICK_HIGH(0x49.toByte()),
+    ALARM_BAD_TICK_PERIOD(0x4a.toByte()),
+    ALARM_BAD_TRIM_VALUE(0x4b.toByte()),
+    ALARM_BAD_BUS_CLOCK(0x4c.toByte()),
+    ALARM_BAD_CAL_MODE(0x4d.toByte()),
+    ALARM_SAW_TRIM_ERROR(0x4e.toByte()),
+    ALARM_RFM_CRYSTAL_ERROR(0x4f.toByte()),
+    ALARM_CALST_TIMEOUT(0x50.toByte()),
+    ALARM_TICKCNT_ERROR(0x51.toByte()),
+    ALARM_BAD_RFM_XTAL_START(0x52.toByte()),
+    ALARM_BAD_RX_SENSENSITIVITY(0x53.toByte()),
+    ALARM_BAD_TX_PKT_SIZE(0x54.toByte()),
+    ALARM_TICK_LOW_PHASE_EXCEEDED(0x55.toByte()),
+    ALARM_TICK_HIGH_PHASE_EXCEEDED(0x56.toByte()),
+    ALARM_OCCL_CRITVAR_FAIL(0x57.toByte()),
+    ALARM_OCCL_PARAM(0x58.toByte()),
+    ALARM_PROG_OCCL_FAIL(0x59.toByte()),
+    ALARM_PW_TO_HIGH_FOR_OCCL_DET(0x5a.toByte()),
+    ALARM_OCCL_CSUM(0x5b.toByte()),
+    ALARM_PRIME_OPEN_CNT_TO_LOW(0x5c.toByte()),
+    ALARM_BAD_RF_CDTHR(0x5d.toByte()),
+    ALARM_FLASH_NOT_SECURE(0x5e.toByte()),
+    ALARM_WIRE_TEST_OPEN_GROUND(0x5f.toByte()),
+    ALARM_OCCL_STARTUP1(0x60.toByte()),
+    ALARM_OCCL_STARTUP2(0x61.toByte()),
+    ALARM_OCCL_EXCESS_TIMEOUTS1(0x62.toByte()),
+    ALARM_SPARE99(0x63.toByte()),
+    ALARM_SPARE100(0x64.toByte()),
+    ALARM_SPARE101(0x65.toByte()),
+    ALARM_OCCL_EXCESS_TIMEOUTS2(0x66.toByte()),
+    ALARM_OCCL_EXCESS_TIMEOUTS3(0x67.toByte()),
+    ALARM_OCCL_NOISY_PULSE_WIDTHS(0x68.toByte()),
+    ALARM_OCCL_AT_BOLUS_END(0x69.toByte()),
+    ALARM_OCCL_ABOVE_THRESHOLD(0x6a.toByte()),
+    ALARM_BASAL_UNDERINFUSION(0x80.toByte()),
+    ALARM_BASAL_OVERINFUSION(0x81.toByte()),
+    ALARM_TEMP_UNDERINFUSION(0x82.toByte()),
+    ALARM_TEMP_OVERINFUSION(0x83.toByte()),
+    ALARM_BOLUS_UNDERINFUSION(0x84.toByte()),
+    ALARM_BOLUS_OVERINFUSION(0x85.toByte()),
+    ALARM_BASAL_OVERINFUSION_PULSE(0x86.toByte()),
+    ALARM_TEMP_OVERINFUSION_PULSE(0x87.toByte()),
+    ALARM_BOLUS_OVERINFUSION_PULSE(0x88.toByte()),
+    ALARM_IMMBOLUS_UNDERINFUSION_PULSE(0x89.toByte()),
+    ALARM_EXTBOLUS_OVERINFUSION_PULSE(0x8a.toByte()),
+    ALARM_PROGRAM_CSUM(0x8b.toByte()),
+    ALARM_UNUSED_140(0x8c.toByte()),
+    ALARM_UNRECOGNIZED_PULSE(0x8d.toByte()),
+    ALARM_SYNC_WITHOUT_TEMP_ACTIVE(0x8e.toByte()),
+    ALARM_INTERLOCK_LOAD(0x8f.toByte()),
+    ALARM_ILLEGAL_CHAN_PARAM(0x90.toByte()),
+    ALARM_BASAL_PULSE_CHAN_INACTIVE(0x91.toByte()),
+    ALARM_TEMP_PULSE_CHAN_INACTIVE(0x92.toByte()),
+    ALARM_BOLUS_PULSE_CHAN_INACTIVE(0x93.toByte()),
+    ALARM_INT_SEMAPHORE_NOT_SET(0x94.toByte()),
+    ALARM_ILLEGAL_INTERLOCK_CHAN(0x95.toByte()),
+    ALARM_TERMINATE_BOLUS(0x96.toByte()),
+    ALARM_OPEN_TRANSITIONS_COUNT(0x97.toByte()),
+    ALARM_BLE_TO(0xa0.toByte()),
+    ALARM_BLE_INITIATED(0xa1.toByte()),
+    ALARM_BLE_UNK_ALARM(0xa2.toByte()),
+    ALARM_UNUSED_163(0xa3.toByte()),
+    ALARM_UNUSED_164(0xa4.toByte()),
+    ALARM_UNUSED_165(0xa5.toByte()),
+    ALARM_BLE_IAAS(0xa6.toByte()),
+    ALARM_UNUSED_167(0xa7.toByte()),
+    ALARM_CRC_FAILURE(0xa8.toByte()),
+    ALARM_BLE_WD_PING_TIMEOUT(0xa9.toByte()),
+    ALARM_BLE_EXCESSIVE_RESETS(0xaa.toByte()),
+    ALARM_BLE_NAK_ERROR(0xab.toByte()),
+    ALARM_BLE_REQ_HIGH_TIMEOUT(0xac.toByte()),
+    ALARM_BLE_UNKNOWN_RESP(0xad.toByte()),
+    ALARM_BLE_UNUSED_174(0xae.toByte()),
+    ALARM_BLE_REQ_STUCK_HIGH(0xaf.toByte()),
+    ALARM_BLE_STATE_MACHINE_1(0xb1.toByte()),
+    ALARM_BLE_STATE_MACHINE_2(0xb2.toByte()),
+    ALARM_BLE_UNUSED_179(0xb3.toByte()),
+    ALARM_BLE_ARB_LOST(0xb4.toByte()),
+    ALARM_BLE_ER48_DUAL_NACK(0xc0.toByte()),
+    ALARM_BLE_QN_EXCEED_MAX_RETRY(0xc1.toByte()),
+    ALARM_BLE_QN_CRIT_VAR_FAIL(0xc2.toByte()),
+    UNKNOWN(0xff.toByte());
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.java
deleted file mode 100644
index a2c5497619..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition;
-
-import androidx.annotation.NonNull;
-
-import java.nio.ByteBuffer;
-
-public class AlertConfiguration implements Encodable {
-    private final AlertSlot slot;
-    private final boolean enabled;
-    private final short durationInMinutes;
-    private final boolean autoOff;
-    private final AlertTriggerType triggerType;
-    private final short offsetInMinutesOrThresholdInMicroLiters;
-    private final BeepType beepType;
-    private final BeepRepetitionType beepRepetition;
-
-    public AlertConfiguration(AlertSlot slot, boolean enabled, short durationInMinutes, boolean autoOff, AlertTriggerType triggerType, short offsetInMinutesOrThresholdInMicroLiters, BeepType beepType, BeepRepetitionType beepRepetition) {
-        this.slot = slot;
-        this.enabled = enabled;
-        this.durationInMinutes = durationInMinutes;
-        this.autoOff = autoOff;
-        this.triggerType = triggerType;
-        this.offsetInMinutesOrThresholdInMicroLiters = offsetInMinutesOrThresholdInMicroLiters;
-        this.beepType = beepType;
-        this.beepRepetition = beepRepetition;
-    }
-
-    @Override public byte[] getEncoded() {
-        byte firstByte = (byte) (slot.getValue() << 4);
-        if (enabled) {
-            firstByte |= 1 << 3;
-        }
-        if (triggerType == AlertTriggerType.RESERVOIR_VOLUME_TRIGGER) {
-            firstByte |= 1 << 2;
-        }
-        if (autoOff) {
-            firstByte |= 1 << 1;
-        }
-        firstByte |= ((durationInMinutes >> 8) & 0x01);
-
-        return ByteBuffer.allocate(6) //
-                .put(firstByte)
-                .put((byte) durationInMinutes) //
-                .putShort(offsetInMinutesOrThresholdInMicroLiters) //
-                .put(beepRepetition.getValue()) //
-                .put(beepType.getValue()) //
-                .array();
-    }
-
-    @NonNull @Override public String toString() {
-        return "AlertConfiguration{" +
-                "slot=" + slot +
-                ", enabled=" + enabled +
-                ", durationInMinutes=" + durationInMinutes +
-                ", autoOff=" + autoOff +
-                ", triggerType=" + triggerType +
-                ", offsetInMinutesOrThresholdInMicroLiters=" + offsetInMinutesOrThresholdInMicroLiters +
-                ", beepType=" + beepType +
-                ", beepRepetition=" + beepRepetition +
-                '}';
-    }
-
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.kt
new file mode 100644
index 0000000000..3dcc266058
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.kt
@@ -0,0 +1,59 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition
+
+import java.nio.ByteBuffer
+import kotlin.experimental.or
+
+class AlertConfiguration(
+    private val type: AlertType,
+    private val enabled: Boolean,
+    private val durationInMinutes: Short,
+    private val autoOff: Boolean,
+    private val trigger: AlertTrigger,
+    private val beepType: BeepType,
+    private val beepRepetition: BeepRepetitionType
+) : Encodable {
+
+    override val encoded: ByteArray
+        get() {
+            var firstByte = (type.index.toInt() shl 4).toByte()
+            if (enabled) {
+                firstByte = firstByte or (1 shl 3).toByte()
+            }
+            if (trigger is AlertTrigger.ReservoirVolumeTrigger) {
+                firstByte = firstByte or (1 shl 2).toByte()
+            }
+            if (autoOff) {
+                firstByte = firstByte or (1 shl 1).toByte()
+            }
+            firstByte = firstByte or ((durationInMinutes.toInt() shr 8 and 0x01).toByte())
+            return ByteBuffer.allocate(6)
+                .put(firstByte)
+                .put(durationInMinutes.toByte())
+                .putShort(
+                    when (trigger) {
+                        is AlertTrigger.ReservoirVolumeTrigger -> {
+                            trigger.thresholdInMicroLiters
+                        }
+
+                        is AlertTrigger.TimerTrigger -> {
+                            trigger.offsetInMinutes
+                        }
+                    }
+                )
+                .put(beepRepetition.value)
+                .put(beepType.value)
+                .array()
+        }
+
+    override fun toString(): String {
+        return "AlertConfiguration{" +
+            "type=" + type +
+            ", enabled=" + enabled +
+            ", durationInMinutes=" + durationInMinutes +
+            ", autoOff=" + autoOff +
+            ", trigger=" + trigger +
+            ", beepType=" + beepType +
+            ", beepRepetition=" + beepRepetition +
+            '}'
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertSlot.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertSlot.java
deleted file mode 100644
index 7ee2b7cb5a..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertSlot.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition;
-
-public enum AlertSlot {
-    AUTO_OFF((byte) 0x00),
-    MULTI_COMMAND((byte) 0x01),
-    EXPIRATION_IMMINENT((byte) 0x02),
-    USER_SET_EXPIRATION((byte) 0x03),
-    LOW_RESERVOIR((byte) 0x04),
-    SUSPEND_IN_PROGRESS((byte) 0x05),
-    SUSPEND_ENDED((byte) 0x06),
-    EXPIRATION((byte) 0x07),
-    UNKNOWN((byte) 0xff);
-
-    private final byte value;
-
-    AlertSlot(byte value) {
-        this.value = value;
-    }
-
-    public static AlertSlot byValue(byte value) {
-        for (AlertSlot slot : values()) {
-            if (slot.value == value) {
-                return slot;
-            }
-        }
-        return UNKNOWN;
-    }
-
-    public byte getValue() {
-        return value;
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTrigger.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTrigger.kt
new file mode 100644
index 0000000000..7c76903127
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTrigger.kt
@@ -0,0 +1,6 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition
+
+sealed class AlertTrigger {
+    class TimerTrigger(val offsetInMinutes: Short) : AlertTrigger()
+    class ReservoirVolumeTrigger(val thresholdInMicroLiters: Short) : AlertTrigger()
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTriggerType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTriggerType.java
deleted file mode 100644
index fda5bf010f..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertTriggerType.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition;
-
-public enum AlertTriggerType {
-    TIME_TRIGGER,
-    RESERVOIR_VOLUME_TRIGGER
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertType.kt
new file mode 100644
index 0000000000..8ee60d2568
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertType.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.HasValue
+
+enum class AlertType(val index: Byte) : HasValue {
+
+    AUTO_OFF(0x00.toByte()),
+    MULTI_COMMAND(0x01.toByte()),
+    EXPIRATION_IMMINENT(0x02.toByte()),
+    USER_SET_EXPIRATION(0x03.toByte()),
+    LOW_RESERVOIR(0x04.toByte()),
+    SUSPEND_IN_PROGRESS(0x05.toByte()),
+    SUSPEND_ENDED(0x06.toByte()),
+    EXPIRATION(0x07.toByte()),
+    UNKNOWN(0xff.toByte());
+
+    override val value: Byte
+        get() = if (this == UNKNOWN) {
+            0xff.toByte()
+        } else {
+            (1 shl index.toInt()).toByte()
+        }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BasalProgram.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BasalProgram.java
deleted file mode 100644
index 5019260b0b..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BasalProgram.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class BasalProgram {
-    private final List<Segment> segments;
-
-    public BasalProgram(List<Segment> segments) {
-        if (segments == null) {
-            throw new IllegalArgumentException("segments can not be null");
-        }
-
-        // TODO validate segments
-
-        this.segments = new ArrayList<>(segments);
-    }
-
-    public void addSegment(Segment segment) {
-        segments.add(segment);
-    }
-
-    public List<Segment> getSegments() {
-        return Collections.unmodifiableList(segments);
-    }
-
-    public boolean isZeroBasal() {
-        int total = 0;
-        for (Segment segment : segments) {
-            total += segment.getBasalRateInHundredthUnitsPerHour();
-        }
-        return total == 0;
-    }
-
-    public boolean hasZeroUnitSegments() {
-        for (Segment segment : segments) {
-            if (segment.getBasalRateInHundredthUnitsPerHour() == 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static class Segment {
-        private static final byte PULSES_PER_UNIT = 20;
-
-        private final short startSlotIndex;
-        private final short endSlotIndex;
-        private final int basalRateInHundredthUnitsPerHour;
-
-        public Segment(short startSlotIndex, short endSlotIndex, int basalRateInHundredthUnitsPerHour) {
-            this.startSlotIndex = startSlotIndex;
-            this.endSlotIndex = endSlotIndex;
-            this.basalRateInHundredthUnitsPerHour = basalRateInHundredthUnitsPerHour;
-        }
-
-        public short getStartSlotIndex() {
-            return startSlotIndex;
-        }
-
-        public short getEndSlotIndex() {
-            return endSlotIndex;
-        }
-
-        public int getBasalRateInHundredthUnitsPerHour() {
-            return basalRateInHundredthUnitsPerHour;
-        }
-
-        public short getPulsesPerHour() {
-            return (short) (basalRateInHundredthUnitsPerHour * PULSES_PER_UNIT / 100);
-        }
-
-        public short getNumberOfSlots() {
-            return (short) (endSlotIndex - startSlotIndex);
-        }
-
-        @Override public String toString() {
-            return "Segment{" +
-                    "startSlotIndex=" + startSlotIndex +
-                    ", endSlotIndex=" + endSlotIndex +
-                    ", basalRateInHundredthUnitsPerHour=" + basalRateInHundredthUnitsPerHour +
-                    '}';
-        }
-    }
-
-    @Override public String toString() {
-        return "BasalProgram{" +
-                "segments=" + segments +
-                '}';
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BasalProgram.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BasalProgram.kt
new file mode 100644
index 0000000000..993874b5e3
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BasalProgram.kt
@@ -0,0 +1,96 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition
+
+import java.util.*
+
+class BasalProgram(
+    segments: List<Segment>
+) {
+
+    val segments: MutableList<Segment> = segments.toMutableList()
+        get() = Collections.unmodifiableList(field)
+
+    fun addSegment(segment: Segment) {
+        segments.add(segment)
+    }
+
+    fun hasZeroUnitSegments() = segments.any { it.basalRateInHundredthUnitsPerHour == 0 }
+
+    fun rateAt(date: Date): Double {
+        val instance = Calendar.getInstance()
+        instance.time = date
+        val hourOfDay = instance[Calendar.HOUR_OF_DAY]
+        val minuteOfHour = instance[Calendar.MINUTE]
+        val slotIndex = hourOfDay * 2 + minuteOfHour.div(30)
+        val slot = segments.find { it.startSlotIndex <= slotIndex && slotIndex < it.endSlotIndex }
+        return (slot?.basalRateInHundredthUnitsPerHour ?: 0).toDouble() / 100
+    }
+
+    class Segment(
+        val startSlotIndex: Short,
+        val endSlotIndex: Short,
+        val basalRateInHundredthUnitsPerHour: Int
+    ) {
+
+        fun getPulsesPerHour(): Short {
+            return (basalRateInHundredthUnitsPerHour * PULSES_PER_UNIT / 100).toShort()
+        }
+
+        fun getNumberOfSlots(): Short {
+            return (endSlotIndex - startSlotIndex).toShort()
+        }
+
+        override fun toString(): String {
+            return "Segment{" +
+                "startSlotIndex=" + startSlotIndex +
+                ", endSlotIndex=" + endSlotIndex +
+                ", basalRateInHundredthUnitsPerHour=" + basalRateInHundredthUnitsPerHour +
+                '}'
+        }
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (javaClass != other?.javaClass) return false
+
+            other as Segment
+
+            if (startSlotIndex != other.startSlotIndex) return false
+            if (endSlotIndex != other.endSlotIndex) return false
+            if (basalRateInHundredthUnitsPerHour != other.basalRateInHundredthUnitsPerHour) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result: Int = startSlotIndex.toInt()
+            result = 31 * result + endSlotIndex
+            result = 31 * result + basalRateInHundredthUnitsPerHour
+            return result
+        }
+
+        companion object {
+
+            private const val PULSES_PER_UNIT: Byte = 20
+        }
+    }
+
+    override fun toString(): String {
+        return "BasalProgram{" +
+            "segments=" + segments +
+            '}'
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as BasalProgram
+
+        if (segments != other.segments) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return segments.hashCode()
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.java
deleted file mode 100644
index 31cb23dc14..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition;
-
-// FIXME names
-public enum BeepRepetitionType {
-    XXX((byte) 0x01), // Used in low reservoir alert
-    XXX2((byte) 0x03), // Used in user pod expiration alert
-    XXX3((byte) 0x05), // Used in pod expiration alert
-    XXX4((byte) 0x06), // Used in imminent pod expiration alert
-    XXX5((byte) 0x08); // Used in lump of coal alert
-
-    private final byte value;
-
-    BeepRepetitionType(byte value) {
-        this.value = value;
-    }
-
-    public byte getValue() {
-        return value;
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.kt
new file mode 100644
index 0000000000..cf668aa036
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepRepetitionType.kt
@@ -0,0 +1,13 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition
+
+// FIXME names
+enum class BeepRepetitionType(
+    val value: Byte
+) {
+
+    XXX(0x01.toByte()), // Used in lump of coal alert, LOW_RESERVOIR
+    XXX2(0x03.toByte()), // Used in USER_SET_EXPIRATION
+    XXX3(0x05.toByte()), // published system expiration alert
+    XXX4(0x06.toByte()), // Used in imminent pod expiration alert, suspend in progress
+    XXX5(0x08.toByte()); // Lump of coal alert
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.java
deleted file mode 100644
index e88f77e67f..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition;
-
-public enum BeepType {
-    SILENT((byte) 0x00),
-    FOUR_TIMES_BIP_BEEP((byte) 0x02), // Used in low reservoir alert, user expiration alert, expiration alert, imminent expiration alert, lump of coal alert
-    LONG_SINGLE_BEEP((byte) 0x06); // Used in stop delivery command
-
-    private final byte value;
-
-    BeepType(byte value) {
-        this.value = value;
-    }
-
-    public byte getValue() {
-        return value;
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.kt
new file mode 100644
index 0000000000..2ce8428ee8
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BeepType.kt
@@ -0,0 +1,9 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition
+
+enum class BeepType(val value: Byte) {
+
+    SILENT(0x00.toByte()),
+    FOUR_TIMES_BIP_BEEP(0x02.toByte()), // Used in low reservoir alert, user expiration alert, expiration alert, imminent expiration alert, lump of coal alert
+    XXX(0x04.toByte()), // Used during suspend
+    LONG_SINGLE_BEEP(0x06.toByte()); // Used in stop delivery command
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.java
deleted file mode 100644
index dad0745505..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition;
-
-public enum DeliveryStatus {
-    SUSPENDED((byte) 0x00),
-    BASAL_ACTIVE((byte) 0x01),
-    TEMP_BASAL_ACTIVE((byte) 0x02),
-    PRIMING((byte) 0x04),
-    BOLUS_AND_BASAL_ACTIVE((byte) 0x05),
-    BOLUS_AND_TEMP_BASAL_ACTIVE((byte) 0x06),
-    UNKNOWN((byte) 0xff);
-
-    private final byte value;
-
-    DeliveryStatus(byte value) {
-        this.value = value;
-    }
-
-    public static DeliveryStatus byValue(byte value) {
-        for (DeliveryStatus status : values()) {
-            if (status.value == value) {
-                return status;
-            }
-        }
-        return UNKNOWN;
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.kt
new file mode 100644
index 0000000000..106a3f3ffe
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/DeliveryStatus.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.HasValue
+
+enum class DeliveryStatus(override val value: Byte) : HasValue {
+
+    SUSPENDED(0x00.toByte()),
+    BASAL_ACTIVE(0x01.toByte()),
+    TEMP_BASAL_ACTIVE(0x02.toByte()),
+    PRIMING(0x04.toByte()),
+    BOLUS_AND_BASAL_ACTIVE(0x05.toByte()),
+    BOLUS_AND_TEMP_BASAL_ACTIVE(0x06.toByte()),
+    UNKNOWN(0xff.toByte());
+
+    fun bolusDeliveringActive(): Boolean {
+        return value in arrayOf(BOLUS_AND_BASAL_ACTIVE.value, BOLUS_AND_TEMP_BASAL_ACTIVE.value)
+    }
+
+    fun tempBasalActive(): Boolean {
+        return value in arrayOf(BOLUS_AND_TEMP_BASAL_ACTIVE.value, TEMP_BASAL_ACTIVE.value)
+    }
+
+    fun suspended(): Boolean {
+        return value == SUSPENDED.value
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/Encodable.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/Encodable.java
deleted file mode 100644
index d17d42050f..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/Encodable.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition;
-
-public interface Encodable {
-    byte[] getEncoded();
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/Encodable.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/Encodable.kt
new file mode 100644
index 0000000000..94f5798175
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/Encodable.kt
@@ -0,0 +1,6 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition
+
+interface Encodable {
+
+    val encoded: ByteArray
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.java
deleted file mode 100644
index a7fc43b744..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition;
-
-public enum NakErrorType {
-    FLASH_WRITE((byte) 0x01),
-    FLASH_ERASE((byte) 0x02),
-    FLASH_OPERATION((byte) 0x03),
-    FLASH_ADDR((byte) 0x04),
-    POD_STATE((byte) 0x05),
-    CRITICAL_VARIABLE((byte) 0x06),
-    ILLEGAL_PARAM((byte) 0x07),
-    BOLUS_CRITICAL_VAR((byte) 0x08),
-    INT_ILLEGAL_PARAM((byte) 0x09),
-    ILLEGAL_CHECKSUM((byte) 0x0a),
-    INVALID_MSG_LEN((byte) 0x0b),
-    PUMP_STATE((byte) 0x0c),
-    ILLEGAL_COMMAND((byte) 0x0d),
-    ILLEGAL_FILL_STATE((byte) 0x0e),
-    MAX_READWRITE_SIZE((byte) 0x0f),
-    ILLEGAL_READ_ADDRESS((byte) 0x10),
-    ILLEGAL_READ_MEM_TYPE((byte) 0x11),
-    INIT_POD((byte) 0x12),
-    ILLEGAL_CMD_STATE((byte) 0x13),
-    ILLEGAL_SECURITY_CODE((byte) 0x14),
-    POD_IN_ALARM((byte) 0x15),
-    COMD_NOT_SET((byte) 0x16),
-    ILLEGAL_RX_SENS_VALUE((byte) 0x17),
-    ILLEGAL_TX_PKT_SIZE((byte) 0x18),
-    OCCL_PARAMS_ALREADY_SET((byte) 0x19),
-    OCCL_PARAM((byte) 0x1a),
-    ILLEGAL_CDTHR_VALUE((byte) 0x1b),
-    IGNORE_COMMAND((byte) 0x1c),
-    INVALID_CRC((byte) 0x1d),
-    UNKNOWN((byte) 0xff);
-
-    private final byte value;
-
-    NakErrorType(byte value) {
-        this.value = value;
-    }
-
-    public static NakErrorType byValue(byte value) {
-        for (NakErrorType type : values()) {
-            if (type.value == value) {
-                return type;
-            }
-        }
-        return UNKNOWN;
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.kt
new file mode 100644
index 0000000000..c700c11388
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/NakErrorType.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.HasValue
+
+enum class NakErrorType(override val value: Byte) : HasValue {
+
+    FLASH_WRITE(0x01.toByte()),
+    FLASH_ERASE(0x02.toByte()),
+    FLASH_OPERATION(0x03.toByte()),
+    FLASH_ADDR(0x04.toByte()),
+    POD_STATE(0x05.toByte()),
+    CRITICAL_VARIABLE(0x06.toByte()),
+    ILLEGAL_PARAM(0x07.toByte()),
+    BOLUS_CRITICAL_VAR(0x08.toByte()),
+    INT_ILLEGAL_PARAM(0x09.toByte()),
+    ILLEGAL_CHECKSUM(0x0a.toByte()),
+    INVALID_MSG_LEN(0x0b.toByte()),
+    PUMP_STATE(0x0c.toByte()),
+    ILLEGAL_COMMAND(0x0d.toByte()),
+    ILLEGAL_FILL_STATE(0x0e.toByte()),
+    MAX_READWRITE_SIZE(0x0f.toByte()),
+    ILLEGAL_READ_ADDRESS(0x10.toByte()),
+    ILLEGAL_READ_MEM_TYPE(0x11.toByte()),
+    INIT_POD(0x12.toByte()),
+    ILLEGAL_CMD_STATE(0x13.toByte()),
+    ILLEGAL_SECURITY_CODE(0x14.toByte()),
+    POD_IN_ALARM(0x15.toByte()),
+    COMD_NOT_SET(0x16.toByte()),
+    ILLEGAL_RX_SENS_VALUE(0x17.toByte()),
+    ILLEGAL_TX_PKT_SIZE(0x18.toByte()),
+    OCCL_PARAMS_ALREADY_SET(0x19.toByte()),
+    OCCL_PARAM(0x1a.toByte()),
+    ILLEGAL_CDTHR_VALUE(0x1b.toByte()),
+    IGNORE_COMMAND(0x1c.toByte()),
+    INVALID_CRC(0x1d.toByte()),
+    UNKNOWN(0xff.toByte());
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/OmnipodEvent.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/OmnipodEvent.java
deleted file mode 100644
index a6f78b06e4..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/OmnipodEvent.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition;
-
-public class OmnipodEvent {
-    public enum OmnipodEventType {
-        CONNECTED,
-        ALREADY_CONNECTED,
-        FAILED_TO_CONNECT,
-        DISCONNECTED,
-        COMMAND_SENT,
-        GOT_POD_VERSION,
-        SET_UNIQUE_ID,
-        PRIMED_PUMP,
-        FINISHED_ACTIVATION_1,
-        PROGRAMMED_BASAL,
-        PROGRAMMED_ALERTS,
-        SET_BEEPS,
-        INSERTED_CANNULA,
-        FINISHED_ACTIVATION_2,
-        PROGRAMMED_TEMP_BASAL,
-        STARTED_BOLUS,
-        STOPPED_DELIVERY,
-        SILENCED_ALERTS,
-        DEACTIVATED,
-        COMMAND_SENDING,
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodConstants.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodConstants.kt
new file mode 100644
index 0000000000..915c6b7bde
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodConstants.kt
@@ -0,0 +1,9 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition
+
+import java.time.Duration
+
+class PodConstants {
+    companion object {
+        val MAX_POD_LIFETIME = Duration.ofHours(80)
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.java
deleted file mode 100644
index b746cd9435..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition;
-
-public enum PodStatus {
-    UNINITIALIZED((byte) 0x00),
-    MFG_TEST((byte) 0x01),
-    FILLED((byte) 0x02),
-    UID_SET((byte) 0x03),
-    ENGAGING_CLUTCH_DRIVE((byte) 0x04),
-    CLUTCH_DRIVE_ENGAGED((byte) 0x05),
-    BASAL_PROGRAM_RUNNING((byte) 0x06),
-    PRIMING((byte) 0x07),
-    RUNNING_ABOVE_MIN_VOLUME((byte) 0x08),
-    RUNNING_BELOW_MIN_VOLUME((byte) 0x09),
-    UNUSED_10((byte) 0x0a),
-    UNUSED_11((byte) 0x0b),
-    UNUSED_12((byte) 0x0c),
-    ALARM((byte) 0x0d),
-    LUMP_OF_COAL((byte) 0x0e),
-    DEACTIVATED((byte) 0x0f),
-    UNKNOWN((byte) 0xff);
-
-    private final byte value;
-
-    PodStatus(byte value) {
-        this.value = value;
-    }
-
-    public static PodStatus byValue(byte value) {
-        for (PodStatus status : values()) {
-            if (status.value == value) {
-                return status;
-            }
-        }
-        return UNKNOWN;
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.kt
new file mode 100644
index 0000000000..9dca9d1c57
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/PodStatus.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.HasValue
+
+enum class PodStatus(override val value: Byte) : HasValue {
+
+    UNINITIALIZED(0x00.toByte()),
+    MFG_TEST(0x01.toByte()),
+    FILLED(0x02.toByte()),
+    UID_SET(0x03.toByte()),
+    ENGAGING_CLUTCH_DRIVE(0x04.toByte()),
+    CLUTCH_DRIVE_ENGAGED(0x05.toByte()),
+    BASAL_PROGRAM_SET(0x06.toByte()),
+    PRIMING(0x07.toByte()),
+    RUNNING_ABOVE_MIN_VOLUME(0x08.toByte()),
+    RUNNING_BELOW_MIN_VOLUME(0x09.toByte()),
+    UNUSED_10(0x0a.toByte()),
+    UNUSED_11(0x0b.toByte()),
+    UNUSED_12(0x0c.toByte()),
+    ALARM(0x0d.toByte()),
+    LUMP_OF_COAL(0x0e.toByte()),
+    DEACTIVATED(0x0f.toByte()),
+    UNKNOWN(0xff.toByte());
+
+    fun isRunning(): Boolean = this == RUNNING_ABOVE_MIN_VOLUME || this == RUNNING_BELOW_MIN_VOLUME
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ProgramReminder.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ProgramReminder.java
deleted file mode 100644
index 018986eb36..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ProgramReminder.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition;
-
-public class ProgramReminder implements Encodable {
-    private final boolean atStart;
-    private final boolean atEnd;
-    private final byte atInterval;
-
-    public ProgramReminder(boolean atStart, boolean atEnd, byte atIntervalInMinutes) {
-        this.atStart = atStart;
-        this.atEnd = atEnd;
-        this.atInterval = atIntervalInMinutes;
-    }
-
-    @Override public byte[] getEncoded() {
-        return new byte[]{(byte) (((this.atStart ? 1 : 0) << 7)
-                | ((this.atEnd ? 1 : 0) << 6)
-                | (this.atInterval & 0x3f))};
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ProgramReminder.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ProgramReminder.kt
new file mode 100644
index 0000000000..06e338bf97
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/ProgramReminder.kt
@@ -0,0 +1,24 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition
+
+import java.io.Serializable
+import kotlin.experimental.and
+
+class ProgramReminder(
+    private val atStart: Boolean,
+    private val atEnd: Boolean,
+    private val atInterval: Byte
+) : Encodable, Serializable {
+
+    override val encoded: ByteArray
+        get() = byteArrayOf(
+            (
+                (if (atStart) 1 else 0) shl 7
+                    or ((if (atEnd) 1 else 0) shl 6)
+                    or ((atInterval and 0x3f).toInt())
+                ).toByte()
+        )
+
+    override fun toString(): String {
+        return "ProgramReminder(atStart=$atStart, atEnd=$atEnd, atInterval=$atInterval)"
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/SoftwareVersion.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/SoftwareVersion.kt
new file mode 100644
index 0000000000..da619a0428
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/SoftwareVersion.kt
@@ -0,0 +1,14 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition
+
+import java.io.Serializable
+
+data class SoftwareVersion(
+    private val major: Short,
+    private val minor: Short,
+    private val interim: Short
+) : Serializable {
+
+    override fun toString(): String {
+        return "$major.$minor.$interim"
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.java
deleted file mode 100644
index f36851f7d8..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response;
-
-abstract class ActivationResponseBase extends ResponseBase {
-    final ResponseType.ActivationResponseType activationResponseType;
-
-    ActivationResponseBase(ResponseType.ActivationResponseType activationResponseType, byte[] encoded) {
-        super(ResponseType.ACTIVATION_RESPONSE, encoded);
-        this.activationResponseType = activationResponseType;
-    }
-
-    public ResponseType.ActivationResponseType getActivationResponseType() {
-        return activationResponseType;
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.kt
new file mode 100644
index 0000000000..d12ce055ea
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ActivationResponseBase.kt
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.ResponseType.ActivationResponseType
+
+abstract class ActivationResponseBase(
+    val activationResponseType: ActivationResponseType,
+    encoded: ByteArray
+) : ResponseBase(ResponseType.ACTIVATION_RESPONSE, encoded)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.java
deleted file mode 100644
index efb356681e..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response;
-
-public class AdditionalStatusResponseBase extends ResponseBase {
-    final ResponseType.AdditionalStatusResponseType statusResponseType;
-
-    AdditionalStatusResponseBase(ResponseType.AdditionalStatusResponseType statusResponseType, byte[] encoded) {
-        super(ResponseType.ADDITIONAL_STATUS_RESPONSE, encoded);
-        this.statusResponseType = statusResponseType;
-    }
-
-    public ResponseType.AdditionalStatusResponseType getStatusResponseType() {
-        return statusResponseType;
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.kt
new file mode 100644
index 0000000000..501033468a
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AdditionalStatusResponseBase.kt
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.ResponseType.StatusResponseType
+
+open class AdditionalStatusResponseBase internal constructor(
+    val statusResponseType: StatusResponseType,
+    encoded: ByteArray
+) : ResponseBase(ResponseType.ADDITIONAL_STATUS_RESPONSE, encoded)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.java
deleted file mode 100644
index ba46f8b9b0..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response;
-
-import androidx.annotation.NonNull;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlarmType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.DeliveryStatus;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus;
-
-public class AlarmStatusResponse extends AdditionalStatusResponseBase {
-    private final byte messageType;
-    private final short messageLength;
-    private final byte additionalStatusResponseType;
-    private final PodStatus podStatus;
-    private final DeliveryStatus deliveryStatus;
-    private final short bolusPulsesRemaining;
-    private final short sequenceNumberOfLastProgrammingCommand;
-    private final short totalPulsesDelivered;
-    private final AlarmType alarmType;
-    private final short alarmTime;
-    private final short reservoirPulsesRemaining;
-    private final short minutesSinceActivation;
-    private final boolean alert0Active;
-    private final boolean alert1Active;
-    private final boolean alert2Active;
-    private final boolean alert3Active;
-    private final boolean alert4Active;
-    private final boolean alert5Active;
-    private final boolean alert6Active;
-    private final boolean alert7Active;
-    private final boolean occlusionAlarm;
-    private final boolean pulseInfoInvalid;
-    private final PodStatus podStatusWhenAlarmOccurred;
-    private final boolean immediateBolusWhenAlarmOccurred;
-    private final byte occlusionType;
-    private final boolean occurredWhenFetchingImmediateBolusActiveInformation;
-    private final short rssi;
-    private final short receiverLowerGain;
-    private final PodStatus podStatusWhenAlarmOccurred2;
-    private final short returnAddressOfPodAlarmHandlerCaller;
-
-    public AlarmStatusResponse(byte[] encoded) {
-        super(ResponseType.AdditionalStatusResponseType.ALARM_STATUS, encoded);
-        messageType = encoded[0];
-        messageLength = (short) (encoded[1] & 0xff);
-        additionalStatusResponseType = encoded[2];
-        podStatus = PodStatus.byValue((byte) (encoded[3] & 0x0f));
-        deliveryStatus = DeliveryStatus.byValue((byte) (encoded[4] & 0x0f));
-        bolusPulsesRemaining = (short) (ByteBuffer.wrap(new byte[]{encoded[5], encoded[6]}).getShort() & 2047);
-        sequenceNumberOfLastProgrammingCommand = (short) (encoded[7] & 0x0f);
-        totalPulsesDelivered = ByteBuffer.wrap(new byte[]{encoded[8], encoded[9]}).getShort();
-        alarmType = AlarmType.byValue(encoded[10]);
-        alarmTime = ByteBuffer.wrap(new byte[]{encoded[11], encoded[12]}).getShort();
-        reservoirPulsesRemaining = ByteBuffer.wrap(new byte[]{encoded[13], encoded[14]}).getShort();
-        minutesSinceActivation = ByteBuffer.wrap(new byte[]{encoded[15], encoded[16]}).getShort();
-
-        byte activeAlerts = encoded[17];
-        alert0Active = (activeAlerts & 1) == 1;
-        alert1Active = ((activeAlerts >>> 1) & 1) == 1;
-        alert2Active = ((activeAlerts >>> 2) & 1) == 1;
-        alert3Active = ((activeAlerts >>> 3) & 1) == 1;
-        alert4Active = ((activeAlerts >>> 4) & 1) == 1;
-        alert5Active = ((activeAlerts >>> 5) & 1) == 1;
-        alert6Active = ((activeAlerts >>> 6) & 1) == 1;
-        alert7Active = ((activeAlerts >>> 7) & 1) == 1;
-
-        byte alarmFlags = encoded[18];
-        occlusionAlarm = (alarmFlags & 1) == 1;
-        pulseInfoInvalid = ((alarmFlags >> 1) & 1) == 1;
-
-        byte byte19 = encoded[19];
-        byte byte20 = encoded[20];
-        podStatusWhenAlarmOccurred = PodStatus.byValue((byte) (byte19 & 0x0f));
-        immediateBolusWhenAlarmOccurred = ((byte19 >> 4) & 1) == 1;
-        occlusionType = (byte) ((byte19 >> 5) & 3);
-        occurredWhenFetchingImmediateBolusActiveInformation = ((byte19 >> 7) & 1) == 1;
-        rssi = (short) (byte20 & 0x3f);
-        receiverLowerGain = (short) ((byte20 >> 6) & 0x03);
-        podStatusWhenAlarmOccurred2 = PodStatus.byValue((byte) (encoded[21] & 0x0f));
-        returnAddressOfPodAlarmHandlerCaller = ByteBuffer.wrap(new byte[]{encoded[22], encoded[23]}).getShort();
-    }
-
-    public byte getMessageType() {
-        return messageType;
-    }
-
-    public short getMessageLength() {
-        return messageLength;
-    }
-
-    public byte getAdditionalStatusResponseType() {
-        return additionalStatusResponseType;
-    }
-
-    public PodStatus getPodStatus() {
-        return podStatus;
-    }
-
-    public DeliveryStatus getDeliveryStatus() {
-        return deliveryStatus;
-    }
-
-    public short getBolusPulsesRemaining() {
-        return bolusPulsesRemaining;
-    }
-
-    public short getSequenceNumberOfLastProgrammingCommand() {
-        return sequenceNumberOfLastProgrammingCommand;
-    }
-
-    public short getTotalPulsesDelivered() {
-        return totalPulsesDelivered;
-    }
-
-    public AlarmType getAlarmType() {
-        return alarmType;
-    }
-
-    public short getAlarmTime() {
-        return alarmTime;
-    }
-
-    public short getReservoirPulsesRemaining() {
-        return reservoirPulsesRemaining;
-    }
-
-    public short getMinutesSinceActivation() {
-        return minutesSinceActivation;
-    }
-
-    public boolean isAlert0Active() {
-        return alert0Active;
-    }
-
-    public boolean isAlert1Active() {
-        return alert1Active;
-    }
-
-    public boolean isAlert2Active() {
-        return alert2Active;
-    }
-
-    public boolean isAlert3Active() {
-        return alert3Active;
-    }
-
-    public boolean isAlert4Active() {
-        return alert4Active;
-    }
-
-    public boolean isAlert5Active() {
-        return alert5Active;
-    }
-
-    public boolean isAlert6Active() {
-        return alert6Active;
-    }
-
-    public boolean isAlert7Active() {
-        return alert7Active;
-    }
-
-    public boolean isOcclusionAlarm() {
-        return occlusionAlarm;
-    }
-
-    public boolean isPulseInfoInvalid() {
-        return pulseInfoInvalid;
-    }
-
-    public PodStatus getPodStatusWhenAlarmOccurred() {
-        return podStatusWhenAlarmOccurred;
-    }
-
-    public boolean isImmediateBolusWhenAlarmOccurred() {
-        return immediateBolusWhenAlarmOccurred;
-    }
-
-    public byte getOcclusionType() {
-        return occlusionType;
-    }
-
-    public boolean isOccurredWhenFetchingImmediateBolusActiveInformation() {
-        return occurredWhenFetchingImmediateBolusActiveInformation;
-    }
-
-    public short getRssi() {
-        return rssi;
-    }
-
-    public short getReceiverLowerGain() {
-        return receiverLowerGain;
-    }
-
-    public PodStatus getPodStatusWhenAlarmOccurred2() {
-        return podStatusWhenAlarmOccurred2;
-    }
-
-    public short getReturnAddressOfPodAlarmHandlerCaller() {
-        return returnAddressOfPodAlarmHandlerCaller;
-    }
-
-    @NonNull @Override public String toString() {
-        return "AlarmStatusResponse{" +
-                "messageType=" + messageType +
-                ", messageLength=" + messageLength +
-                ", additionalStatusResponseType=" + additionalStatusResponseType +
-                ", podStatus=" + podStatus +
-                ", deliveryStatus=" + deliveryStatus +
-                ", bolusPulsesRemaining=" + bolusPulsesRemaining +
-                ", sequenceNumberOfLastProgrammingCommand=" + sequenceNumberOfLastProgrammingCommand +
-                ", totalPulsesDelivered=" + totalPulsesDelivered +
-                ", alarmType=" + alarmType +
-                ", alarmTime=" + alarmTime +
-                ", reservoirPulsesRemaining=" + reservoirPulsesRemaining +
-                ", minutesSinceActivation=" + minutesSinceActivation +
-                ", alert0Active=" + alert0Active +
-                ", alert1Active=" + alert1Active +
-                ", alert2Active=" + alert2Active +
-                ", alert3Active=" + alert3Active +
-                ", alert4Active=" + alert4Active +
-                ", alert5Active=" + alert5Active +
-                ", alert6Active=" + alert6Active +
-                ", alert7Active=" + alert7Active +
-                ", occlusionAlarm=" + occlusionAlarm +
-                ", pulseInfoInvalid=" + pulseInfoInvalid +
-                ", podStatusWhenAlarmOccurred=" + podStatusWhenAlarmOccurred +
-                ", immediateBolusWhenAlarmOccurred=" + immediateBolusWhenAlarmOccurred +
-                ", occlusionType=" + occlusionType +
-                ", occurredWhenFetchingImmediateBolusActiveInformation=" + occurredWhenFetchingImmediateBolusActiveInformation +
-                ", rssi=" + rssi +
-                ", receiverLowerGain=" + receiverLowerGain +
-                ", podStatusWhenAlarmOccurred2=" + podStatusWhenAlarmOccurred2 +
-                ", returnAddressOfPodAlarmHandlerCaller=" + returnAddressOfPodAlarmHandlerCaller +
-                ", statusResponseType=" + statusResponseType +
-                ", responseType=" + responseType +
-                ", encoded=" + Arrays.toString(encoded) +
-                '}';
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.kt
new file mode 100644
index 0000000000..333af17c03
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponse.kt
@@ -0,0 +1,87 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlarmType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.DeliveryStatus
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.ResponseType.StatusResponseType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.AlertUtil
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.byValue
+import java.nio.ByteBuffer
+import java.util.*
+import kotlin.experimental.and
+
+class AlarmStatusResponse(
+    encoded: ByteArray
+) : AdditionalStatusResponseBase(StatusResponseType.ALARM_STATUS, encoded) {
+
+    val messageType: Byte = encoded[0]
+    val messageLength: Short = (encoded[1].toInt() and 0xff).toShort()
+    val additionalStatusResponseType: Byte = encoded[2]
+    val podStatus: PodStatus = byValue((encoded[3] and 0x0f), PodStatus.UNKNOWN)
+    val deliveryStatus: DeliveryStatus = byValue((encoded[4] and 0x0f), DeliveryStatus.UNKNOWN)
+    val bolusPulsesRemaining: Short = (ByteBuffer.wrap(byteArrayOf(encoded[5], encoded[6])).short and 2047)
+    val sequenceNumberOfLastProgrammingCommand: Short = (encoded[7] and 0x0f).toShort()
+    val totalPulsesDelivered: Short = ByteBuffer.wrap(byteArrayOf(encoded[8], encoded[9])).short
+    val alarmType: AlarmType = byValue(encoded[10], AlarmType.UNKNOWN)
+    val alarmTime: Short = ByteBuffer.wrap(byteArrayOf(encoded[11], encoded[12])).short
+    val reservoirPulsesRemaining: Short = ByteBuffer.wrap(byteArrayOf(encoded[13], encoded[14])).short
+    val minutesSinceActivation: Short = ByteBuffer.wrap(byteArrayOf(encoded[15], encoded[16])).short
+    val activeAlerts: EnumSet<AlertType> = AlertUtil.decodeAlertSet(encoded[17])
+    val occlusionAlarm: Boolean
+    val pulseInfoInvalid: Boolean
+    val podStatusWhenAlarmOccurred: PodStatus
+    val immediateBolusWhenAlarmOccurred: Boolean
+    val occlusionType: Byte
+    val occurredWhenFetchingImmediateBolusActiveInformation: Boolean
+    val rssi: Short
+    val receiverLowerGain: Short
+    val podStatusWhenAlarmOccurred2: PodStatus
+    val returnAddressOfPodAlarmHandlerCaller: Short
+
+    init {
+        val alarmFlags = encoded[18]
+        occlusionAlarm = (alarmFlags.toInt() and 1) == 1
+        pulseInfoInvalid = alarmFlags shr 1 and 1 == 1
+        val byte19 = encoded[19]
+        val byte20 = encoded[20]
+        podStatusWhenAlarmOccurred = byValue((byte19 and 0x0f), PodStatus.UNKNOWN)
+        immediateBolusWhenAlarmOccurred = byte19 shr 4 and 1 == 1
+        occlusionType = ((byte19 shr 5 and 3).toByte())
+        occurredWhenFetchingImmediateBolusActiveInformation = byte19 shr 7 and 1 == 1
+        rssi = (byte20 and 0x3f).toShort()
+        receiverLowerGain = ((byte20 shr 6 and 0x03).toShort())
+        podStatusWhenAlarmOccurred2 = byValue((encoded[21] and 0x0f), PodStatus.UNKNOWN)
+        returnAddressOfPodAlarmHandlerCaller = ByteBuffer.wrap(byteArrayOf(encoded[22], encoded[23])).short
+    }
+
+    override fun toString(): String {
+        return "AlarmStatusResponse(" +
+            "messageType=$messageType, " +
+            "messageLength=$messageLength, " +
+            "additionalStatusResponseType=$additionalStatusResponseType, " +
+            "podStatus=$podStatus, " +
+            "deliveryStatus=$deliveryStatus, " +
+            "bolusPulsesRemaining=$bolusPulsesRemaining, " +
+            "sequenceNumberOfLastProgrammingCommand=$sequenceNumberOfLastProgrammingCommand, " +
+            "totalPulsesDelivered=$totalPulsesDelivered, " +
+            "alarmType=$alarmType, " +
+            "alarmTime=$alarmTime, " +
+            "reservoirPulsesRemaining=$reservoirPulsesRemaining, " +
+            "minutesSinceActivation=$minutesSinceActivation, " +
+            "activeAlerts=$activeAlerts, " +
+            "occlusionAlarm=$occlusionAlarm, " +
+            "pulseInfoInvalid=$pulseInfoInvalid, " +
+            "podStatusWhenAlarmOccurred=$podStatusWhenAlarmOccurred, " +
+            "immediateBolusWhenAlarmOccurred=$immediateBolusWhenAlarmOccurred, " +
+            "occlusionType=$occlusionType, " +
+            "occurredWhenFetchingImmediateBolusActiveInformation=$occurredWhenFetchingImmediateBolusActiveInformation, " +
+            "rssi=$rssi, " +
+            "receiverLowerGain=$receiverLowerGain, " +
+            "podStatusWhenAlarmOccurred2=$podStatusWhenAlarmOccurred2, " +
+            "returnAddressOfPodAlarmHandlerCaller=$returnAddressOfPodAlarmHandlerCaller" +
+            ")"
+    }
+
+    infix fun Byte.shr(i: Int): Int = toInt() shr i
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.java
deleted file mode 100644
index bc448f18fb..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response;
-
-import java.util.Arrays;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.DeliveryStatus;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus;
-
-public class DefaultStatusResponse extends ResponseBase {
-    private final byte messageType;
-    private final DeliveryStatus deliveryStatus;
-    private final PodStatus podStatus;
-    private final short totalPulsesDelivered;
-    private final short sequenceNumberOfLastProgrammingCommand;
-    private final short bolusPulsesRemaining;
-    private final boolean occlusionAlertActive;
-    private final boolean alert1Active;
-    private final boolean alert2Active;
-    private final boolean alert3Active;
-    private final boolean alert4Active;
-    private final boolean alert5Active;
-    private final boolean alert6Active;
-    private final boolean alert7Active;
-    private final short minutesSinceActivation;
-    private final short reservoirPulsesRemaining;
-
-    public DefaultStatusResponse(byte[] encoded) {
-        super(ResponseType.DEFAULT_STATUS_RESPONSE, encoded);
-
-        messageType = encoded[0];
-        deliveryStatus = DeliveryStatus.byValue((byte) ((encoded[1] >> 4) & 0x0f));
-        podStatus = PodStatus.byValue((byte) (encoded[1] & 0x0f));
-        totalPulsesDelivered = (short) (((encoded[2] & 0x0f) << 12) | ((encoded[3] & 0xff) << 1) | ((encoded[4] & 0xff) >>> 7));
-        sequenceNumberOfLastProgrammingCommand = (byte) ((encoded[4] >>> 3) & 0x0f);
-        bolusPulsesRemaining = (short) ((((encoded[4] & 0x07) << 10) | (encoded[5] & 0xff)) & 2047);
-
-        short activeAlerts = (short) (((encoded[6] & 0xff) << 1) | (encoded[7] >>> 7));
-        occlusionAlertActive = (activeAlerts & 1) == 1;
-        alert1Active = ((activeAlerts >> 1) & 1) == 1;
-        alert2Active = ((activeAlerts >> 2) & 1) == 1;
-        alert3Active = ((activeAlerts >> 3) & 1) == 1;
-        alert4Active = ((activeAlerts >> 4) & 1) == 1;
-        alert5Active = ((activeAlerts >> 5) & 1) == 1;
-        alert6Active = ((activeAlerts >> 6) & 1) == 1;
-        alert7Active = ((activeAlerts >> 7) & 1) == 1;
-
-        minutesSinceActivation = (short) (((encoded[7] & 0x7f) << 6) | (((encoded[8] & 0xff) >>> 2) & 0x3f));
-        reservoirPulsesRemaining = (short) (((encoded[8] << 8) | encoded[9]) & 0x3ff);
-    }
-
-    public byte getMessageType() {
-        return messageType;
-    }
-
-    public DeliveryStatus getDeliveryStatus() {
-        return deliveryStatus;
-    }
-
-    public PodStatus getPodStatus() {
-        return podStatus;
-    }
-
-    public short getTotalPulsesDelivered() {
-        return totalPulsesDelivered;
-    }
-
-    public short getSequenceNumberOfLastProgrammingCommand() {
-        return sequenceNumberOfLastProgrammingCommand;
-    }
-
-    public short getBolusPulsesRemaining() {
-        return bolusPulsesRemaining;
-    }
-
-    public boolean isOcclusionAlertActive() {
-        return occlusionAlertActive;
-    }
-
-    public boolean isAlert1Active() {
-        return alert1Active;
-    }
-
-    public boolean isAlert2Active() {
-        return alert2Active;
-    }
-
-    public boolean isAlert3Active() {
-        return alert3Active;
-    }
-
-    public boolean isAlert4Active() {
-        return alert4Active;
-    }
-
-    public boolean isAlert5Active() {
-        return alert5Active;
-    }
-
-    public boolean isAlert6Active() {
-        return alert6Active;
-    }
-
-    public boolean isAlert7Active() {
-        return alert7Active;
-    }
-
-    public short getMinutesSinceActivation() {
-        return minutesSinceActivation;
-    }
-
-    public short getReservoirPulsesRemaining() {
-        return reservoirPulsesRemaining;
-    }
-
-    @Override public String toString() {
-        return "DefaultStatusResponse{" +
-                "messageType=" + messageType +
-                ", deliveryStatus=" + deliveryStatus +
-                ", podStatus=" + podStatus +
-                ", totalPulsesDelivered=" + totalPulsesDelivered +
-                ", sequenceNumberOfLastProgrammingCommand=" + sequenceNumberOfLastProgrammingCommand +
-                ", bolusPulsesRemaining=" + bolusPulsesRemaining +
-                ", occlusionAlertActive=" + occlusionAlertActive +
-                ", alert1Active=" + alert1Active +
-                ", alert2Active=" + alert2Active +
-                ", alert3Active=" + alert3Active +
-                ", alert4Active=" + alert4Active +
-                ", alert5Active=" + alert5Active +
-                ", alert6Active=" + alert6Active +
-                ", alert7Active=" + alert7Active +
-                ", minutesSinceActivation=" + minutesSinceActivation +
-                ", reservoirPulsesRemaining=" + reservoirPulsesRemaining +
-                ", responseType=" + responseType +
-                ", encoded=" + Arrays.toString(encoded) +
-                '}';
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.kt
new file mode 100644
index 0000000000..584349de78
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.DeliveryStatus
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.AlertUtil
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.byValue
+import java.util.*
+import kotlin.experimental.and
+
+class DefaultStatusResponse(
+    encoded: ByteArray
+) : ResponseBase(ResponseType.DEFAULT_STATUS_RESPONSE, encoded) {
+
+    val messageType: Byte = encoded[0]
+    val deliveryStatus: DeliveryStatus = byValue((encoded[1].toInt() shr 4 and 0x0f).toByte(), DeliveryStatus.UNKNOWN)
+    val podStatus: PodStatus = byValue((encoded[1] and 0x0f), PodStatus.UNKNOWN)
+    val totalPulsesDelivered: Short =
+        (encoded[2] and 0x0f shl 9 or (encoded[3].toInt() and 0xff shl 1) or (encoded[4].toInt() and 0xff ushr 7)).toShort()
+
+    val sequenceNumberOfLastProgrammingCommand: Short = (encoded[4] ushr 3 and 0x0f).toShort()
+    val bolusPulsesRemaining: Short = ((encoded[4] and 0x07 shl 10 or (encoded[5].toInt() and 0xff) and 2047).toShort())
+    val activeAlerts: EnumSet<AlertType> =
+        AlertUtil.decodeAlertSet((encoded[6].toInt() and 0xff shl 1 or (encoded[7] ushr 7)).toByte())
+    val minutesSinceActivation: Short =
+        (encoded[7] and 0x7f shl 6 or (encoded[8].toInt() and 0xff ushr 2 and 0x3f)).toShort()
+    val reservoirPulsesRemaining: Short = (encoded[8] shl 8 or encoded[9].toInt() and 0x3ff).toShort()
+
+    override fun toString(): String {
+        return "DefaultStatusResponse(" +
+            "messageType=$messageType" +
+            ", deliveryStatus=$deliveryStatus" +
+            ", podStatus=$podStatus" +
+            ", totalPulsesDelivered=$totalPulsesDelivered" +
+            ", sequenceNumberOfLastProgrammingCommand=$sequenceNumberOfLastProgrammingCommand" +
+            ", bolusPulsesRemaining=$bolusPulsesRemaining" +
+            ", activeAlerts=$activeAlerts" +
+            ", minutesSinceActivation=$minutesSinceActivation" +
+            ", reservoirPulsesRemaining=$reservoirPulsesRemaining)"
+    }
+}
+
+infix fun Byte.ushr(i: Int) = toInt() ushr i
+infix fun Byte.shl(i: Int): Int = toInt() shl i
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.java
deleted file mode 100644
index 8b55189ebe..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response;
-
-import java.util.Arrays;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlarmType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.NakErrorType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus;
-
-public class NakResponse extends ResponseBase {
-    private final byte messageType;
-    private final short messageLength;
-    private final NakErrorType nakErrorType;
-    private final AlarmType alarmType;
-    private final PodStatus podStatus;
-    private final short securityNakSyncCount;
-
-    public NakResponse(byte[] encoded) {
-        super(ResponseType.NAK_RESPONSE, encoded);
-        this.messageType = encoded[0];
-        this.messageLength = encoded[1];
-        this.nakErrorType = NakErrorType.byValue(encoded[2]);
-        byte byte3 = encoded[3];
-        byte byte4 = encoded[4];
-        if (nakErrorType == NakErrorType.ILLEGAL_SECURITY_CODE) {
-            this.securityNakSyncCount = (short) ((byte3 << 8) | byte4);
-            this.alarmType = null;
-            this.podStatus = null;
-        } else {
-            this.securityNakSyncCount = 0;
-            this.alarmType = AlarmType.byValue(byte3);
-            this.podStatus = PodStatus.byValue(byte4);
-        }
-    }
-
-    public byte getMessageType() {
-        return messageType;
-    }
-
-    public short getMessageLength() {
-        return messageLength;
-    }
-
-    public NakErrorType getNakErrorType() {
-        return nakErrorType;
-    }
-
-    public AlarmType getAlarmType() {
-        return alarmType;
-    }
-
-    public PodStatus getPodStatus() {
-        return podStatus;
-    }
-
-    public short getSecurityNakSyncCount() {
-        return securityNakSyncCount;
-    }
-
-    @Override public String toString() {
-        return "NakResponse{" +
-                "messageType=" + messageType +
-                ", messageLength=" + messageLength +
-                ", nakErrorType=" + nakErrorType +
-                ", alarmType=" + alarmType +
-                ", podStatus=" + podStatus +
-                ", securityNakSyncCount=" + securityNakSyncCount +
-                ", responseType=" + responseType +
-                ", encoded=" + Arrays.toString(encoded) +
-                '}';
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.kt
new file mode 100644
index 0000000000..f2a6cfb1cd
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponse.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlarmType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.NakErrorType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.byValue
+
+class NakResponse(
+    encoded: ByteArray
+) : ResponseBase(ResponseType.NAK_RESPONSE, encoded) {
+
+    val messageType: Byte = encoded[0]
+    val messageLength: Short = encoded[1].toShort()
+    val nakErrorType: NakErrorType = byValue(encoded[2], NakErrorType.UNKNOWN)
+    var alarmType: AlarmType? = null
+        private set
+    var podStatus: PodStatus? = null
+        private set
+
+    var securityNakSyncCount: Short = 0
+        private set
+
+    init {
+        val byte3 = encoded[3]
+        val byte4 = encoded[4]
+        if (nakErrorType == NakErrorType.ILLEGAL_SECURITY_CODE) {
+            securityNakSyncCount = ((byte3.toInt() shl 8 or byte4.toInt()).toShort())
+            alarmType = null
+            podStatus = null
+        } else {
+            securityNakSyncCount = 0
+            alarmType = byValue(byte3, AlarmType.UNKNOWN)
+            podStatus = byValue(byte4, PodStatus.UNKNOWN)
+        }
+    }
+
+    override fun toString(): String {
+        return "NakResponse{" +
+            "messageType=" + messageType +
+            ", messageLength=" + messageLength +
+            ", nakErrorType=" + nakErrorType +
+            ", alarmType=" + alarmType +
+            ", podStatus=" + podStatus +
+            ", securityNakSyncCount=" + securityNakSyncCount +
+            ", responseType=" + responseType +
+            ", encoded=" + encoded.contentToString() +
+            '}'
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.java
deleted file mode 100644
index e4edf3f4ba..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response;
-
-public interface Response {
-    ResponseType getResponseType();
-
-    byte[] getEncoded();
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.kt
new file mode 100644
index 0000000000..f64cca766c
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/Response.kt
@@ -0,0 +1,9 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
+
+import java.io.Serializable
+
+interface Response : Serializable {
+
+    val responseType: ResponseType
+    val encoded: ByteArray
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.java
deleted file mode 100644
index bb43dcf4dc..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response;
-
-import java.util.Arrays;
-
-abstract class ResponseBase implements Response {
-    final ResponseType responseType;
-    final byte[] encoded;
-
-    ResponseBase(ResponseType responseType, byte[] encoded) {
-        this.responseType = responseType;
-        this.encoded = Arrays.copyOf(encoded, encoded.length);
-    }
-
-    @Override public ResponseType getResponseType() {
-        return responseType;
-    }
-
-    @Override
-    public byte[] getEncoded() {
-        return encoded;
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.kt
new file mode 100644
index 0000000000..9eacc0d1ef
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseBase.kt
@@ -0,0 +1,9 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
+
+abstract class ResponseBase(
+    override val responseType: ResponseType,
+    encoded: ByteArray
+) : Response {
+
+    override val encoded: ByteArray = encoded.copyOf(encoded.size)
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.java
deleted file mode 100644
index f903c28eb9..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response;
-
-public enum ResponseType {
-    ACTIVATION_RESPONSE((byte) 0x01),
-    DEFAULT_STATUS_RESPONSE((byte) 0x1d),
-    ADDITIONAL_STATUS_RESPONSE((byte) 0x02),
-    NAK_RESPONSE((byte) 0x06),
-    UNKNOWN((byte) 0xff);
-
-    private final byte value;
-
-    ResponseType(byte value) {
-        this.value = value;
-    }
-
-    public byte getValue() {
-        return value;
-    }
-
-    public static ResponseType byValue(byte value) {
-        for (ResponseType type : values()) {
-            if (type.value == value) {
-                return type;
-            }
-        }
-        return UNKNOWN;
-    }
-
-    enum AdditionalStatusResponseType {
-        STATUS_RESPONSE_PAGE_1((byte) 0x01),
-        ALARM_STATUS((byte) 0x02),
-        STATUS_RESPONSE_PAGE_3((byte) 0x03),
-        STATUS_RESPONSE_PAGE_5((byte) 0x05),
-        STATUS_RESPONSE_PAGE_6((byte) 0x06),
-        STATUS_RESPONSE_PAGE_70((byte) 0x46),
-        STATUS_RESPONSE_PAGE_80((byte) 0x50),
-        STATUS_RESPONSE_PAGE_81((byte) 0x51),
-        UNKNOWN((byte) 0xff);
-
-        private final byte value;
-
-        AdditionalStatusResponseType(byte value) {
-            this.value = value;
-        }
-
-        public static AdditionalStatusResponseType byValue(byte value) {
-            for (AdditionalStatusResponseType type : values()) {
-                if (type.value == value) {
-                    return type;
-                }
-            }
-            return UNKNOWN;
-        }
-
-        public byte getValue() {
-            return value;
-        }
-    }
-
-    enum ActivationResponseType {
-        GET_VERSION_RESPONSE((byte) 0x15),
-        SET_UNIQUE_ID_RESPONSE((byte) 0x1b),
-        UNKNOWN((byte) 0xff);
-
-        private final byte length;
-
-        ActivationResponseType(byte length) {
-            this.length = length;
-        }
-
-        public static ActivationResponseType byLength(byte length) {
-            for (ActivationResponseType type : values()) {
-                if (type.length == length) {
-                    return type;
-                }
-            }
-            return UNKNOWN;
-        }
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.kt
new file mode 100644
index 0000000000..283a1cd284
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/ResponseType.kt
@@ -0,0 +1,33 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.HasValue
+
+enum class ResponseType(override val value: Byte) : HasValue {
+
+    ACTIVATION_RESPONSE(0x01.toByte()),
+    DEFAULT_STATUS_RESPONSE(0x1d.toByte()),
+    ADDITIONAL_STATUS_RESPONSE(0x02.toByte()),
+    NAK_RESPONSE(0x06.toByte()),
+    UNKNOWN(0xff.toByte());
+
+    enum class StatusResponseType(override val value: Byte) : HasValue {
+
+        DEFAULT_STATUS_RESPONSE(0x00.toByte()),
+        STATUS_RESPONSE_PAGE_1(0x01.toByte()),
+        ALARM_STATUS(0x02.toByte()),
+        STATUS_RESPONSE_PAGE_3(0x03.toByte()),
+        STATUS_RESPONSE_PAGE_5(0x05.toByte()),
+        STATUS_RESPONSE_PAGE_6(0x06.toByte()),
+        STATUS_RESPONSE_PAGE_70(0x46.toByte()),
+        STATUS_RESPONSE_PAGE_80(0x50.toByte()),
+        STATUS_RESPONSE_PAGE_81(0x51.toByte()),
+        UNKNOWN(0xff.toByte());
+    }
+
+    enum class ActivationResponseType(override val value: Byte) : HasValue {
+
+        GET_VERSION_RESPONSE(0x15.toByte()),
+        SET_UNIQUE_ID_RESPONSE(0x1b.toByte()),
+        UNKNOWN(0xff.toByte());
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.java
deleted file mode 100644
index 6268ae57f5..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus;
-
-public final class SetUniqueIdResponse extends ActivationResponseBase {
-    private final byte messageType;
-    private final short messageLength;
-    private final short pulseVolumeInTenThousandthMicroLiter;
-    private final short pumpRate;
-    private final short primePumpRate;
-    private final short numberOfEngagingClutchDrivePulses;
-    private final short numberOfPrimePulses;
-    private final short podExpirationTimeInHours;
-    private final short firmwareVersionMajor;
-    private final short firmwareVersionMinor;
-    private final short firmwareVersionInterim;
-    private final short bleVersionMajor;
-    private final short bleVersionMinor;
-    private final short bleVersionInterim;
-    private final short productId;
-    private final PodStatus podStatus;
-    private final long lotNumber;
-    private final long podSequenceNumber;
-    private final long uniqueIdReceivedInCommand;
-
-    public SetUniqueIdResponse(byte[] encoded) {
-        super(ResponseType.ActivationResponseType.SET_UNIQUE_ID_RESPONSE, encoded);
-
-        messageType = encoded[0];
-        messageLength = (short) (encoded[1] & 0xff);
-        pulseVolumeInTenThousandthMicroLiter = ByteBuffer.wrap(new byte[]{encoded[2], encoded[3]}).getShort();
-        pumpRate = (short) (encoded[4] & 0xff);
-        primePumpRate = (short) (encoded[5] & 0xff);
-        numberOfEngagingClutchDrivePulses = (short) (encoded[6] & 0xff);
-        numberOfPrimePulses = (short) (encoded[7] & 0xff);
-        podExpirationTimeInHours = (short) (encoded[8] & 0xff);
-        firmwareVersionMajor = (short) (encoded[9] & 0xff);
-        firmwareVersionMinor = (short) (encoded[10] & 0xff);
-        firmwareVersionInterim = (short) (encoded[11] & 0xff);
-        bleVersionMajor = (short) (encoded[12] & 0xff);
-        bleVersionMinor = (short) (encoded[13] & 0xff);
-        bleVersionInterim = (short) (encoded[14] & 0xff);
-        productId = (short) (encoded[15] & 0xff);
-        podStatus = PodStatus.byValue(encoded[16]);
-        lotNumber = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[17], encoded[18], encoded[19], encoded[20]}).getLong();
-        podSequenceNumber = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[21], encoded[22], encoded[23], encoded[24]}).getLong();
-        uniqueIdReceivedInCommand = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[25], encoded[26], encoded[27], encoded[28]}).getLong();
-    }
-
-    public byte getMessageType() {
-        return messageType;
-    }
-
-    public short getMessageLength() {
-        return messageLength;
-    }
-
-    public short getPulseVolumeInTenThousandthMicroLiter() {
-        return pulseVolumeInTenThousandthMicroLiter;
-    }
-
-    public short getDeliveryRate() {
-        return pumpRate;
-    }
-
-    public short getPrimeRate() {
-        return primePumpRate;
-    }
-
-    public short getNumberOfEngagingClutchDrivePulses() {
-        return numberOfEngagingClutchDrivePulses;
-    }
-
-    public short getNumberOfPrimePulses() {
-        return numberOfPrimePulses;
-    }
-
-    public short getPodExpirationTimeInHours() {
-        return podExpirationTimeInHours;
-    }
-
-    public short getFirmwareVersionMajor() {
-        return firmwareVersionMajor;
-    }
-
-    public short getFirmwareVersionMinor() {
-        return firmwareVersionMinor;
-    }
-
-    public short getFirmwareVersionInterim() {
-        return firmwareVersionInterim;
-    }
-
-    public short getBleVersionMajor() {
-        return bleVersionMajor;
-    }
-
-    public short getBleVersionMinor() {
-        return bleVersionMinor;
-    }
-
-    public short getBleVersionInterim() {
-        return bleVersionInterim;
-    }
-
-    public short getProductId() {
-        return productId;
-    }
-
-    public PodStatus getPodStatus() {
-        return podStatus;
-    }
-
-    public long getLotNumber() {
-        return lotNumber;
-    }
-
-    public long getPodSequenceNumber() {
-        return podSequenceNumber;
-    }
-
-    public long getUniqueIdReceivedInCommand() {
-        return uniqueIdReceivedInCommand;
-    }
-
-    @Override public String toString() {
-        return "SetUniqueIdResponse{" +
-                "messageType=" + messageType +
-                ", messageLength=" + messageLength +
-                ", pulseVolume=" + pulseVolumeInTenThousandthMicroLiter +
-                ", pumpRate=" + pumpRate +
-                ", primePumpRate=" + primePumpRate +
-                ", numberOfEngagingClutchDrivePulses=" + numberOfEngagingClutchDrivePulses +
-                ", numberOfPrimePulses=" + numberOfPrimePulses +
-                ", podExpirationTimeInHours=" + podExpirationTimeInHours +
-                ", softwareVersionMajor=" + firmwareVersionMajor +
-                ", softwareVersionMinor=" + firmwareVersionMinor +
-                ", softwareVersionInterim=" + firmwareVersionInterim +
-                ", bleVersionMajor=" + bleVersionMajor +
-                ", bleVersionMinor=" + bleVersionMinor +
-                ", bleVersionInterim=" + bleVersionInterim +
-                ", productId=" + productId +
-                ", podStatus=" + podStatus +
-                ", lotNumber=" + lotNumber +
-                ", podSequenceNumber=" + podSequenceNumber +
-                ", uniqueIdReceivedInCommand=" + uniqueIdReceivedInCommand +
-                ", activationResponseType=" + activationResponseType +
-                ", responseType=" + responseType +
-                ", encoded=" + Arrays.toString(encoded) +
-                '}';
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.kt
new file mode 100644
index 0000000000..6fc40336a1
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponse.kt
@@ -0,0 +1,91 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.ResponseType.ActivationResponseType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.byValue
+import java.nio.ByteBuffer
+
+class SetUniqueIdResponse(
+    encoded: ByteArray
+) : ActivationResponseBase(ActivationResponseType.SET_UNIQUE_ID_RESPONSE, encoded) {
+
+    val messageType: Byte = encoded[0]
+    val messageLength: Short = (encoded[1].toInt() and 0xff).toShort()
+    val pulseVolumeInTenThousandthMicroLiter: Short = ByteBuffer.wrap(byteArrayOf(encoded[2], encoded[3])).short
+    val pumpRate: Short = (encoded[4].toInt() and 0xff).toShort()
+    val primePumpRate: Short = (encoded[5].toInt() and 0xff).toShort()
+    val numberOfEngagingClutchDrivePulses: Short = (encoded[6].toInt() and 0xff).toShort()
+    val numberOfPrimePulses: Short = (encoded[7].toInt() and 0xff).toShort()
+    val podExpirationTimeInHours: Short = (encoded[8].toInt() and 0xff).toShort()
+    val firmwareVersionMajor: Short = (encoded[9].toInt() and 0xff).toShort()
+    val firmwareVersionMinor: Short = (encoded[10].toInt() and 0xff).toShort()
+    val firmwareVersionInterim: Short = (encoded[11].toInt() and 0xff).toShort()
+    val bleVersionMajor: Short = (encoded[12].toInt() and 0xff).toShort()
+    val bleVersionMinor: Short = (encoded[13].toInt() and 0xff).toShort()
+    val bleVersionInterim: Short = (encoded[14].toInt() and 0xff).toShort()
+    val productId: Short = (encoded[15].toInt() and 0xff).toShort()
+    val podStatus: PodStatus = byValue(encoded[16], PodStatus.UNKNOWN)
+    val lotNumber: Long = ByteBuffer.wrap(
+        byteArrayOf(
+            0,
+            0,
+            0,
+            0,
+            encoded[17],
+            encoded[18],
+            encoded[19],
+            encoded[20]
+        )
+    ).long
+    val podSequenceNumber: Long = ByteBuffer.wrap(
+        byteArrayOf(
+            0,
+            0,
+            0,
+            0,
+            encoded[21],
+            encoded[22],
+            encoded[23],
+            encoded[24]
+        )
+    ).long
+    val uniqueIdReceivedInCommand: Long = ByteBuffer.wrap(
+        byteArrayOf(
+            0,
+            0,
+            0,
+            0,
+            encoded[25],
+            encoded[26],
+            encoded[27],
+            encoded[28]
+        )
+    ).long
+
+    override fun toString(): String {
+        return "SetUniqueIdResponse{" +
+            "messageType=" + messageType +
+            ", messageLength=" + messageLength +
+            ", pulseVolume=" + pulseVolumeInTenThousandthMicroLiter +
+            ", pumpRate=" + pumpRate +
+            ", primePumpRate=" + primePumpRate +
+            ", numberOfEngagingClutchDrivePulses=" + numberOfEngagingClutchDrivePulses +
+            ", numberOfPrimePulses=" + numberOfPrimePulses +
+            ", podExpirationTimeInHours=" + podExpirationTimeInHours +
+            ", softwareVersionMajor=" + firmwareVersionMajor +
+            ", softwareVersionMinor=" + firmwareVersionMinor +
+            ", softwareVersionInterim=" + firmwareVersionInterim +
+            ", bleVersionMajor=" + bleVersionMajor +
+            ", bleVersionMinor=" + bleVersionMinor +
+            ", bleVersionInterim=" + bleVersionInterim +
+            ", productId=" + productId +
+            ", podStatus=" + podStatus +
+            ", lotNumber=" + lotNumber +
+            ", podSequenceNumber=" + podSequenceNumber +
+            ", uniqueIdReceivedInCommand=" + uniqueIdReceivedInCommand +
+            ", activationResponseType=" + activationResponseType +
+            ", responseType=" + responseType +
+            ", encoded=" + encoded.contentToString() +
+            '}'
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.java
deleted file mode 100644
index 8f3c2e2be8..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus;
-
-public final class VersionResponse extends ActivationResponseBase {
-
-    private final byte messageType;
-    private final short messageLength;
-    private final short firmwareVersionMajor;
-    private final short firmwareVersionMinor;
-    private final short firmwareVersionInterim;
-    private final short bleVersionMajor;
-    private final short bleVersionMinor;
-    private final short bleVersionInterim;
-    private final short productId;
-    private final PodStatus podStatus;
-    private final long lotNumber;
-    private final long podSequenceNumber;
-    private final byte rssi;
-    private final byte receiverLowerGain;
-    private final long uniqueIdReceivedInCommand;
-
-    public VersionResponse(byte[] encoded) {
-        super(ResponseType.ActivationResponseType.GET_VERSION_RESPONSE, encoded);
-
-        messageType = encoded[0];
-        messageLength = (short) (encoded[1] & 0xff);
-        firmwareVersionMajor = (short) (encoded[2] & 0xff);
-        firmwareVersionMinor = (short) (encoded[3] & 0xff);
-        firmwareVersionInterim = (short) (encoded[4] & 0xff);
-        bleVersionMajor = (short) (encoded[5] & 0xff);
-        bleVersionMinor = (short) (encoded[6] & 0xff);
-        bleVersionInterim = (short) (encoded[7] & 0xff);
-        productId = (short) (encoded[8] & 0xff);
-        podStatus = PodStatus.byValue((byte) (encoded[9] & 0xf));
-        lotNumber = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[10], encoded[11], encoded[12], encoded[13]}).getLong();
-        podSequenceNumber = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[14], encoded[15], encoded[16], encoded[17]}).getLong();
-        rssi = (byte) (encoded[18] & 0x3f);
-        receiverLowerGain = (byte) ((encoded[18] >> 6) & 0x03);
-        uniqueIdReceivedInCommand = ByteBuffer.wrap(new byte[]{0, 0, 0, 0, encoded[19], encoded[20], encoded[21], encoded[22]}).getLong();
-    }
-
-    public byte getMessageType() {
-        return messageType;
-    }
-
-    public short getMessageLength() {
-        return messageLength;
-    }
-
-    public short getFirmwareVersionMajor() {
-        return firmwareVersionMajor;
-    }
-
-    public short getFirmwareVersionMinor() {
-        return firmwareVersionMinor;
-    }
-
-    public short getFirmwareVersionInterim() {
-        return firmwareVersionInterim;
-    }
-
-    public short getBleVersionMajor() {
-        return bleVersionMajor;
-    }
-
-    public short getBleVersionMinor() {
-        return bleVersionMinor;
-    }
-
-    public short getBleVersionInterim() {
-        return bleVersionInterim;
-    }
-
-    public short getProductId() {
-        return productId;
-    }
-
-    public PodStatus getPodStatus() {
-        return podStatus;
-    }
-
-    public long getLotNumber() {
-        return lotNumber;
-    }
-
-    public long getPodSequenceNumber() {
-        return podSequenceNumber;
-    }
-
-    public byte getRssi() {
-        return rssi;
-    }
-
-    public byte getReceiverLowerGain() {
-        return receiverLowerGain;
-    }
-
-    public long getUniqueIdReceivedInCommand() {
-        return uniqueIdReceivedInCommand;
-    }
-
-    @Override public String toString() {
-        return "VersionResponse{" +
-                "messageType=" + messageType +
-                ", messageLength=" + messageLength +
-                ", firmwareVersionMajor=" + firmwareVersionMajor +
-                ", firmwareVersionMinor=" + firmwareVersionMinor +
-                ", firmwareVersionInterim=" + firmwareVersionInterim +
-                ", bleVersionMajor=" + bleVersionMajor +
-                ", bleVersionMinor=" + bleVersionMinor +
-                ", bleVersionInterim=" + bleVersionInterim +
-                ", productId=" + productId +
-                ", podStatus=" + podStatus +
-                ", lotNumber=" + lotNumber +
-                ", podSequenceNumber=" + podSequenceNumber +
-                ", rssi=" + rssi +
-                ", receiverLowerGain=" + receiverLowerGain +
-                ", uniqueIdReceivedInCommand=" + uniqueIdReceivedInCommand +
-                ", activationResponseType=" + activationResponseType +
-                ", responseType=" + responseType +
-                ", encoded=" + Arrays.toString(encoded) +
-                '}';
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.kt
new file mode 100644
index 0000000000..da963f0636
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponse.kt
@@ -0,0 +1,85 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.ResponseType.ActivationResponseType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.byValue
+import java.nio.ByteBuffer
+import java.util.*
+import kotlin.experimental.and
+
+class VersionResponse(
+    encoded: ByteArray
+) : ActivationResponseBase(ActivationResponseType.GET_VERSION_RESPONSE, encoded) {
+
+    val messageType: Byte = encoded[0]
+    val messageLength: Short = (encoded[1].toInt() and 0xff).toShort()
+    val firmwareVersionMajor: Short = (encoded[2].toInt() and 0xff).toShort()
+    val firmwareVersionMinor: Short = (encoded[3].toInt() and 0xff).toShort()
+    val firmwareVersionInterim: Short = (encoded[4].toInt() and 0xff).toShort()
+    val bleVersionMajor: Short = (encoded[5].toInt() and 0xff).toShort()
+    val bleVersionMinor: Short = (encoded[6].toInt() and 0xff).toShort()
+    val bleVersionInterim: Short = (encoded[7].toInt() and 0xff).toShort()
+    val productId: Short = (encoded[8].toInt() and 0xff).toShort()
+    val podStatus: PodStatus = byValue((encoded[9] and 0xf), PodStatus.UNKNOWN)
+    val lotNumber: Long = ByteBuffer.wrap(
+        byteArrayOf(
+            0,
+            0,
+            0,
+            0,
+            encoded[10],
+            encoded[11],
+            encoded[12],
+            encoded[13]
+        )
+    ).long
+    val podSequenceNumber: Long = ByteBuffer.wrap(
+        byteArrayOf(
+            0,
+            0,
+            0,
+            0,
+            encoded[14],
+            encoded[15],
+            encoded[16],
+            encoded[17]
+        )
+    ).long
+    val rssi: Byte = (encoded[18] and 0x3f)
+    val receiverLowerGain: Byte = ((encoded[18].toInt() shr 6 and 0x03).toByte())
+    val uniqueIdReceivedInCommand: Long = ByteBuffer.wrap(
+        byteArrayOf(
+            0,
+            0,
+            0,
+            0,
+            encoded[19],
+            encoded[20],
+            encoded[21],
+            encoded[22]
+        )
+    ).long
+
+    override fun toString(): String {
+        return "VersionResponse{" +
+            "messageType=" + messageType +
+            ", messageLength=" + messageLength +
+            ", firmwareVersionMajor=" + firmwareVersionMajor +
+            ", firmwareVersionMinor=" + firmwareVersionMinor +
+            ", firmwareVersionInterim=" + firmwareVersionInterim +
+            ", bleVersionMajor=" + bleVersionMajor +
+            ", bleVersionMinor=" + bleVersionMinor +
+            ", bleVersionInterim=" + bleVersionInterim +
+            ", productId=" + productId +
+            ", podStatus=" + podStatus +
+            ", lotNumber=" + lotNumber +
+            ", podSequenceNumber=" + podSequenceNumber +
+            ", rssi=" + rssi +
+            ", receiverLowerGain=" + receiverLowerGain +
+            ", uniqueIdReceivedInCommand=" + uniqueIdReceivedInCommand +
+            ", activationResponseType=" + activationResponseType +
+            ", responseType=" + responseType +
+            ", encoded=" + Arrays.toString(encoded) +
+            '}'
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/CommandConfirmed.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/CommandConfirmed.kt
new file mode 100644
index 0000000000..266c671c33
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/CommandConfirmed.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state
+
+data class CommandConfirmed(val command: OmnipodDashPodStateManager.ActiveCommand, val success: Boolean)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.java
deleted file mode 100644
index 275bb1d6ec..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state;
-
-public interface OmnipodDashPodStateManager {
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
new file mode 100644
index 0000000000..d27a3b28c4
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
@@ -0,0 +1,152 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state
+
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Id
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair.PairResult
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.*
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.AlarmStatusResponse
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.DefaultStatusResponse
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.SetUniqueIdResponse
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.VersionResponse
+import io.reactivex.Completable
+import io.reactivex.Maybe
+import io.reactivex.Single
+import java.io.Serializable
+import java.time.ZonedDateTime
+import java.util.*
+
+sealed class CommandConfirmationFromState
+object CommandSendingFailure : CommandConfirmationFromState()
+object CommandSendingNotConfirmed : CommandConfirmationFromState()
+object CommandConfirmationDenied : CommandConfirmationFromState()
+object CommandConfirmationSuccess : CommandConfirmationFromState()
+object NoActiveCommand : CommandConfirmationFromState()
+
+interface OmnipodDashPodStateManager {
+
+    var activationProgress: ActivationProgress
+    val isUniqueIdSet: Boolean
+    val isActivationCompleted: Boolean
+    val isSuspended: Boolean
+    val isPodRunning: Boolean
+    val isPodKaput: Boolean
+    var bluetoothConnectionState: BluetoothConnectionState
+    var connectionAttempts: Int
+    var successfulConnections: Int
+
+    var timeZone: TimeZone
+    val sameTimeZone: Boolean // The TimeZone is the same on the phone and on the pod
+    val lastUpdatedSystem: Long // System.currentTimeMillis()
+    val lastStatusResponseReceived: Long
+    val time: ZonedDateTime?
+    val timeDrift: java.time.Duration?
+    val expiry: ZonedDateTime?
+    var alarmSynced: Boolean
+
+    val messageSequenceNumber: Short
+    val sequenceNumberOfLastProgrammingCommand: Short?
+    val activationTime: Long?
+    var uniqueId: Long? // TODO make Int
+    var bluetoothAddress: String?
+    var ltk: ByteArray?
+    var eapAkaSequenceNumber: Long
+
+    val bluetoothVersion: SoftwareVersion?
+    val firmwareVersion: SoftwareVersion?
+    val lotNumber: Long?
+    val podSequenceNumber: Long?
+    val pulseRate: Short?
+    val primePulseRate: Short?
+    val podLifeInHours: Short?
+    val firstPrimeBolusVolume: Short?
+    val secondPrimeBolusVolume: Short?
+
+    val pulsesDelivered: Short?
+    val pulsesRemaining: Short?
+    val podStatus: PodStatus?
+    val deliveryStatus: DeliveryStatus?
+    val minutesSinceActivation: Short?
+    val activeAlerts: EnumSet<AlertType>?
+    val alarmType: AlarmType?
+
+    var tempBasal: TempBasal?
+    val tempBasalActive: Boolean
+    var basalProgram: BasalProgram?
+    val activeCommand: ActiveCommand?
+    val lastBolus: LastBolus?
+
+    fun increaseMessageSequenceNumber()
+    fun increaseEapAkaSequenceNumber(): ByteArray
+    fun commitEapAkaSequenceNumber()
+    fun updateFromDefaultStatusResponse(response: DefaultStatusResponse)
+    fun updateFromVersionResponse(response: VersionResponse)
+    fun updateFromSetUniqueIdResponse(response: SetUniqueIdResponse)
+    fun updateFromAlarmStatusResponse(response: AlarmStatusResponse)
+    fun updateFromPairing(uniqueId: Id, pairResult: PairResult)
+    fun reset()
+    fun connectionSuccessRatio(): Float
+
+    fun createActiveCommand(
+        historyId: String,
+        basalProgram: BasalProgram? = null,
+        tempBasal: TempBasal? = null,
+        requestedBolus: Double? = null
+    ): Single<ActiveCommand>
+    fun updateActiveCommand(): Maybe<CommandConfirmed>
+    fun observeNoActiveCommand(): Completable
+    fun getCommandConfirmationFromState(): CommandConfirmationFromState
+
+    fun createLastBolus(requestedUnits: Double, historyId: String, bolusType: DetailedBolusInfo.BolusType)
+    fun markLastBolusComplete(): LastBolus?
+    fun onStart()
+    /*
+    This is called only:. It overwrites activationStatus
+       - when activation was interrupted(application crash, killed, etc)
+       - after getPodStatus was successful(we have an up-to-date podStatus)
+     */
+    fun recoverActivationFromPodStatus(): String?
+    fun differentAlertSettings(expirationReminderEnabled: Boolean, expirationHours: Int, lowReservoirAlertEnabled: Boolean, lowReservoirAlertUnits: Int): Boolean
+    fun updateExpirationAlertSettings(expirationReminderEnabled: Boolean, expirationHours: Int): Completable
+    fun updateLowReservoirAlertSettings(lowReservoirAlertEnabled: Boolean, lowReservoirAlertUnits: Int): Completable
+
+    data class ActiveCommand(
+        val sequence: Short,
+        val createdRealtime: Long,
+        var sentRealtime: Long = 0,
+        val historyId: String,
+        var sendError: Throwable?,
+        var basalProgram: BasalProgram?,
+        val tempBasal: TempBasal?,
+        val requestedBolus: Double?
+    )
+
+    // TODO: set created to "now" on boot
+    data class TempBasal(val startTime: Long, val rate: Double, val durationInMinutes: Short) : Serializable
+
+    data class LastBolus(
+        val startTime: Long,
+        val requestedUnits: Double,
+        var bolusUnitsRemaining: Double,
+        var deliveryComplete: Boolean,
+        val historyId: String,
+        val bolusType: DetailedBolusInfo.BolusType
+    ) {
+
+        fun deliveredUnits(): Double? {
+            return if (deliveryComplete) {
+                requestedUnits - bolusUnitsRemaining
+            } else {
+                null
+            }
+        }
+
+        fun markComplete(): Double {
+            this.deliveryComplete = true
+            return requestedUnits - bolusUnitsRemaining
+        }
+    }
+
+    enum class BluetoothConnectionState {
+        CONNECTING, CONNECTED, DISCONNECTED
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
new file mode 100644
index 0000000000..0195dbeb67
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
@@ -0,0 +1,715 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state
+
+import android.os.SystemClock
+import com.google.gson.Gson
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.EventOmnipodDashPumpValuesChanged
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Id
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair.PairResult
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session.EapSqn
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.*
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.AlarmStatusResponse
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.DefaultStatusResponse
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.SetUniqueIdResponse
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.VersionResponse
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.Completable
+import io.reactivex.Maybe
+import io.reactivex.Single
+import java.io.Serializable
+import java.time.Duration
+import java.time.Instant
+import java.time.ZonedDateTime
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class OmnipodDashPodStateManagerImpl @Inject constructor(
+    private val logger: AAPSLogger,
+    private val sharedPreferences: SP,
+    private val rxBus: RxBusWrapper
+) : OmnipodDashPodStateManager {
+
+    private var podState: PodState
+
+    init {
+        podState = load()
+    }
+
+    override var activationProgress: ActivationProgress
+        get() = podState.activationProgress
+        set(activationProgress) {
+            podState.activationProgress = activationProgress
+            store()
+        }
+
+    override val isUniqueIdSet: Boolean
+        get() = activationProgress.isAtLeast(ActivationProgress.SET_UNIQUE_ID)
+
+    override val isActivationCompleted: Boolean
+        get() = activationProgress == ActivationProgress.COMPLETED
+
+    override val isSuspended: Boolean
+        get() = podState.deliveryStatus?.equals(DeliveryStatus.SUSPENDED)
+            ?: false
+
+    override val isPodKaput: Boolean
+        get() = podState.podStatus in arrayOf(PodStatus.ALARM, PodStatus.DEACTIVATED)
+
+    override val isPodRunning: Boolean
+        get() = podState.podStatus?.isRunning() ?: false
+
+    override val lastUpdatedSystem: Long
+        get() = podState.lastUpdatedSystem
+
+    override val messageSequenceNumber: Short
+        get() = podState.messageSequenceNumber
+
+    override val sequenceNumberOfLastProgrammingCommand: Short?
+        get() = podState.sequenceNumberOfLastProgrammingCommand
+
+    override val activationTime: Long?
+        get() = podState.activationTime
+
+    override var uniqueId: Long?
+        get() = podState.uniqueId
+        set(uniqueId) {
+            if (podState.uniqueId == null) {
+                podState.uniqueId = uniqueId
+                store()
+            } else if (uniqueId != podState.uniqueId) {
+                throw IllegalStateException("Trying to set Unique ID to $uniqueId, but it is already set to ${podState.uniqueId}")
+            }
+        }
+
+    override var bluetoothAddress: String?
+        get() = podState.bluetoothAddress
+        set(bluetoothAddress) {
+            if (podState.bluetoothAddress == null) {
+                podState.bluetoothAddress = bluetoothAddress
+                store()
+            } else if (bluetoothAddress != podState.bluetoothAddress) {
+                throw IllegalStateException("Trying to set Bluetooth Address to $bluetoothAddress, but it is already set to ${podState.bluetoothAddress}")
+            }
+        }
+
+    override var connectionAttempts: Int
+        @Synchronized
+        get() = podState.connectionAttempts
+        @Synchronized
+        set(value) {
+            podState.connectionAttempts = value
+        }
+
+    override var successfulConnections: Int
+        @Synchronized
+        get() = podState.successfulConnections
+        @Synchronized
+        set(value) {
+            podState.successfulConnections = value
+        }
+
+    override var timeZone: TimeZone
+        get() = TimeZone.getTimeZone(podState.timeZone)
+        set(tz) {
+            podState.timeZone = tz.toZoneId().normalized().id
+            store()
+        }
+
+    override val sameTimeZone: Boolean
+        get() {
+            val now = System.currentTimeMillis()
+            val currentTimezone = TimeZone.getDefault()
+            val currentOffset = currentTimezone.getOffset(now)
+            val podOffset = timeZone.getOffset(now)
+            logger.debug(
+                LTag.PUMPCOMM,
+                "sameTimeZone currentTimezone=${currentTimezone.getDisplayName(
+                    true,
+                    TimeZone.SHORT
+                )} " +
+                    "currentOffset=$currentOffset " +
+                    "podOffset=$podOffset"
+            )
+            return currentOffset == podOffset
+        }
+
+    override val bluetoothVersion: SoftwareVersion?
+        get() = podState.bleVersion
+
+    override val firmwareVersion: SoftwareVersion?
+        get() = podState.firmwareVersion
+
+    override val lotNumber: Long?
+        get() = podState.lotNumber
+
+    override val podSequenceNumber: Long?
+        get() = podState.podSequenceNumber
+
+    override val pulseRate: Short?
+        get() = podState.pulseRate
+
+    override val primePulseRate: Short?
+        get() = podState.primePulseRate
+
+    override val podLifeInHours: Short?
+        get() = podState.podLifeInHours
+
+    override val firstPrimeBolusVolume: Short?
+        get() = podState.firstPrimeBolusVolume
+
+    override val secondPrimeBolusVolume: Short?
+        get() = podState.secondPrimeBolusVolume
+
+    override val pulsesDelivered: Short?
+        get() = podState.pulsesDelivered
+
+    override val pulsesRemaining: Short?
+        get() = podState.pulsesRemaining
+
+    override val podStatus: PodStatus?
+        get() = podState.podStatus
+
+    override val deliveryStatus: DeliveryStatus?
+        get() = podState.deliveryStatus
+
+    override val minutesSinceActivation: Short?
+        get() = podState.minutesSinceActivation
+
+    override val activeAlerts: EnumSet<AlertType>?
+        get() = podState.activeAlerts
+
+    override val alarmType: AlarmType?
+        get() = podState.alarmType
+
+    override var tempBasal: OmnipodDashPodStateManager.TempBasal?
+        get() = podState.tempBasal
+        set(tempBasal) {
+            podState.tempBasal = tempBasal
+            rxBus.send(EventOmnipodDashPumpValuesChanged())
+            store()
+        }
+
+    override val lastBolus: OmnipodDashPodStateManager.LastBolus?
+        @Synchronized
+        get() = podState.lastBolus
+
+    override val tempBasalActive: Boolean
+        get() = !isSuspended && tempBasal?.let {
+            it.startTime + it.durationInMinutes * 60 * 1000 > System.currentTimeMillis()
+        } ?: false
+
+    override var basalProgram: BasalProgram?
+        get() = podState.basalProgram
+        set(basalProgram) {
+            podState.basalProgram = basalProgram
+            rxBus.send(EventOmnipodDashPumpValuesChanged())
+            store()
+        }
+
+    override val lastStatusResponseReceived: Long
+        get() = podState.lastStatusResponseReceived
+
+    override val time: ZonedDateTime?
+        get() {
+            val minutesSinceActivation = podState.minutesSinceActivation
+            val activationTime = podState.activationTime
+            if ((activationTime != null) && (minutesSinceActivation != null)) {
+                return ZonedDateTime.ofInstant(Instant.ofEpochMilli(activationTime), timeZone.toZoneId())
+                    .plusMinutes(minutesSinceActivation.toLong())
+                    .plus(Duration.ofMillis(System.currentTimeMillis() - lastUpdatedSystem))
+            }
+            return null
+        }
+
+    override val timeDrift: Duration?
+        get() {
+            return Duration.between(ZonedDateTime.now(), time)
+        }
+
+    override val expiry: ZonedDateTime?
+        get() {
+            val podLifeInHours = podLifeInHours
+            val minutesSinceActivation = podState.minutesSinceActivation
+            if (podLifeInHours != null && minutesSinceActivation != null) {
+                return ZonedDateTime.now()
+                    .plusHours(podLifeInHours.toLong())
+                    .minusMinutes(minutesSinceActivation.toLong())
+                    .minus(Duration.ofMillis(System.currentTimeMillis() - lastUpdatedSystem))
+                    .minusHours(8)
+            }
+            return null
+        }
+
+    override var alarmSynced: Boolean
+        get() = podState.alarmSynced
+        set(value) {
+            podState.alarmSynced = value
+            store()
+        }
+
+    override var bluetoothConnectionState: OmnipodDashPodStateManager.BluetoothConnectionState
+        @Synchronized
+        get() = podState.bluetoothConnectionState
+        @Synchronized
+        set(bluetoothConnectionState) {
+            podState.bluetoothConnectionState = bluetoothConnectionState
+            rxBus.send(EventOmnipodDashPumpValuesChanged())
+            // do not store
+        }
+
+    override fun increaseMessageSequenceNumber() {
+        podState.messageSequenceNumber = ((podState.messageSequenceNumber.toInt() + 1) and 0x0f).toShort()
+        store()
+    }
+
+    override var eapAkaSequenceNumber: Long
+        get() = podState.eapAkaSequenceNumber
+        set(eapAkaSequenceNumber) {
+            podState.eapAkaSequenceNumber = eapAkaSequenceNumber
+            store()
+        }
+
+    override var ltk: ByteArray?
+        get() = podState.ltk
+        set(ltk) {
+            podState.ltk = ltk
+            store()
+        }
+
+    override val activeCommand: OmnipodDashPodStateManager.ActiveCommand?
+        get() = podState.activeCommand
+
+    @Synchronized
+    override fun createLastBolus(requestedUnits: Double, historyId: String, bolusType: DetailedBolusInfo.BolusType) {
+        podState.lastBolus = OmnipodDashPodStateManager.LastBolus(
+            startTime = System.currentTimeMillis(),
+            requestedUnits = requestedUnits,
+            bolusUnitsRemaining = requestedUnits,
+            deliveryComplete = false, // cancelled, delivered 100% or pod failure
+            historyId = historyId,
+            bolusType = bolusType
+        )
+    }
+
+    @Synchronized
+    override fun markLastBolusComplete(): OmnipodDashPodStateManager.LastBolus? {
+        val lastBolus = podState.lastBolus
+
+        lastBolus?.run {
+            this.deliveryComplete = true
+        }
+            ?: logger.error(LTag.PUMP, "Trying to mark null bolus as complete")
+
+        return lastBolus
+    }
+
+    private fun updateLastBolusFromResponse(bolusPulsesRemaining: Short) {
+        podState.lastBolus?.run {
+            val remainingUnits = bolusPulsesRemaining.toDouble() * 0.05
+            this.bolusUnitsRemaining = remainingUnits
+            if (remainingUnits == 0.0) {
+                this.deliveryComplete = true
+            }
+        }
+    }
+
+    @Synchronized
+    override fun createActiveCommand(
+        historyId: String,
+        basalProgram: BasalProgram?,
+        tempBasal: OmnipodDashPodStateManager.TempBasal?,
+        requestedBolus: Double?
+    ):
+        Single<OmnipodDashPodStateManager.ActiveCommand> {
+        return Single.create { source ->
+            if (activeCommand == null) {
+                val command = OmnipodDashPodStateManager.ActiveCommand(
+                    podState.messageSequenceNumber,
+                    createdRealtime = SystemClock.elapsedRealtime(),
+                    historyId = historyId,
+                    sendError = null,
+                    basalProgram = basalProgram,
+                    tempBasal = tempBasal,
+                    requestedBolus = requestedBolus
+                )
+                podState.activeCommand = command
+                source.onSuccess(command)
+            } else {
+                source.onError(
+                    java.lang.IllegalStateException(
+                        "Trying to send a command " +
+                            "and the last command was not confirmed"
+                    )
+                )
+            }
+        }
+    }
+
+    @Synchronized
+    override fun observeNoActiveCommand(): Completable {
+        return Completable.defer {
+            if (activeCommand == null) {
+                Completable.complete()
+            } else {
+                logger.warn(LTag.PUMP, "Active command already existing: $activeCommand")
+                Completable.error(
+                    java.lang.IllegalStateException(
+                        "Trying to send a command " +
+                            "and the last command was not confirmed"
+                    )
+                )
+            }
+        }
+    }
+
+    override fun recoverActivationFromPodStatus(): String? {
+        val newActivationProgress = when (podState.podStatus) {
+            PodStatus.FILLED ->
+                ActivationProgress.NOT_STARTED
+            PodStatus.UID_SET ->
+                ActivationProgress.SET_UNIQUE_ID
+            PodStatus.ENGAGING_CLUTCH_DRIVE, PodStatus.PRIMING ->
+                return "Busy"
+            PodStatus.CLUTCH_DRIVE_ENGAGED ->
+                ActivationProgress.PRIME_COMPLETED
+            PodStatus.BASAL_PROGRAM_SET ->
+                ActivationProgress.PROGRAMMED_BASAL
+            PodStatus.RUNNING_ABOVE_MIN_VOLUME, PodStatus.RUNNING_BELOW_MIN_VOLUME ->
+                ActivationProgress.CANNULA_INSERTED
+            else ->
+                null
+        }
+        newActivationProgress?.let {
+            podState.activationProgress = it
+        }
+        return null
+    }
+
+    @Synchronized
+    override fun updateActiveCommand() = Maybe.create<CommandConfirmed> { source ->
+        val activeCommand = podState.activeCommand
+        if (activeCommand == null) {
+            logger.error("No active command to update")
+            source.onComplete()
+            return@create
+        }
+        val cmdConfirmation = getCommandConfirmationFromState()
+        logger.info(LTag.PUMPCOMM, "Update active command with confirmation: $cmdConfirmation")
+        when (cmdConfirmation) {
+            CommandSendingFailure -> {
+                podState.activeCommand = null
+                source.onError(
+                    activeCommand.sendError
+                        ?: java.lang.IllegalStateException(
+                            "Could not send command and sendError is " +
+                                "missing"
+                        )
+                )
+            }
+
+            CommandSendingNotConfirmed -> {
+                // we did not receive a valid response yet
+                source.onComplete()
+            }
+
+            CommandConfirmationDenied -> {
+                podState.activeCommand = null
+                source.onSuccess(CommandConfirmed(activeCommand, false))
+            }
+
+            CommandConfirmationSuccess -> {
+                podState.activeCommand = null
+
+                source.onSuccess(CommandConfirmed(activeCommand, true))
+            }
+
+            NoActiveCommand -> {
+                source.onComplete()
+            }
+        }
+    }
+
+    override fun differentAlertSettings(
+        expirationReminderEnabled: Boolean,
+        expirationHours: Int,
+        lowReservoirAlertEnabled: Boolean,
+        lowReservoirAlertUnits: Int
+    ): Boolean {
+        return podState.expirationReminderEnabled == expirationReminderEnabled &&
+            podState.expirationHours == expirationHours &&
+            podState.lowReservoirAlertEnabled == lowReservoirAlertEnabled &&
+            podState.lowReservoirAlertUnits == lowReservoirAlertUnits
+    }
+
+    override fun updateExpirationAlertSettings(expirationReminderEnabled: Boolean, expirationHours: Int):
+        Completable = Completable.defer {
+        podState.expirationReminderEnabled = expirationReminderEnabled
+        podState.expirationHours = expirationHours
+        Completable.complete()
+    }
+
+    override fun updateLowReservoirAlertSettings(lowReservoirAlertEnabled: Boolean, lowReservoirAlertUnits: Int):
+        Completable = Completable.defer {
+        podState.lowReservoirAlertEnabled = lowReservoirAlertEnabled
+        podState.lowReservoirAlertUnits = lowReservoirAlertUnits
+        Completable.complete()
+    }
+
+    @Synchronized
+    override fun getCommandConfirmationFromState(): CommandConfirmationFromState {
+        return podState.activeCommand?.run {
+            logger.debug(
+                "Getting command state with parameters: $activeCommand " +
+                    "lastResponse=$lastStatusResponseReceived " +
+                    "$sequenceNumberOfLastProgrammingCommand $historyId"
+            )
+            when {
+                createdRealtime <= podState.lastStatusResponseReceived &&
+                    sequence == podState.sequenceNumberOfLastProgrammingCommand ->
+                    CommandConfirmationSuccess
+                createdRealtime <= podState.lastStatusResponseReceived &&
+                    sequence != podState.sequenceNumberOfLastProgrammingCommand ->
+                    CommandConfirmationDenied
+                // no response received after this point
+                createdRealtime <= sentRealtime ->
+                    CommandSendingNotConfirmed
+                createdRealtime > sentRealtime ->
+                    CommandSendingFailure
+                else -> // this can't happen, see the previous two conditions
+                    NoActiveCommand
+            }
+        } ?: NoActiveCommand
+    }
+
+    override fun increaseEapAkaSequenceNumber(): ByteArray {
+        podState.eapAkaSequenceNumber++
+        return EapSqn(podState.eapAkaSequenceNumber).value
+    }
+
+    override fun commitEapAkaSequenceNumber() {
+        store()
+    }
+
+    override fun onStart() {
+        when (getCommandConfirmationFromState()) {
+            CommandConfirmationSuccess, CommandConfirmationDenied -> {
+                val now = SystemClock.elapsedRealtime()
+                val newCommand = podState.activeCommand?.copy(
+                    createdRealtime = now,
+                    sentRealtime = now + 1
+                )
+                podState.lastStatusResponseReceived = now + 2
+                podState.activeCommand = newCommand
+            }
+
+            CommandSendingNotConfirmed -> {
+                val now = SystemClock.elapsedRealtime()
+                val newCommand = podState.activeCommand?.copy(
+                    createdRealtime = now,
+                    sentRealtime = now + 1
+                )
+                podState.activeCommand = newCommand
+                podState.lastStatusResponseReceived = 0
+            }
+
+            CommandSendingFailure, NoActiveCommand -> {
+                podState.activeCommand = null
+                podState.lastStatusResponseReceived = 0
+            }
+        }
+    }
+
+    override fun updateFromDefaultStatusResponse(response: DefaultStatusResponse) {
+        logger.debug(LTag.PUMPCOMM, "Default status response :$response")
+        podState.deliveryStatus = response.deliveryStatus
+        podState.podStatus = response.podStatus
+        podState.pulsesDelivered = response.totalPulsesDelivered
+        if (response.reservoirPulsesRemaining < 1023) {
+            podState.pulsesRemaining = response.reservoirPulsesRemaining
+        }
+        podState.sequenceNumberOfLastProgrammingCommand = response.sequenceNumberOfLastProgrammingCommand
+        podState.minutesSinceActivation = response.minutesSinceActivation
+        podState.activeAlerts = response.activeAlerts
+
+        podState.lastUpdatedSystem = System.currentTimeMillis()
+        podState.lastStatusResponseReceived = SystemClock.elapsedRealtime()
+        updateLastBolusFromResponse(response.bolusPulsesRemaining)
+        if (podState.activationTime == null) {
+            podState.activationTime = System.currentTimeMillis() - (response.minutesSinceActivation * 60_000)
+        }
+
+        store()
+        rxBus.send(EventOmnipodDashPumpValuesChanged())
+    }
+
+    override fun updateFromVersionResponse(response: VersionResponse) {
+        podState.bleVersion = SoftwareVersion(
+            response.bleVersionMajor,
+            response.bleVersionMinor,
+            response.bleVersionInterim
+        )
+        podState.firmwareVersion = SoftwareVersion(
+            response.firmwareVersionMajor,
+            response.firmwareVersionMinor,
+            response.firmwareVersionInterim
+        )
+        podState.podStatus = response.podStatus
+        podState.lotNumber = response.lotNumber
+        podState.podSequenceNumber = response.podSequenceNumber
+
+        podState.lastUpdatedSystem = System.currentTimeMillis()
+
+        store()
+        rxBus.send(EventOmnipodDashPumpValuesChanged())
+    }
+
+    override fun updateFromSetUniqueIdResponse(response: SetUniqueIdResponse) {
+        podState.pulseRate = response.pumpRate
+        podState.primePulseRate = response.primePumpRate
+        podState.firstPrimeBolusVolume = response.numberOfEngagingClutchDrivePulses
+        podState.secondPrimeBolusVolume = response.numberOfPrimePulses
+        podState.podLifeInHours = response.podExpirationTimeInHours
+        podState.bleVersion = SoftwareVersion(
+            response.bleVersionMajor,
+            response.bleVersionMinor,
+            response.bleVersionInterim
+        )
+        podState.firmwareVersion = SoftwareVersion(
+            response.firmwareVersionMajor,
+            response.firmwareVersionMinor,
+            response.firmwareVersionInterim
+        )
+        podState.podStatus = response.podStatus
+        podState.lotNumber = response.lotNumber
+        podState.podSequenceNumber = response.podSequenceNumber
+        podState.uniqueId = response.uniqueIdReceivedInCommand
+
+        podState.lastUpdatedSystem = System.currentTimeMillis()
+        store()
+        rxBus.send(EventOmnipodDashPumpValuesChanged())
+    }
+
+    override fun updateFromAlarmStatusResponse(response: AlarmStatusResponse) {
+        logger.info(
+            LTag.PUMP,
+            "Received AlarmStatusResponse: $response"
+        )
+        podState.deliveryStatus = response.deliveryStatus
+        podState.podStatus = response.podStatus
+        podState.pulsesDelivered = response.totalPulsesDelivered
+
+        if (response.reservoirPulsesRemaining < 1023) {
+            podState.pulsesRemaining = response.reservoirPulsesRemaining
+        }
+        podState.sequenceNumberOfLastProgrammingCommand = response.sequenceNumberOfLastProgrammingCommand
+        podState.minutesSinceActivation = response.minutesSinceActivation
+        podState.activeAlerts = response.activeAlerts
+        podState.alarmType = response.alarmType
+
+        podState.lastUpdatedSystem = System.currentTimeMillis()
+        podState.lastStatusResponseReceived = SystemClock.elapsedRealtime()
+        updateLastBolusFromResponse(response.bolusPulsesRemaining)
+
+        store()
+        rxBus.send(EventOmnipodDashPumpValuesChanged())
+    }
+
+    override fun updateFromPairing(uniqueId: Id, pairResult: PairResult) {
+        podState.eapAkaSequenceNumber = 1
+        podState.ltk = pairResult.ltk
+        podState.uniqueId = uniqueId.toLong()
+    }
+
+    override fun connectionSuccessRatio(): Float {
+        val attempts = connectionAttempts
+        if (attempts == 0) {
+            return 0.0F
+        }
+        return successfulConnections.toFloat() / attempts.toFloat()
+    }
+
+    override fun reset() {
+        podState = PodState()
+        store()
+    }
+
+    private fun store() {
+        try {
+            val serialized = Gson().toJson(podState)
+            logger.debug(LTag.PUMP, "Storing Pod state: $serialized")
+            sharedPreferences.putString(R.string.key_omnipod_dash_pod_state, serialized)
+        } catch (ex: Exception) {
+            logger.error(LTag.PUMP, "Failed to store Pod state", ex)
+        }
+    }
+
+    private fun load(): PodState {
+        if (sharedPreferences.contains(R.string.key_omnipod_dash_pod_state)) {
+            try {
+                return Gson().fromJson(
+                    sharedPreferences.getString(R.string.key_omnipod_dash_pod_state, ""),
+                    PodState::class.java
+                )
+            } catch (ex: Exception) {
+                logger.error(LTag.PUMP, "Failed to deserialize Pod state", ex)
+            }
+        }
+        logger.debug(LTag.PUMP, "Creating new Pod state")
+        return PodState()
+    }
+
+    class PodState : Serializable {
+
+        var activationProgress: ActivationProgress = ActivationProgress.NOT_STARTED
+        var lastUpdatedSystem: Long = 0
+        var lastStatusResponseReceived: Long = 0
+        var bluetoothConnectionState: OmnipodDashPodStateManager.BluetoothConnectionState =
+            OmnipodDashPodStateManager.BluetoothConnectionState.DISCONNECTED
+        var connectionAttempts = 0
+        var successfulConnections = 0
+        var messageSequenceNumber: Short = 0
+        var sequenceNumberOfLastProgrammingCommand: Short? = null
+        var activationTime: Long? = null
+        var uniqueId: Long? = null
+        var bluetoothAddress: String? = null
+        var ltk: ByteArray? = null
+        var eapAkaSequenceNumber: Long = 1
+        var bolusPulsesRemaining: Short = 0
+        var timeZone: String = "" // TimeZone ID (e.g. "Europe/Amsterdam")
+        var alarmSynced: Boolean = false
+
+        var bleVersion: SoftwareVersion? = null
+        var firmwareVersion: SoftwareVersion? = null
+        var lotNumber: Long? = null
+        var podSequenceNumber: Long? = null
+        var pulseRate: Short? = null
+        var primePulseRate: Short? = null
+        var podLifeInHours: Short? = null
+        var firstPrimeBolusVolume: Short? = null
+        var secondPrimeBolusVolume: Short? = null
+
+        var expirationReminderEnabled: Boolean? = null
+        var expirationHours: Int? = null
+        var lowReservoirAlertEnabled: Boolean? = null
+        var lowReservoirAlertUnits: Int? = null
+
+        var pulsesDelivered: Short? = null
+        var pulsesRemaining: Short? = null
+        var podStatus: PodStatus? = null
+        var deliveryStatus: DeliveryStatus? = null
+        var minutesSinceActivation: Short? = null
+        var activeAlerts: EnumSet<AlertType>? = null
+        var alarmType: AlarmType? = null
+
+        var basalProgram: BasalProgram? = null
+        var tempBasal: OmnipodDashPodStateManager.TempBasal? = null
+        var activeCommand: OmnipodDashPodStateManager.ActiveCommand? = null
+        var lastBolus: OmnipodDashPodStateManager.LastBolus? = null
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/AlertUtil.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/AlertUtil.kt
new file mode 100644
index 0000000000..5a12dabb23
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/AlertUtil.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
+import java.util.*
+
+object AlertUtil {
+
+    fun decodeAlertSet(encoded: Byte): EnumSet<AlertType> {
+        val encodedInt = encoded.toInt() and 0xff
+
+        val alertList = AlertType.values()
+            .filter { it != AlertType.UNKNOWN } // 0xff && <something> will always be true
+            .filter { (it.value.toInt() and 0xff) and encodedInt != 0 }
+            .toList()
+
+        return if (alertList.isEmpty()) {
+            EnumSet.noneOf(AlertType::class.java)
+        } else {
+            EnumSet.copyOf(alertList)
+        }
+    }
+
+    fun encodeAlertSet(alertSet: EnumSet<AlertType>): Byte =
+        alertSet.fold(
+            0,
+            { out, slot ->
+                out or (slot.value.toInt() and 0xff)
+            }
+        ).toByte()
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/HasValue.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/HasValue.kt
new file mode 100644
index 0000000000..0976efd028
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/HasValue.kt
@@ -0,0 +1,10 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util
+
+interface HasValue {
+
+    val value: Byte
+}
+
+inline fun <reified T> byValue(value: Byte, default: T): T where T : Enum<T>, T : HasValue {
+    return enumValues<T>().firstOrNull { it.value == value } ?: default
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/MessageUtil.java b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/MessageUtil.java
deleted file mode 100644
index 6d9297f12a..0000000000
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/MessageUtil.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util;
-
-public class MessageUtil {
-
-    private static final short[] crc16table = {0, -32763, -32753, 10, -32741, 30, 20, -32751, -32717, 54, 60, -32711, 40, -32723, -32729, 34, -32669, 102, 108, -32663, 120, -32643, -32649, 114, 80, -32683, -32673, 90, -32693, 78, 68, -32703, -32573, 198, 204, -32567, 216, -32547, -32553, 210, 240, -32523, -32513, 250, -32533, 238, 228, -32543, 160, -32603, -32593, 170, -32581, 190, 180, -32591, -32621, 150, 156, -32615, 136, -32627, -32633, 130, -32381, 390, 396, -32375, 408, -32355, -32361, 402, 432, -32331, -32321, 442, -32341, 430, 420, -32351, 480, -32283, -32273, 490, -32261, 510, 500, -32271, -32301, 470, 476, -32295, 456, -32307, -32313, 450, 320, -32443, -32433, 330, -32421, 350, 340, -32431, -32397, 374, 380, -32391, 360, -32403, -32409, 354, -32477, 294, 300, -32471, 312, -32451, -32457, 306, 272, -32491, -32481, 282, -32501, 270, 260, -32511, -31997, 774, 780, -31991, 792, -31971, -31977, 786, 816, -31947, -31937, 826, -31957, 814, 804, -31967, 864, -31899, -31889, 874, -31877, 894, 884, -31887, -31917, 854, 860, -31911, 840, -31923, -31929, 834, 960, -31803, -31793, 970, -31781, 990, 980, -31791, -31757, 1014, 1020, -31751, 1000, -31763, -31769, 994, -31837, 934, 940, -31831, 952, -31811, -31817, 946, 912, -31851, -31841, 922, -31861, 910, 900, -31871, 640, -32123, -32113, 650, -32101, 670, 660, -32111, -32077, 694, 700, -32071, 680, -32083, -32089, 674, -32029, 742, 748, -32023, 760, -32003, -32009, 754, 720, -32043, -32033, 730, -32053, 718, 708, -32063, -32189, 582, 588, -32183, 600, -32163, -32169, 594, 624, -32139, -32129, 634, -32149, 622, 612, -32159, 544, -32219, -32209, 554, -32197, 574, 564, -32207, -32237, 534, 540, -32231, 520, -32243, -32249, 514};
-
-    public static int createCrc(short[] sArr) {
-        int i = 0;
-        for (short s = 0; s < sArr.length; s = (short) (s + 1)) {
-            byte b = (byte) sArr[s];
-            short s2 = b;
-            if (b < 0) {
-                s2 = (short) (((byte) (b & Byte.MAX_VALUE)) + 128);
-            }
-            i += s2;
-        }
-        return i;
-    }
-
-    public static short createCrc(byte[] bArr) {
-        short s = 0;
-        for (byte b : bArr) {
-            byte b2 = (byte) (b ^ (s & 255));
-            short s2 = b2;
-            if (b2 < 0) {
-                s2 = (short) (((byte) (b2 & Byte.MAX_VALUE)) + 128);
-            }
-            s = (short) (((short) (((short) (s >> 8)) & 255)) ^ crc16table[s2]);
-        }
-        return s;
-    }
-
-    public static short calculateChecksum(byte[] bytes) {
-        short sum = 0;
-        for (byte b : bytes) {
-            sum += (short) (b & 0xff);
-        }
-        return sum;
-    }
-}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/MessageUtil.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/MessageUtil.kt
new file mode 100644
index 0000000000..ae08043294
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/MessageUtil.kt
@@ -0,0 +1,302 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util
+
+import kotlin.experimental.and
+import kotlin.experimental.xor
+
+object MessageUtil {
+
+    private val crc16table = shortArrayOf(
+        0,
+        -32763,
+        -32753,
+        10,
+        -32741,
+        30,
+        20,
+        -32751,
+        -32717,
+        54,
+        60,
+        -32711,
+        40,
+        -32723,
+        -32729,
+        34,
+        -32669,
+        102,
+        108,
+        -32663,
+        120,
+        -32643,
+        -32649,
+        114,
+        80,
+        -32683,
+        -32673,
+        90,
+        -32693,
+        78,
+        68,
+        -32703,
+        -32573,
+        198,
+        204,
+        -32567,
+        216,
+        -32547,
+        -32553,
+        210,
+        240,
+        -32523,
+        -32513,
+        250,
+        -32533,
+        238,
+        228,
+        -32543,
+        160,
+        -32603,
+        -32593,
+        170,
+        -32581,
+        190,
+        180,
+        -32591,
+        -32621,
+        150,
+        156,
+        -32615,
+        136,
+        -32627,
+        -32633,
+        130,
+        -32381,
+        390,
+        396,
+        -32375,
+        408,
+        -32355,
+        -32361,
+        402,
+        432,
+        -32331,
+        -32321,
+        442,
+        -32341,
+        430,
+        420,
+        -32351,
+        480,
+        -32283,
+        -32273,
+        490,
+        -32261,
+        510,
+        500,
+        -32271,
+        -32301,
+        470,
+        476,
+        -32295,
+        456,
+        -32307,
+        -32313,
+        450,
+        320,
+        -32443,
+        -32433,
+        330,
+        -32421,
+        350,
+        340,
+        -32431,
+        -32397,
+        374,
+        380,
+        -32391,
+        360,
+        -32403,
+        -32409,
+        354,
+        -32477,
+        294,
+        300,
+        -32471,
+        312,
+        -32451,
+        -32457,
+        306,
+        272,
+        -32491,
+        -32481,
+        282,
+        -32501,
+        270,
+        260,
+        -32511,
+        -31997,
+        774,
+        780,
+        -31991,
+        792,
+        -31971,
+        -31977,
+        786,
+        816,
+        -31947,
+        -31937,
+        826,
+        -31957,
+        814,
+        804,
+        -31967,
+        864,
+        -31899,
+        -31889,
+        874,
+        -31877,
+        894,
+        884,
+        -31887,
+        -31917,
+        854,
+        860,
+        -31911,
+        840,
+        -31923,
+        -31929,
+        834,
+        960,
+        -31803,
+        -31793,
+        970,
+        -31781,
+        990,
+        980,
+        -31791,
+        -31757,
+        1014,
+        1020,
+        -31751,
+        1000,
+        -31763,
+        -31769,
+        994,
+        -31837,
+        934,
+        940,
+        -31831,
+        952,
+        -31811,
+        -31817,
+        946,
+        912,
+        -31851,
+        -31841,
+        922,
+        -31861,
+        910,
+        900,
+        -31871,
+        640,
+        -32123,
+        -32113,
+        650,
+        -32101,
+        670,
+        660,
+        -32111,
+        -32077,
+        694,
+        700,
+        -32071,
+        680,
+        -32083,
+        -32089,
+        674,
+        -32029,
+        742,
+        748,
+        -32023,
+        760,
+        -32003,
+        -32009,
+        754,
+        720,
+        -32043,
+        -32033,
+        730,
+        -32053,
+        718,
+        708,
+        -32063,
+        -32189,
+        582,
+        588,
+        -32183,
+        600,
+        -32163,
+        -32169,
+        594,
+        624,
+        -32139,
+        -32129,
+        634,
+        -32149,
+        622,
+        612,
+        -32159,
+        544,
+        -32219,
+        -32209,
+        554,
+        -32197,
+        574,
+        564,
+        -32207,
+        -32237,
+        534,
+        540,
+        -32231,
+        520,
+        -32243,
+        -32249,
+        514
+    )
+
+    fun createCrc(sArr: ShortArray): Int {
+        var i = 0
+        var s: Short = 0
+        while (s < sArr.size) {
+            val b = sArr[s.toInt()].toByte()
+            var s2 = b.toShort()
+            if (b < 0) {
+                s2 = ((b and Byte.MAX_VALUE) + 128).toShort()
+            }
+            i += s2.toInt()
+            s = (s + 1).toShort()
+        }
+        return i
+    }
+
+    fun createCrc(bArr: ByteArray): Short {
+        var s: Short = 0
+        for (b in bArr) {
+            val b2 = (b xor (s and 255).toByte()) // TODO byte conversion ok?
+            var s2 = b2.toShort()
+            if (b2 < 0) {
+                s2 = ((b2 and Byte.MAX_VALUE) + 128).toShort()
+            }
+            s = (((s.toInt() shr 8).toShort() and 255) xor crc16table[s2.toInt()])
+        }
+        return s
+    }
+
+    fun calculateChecksum(bytes: ByteArray): Short {
+        var sum: Short = 0
+        for (b in bytes) {
+            sum = (sum + (b.toInt() and 0xff)).toShort()
+        }
+        return sum
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/RandomByteGenerator.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/RandomByteGenerator.kt
new file mode 100644
index 0000000000..ca6beb17dd
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/RandomByteGenerator.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.annotations.OpenForTesting
+import java.security.SecureRandom
+
+@OpenForTesting
+class RandomByteGenerator {
+    private val secureRandom = SecureRandom()
+
+    fun nextBytes(length: Int): ByteArray = ByteArray(length).also(secureRandom::nextBytes)
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/X25519KeyGenerator.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/X25519KeyGenerator.kt
new file mode 100644
index 0000000000..160f620df6
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/X25519KeyGenerator.kt
@@ -0,0 +1,13 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util
+
+import com.google.crypto.tink.subtle.X25519
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.annotations.OpenForTesting
+
+@OpenForTesting
+class X25519KeyGenerator {
+
+    fun generatePrivateKey(): ByteArray = X25519.generatePrivateKey()
+    fun publicFromPrivate(privateKey: ByteArray): ByteArray = X25519.publicFromPrivate(privateKey)
+    fun computeSharedSecret(privateKey: ByteArray, publicKey: ByteArray): ByteArray =
+        X25519.computeSharedSecret(privateKey, publicKey)
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt
new file mode 100644
index 0000000000..f1e91651f7
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt
@@ -0,0 +1,108 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.history
+
+import com.github.guepardoapps.kulid.ULID
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType.SET_BOLUS
+import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType.SET_TEMPORARY_BASAL
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.*
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BolusRecord
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.HistoryRecord
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.InitialResult
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.ResolvedResult
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.TempBasalRecord
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.HistoryRecordDao
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.HistoryRecordEntity
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.mapper.HistoryMapper
+import io.reactivex.Completable
+import io.reactivex.Single
+import java.lang.System.currentTimeMillis
+import javax.inject.Inject
+
+class DashHistory @Inject constructor(
+    private val dao: HistoryRecordDao,
+    private val historyMapper: HistoryMapper,
+    private val logger: AAPSLogger
+) {
+
+    private fun markSuccess(id: String): Completable = dao.markResolved(
+        id,
+        ResolvedResult.SUCCESS,
+        currentTimeMillis()
+    )
+
+    private fun markFailure(id: String): Completable = dao.markResolved(
+        id,
+        ResolvedResult.FAILURE,
+        currentTimeMillis()
+    )
+
+    fun getById(id: String): HistoryRecord {
+        val entry = dao.byIdBlocking(id)
+        if (entry == null) {
+            throw java.lang.IllegalArgumentException("history entry [$id] not found")
+        }
+        return historyMapper.entityToDomain(entry)
+    }
+
+    @Suppress("ReturnCount")
+    fun createRecord(
+        commandType: OmnipodCommandType,
+        date: Long = System.currentTimeMillis(),
+        initialResult: InitialResult = InitialResult.NOT_SENT,
+        tempBasalRecord: TempBasalRecord? = null,
+        bolusRecord: BolusRecord? = null,
+        resolveResult: ResolvedResult? = null,
+        resolvedAt: Long? = null
+    ): Single<String> = Single.defer {
+        val id = ULID.random()
+
+        when {
+            commandType == SET_BOLUS && bolusRecord == null ->
+                Single.error(IllegalArgumentException("bolusRecord missing on SET_BOLUS"))
+            commandType == SET_TEMPORARY_BASAL && tempBasalRecord == null ->
+                Single.error(IllegalArgumentException("tempBasalRecord missing on SET_TEMPORARY_BASAL"))
+            else ->
+                dao.save(
+                    HistoryRecordEntity(
+                        id = id,
+                        date = date,
+                        createdAt = currentTimeMillis(),
+                        commandType = commandType,
+                        tempBasalRecord = tempBasalRecord,
+                        bolusRecord = bolusRecord,
+                        initialResult = initialResult,
+                        resolvedResult = resolveResult,
+                        resolvedAt = resolvedAt
+                    )
+                ).toSingle { id }
+        }
+    }
+
+    fun getRecords(): Single<List<HistoryRecord>> =
+        dao.all().map { list -> list.map(historyMapper::entityToDomain) }
+
+    fun getRecordsAfter(time: Long): Single<List<HistoryRecordEntity>> = dao.allSince(time)
+
+    fun updateFromState(podState: OmnipodDashPodStateManager) = Completable.defer {
+        val historyId = podState.activeCommand?.historyId
+        if (historyId == null) {
+            logger.error(LTag.PUMP, "HistoryId not found to for updating from state")
+            return@defer Completable.complete()
+        }
+        when (podState.getCommandConfirmationFromState()) {
+            CommandSendingFailure ->
+                dao.setInitialResult(historyId, InitialResult.FAILURE_SENDING)
+            CommandSendingNotConfirmed ->
+                dao.setInitialResult(historyId, InitialResult.SENT)
+            CommandConfirmationDenied ->
+                markFailure(historyId)
+            CommandConfirmationSuccess ->
+                dao.setInitialResult(historyId, InitialResult.SENT)
+                    .andThen(markSuccess(historyId))
+            NoActiveCommand ->
+                Completable.complete()
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/HistoryRecord.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/HistoryRecord.kt
new file mode 100644
index 0000000000..f7510c40b1
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/HistoryRecord.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data
+
+import com.github.guepardoapps.kulid.ULID
+import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
+import java.nio.ByteBuffer
+
+data class HistoryRecord(
+    val id: String, // ULID
+    val createdAt: Long, // creation date of the record
+    val date: Long, // when event actually happened
+    val commandType: OmnipodCommandType,
+    val initialResult: InitialResult,
+    val record: Record?,
+    val resolvedResult: ResolvedResult?,
+    val resolvedAt: Long?
+) {
+    fun pumpId(): Long {
+        val entropy = ULID.getEntropy(id)
+        return ByteBuffer.wrap(entropy).long
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt
new file mode 100644
index 0000000000..c5ea0ab4b3
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data
+
+import info.nightscout.androidaps.data.DetailedBolusInfo
+
+sealed class Record
+
+data class BolusRecord(val amout: Double, val bolusType: BolusType) : Record()
+
+data class TempBasalRecord(val duration: Int, val rate: Double) : Record()
+
+enum class BolusType {
+    DEFAULT, SMB;
+
+    fun toBolusInfoBolusType(): DetailedBolusInfo.BolusType {
+        return when (this) {
+            DEFAULT -> DetailedBolusInfo.BolusType.NORMAL
+            SMB -> DetailedBolusInfo.BolusType.SMB
+        }
+    }
+
+    companion object {
+        fun fromBolusInfoBolusType(type: DetailedBolusInfo.BolusType): BolusType {
+            return when (type) {
+                DetailedBolusInfo.BolusType.SMB -> SMB
+                else -> DEFAULT
+            }
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/ResultStates.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/ResultStates.kt
new file mode 100644
index 0000000000..ee92d9ed78
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/ResultStates.kt
@@ -0,0 +1,9 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data
+
+enum class InitialResult {
+    NOT_SENT, FAILURE_SENDING, UNCONFIRMED, SENT
+}
+
+enum class ResolvedResult {
+    SUCCESS, FAILURE
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt
new file mode 100644
index 0000000000..8d21ea751a
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/Converters.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database
+
+import androidx.room.TypeConverter
+import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BolusType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.InitialResult
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.ResolvedResult
+
+class Converters {
+
+    @TypeConverter
+    fun toBolusType(s: String) = enumValueOf<BolusType>(s)
+
+    @TypeConverter
+    fun fromBolusType(bolusType: BolusType) = bolusType.name
+
+    @TypeConverter
+    fun toInitialResult(s: String) = enumValueOf<InitialResult>(s)
+
+    @TypeConverter
+    fun fromInitialResult(initialResult: InitialResult) = initialResult.name
+
+    @TypeConverter
+    fun toResolvedResult(s: String?) = s?.let { enumValueOf<ResolvedResult>(it) }
+
+    @TypeConverter
+    fun fromResolvedResult(resolvedResult: ResolvedResult?) = resolvedResult?.name
+
+    @TypeConverter
+    fun toOmnipodCommandType(s: String) = enumValueOf<OmnipodCommandType>(s)
+
+    @TypeConverter
+    fun fromOmnipodCommandType(omnipodCommandType: OmnipodCommandType) = omnipodCommandType.name
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt
new file mode 100644
index 0000000000..3014f3eba0
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/DashHistoryDatabase.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+
+@Database(
+    entities = [HistoryRecordEntity::class],
+    exportSchema = false,
+    version = DashHistoryDatabase.VERSION
+)
+@TypeConverters(Converters::class)
+abstract class DashHistoryDatabase : RoomDatabase() {
+
+    abstract fun historyRecordDao(): HistoryRecordDao
+
+    companion object {
+
+        const val VERSION = 1
+
+        fun build(context: Context) =
+            Room.databaseBuilder(
+                context.applicationContext,
+                DashHistoryDatabase::class.java,
+                "omnipod_dash_history_database.db"
+            )
+                .fallbackToDestructiveMigration()
+                .build()
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt
new file mode 100644
index 0000000000..84ca7f9f4d
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt
@@ -0,0 +1,42 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.InitialResult
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.ResolvedResult
+import io.reactivex.Completable
+import io.reactivex.Single
+
+@Dao
+abstract class HistoryRecordDao {
+
+    @Query("SELECT * from historyrecords")
+    abstract fun all(): Single<List<HistoryRecordEntity>>
+
+    @Query("SELECT * from historyrecords")
+    abstract fun allBlocking(): List<HistoryRecordEntity>
+
+    @Query("SELECT * from historyrecords WHERE createdAt <= :since")
+    abstract fun allSince(since: Long): Single<List<HistoryRecordEntity>>
+
+    @Query("SELECT * FROM historyrecords WHERE id = :id LIMIT 1")
+    abstract fun byIdBlocking(id: String): HistoryRecordEntity?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun saveBlocking(historyRecordEntity: HistoryRecordEntity)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun save(historyRecordEntity: HistoryRecordEntity): Completable
+
+    @Delete
+    abstract fun delete(historyRecordEntity: HistoryRecordEntity): Completable
+
+    @Query("UPDATE historyrecords SET resolvedResult = :resolvedResult, resolvedAt = :resolvedAt WHERE id = :id ")
+    abstract fun markResolved(id: String, resolvedResult: ResolvedResult, resolvedAt: Long): Completable
+
+    @Query("UPDATE historyrecords SET initialResult = :initialResult  WHERE id = :id ")
+    abstract fun setInitialResult(id: String, initialResult: InitialResult): Completable
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt
new file mode 100644
index 0000000000..18ff9c14d2
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordEntity.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database
+
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BolusRecord
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.InitialResult
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.ResolvedResult
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.TempBasalRecord
+
+@Entity(tableName = "historyrecords")
+data class HistoryRecordEntity(
+    @PrimaryKey val id: String, // ULID
+    val createdAt: Long, // creation date of the record
+    val date: Long, // when event actually happened
+    val commandType: OmnipodCommandType,
+    val initialResult: InitialResult,
+    @Embedded(prefix = "tempBasalRecord_") val tempBasalRecord: TempBasalRecord?,
+    @Embedded(prefix = "bolusRecord_") val bolusRecord: BolusRecord?,
+    val resolvedResult: ResolvedResult?,
+    val resolvedAt: Long?
+)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt
new file mode 100644
index 0000000000..5266924514
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/mapper/HistoryMapper.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.mapper
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BolusRecord
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.HistoryRecord
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.TempBasalRecord
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.HistoryRecordEntity
+
+class HistoryMapper {
+
+    fun domainToEntity(historyRecord: HistoryRecord): HistoryRecordEntity =
+        HistoryRecordEntity(
+            id = historyRecord.id,
+            createdAt = historyRecord.createdAt,
+            date = historyRecord.date,
+            commandType = historyRecord.commandType,
+            initialResult = historyRecord.initialResult,
+            tempBasalRecord = historyRecord.record as? TempBasalRecord,
+            bolusRecord = historyRecord.record as? BolusRecord,
+            resolvedResult = historyRecord.resolvedResult,
+            resolvedAt = historyRecord.resolvedAt
+        )
+
+    fun entityToDomain(entity: HistoryRecordEntity): HistoryRecord =
+        HistoryRecord(
+            id = entity.id,
+            createdAt = entity.createdAt,
+            date = entity.date,
+            initialResult = entity.initialResult,
+            commandType = entity.commandType,
+            record = entity.bolusRecord ?: entity.tempBasalRecord,
+            resolvedResult = entity.resolvedResult,
+            resolvedAt = entity.resolvedAt
+        )
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
new file mode 100644
index 0000000000..0e31e65ff7
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
@@ -0,0 +1,151 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.extensions.toVisibility
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandPlayTestBeep
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.PodActivationWizardActivity
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.databinding.OmnipodDashPodManagementBinding
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ActivationProgress
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.DashPodActivationWizardActivity
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.DashPodDeactivationWizardActivity
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.queue.events.EventQueueChanged
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
+import javax.inject.Inject
+
+class DashPodManagementActivity : NoSplashAppCompatActivity() {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var injector: HasAndroidInjector
+    @Inject lateinit var context: Context
+    @Inject lateinit var aapsSchedulers: AapsSchedulers
+    @Inject lateinit var podStateManager: OmnipodDashPodStateManager
+
+    private var disposables: CompositeDisposable = CompositeDisposable()
+
+    private lateinit var binding: OmnipodDashPodManagementBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = OmnipodDashPodManagementBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.buttonActivatePod.setOnClickListener {
+            val type: PodActivationWizardActivity.Type =
+                if (podStateManager.activationProgress.isAtLeast(ActivationProgress.PRIME_COMPLETED)) {
+                    PodActivationWizardActivity.Type.SHORT
+                } else {
+                    PodActivationWizardActivity.Type.LONG
+                }
+
+            val intent = Intent(this, DashPodActivationWizardActivity::class.java)
+            intent.putExtra(PodActivationWizardActivity.KEY_TYPE, type)
+            startActivity(intent)
+        }
+
+        binding.buttonDeactivatePod.setOnClickListener {
+            startActivity(Intent(this, DashPodDeactivationWizardActivity::class.java))
+        }
+
+        binding.buttonDiscardPod.setOnClickListener {
+            OKDialog.showConfirmation(
+                this,
+                resourceHelper.gs(R.string.omnipod_common_pod_management_discard_pod_confirmation),
+                Thread {
+                    podStateManager.reset()
+                }
+            )
+        }
+
+        binding.buttonPlayTestBeep.setOnClickListener {
+            binding.buttonPlayTestBeep.isEnabled = false
+            binding.buttonPlayTestBeep.setText(R.string.omnipod_common_pod_management_button_playing_test_beep)
+
+            commandQueue.customCommand(
+                CommandPlayTestBeep(),
+                object : Callback() {
+                    override fun run() {
+                        if (!result.success) {
+                            displayErrorDialog(
+                                resourceHelper.gs(R.string.omnipod_common_warning),
+                                resourceHelper.gs(
+                                    R.string.omnipod_common_two_strings_concatenated_by_colon,
+                                    resourceHelper.gs(R.string.omnipod_common_error_failed_to_play_test_beep),
+                                    result.comment
+                                ),
+                                false
+                            )
+                        }
+                    }
+                }
+            )
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        disposables += rxBus
+            .toObservable(EventQueueChanged::class.java)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ refreshButtons() }, fabricPrivacy::logException)
+
+        refreshButtons()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        disposables.clear()
+    }
+
+    private fun refreshButtons() {
+        // Only show the discard button to reset a cached unique ID before the unique ID has actually been set
+        // Otherwise, users should use the Deactivate Pod Wizard. In case proper deactivation fails,
+        // they will get an option to discard the Pod there
+        val discardButtonEnabled =
+            podStateManager.uniqueId != null &&
+                podStateManager.activationProgress.isBefore(ActivationProgress.SET_UNIQUE_ID)
+        binding.buttonDiscardPod.visibility = discardButtonEnabled.toVisibility()
+
+        binding.buttonActivatePod.isEnabled = podStateManager.activationProgress.isBefore(ActivationProgress.COMPLETED)
+        binding.buttonDeactivatePod.isEnabled = podStateManager.bluetoothAddress != null
+
+        if (podStateManager.activationProgress.isAtLeast(ActivationProgress.PHASE_1_COMPLETED)) {
+            if (commandQueue.isCustomCommandInQueue(CommandPlayTestBeep::class.java)) {
+                binding.buttonPlayTestBeep.isEnabled = false
+                binding.buttonPlayTestBeep.setText(R.string.omnipod_common_pod_management_button_playing_test_beep)
+            } else {
+                binding.buttonPlayTestBeep.isEnabled = true
+                binding.buttonPlayTestBeep.setText(R.string.omnipod_common_pod_management_button_play_test_beep)
+            }
+        } else {
+            binding.buttonPlayTestBeep.isEnabled = false
+            binding.buttonPlayTestBeep.setText(R.string.omnipod_common_pod_management_button_play_test_beep)
+        }
+
+        if (discardButtonEnabled) {
+            binding.buttonDiscardPod.isEnabled = true
+        }
+    }
+
+    private fun displayErrorDialog(title: String, message: String, @Suppress("SameParameterValue") withSound: Boolean) {
+        context.let {
+            ErrorHelperActivity.runAlarm(it, message, title, if (withSound) R.raw.boluserror else 0)
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index cb01eafe10..d0267f0589 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -1,28 +1,102 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui
 
+import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.os.SystemClock
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.events.EventPreferenceChange
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.PumpSync
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.OmnipodCommonOverviewButtonsBinding
 import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.OmnipodCommonOverviewPodInfoBinding
+import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandHandleTimeChange
+import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandResumeDelivery
+import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandSilenceAlerts
+import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandSuspendDelivery
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.EventOmnipodDashPumpValuesChanged
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.OmnipodDashPumpPlugin
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.databinding.OmnipodDashOverviewBinding
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.databinding.OmnipodDashOverviewBluetoothStatusBinding
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ActivationProgress
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.queue.events.EventQueueChanged
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import info.nightscout.androidaps.utils.ui.UIRunnable
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
+import org.apache.commons.lang3.StringUtils
+import java.time.Duration
+import java.time.ZonedDateTime
+import java.util.*
+import javax.inject.Inject
+import kotlin.collections.ArrayList
 
+// TODO generify; see OmnipodErosOverviewFragment
 class OmnipodDashOverviewFragment : DaggerFragment() {
 
-    var _binding: OmnipodDashOverviewBinding? = null
-    var _bluetoothStatusBinding: OmnipodDashOverviewBluetoothStatusBinding? = null
-    var _podInfoBinding: OmnipodCommonOverviewPodInfoBinding? = null
-    var _buttonBinding: OmnipodCommonOverviewButtonsBinding? = null
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var omnipodDashPumpPlugin: OmnipodDashPumpPlugin
+    @Inject lateinit var podStateManager: OmnipodDashPodStateManager
+    @Inject lateinit var sp: SP
+    @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var aapsSchedulers: AapsSchedulers
+    @Inject lateinit var pumpSync: PumpSync
+    @Inject lateinit var buildHelper: BuildHelper
+
+    companion object {
+
+        private const val REFRESH_INTERVAL_MILLIS = 15 * 1000L // 15 seconds
+        private const val PLACEHOLDER = "-"
+        private const val MAX_TIME_DEVIATION_MINUTES = 10L
+    }
+
+    private var disposables: CompositeDisposable = CompositeDisposable()
+
+    private val loopHandler = Handler(Looper.getMainLooper())
+    private lateinit var refreshLoop: Runnable
+
+    init {
+        refreshLoop = Runnable {
+            activity?.runOnUiThread { updateUi() }
+            loopHandler.postDelayed(refreshLoop, REFRESH_INTERVAL_MILLIS)
+        }
+    }
+
+    private var _binding: OmnipodDashOverviewBinding? = null
+    private var _bluetoothStatusBinding: OmnipodDashOverviewBluetoothStatusBinding? = null
+    private var _podInfoBinding: OmnipodCommonOverviewPodInfoBinding? = null
+    private var _buttonBinding: OmnipodCommonOverviewButtonsBinding? = null
 
     // These properties are only valid between onCreateView and
     // onDestroyView.
     val binding get() = _binding!!
-    val bluetoothStatusBinding get() = _bluetoothStatusBinding!!
-    val podInfoBinding get() = _podInfoBinding!!
-    val buttonBinding get() = _buttonBinding!!
+    private val bluetoothStatusBinding get() = _bluetoothStatusBinding!!
+    private val podInfoBinding get() = _podInfoBinding!!
+    private val buttonBinding get() = _buttonBinding!!
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
         OmnipodDashOverviewBinding.inflate(inflater, container, false).also {
@@ -31,4 +105,672 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             _bluetoothStatusBinding = OmnipodDashOverviewBluetoothStatusBinding.bind(it.root)
             _binding = it
         }.root
-}
\ No newline at end of file
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        buttonBinding.buttonPodManagement.setOnClickListener {
+            // TODO add protection
+            startActivity(Intent(context, DashPodManagementActivity::class.java))
+        }
+
+        buttonBinding.buttonResumeDelivery.setOnClickListener {
+            disablePodActionButtons()
+            commandQueue.customCommand(
+                CommandResumeDelivery(),
+                DisplayResultDialogCallback(
+                    resourceHelper.gs(R.string.omnipod_common_error_failed_to_resume_delivery),
+                    true
+                ).messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_delivery_resumed))
+            )
+        }
+
+        buttonBinding.buttonRefreshStatus.setOnClickListener {
+            disablePodActionButtons()
+            commandQueue.readStatus(
+                "REQUESTED BY USER",
+                DisplayResultDialogCallback(
+                    resourceHelper.gs(R.string.omnipod_common_error_failed_to_refresh_status),
+                    false
+                )
+            )
+        }
+
+        buttonBinding.buttonSilenceAlerts.setOnClickListener {
+            disablePodActionButtons()
+            commandQueue.customCommand(
+                CommandSilenceAlerts(),
+                DisplayResultDialogCallback(
+                    resourceHelper.gs(R.string.omnipod_common_error_failed_to_silence_alerts),
+                    false
+                )
+                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_silenced_alerts))
+                    .actionOnSuccess { rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_ALERTS)) }
+            )
+        }
+
+        buttonBinding.buttonSuspendDelivery.setOnClickListener {
+            disablePodActionButtons()
+            commandQueue.customCommand(
+                CommandSuspendDelivery(),
+                DisplayResultDialogCallback(
+                    resourceHelper.gs(R.string.omnipod_common_error_failed_to_suspend_delivery),
+                    true
+                )
+                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_suspended_delivery))
+            )
+        }
+
+        buttonBinding.buttonSetTime.setOnClickListener {
+            disablePodActionButtons()
+            commandQueue.customCommand(
+                CommandHandleTimeChange(true),
+                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_set_time), true)
+                    .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_time_on_pod_updated))
+            )
+        }
+        if (buildHelper.isEngineeringMode()) {
+            bluetoothStatusBinding.deliveryStatus.visibility = View.VISIBLE
+            bluetoothStatusBinding.connectionQuality.visibility = View.VISIBLE
+        }
+        podInfoBinding.omnipodCommonOverviewLotNumberLayout.visibility = View.GONE
+        podInfoBinding.omnipodCommonOverviewPodUniqueIdLayout.visibility = View.GONE
+    }
+
+    override fun onResume() {
+        super.onResume()
+        loopHandler.postDelayed(refreshLoop, REFRESH_INTERVAL_MILLIS)
+        disposables += rxBus
+            .toObservable(EventOmnipodDashPumpValuesChanged::class.java)
+            .observeOn(aapsSchedulers.main)
+            .subscribe(
+                {
+                    updateOmnipodStatus()
+                    updatePodActionButtons()
+                },
+                fabricPrivacy::logException
+            )
+        disposables += rxBus
+            .toObservable(EventQueueChanged::class.java)
+            .observeOn(aapsSchedulers.main)
+            .subscribe(
+                {
+                    updateQueueStatus()
+                    updatePodActionButtons()
+                },
+                fabricPrivacy::logException
+            )
+        disposables += rxBus
+            .toObservable(EventPreferenceChange::class.java)
+            .observeOn(aapsSchedulers.main)
+            .subscribe(
+                {
+                    updatePodActionButtons()
+                },
+                fabricPrivacy::logException
+            )
+
+        disposables += rxBus
+            .toObservable(EventPumpStatusChanged::class.java)
+            .observeOn(aapsSchedulers.main)
+            .subscribe(
+                {
+                    updateBluetoothConnectionStatus(it)
+                },
+                fabricPrivacy::logException
+            )
+        updateUi()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        disposables.clear()
+        loopHandler.removeCallbacks(refreshLoop)
+    }
+
+    @Synchronized
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+        _bluetoothStatusBinding = null
+        _buttonBinding = null
+        _podInfoBinding = null
+    }
+
+    private fun updateUi() {
+        updateBluetoothStatus()
+        updateOmnipodStatus()
+        updatePodActionButtons()
+        updateQueueStatus()
+    }
+
+    private fun updateBluetoothConnectionStatus(event: EventPumpStatusChanged) {
+        var status = event.getStatus(resourceHelper)
+        bluetoothStatusBinding.omnipodDashBluetoothStatus.text = status
+    }
+
+    private fun updateBluetoothStatus() {
+        bluetoothStatusBinding.omnipodDashBluetoothAddress.text = podStateManager.bluetoothAddress
+            ?: PLACEHOLDER
+
+        val connectionSuccessPercentage = podStateManager.connectionSuccessRatio() * 100
+        val successPercentageString = String.format("%.2f %%", connectionSuccessPercentage)
+        val quality =
+            "${podStateManager.successfulConnections}/${podStateManager.connectionAttempts} :: $successPercentageString"
+        bluetoothStatusBinding.omnipodDashBluetoothConnectionQuality.text = quality
+        val connectionStatsColor = when {
+            connectionSuccessPercentage > 90 ->
+                Color.WHITE
+            connectionSuccessPercentage > 60 ->
+                Color.YELLOW
+            else ->
+                Color.RED
+        }
+        bluetoothStatusBinding.omnipodDashBluetoothConnectionQuality.setTextColor(connectionStatsColor)
+        bluetoothStatusBinding.omnipodDashDeliveryStatus.text = podStateManager.deliveryStatus?.let {
+            podStateManager.deliveryStatus.toString()
+        } ?: PLACEHOLDER
+    }
+
+    private fun updateOmnipodStatus() {
+        updateLastConnection()
+        updateLastBolus()
+        updateTempBasal()
+        updatePodStatus()
+
+        val errors = ArrayList<String>()
+
+        if (podStateManager.activationProgress.isBefore(ActivationProgress.SET_UNIQUE_ID)) {
+            podInfoBinding.uniqueId.text = PLACEHOLDER
+            podInfoBinding.podLot.text = PLACEHOLDER
+            podInfoBinding.podSequenceNumber.text = PLACEHOLDER
+            podInfoBinding.firmwareVersion.text = PLACEHOLDER
+            podInfoBinding.timeOnPod.text = PLACEHOLDER
+            podInfoBinding.podExpiryDate.text = PLACEHOLDER
+            podInfoBinding.podExpiryDate.setTextColor(Color.WHITE)
+            podInfoBinding.baseBasalRate.text = PLACEHOLDER
+            podInfoBinding.totalDelivered.text = PLACEHOLDER
+            podInfoBinding.reservoir.text = PLACEHOLDER
+            podInfoBinding.reservoir.setTextColor(Color.WHITE)
+            podInfoBinding.podActiveAlerts.text = PLACEHOLDER
+        } else {
+            podInfoBinding.uniqueId.text = podStateManager.uniqueId.toString()
+            podInfoBinding.podLot.text = podStateManager.lotNumber.toString()
+            podInfoBinding.podSequenceNumber.text = podStateManager.podSequenceNumber.toString()
+            podInfoBinding.firmwareVersion.text = resourceHelper.gs(
+                R.string.omnipod_dash_overview_firmware_version_value,
+                podStateManager.firmwareVersion.toString(),
+                podStateManager.bluetoothVersion.toString()
+            )
+
+            // Update time on Pod
+            podInfoBinding.timeOnPod.text = podStateManager.time?.let {
+                resourceHelper.gs(
+                    R.string.omnipod_common_time_with_timezone,
+                    dateUtil.dateAndTimeString(it.toEpochSecond() * 1000),
+                    podStateManager.timeZone.getDisplayName(true, TimeZone.SHORT)
+                )
+            } ?: PLACEHOLDER
+
+            val timeDeviationTooBig = podStateManager.timeDrift?.let {
+                Duration.ofMinutes(MAX_TIME_DEVIATION_MINUTES).minus(
+                    it.abs()
+                ).isNegative
+            } ?: false
+            podInfoBinding.timeOnPod.setTextColor(
+                when {
+                    !podStateManager.sameTimeZone ->
+                        Color.MAGENTA
+                    timeDeviationTooBig ->
+                        Color.YELLOW
+                    else ->
+                        Color.WHITE
+                }
+            )
+
+            // Update Pod expiry time
+            val expiresAt = podStateManager.expiry
+            podInfoBinding.podExpiryDate.text = expiresAt?.let {
+                dateUtil.dateAndTimeString(it.toEpochSecond() * 1000)
+            }
+                ?: PLACEHOLDER
+            podInfoBinding.podExpiryDate.setTextColor(
+                when {
+                    expiresAt != null && ZonedDateTime.now().isAfter(expiresAt) ->
+                        Color.RED
+                    expiresAt != null && ZonedDateTime.now().isAfter(expiresAt.minusHours(4)) ->
+                        Color.YELLOW
+                    else ->
+                        Color.WHITE
+                }
+            )
+
+            podStateManager.alarmType?.let {
+                errors.add(
+                    resourceHelper.gs(
+                        R.string.omnipod_common_pod_status_pod_fault_description,
+                        it.value,
+                        it.toString()
+                    )
+                )
+            }
+
+            // base basal rate
+            podInfoBinding.baseBasalRate.text =
+                if (podStateManager.basalProgram != null && !podStateManager.isSuspended) {
+                    resourceHelper.gs(
+                        R.string.pump_basebasalrate,
+                        omnipodDashPumpPlugin.model()
+                            .determineCorrectBasalSize(podStateManager.basalProgram!!.rateAt(Date()))
+                    )
+                } else {
+                    PLACEHOLDER
+                }
+
+            // total delivered
+            podInfoBinding.totalDelivered.text =
+                if (podStateManager.isActivationCompleted && podStateManager.pulsesDelivered != null) {
+                    resourceHelper.gs(
+                        R.string.omnipod_common_overview_total_delivered_value,
+                        podStateManager.pulsesDelivered!! * 0.05
+                    )
+                } else {
+                    PLACEHOLDER
+                }
+
+            // reservoir
+            if (podStateManager.pulsesRemaining == null) {
+                podInfoBinding.reservoir.text =
+                    resourceHelper.gs(R.string.omnipod_common_overview_reservoir_value_over50)
+                podInfoBinding.reservoir.setTextColor(Color.WHITE)
+            } else {
+                // TODO
+                // val lowReservoirThreshold = (omnipodAlertUtil.lowReservoirAlertUnits
+                //    ?: OmnipodConstants.DEFAULT_MAX_RESERVOIR_ALERT_THRESHOLD).toDouble()
+                val lowReservoirThreshold: Short = 20
+
+                podInfoBinding.reservoir.text = resourceHelper.gs(
+                    R.string.omnipod_common_overview_reservoir_value,
+                    (podStateManager.pulsesRemaining!! * 0.05)
+                )
+                podInfoBinding.reservoir.setTextColor(
+                    if (podStateManager.pulsesRemaining!! < lowReservoirThreshold) {
+                        Color.RED
+                    } else {
+                        Color.WHITE
+                    }
+                )
+            }
+
+            podInfoBinding.podActiveAlerts.text = podStateManager.activeAlerts?.let { it ->
+                it.joinToString(System.lineSeparator()) { t -> translatedActiveAlert(t) }
+            } ?: PLACEHOLDER
+        }
+
+        if (errors.size == 0) {
+            podInfoBinding.errors.text = PLACEHOLDER
+            podInfoBinding.errors.setTextColor(Color.WHITE)
+        } else {
+            podInfoBinding.errors.text = StringUtils.join(errors, System.lineSeparator())
+            podInfoBinding.errors.setTextColor(Color.RED)
+        }
+    }
+
+    private fun translatedActiveAlert(alert: AlertType): String {
+        val id = when (alert) {
+            AlertType.LOW_RESERVOIR ->
+                R.string.omnipod_common_alert_low_reservoir
+            AlertType.EXPIRATION ->
+                R.string.omnipod_common_alert_expiration_advisory
+            AlertType.EXPIRATION_IMMINENT ->
+                R.string.omnipod_common_alert_expiration
+            AlertType.USER_SET_EXPIRATION ->
+                R.string.omnipod_common_alert_expiration_advisory
+            AlertType.AUTO_OFF ->
+                R.string.omnipod_common_alert_shutdown_imminent
+            else ->
+                R.string.omnipod_common_alert_unknown_alert
+        }
+        return resourceHelper.gs(id)
+    }
+
+    private fun updateLastConnection() {
+        if (podStateManager.isUniqueIdSet) {
+            podInfoBinding.lastConnection.text = readableDuration(
+                Duration.ofMillis(
+                    System.currentTimeMillis() -
+                        podStateManager.lastUpdatedSystem,
+
+                )
+            )
+            val lastConnectionColor =
+                if (omnipodDashPumpPlugin.isUnreachableAlertTimeoutExceeded(getPumpUnreachableTimeout().toMillis())) {
+                    Color.RED
+                } else {
+                    Color.WHITE
+                }
+            podInfoBinding.lastConnection.setTextColor(lastConnectionColor)
+        } else {
+            podInfoBinding.lastConnection.setTextColor(Color.WHITE)
+            podInfoBinding.lastConnection.text = PLACEHOLDER
+        }
+    }
+
+    private fun updatePodStatus() {
+        podInfoBinding.podStatus.text = if (podStateManager.activationProgress == ActivationProgress.NOT_STARTED) {
+            resourceHelper.gs(R.string.omnipod_common_pod_status_no_active_pod)
+        } else if (!podStateManager.isActivationCompleted) {
+            if (!podStateManager.isUniqueIdSet) {
+                resourceHelper.gs(R.string.omnipod_common_pod_status_waiting_for_activation)
+            } else {
+                if (podStateManager.activationProgress.isBefore(ActivationProgress.PRIME_COMPLETED)) {
+                    resourceHelper.gs(R.string.omnipod_common_pod_status_waiting_for_activation)
+                } else {
+                    resourceHelper.gs(R.string.omnipod_common_pod_status_waiting_for_cannula_insertion)
+                }
+            }
+        } else {
+            if (podStateManager.podStatus!!.isRunning()) {
+                if (podStateManager.isSuspended) {
+                    resourceHelper.gs(R.string.omnipod_common_pod_status_suspended)
+                } else {
+                    resourceHelper.gs(R.string.omnipod_common_pod_status_running)
+                }
+                /*
+            } else if (podStateManager.podStatus == PodProgressStatus.FAULT_EVENT_OCCURRED) {
+                resourceHelper.gs(R.string.omnipod_common_pod_status_pod_fault)
+            } else if (podStateManager.podStatus == PodProgressStatus.INACTIVE) {
+                resourceHelper.gs(R.string.omnipod_common_pod_status_inactive)
+                 */
+            } else {
+                podStateManager.podStatus.toString()
+            }
+        }
+
+        val podStatusColor = when {
+            !podStateManager.isActivationCompleted || podStateManager.isPodKaput || podStateManager.isSuspended ->
+                Color.RED
+            podStateManager.activeCommand != null ->
+                Color.YELLOW
+            else ->
+                Color.WHITE
+        }
+        podInfoBinding.podStatus.setTextColor(podStatusColor)
+    }
+
+    private fun updateLastBolus() {
+
+        var textColor = Color.WHITE
+        podStateManager.activeCommand?.let {
+            val requestedBolus = it.requestedBolus
+            if (requestedBolus != null) {
+                var text = resourceHelper.gs(
+                    R.string.omnipod_common_overview_last_bolus_value,
+                    omnipodDashPumpPlugin.model().determineCorrectBolusSize(requestedBolus),
+                    resourceHelper.gs(R.string.insulin_unit_shortname),
+                    readableDuration(Duration.ofMillis(SystemClock.elapsedRealtime() - it.createdRealtime))
+                )
+                text += " (uncertain) "
+                textColor = Color.RED
+                podInfoBinding.lastBolus.text = text
+                podInfoBinding.lastBolus.setTextColor(textColor)
+                return
+            }
+        }
+
+        podInfoBinding.lastBolus.setTextColor(textColor)
+        podStateManager.lastBolus?.let {
+            // display requested units if delivery is in progress
+            val bolusSize = it.deliveredUnits()
+                ?: it.requestedUnits
+
+            val text = resourceHelper.gs(
+                R.string.omnipod_common_overview_last_bolus_value,
+                omnipodDashPumpPlugin.model().determineCorrectBolusSize(bolusSize),
+                resourceHelper.gs(R.string.insulin_unit_shortname),
+                readableDuration(Duration.ofMillis(System.currentTimeMillis() - it.startTime))
+            )
+            if (!it.deliveryComplete) {
+                textColor = Color.YELLOW
+            }
+            podInfoBinding.lastBolus.text = text
+            podInfoBinding.lastBolus.setTextColor(textColor)
+        }
+    }
+
+    private fun updateTempBasal() {
+        val tempBasal = podStateManager.tempBasal
+        if (podStateManager.isActivationCompleted && podStateManager.tempBasalActive && tempBasal != null) {
+            val startTime = tempBasal.startTime
+            val rate = tempBasal.rate
+            val duration = tempBasal.durationInMinutes
+
+            val minutesRunning = Duration.ofMillis(System.currentTimeMillis() - startTime).toMinutes()
+
+            podInfoBinding.tempBasal.text = resourceHelper.gs(
+                R.string.omnipod_common_overview_temp_basal_value,
+                rate,
+                dateUtil.timeString(startTime),
+                minutesRunning,
+                duration
+            )
+        } else {
+            podInfoBinding.tempBasal.text = PLACEHOLDER
+        }
+    }
+
+    private fun updateQueueStatus() {
+        if (isQueueEmpty()) {
+            podInfoBinding.queue.visibility = View.GONE
+        } else {
+            podInfoBinding.queue.visibility = View.VISIBLE
+            podInfoBinding.queue.text = commandQueue.spannedStatus().toString()
+        }
+    }
+
+    private fun updatePodActionButtons() {
+        updateRefreshStatusButton()
+        updateResumeDeliveryButton()
+        updateSilenceAlertsButton()
+        updateSuspendDeliveryButton()
+        updateSetTimeButton()
+    }
+
+    private fun disablePodActionButtons() {
+        buttonBinding.buttonSilenceAlerts.isEnabled = false
+        buttonBinding.buttonResumeDelivery.isEnabled = false
+        buttonBinding.buttonSuspendDelivery.isEnabled = false
+        buttonBinding.buttonSetTime.isEnabled = false
+        buttonBinding.buttonRefreshStatus.isEnabled = false
+    }
+
+    private fun updateRefreshStatusButton() {
+        buttonBinding.buttonRefreshStatus.isEnabled =
+            podStateManager.isUniqueIdSet &&
+            isQueueEmpty()
+    }
+
+    private fun updateResumeDeliveryButton() {
+        if (podStateManager.isPodRunning &&
+            (podStateManager.isSuspended || commandQueue.isCustomCommandInQueue(CommandResumeDelivery::class.java))
+        ) {
+            buttonBinding.buttonResumeDelivery.visibility = View.VISIBLE
+            buttonBinding.buttonResumeDelivery.isEnabled = isQueueEmpty()
+        } else {
+            buttonBinding.buttonResumeDelivery.visibility = View.GONE
+        }
+    }
+
+    private fun updateSilenceAlertsButton() {
+        if (!isAutomaticallySilenceAlertsEnabled() &&
+            podStateManager.isPodRunning &&
+            (
+                podStateManager.activeAlerts!!.size > 0 ||
+                    commandQueue.isCustomCommandInQueue(CommandSilenceAlerts::class.java)
+                )
+        ) {
+            buttonBinding.buttonSilenceAlerts.visibility = View.VISIBLE
+            buttonBinding.buttonSilenceAlerts.isEnabled = isQueueEmpty()
+        } else {
+            buttonBinding.buttonSilenceAlerts.visibility = View.GONE
+        }
+    }
+
+    private fun updateSuspendDeliveryButton() {
+        // If the Pod is currently suspended, we show the Resume delivery button instead.
+        if (isSuspendDeliveryButtonEnabled() &&
+            podStateManager.isPodRunning &&
+            (!podStateManager.isSuspended || commandQueue.isCustomCommandInQueue(CommandSuspendDelivery::class.java))
+        ) {
+            buttonBinding.buttonSuspendDelivery.visibility = View.VISIBLE
+            buttonBinding.buttonSuspendDelivery.isEnabled =
+                podStateManager.isPodRunning && !podStateManager.isSuspended && isQueueEmpty()
+        } else {
+            buttonBinding.buttonSuspendDelivery.visibility = View.GONE
+        }
+    }
+
+    private fun updateSetTimeButton() {
+        // TODO
+        /*
+        if (podStateManager.isPodRunning && (podStateManager.timeDeviatesMoreThan(Duration.standardMinutes(5)) || commandQueue.isCustomCommandInQueue(CommandHandleTimeChange::class.java))) {
+            buttonBinding.buttonSetTime.visibility = View.VISIBLE
+            buttonBinding.buttonSetTime.isEnabled = !podStateManager.isSuspended && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
+        } else {
+            buttonBinding.buttonSetTime.visibility = View.GONE
+        }
+         */
+    }
+
+    private fun isAutomaticallySilenceAlertsEnabled(): Boolean {
+        return sp.getBoolean(R.string.omnipod_common_preferences_automatically_silence_alerts, false)
+    }
+
+    private fun isSuspendDeliveryButtonEnabled(): Boolean {
+        return sp.getBoolean(R.string.key_omnipod_common_suspend_delivery_button_enabled, false)
+    }
+
+    private fun displayErrorDialog(title: String, message: String, withSound: Boolean) {
+        context?.let {
+            ErrorHelperActivity.runAlarm(it, message, title, if (withSound) R.raw.boluserror else 0)
+        }
+    }
+
+    private fun displayOkDialog(title: String, message: String) {
+        context?.let {
+            UIRunnable {
+                OKDialog.show(it, title, message, null)
+            }.run()
+        }
+    }
+
+    private fun readableDuration(duration: Duration): String {
+        val hours = duration.toHours().toInt()
+        val minutes = duration.toMinutes().toInt()
+        val seconds = duration.seconds
+        when {
+            seconds < 10 -> {
+                return resourceHelper.gs(R.string.omnipod_common_moments_ago)
+            }
+
+            seconds < 60 -> {
+                return resourceHelper.gs(R.string.omnipod_common_less_than_a_minute_ago)
+            }
+
+            seconds < 60 * 60 -> { // < 1 hour
+                return resourceHelper.gs(
+                    R.string.omnipod_common_time_ago,
+                    resourceHelper.gq(R.plurals.omnipod_common_minutes, minutes, minutes)
+                )
+            }
+
+            seconds < 24 * 60 * 60 -> { // < 1 day
+                val minutesLeft = minutes % 60
+                if (minutesLeft > 0)
+                    return resourceHelper.gs(
+                        R.string.omnipod_common_time_ago,
+                        resourceHelper.gs(
+                            R.string.omnipod_common_composite_time,
+                            resourceHelper.gq(R.plurals.omnipod_common_hours, hours, hours),
+                            resourceHelper.gq(R.plurals.omnipod_common_minutes, minutesLeft, minutesLeft)
+                        )
+                    )
+                return resourceHelper.gs(
+                    R.string.omnipod_common_time_ago,
+                    resourceHelper.gq(R.plurals.omnipod_common_hours, hours, hours)
+                )
+            }
+
+            else -> {
+                val days = hours / 24
+                val hoursLeft = hours % 24
+                if (hoursLeft > 0)
+                    return resourceHelper.gs(
+                        R.string.omnipod_common_time_ago,
+                        resourceHelper.gs(
+                            R.string.omnipod_common_composite_time,
+                            resourceHelper.gq(R.plurals.omnipod_common_days, days, days),
+                            resourceHelper.gq(R.plurals.omnipod_common_hours, hoursLeft, hoursLeft)
+                        )
+                    )
+                return resourceHelper.gs(
+                    R.string.omnipod_common_time_ago,
+                    resourceHelper.gq(R.plurals.omnipod_common_days, days, days)
+                )
+            }
+        }
+    }
+
+    private fun isQueueEmpty(): Boolean {
+        return commandQueue.size() == 0 && commandQueue.performing() == null
+    }
+
+    // FIXME ideally we should just have access to LocalAlertUtils here
+    private fun getPumpUnreachableTimeout(): Duration {
+        return Duration.ofMinutes(
+            sp.getInt(
+                R.string.key_pump_unreachable_threshold_minutes,
+                Constants.DEFAULT_PUMP_UNREACHABLE_THRESHOLD_MINUTES
+            ).toLong()
+        )
+    }
+
+    inner class DisplayResultDialogCallback(
+        private val errorMessagePrefix: String,
+        private val withSoundOnError: Boolean
+    ) : Callback() {
+
+        private var messageOnSuccess: String? = null
+        private var actionOnSuccess: Runnable? = null
+
+        override fun run() {
+            if (result.success) {
+                val messageOnSuccess = this.messageOnSuccess
+                if (messageOnSuccess != null) {
+                    displayOkDialog(resourceHelper.gs(R.string.omnipod_common_confirmation), messageOnSuccess)
+                }
+                actionOnSuccess?.run()
+            } else {
+                displayErrorDialog(
+                    resourceHelper.gs(R.string.omnipod_common_warning),
+                    resourceHelper.gs(
+                        R.string.omnipod_common_two_strings_concatenated_by_colon,
+                        errorMessagePrefix,
+                        result.comment
+                    ),
+                    withSoundOnError
+                )
+            }
+        }
+
+        fun messageOnSuccess(message: String): DisplayResultDialogCallback {
+            messageOnSuccess = message
+            return this
+        }
+
+        fun actionOnSuccess(action: Runnable): DisplayResultDialogCallback {
+            actionOnSuccess = action
+            return this
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt
new file mode 100644
index 0000000000..ad340053bf
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/DashPodActivationWizardActivity.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation
+
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.PodActivationWizardActivity
+
+class DashPodActivationWizardActivity : PodActivationWizardActivity()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt
new file mode 100644
index 0000000000..a6faa187f4
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInitializePodViewModel.kt
@@ -0,0 +1,71 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.action
+
+import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
+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.common.ui.wizard.activation.viewmodel.action.InitializePodViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertTrigger
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.I8n
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.Single
+import io.reactivex.rxkotlin.subscribeBy
+import javax.inject.Inject
+
+class DashInitializePodViewModel @Inject constructor(
+    private val omnipodManager: OmnipodDashManager,
+    injector: HasAndroidInjector,
+    logger: AAPSLogger,
+    private val sp: SP,
+    private val podStateManager: OmnipodDashPodStateManager,
+    private val resourceHelper: ResourceHelper
+) : InitializePodViewModel(injector, logger) {
+    override fun isPodInAlarm(): Boolean = false // TODO
+
+    override fun isPodActivationTimeExceeded(): Boolean = false // TODO
+
+    override fun isPodDeactivatable(): Boolean = true // TODO
+
+    override fun doExecuteAction(): Single<PumpEnactResult> =
+        Single.create { source ->
+            val lowReservoirAlertEnabled = sp.getBoolean(R.string.key_omnipod_common_low_reservoir_alert_enabled, true)
+            val lowReservoirAlertUnits = sp.getInt(R.string.key_omnipod_common_low_reservoir_alert_units, 10)
+            val lowReservoirAlertTrigger = if (lowReservoirAlertEnabled) {
+                AlertTrigger.ReservoirVolumeTrigger((lowReservoirAlertUnits * 10).toShort())
+            } else
+                null
+
+            omnipodManager.activatePodPart1(lowReservoirAlertTrigger).subscribeBy(
+                onNext = { podEvent ->
+                    logger.debug(
+                        LTag.PUMP,
+                        "Received PodEvent in Pod activation part 1: $podEvent"
+                    )
+                },
+                onError = { throwable ->
+                    logger.error(LTag.PUMP, "Error in Pod activation part 1", throwable)
+                    source.onSuccess(
+                        PumpEnactResult(injector)
+                            .success(false)
+                            .comment(I8n.textFromException(throwable, resourceHelper))
+                    )
+                },
+                onComplete = {
+                    logger.debug("Pod activation part 1 completed")
+                    podStateManager.updateLowReservoirAlertSettings(lowReservoirAlertEnabled, lowReservoirAlertUnits)
+                    source.onSuccess(PumpEnactResult(injector).success(true))
+                }
+            )
+        }
+
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_initialize_pod_title
+
+    @StringRes
+    override fun getTextId() = R.string.omnipod_dash_pod_activation_wizard_initialize_pod_text
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
new file mode 100644
index 0000000000..9a3530f443
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
@@ -0,0 +1,112 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.action
+
+import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.interfaces.PumpSync
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.I8n
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.util.mapProfileToBasalProgram
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.Single
+import io.reactivex.rxkotlin.subscribeBy
+import javax.inject.Inject
+
+class DashInsertCannulaViewModel @Inject constructor(
+    private val omnipodManager: OmnipodDashManager,
+    private val profileFunction: ProfileFunction,
+    private val pumpSync: PumpSync,
+    private val podStateManager: OmnipodDashPodStateManager,
+    private val rxBus: RxBusWrapper,
+    private val sp: SP,
+    private val resourceHelper: ResourceHelper,
+
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : InsertCannulaViewModel(injector, logger) {
+
+    override fun isPodInAlarm(): Boolean = false // TODO
+
+    override fun isPodActivationTimeExceeded(): Boolean = false // TODO
+
+    override fun isPodDeactivatable(): Boolean = true // TODO
+
+    override fun doExecuteAction(): Single<PumpEnactResult> = Single.create { source ->
+        val profile = profileFunction.getProfile()
+        if (profile == null) {
+            source.onError(IllegalStateException("No profile set"))
+        } else {
+            val basalProgram = mapProfileToBasalProgram(profile)
+            logger.debug(
+                LTag.PUMPCOMM,
+                "Mapped profile to basal program. profile={}, basalProgram={}",
+                profile,
+                basalProgram
+            )
+            val expirationReminderEnabled = sp.getBoolean(R.string.key_omnipod_common_expiration_reminder_enabled, true)
+            val expirationHours = sp.getInt(R.string.key_omnipod_common_expiration_reminder_hours_before_shutdown, 9)
+
+            val expirationHoursBeforeShutdown = if (expirationReminderEnabled)
+                expirationHours.toLong()
+            else
+                null
+
+            omnipodManager.activatePodPart2(basalProgram, expirationHoursBeforeShutdown).subscribeBy(
+                onNext = { podEvent ->
+                    logger.debug(
+                        LTag.PUMP,
+                        "Received PodEvent in Pod activation part 2: $podEvent"
+                    )
+                },
+                onError = { throwable ->
+                    logger.error(LTag.PUMP, "Error in Pod activation part 2", throwable)
+                    source.onSuccess(PumpEnactResult(injector).success(false).comment(I8n.textFromException(throwable, resourceHelper)))
+                },
+                onComplete = {
+                    logger.debug("Pod activation part 2 completed")
+                    podStateManager.basalProgram = basalProgram
+                    pumpSync.connectNewPump()
+                    pumpSync.insertTherapyEventIfNewWithTimestamp(
+                        timestamp = System.currentTimeMillis(),
+                        type = DetailedBolusInfo.EventType.CANNULA_CHANGE,
+                        pumpType = PumpType.OMNIPOD_DASH,
+                        pumpSerial = podStateManager.uniqueId?.toString() ?: "n/a"
+                    )
+                    pumpSync.insertTherapyEventIfNewWithTimestamp(
+                        timestamp = System.currentTimeMillis(),
+                        type = DetailedBolusInfo.EventType.INSULIN_CHANGE,
+                        pumpType = PumpType.OMNIPOD_DASH,
+                        pumpSerial = podStateManager.uniqueId?.toString() ?: "n/a"
+                    )
+                    pumpSync.syncStopTemporaryBasalWithPumpId(
+                        timestamp = System.currentTimeMillis(),
+                        endPumpId = System.currentTimeMillis(),
+                        pumpType = PumpType.OMNIPOD_DASH,
+                        pumpSerial = podStateManager.uniqueId?.toString() ?: "n/a"
+                    )
+                    podStateManager.updateExpirationAlertSettings(expirationReminderEnabled, expirationHours)
+                    rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_NOT_ATTACHED))
+                    source.onSuccess(PumpEnactResult(injector).success(true))
+                }
+            )
+        }
+    }
+
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_insert_cannula_title
+
+    @StringRes
+    override fun getTextId() = R.string.omnipod_common_pod_activation_wizard_insert_cannula_text
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashAttachPodViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashAttachPodViewModel.kt
new file mode 100644
index 0000000000..36b00e5738
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashAttachPodViewModel.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.info
+
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.AttachPodViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
+import javax.inject.Inject
+
+class DashAttachPodViewModel @Inject constructor() : AttachPodViewModel() {
+
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_attach_pod_title
+
+    @StringRes
+    override fun getTextId() = R.string.omnipod_common_pod_activation_wizard_attach_pod_text
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashPodActivatedViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashPodActivatedViewModel.kt
new file mode 100644
index 0000000000..de6d558662
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashPodActivatedViewModel.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.info
+
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.PodActivatedViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
+import javax.inject.Inject
+
+class DashPodActivatedViewModel @Inject constructor() : PodActivatedViewModel() {
+
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_pod_activated_title
+
+    @StringRes
+    override fun getTextId() = R.string.omnipod_common_pod_activation_wizard_pod_activated_text
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashStartPodActivationViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashStartPodActivationViewModel.kt
new file mode 100644
index 0000000000..1bb7ae1a22
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/info/DashStartPodActivationViewModel.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.info
+
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.info.StartPodActivationViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
+import javax.inject.Inject
+
+class DashStartPodActivationViewModel @Inject constructor() : StartPodActivationViewModel() {
+
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_start_pod_activation_title
+
+    @StringRes
+    override fun getTextId(): Int = R.string.omnipod_dash_pod_activation_wizard_start_pod_activation_text
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/DashPodDeactivationWizardActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/DashPodDeactivationWizardActivity.kt
new file mode 100644
index 0000000000..adce6f5806
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/DashPodDeactivationWizardActivity.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation
+
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.PodDeactivationWizardActivity
+
+class DashPodDeactivationWizardActivity : PodDeactivationWizardActivity()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt
new file mode 100644
index 0000000000..c3507e5f1d
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/action/DashDeactivatePodViewModel.kt
@@ -0,0 +1,48 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.action
+
+import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.omnipod.common.R
+import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandDeactivatePod
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.action.DeactivatePodViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
+import info.nightscout.androidaps.queue.Callback
+import io.reactivex.Single
+import javax.inject.Inject
+
+class DashDeactivatePodViewModel @Inject constructor(
+    private val podStateManager: OmnipodDashPodStateManager,
+    private val commandQueueProvider: CommandQueueProvider,
+    private val rxBus: RxBusWrapper,
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : DeactivatePodViewModel(injector, logger) {
+
+    override fun doExecuteAction(): Single<PumpEnactResult> = Single.create { source ->
+        commandQueueProvider.customCommand(
+            CommandDeactivatePod(),
+            object : Callback() {
+                override fun run() {
+                    source.onSuccess(result)
+                }
+            }
+        )
+    }
+
+    override fun discardPod() {
+        podStateManager.reset()
+        rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_FAULT))
+    }
+
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_common_pod_deactivation_wizard_deactivating_pod_title
+
+    @StringRes
+    override fun getTextId(): Int = R.string.omnipod_common_pod_deactivation_wizard_deactivating_pod_text
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDeactivatedViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDeactivatedViewModel.kt
new file mode 100644
index 0000000000..a848db0bd6
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDeactivatedViewModel.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.info
+
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.info.PodDeactivatedViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
+import javax.inject.Inject
+
+class DashPodDeactivatedViewModel @Inject constructor() : PodDeactivatedViewModel() {
+
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_common_pod_deactivation_wizard_pod_deactivated_title
+
+    @StringRes
+    override fun getTextId() = R.string.omnipod_common_pod_deactivation_wizard_pod_deactivated_text
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDiscardedViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDiscardedViewModel.kt
new file mode 100644
index 0000000000..a7cce31cce
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashPodDiscardedViewModel.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.info
+
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.info.PodDiscardedViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
+import javax.inject.Inject
+
+class DashPodDiscardedViewModel @Inject constructor() : PodDiscardedViewModel() {
+
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_common_pod_deactivation_wizard_pod_discarded_title
+
+    @StringRes
+    override fun getTextId() = R.string.omnipod_common_pod_deactivation_wizard_pod_discarded_text
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashStartPodDeactivationViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashStartPodDeactivationViewModel.kt
new file mode 100644
index 0000000000..1f929af9ae
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/deactivation/viewmodel/info/DashStartPodDeactivationViewModel.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.viewmodel.info
+
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.info.StartPodDeactivationViewModel
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
+import javax.inject.Inject
+
+class DashStartPodDeactivationViewModel @Inject constructor() : StartPodDeactivationViewModel() {
+
+    @StringRes
+    override fun getTitleId(): Int = R.string.omnipod_common_pod_deactivation_wizard_start_pod_deactivation_title
+
+    @StringRes
+    override fun getTextId() = R.string.omnipod_common_pod_deactivation_wizard_start_pod_deactivation_text
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt
new file mode 100644
index 0000000000..1c2d69e41e
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/Functions.kt
@@ -0,0 +1,62 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.util
+
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram
+import java.util.*
+import kotlin.math.roundToInt
+
+fun mapProfileToBasalProgram(profile: Profile): BasalProgram {
+    val basalValues = profile.getBasalValues()
+    if (basalValues.isEmpty()) {
+        throw IllegalArgumentException("Basal values should contain values")
+    }
+
+    val entries: MutableList<BasalProgram.Segment> = ArrayList()
+
+    var previousBasalValue: Profile.ProfileValue? = null
+
+    for (basalValue in basalValues) {
+        if (basalValue.timeAsSeconds >= 86_400) {
+            throw IllegalArgumentException("Basal segment start time can not be greater than 86400")
+        }
+        if (basalValue.timeAsSeconds < 0) {
+            throw IllegalArgumentException("Basal segment start time can not be less than 0")
+        }
+        if (basalValue.timeAsSeconds % 1_800 != 0) {
+            throw IllegalArgumentException("Basal segment time should be dividable by 30 minutes")
+        }
+
+        val startSlotIndex = (basalValue.timeAsSeconds / 1800).toShort()
+
+        if (previousBasalValue != null) {
+            entries.add(
+                BasalProgram.Segment(
+                    (previousBasalValue.timeAsSeconds / 1800).toShort(),
+                    startSlotIndex,
+                    (PumpType.OMNIPOD_DASH.determineCorrectBasalSize(previousBasalValue.value) * 100).roundToInt()
+                )
+            )
+        }
+
+        if (entries.size == 0 && basalValue.timeAsSeconds != 0) {
+            throw IllegalArgumentException("First basal segment start time should be 0")
+        }
+
+        if (entries.size > 0 && entries[entries.size - 1].endSlotIndex != startSlotIndex) {
+            throw IllegalArgumentException("Illegal start time for basal segment: does not match previous previous segment's end time")
+        }
+
+        previousBasalValue = basalValue
+    }
+
+    entries.add(
+        BasalProgram.Segment(
+            (previousBasalValue!!.timeAsSeconds / 1800).toShort(),
+            48,
+            (PumpType.OMNIPOD_DASH.determineCorrectBasalSize(previousBasalValue.value) * 100).roundToInt()
+        )
+    )
+
+    return BasalProgram(entries)
+}
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/I8n.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/I8n.kt
new file mode 100644
index 0000000000..b34fbf0b1a
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/I8n.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.util
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.FailedToConnectException
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ScanException
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ScanFailFoundTooManyException
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+
+class I8n {
+    companion object {
+        fun textFromException(exception: Throwable, rs: ResourceHelper): String {
+            return when (exception) {
+                is FailedToConnectException -> rs.gs(R.string.omnipod_dash_failed_to_connect)
+                is ScanFailFoundTooManyException -> rs.gs(R.string.omnipod_dash_found_too_many_pods)
+                is ScanException -> rs.gs(R.string.omnipod_dash_scan_failed)
+                else ->
+                    rs.gs(R.string.omnipod_dash_generic_error, exception.toString())
+            }
+        }
+    }
+}
diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml b/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml
index ae28ff9884..04822f68d3 100644
--- a/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml
+++ b/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml
@@ -13,7 +13,7 @@
             android:gravity="end"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
-            android:text="@string/omnipod_dash_bluetooth_address"
+            android:text="@string/omnipod_dash_overview_bluetooth_address"
             android:textSize="14sp" />
 
         <TextView
@@ -29,7 +29,7 @@
 
 
         <TextView
-            android:id="@+id/omnipod_dash_bluetooth_status"
+            android:id="@+id/omnipod_dash_bluetooth_address"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -37,49 +37,125 @@
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
             android:textSize="14sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1.5"
-                android:gravity="end"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:text="@string/omnipod_dash_bluetooth_status"
-                android:textSize="14sp" />
-
-            <TextView
-                android:layout_width="5dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:gravity="center_horizontal"
-                android:paddingStart="2dp"
-                android:paddingEnd="2dp"
-                android:text=":"
-                android:textSize="14sp"
-                tools:ignore="HardcodedText" />
-
-            <com.joanzapata.iconify.widget.IconTextView
-                android:id="@+id/omnipod_dash_bluetooth_address"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="start"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:text="{fa-bluetooth-b} "
-                android:textSize="14sp"
-                tools:ignore="HardcodedText" />
-        </LinearLayout>
-
-
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1.5"
+            android:gravity="end"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:text="@string/omnipod_dash_overview_bluetooth_status"
+            android:textSize="14sp" />
+
+        <TextView
+            android:layout_width="5dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:gravity="center_horizontal"
+            android:paddingStart="2dp"
+            android:paddingEnd="2dp"
+            android:text=":"
+            android:textSize="14sp"
+            tools:ignore="HardcodedText" />
+
+        <com.joanzapata.iconify.widget.IconTextView
+            android:id="@+id/omnipod_dash_bluetooth_status"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="start"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:textSize="14sp"
+            tools:ignore="HardcodedText" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/connectionQuality"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:visibility="gone">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1.5"
+            android:gravity="end"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:text="@string/omnipod_dash_overview_bluetooth_connection_quality"
+            android:textSize="14sp" />
+
+        <TextView
+            android:layout_width="5dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:gravity="center_horizontal"
+            android:paddingStart="2dp"
+            android:paddingEnd="2dp"
+            android:text=":"
+            android:textSize="14sp"
+            tools:ignore="HardcodedText" />
+
+        <com.joanzapata.iconify.widget.IconTextView
+            android:id="@+id/omnipod_dash_bluetooth_connection_quality"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="start"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:textSize="14sp"
+            tools:ignore="HardcodedText" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/deliveryStatus"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:visibility="gone">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1.5"
+            android:gravity="end"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:text="@string/omnipod_dash_overview_delivery_status"
+            android:textSize="14sp" />
+
+        <TextView
+            android:layout_width="5dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:gravity="center_horizontal"
+            android:paddingStart="2dp"
+            android:paddingEnd="2dp"
+            android:text=":"
+            android:textSize="14sp"
+            tools:ignore="HardcodedText" />
+
+        <com.joanzapata.iconify.widget.IconTextView
+            android:id="@+id/omnipod_dash_delivery_status"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="start"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:textSize="14sp"
+            tools:ignore="HardcodedText" />
+    </LinearLayout>
     <View
         android:layout_width="fill_parent"
         android:layout_height="2dip"
diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml b/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml
new file mode 100644
index 0000000000..4ea9533d45
--- /dev/null
+++ b/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/omnipod_dash_pod_management"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".ui.DashPodManagementActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginRight="10dp"
+
+            android:gravity="center"
+            android:text="@string/omnipod_common_pod_management_title"
+            android:textAlignment="center"
+            android:textSize="12pt"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
+            android:text="@string/omnipod_common_pod_management_heading_actions" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+
+            android:id="@+id/Actions_Row_1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/Actions_Row_1_horizontal_guideline"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0" />
+
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
+                android:id="@+id/button_activate_pod"
+                style="?android:attr/buttonStyle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:drawableTop="@drawable/ic_pod_management_activate_pod"
+                android:text="@string/omnipod_common_pod_management_button_activate_pod"
+                android:textAllCaps="false"
+                android:visibility="visible"
+                app:layout_constrainedHeight="@+id/Actions_Row_1_horizontal_guideline"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@+id/Actions_Col_1_Row_1_vertical_guideline"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/Actions_Col_1_Row_1_vertical_guideline"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.5" />
+
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
+                android:id="@+id/button_deactivate_pod"
+                style="?android:attr/buttonStyle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:drawableTop="@drawable/ic_pod_management_deactivate_pod"
+                android:text="@string/omnipod_common_pod_management_button_deactivate_pod"
+                android:textAllCaps="false"
+                android:visibility="visible"
+                app:layout_constrainedHeight="@+id/Actions_Row_1_horizontal_guideline"
+                app:layout_constraintLeft_toRightOf="@+id/Actions_Col_1_Row_1_vertical_guideline"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+
+            android:id="@+id/Actions_Row_2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/Actions_Row_2_horizontal_guideline"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0" />
+
+            <info.nightscout.androidaps.utils.ui.SingleClickButton
+                android:id="@+id/button_play_test_beep"
+                style="?android:attr/buttonStyle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:drawableTop="@drawable/ic_pod_management_play_test_beep"
+                android:text="@string/omnipod_common_pod_management_button_play_test_beep"
+                android:textAllCaps="false"
+                android:visibility="visible"
+                app:layout_constrainedHeight="@+id/Actions_Row_2_horizontal_guideline"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@+id/Actions_Col_1_Row_2_vertical_guideline"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/Actions_Col_1_Row_2_vertical_guideline"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.5" />
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/button_discard_pod"
+                style="?android:attr/buttonStyle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:drawableTop="@drawable/ic_pod_management_discard_pod"
+                android:text="@string/omnipod_common_pod_management_button_discard_pod"
+                android:textAllCaps="false"
+                android:visibility="gone"
+                app:layout_constrainedHeight="@+id/Actions_Row_2_horizontal_guideline"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintLeft_toRightOf="@+id/Actions_Col_1_Row_2_vertical_guideline"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/omnipod-dash/src/main/res/values-af-rZA/strings.xml b/omnipod-dash/src/main/res/values-af-rZA/strings.xml
index c690568d07..0d89375603 100644
--- a/omnipod-dash/src/main/res/values-af-rZA/strings.xml
+++ b/omnipod-dash/src/main/res/values-af-rZA/strings.xml
@@ -3,4 +3,6 @@
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-bg-rBG/strings.xml b/omnipod-dash/src/main/res/values-bg-rBG/strings.xml
index c690568d07..0d89375603 100644
--- a/omnipod-dash/src/main/res/values-bg-rBG/strings.xml
+++ b/omnipod-dash/src/main/res/values-bg-rBG/strings.xml
@@ -3,4 +3,6 @@
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-ca-rES/strings.xml b/omnipod-dash/src/main/res/values-ca-rES/strings.xml
index c690568d07..0d89375603 100644
--- a/omnipod-dash/src/main/res/values-ca-rES/strings.xml
+++ b/omnipod-dash/src/main/res/values-ca-rES/strings.xml
@@ -3,4 +3,6 @@
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-cs-rCZ/strings.xml b/omnipod-dash/src/main/res/values-cs-rCZ/strings.xml
index 059619b513..2aa2949dc0 100644
--- a/omnipod-dash/src/main/res/values-cs-rCZ/strings.xml
+++ b/omnipod-dash/src/main/res/values-cs-rCZ/strings.xml
@@ -4,6 +4,18 @@
     <string name="omnipod_dash_pump_description">Integrace pumpy pro Omnipod Dash (nový model s funkcí Bluetooth a modrým krytem).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
-    <string name="omnipod_dash_bluetooth_status">Stav Bluetooth</string>
-    <string name="omnipod_dash_bluetooth_address">Adresa Bluetooth</string>
+    <string name="omnipod_dash_overview_bluetooth_status">Stav Bluetooth</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Adresa Bluetooth</string>
+    <string name="omnipod_dash_overview_firmware_version_value">Firmware %1$s / Bluetooth %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">Kvalita připojení</string>
+    <string name="omnipod_dash_overview_delivery_status">Stav doručení</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Naplňte nový Pod dostatkem inzulínu na 3 dny.\n\nPoslouchejte, zda Pod během procesu plnění dvakrát zapípá. Tento zvukový signál značí, že bylo naplněno minimální množství 85 U. Ujistěte se, že stříkačka je zcela vyprázdněná, a to i poté, co uslyšíte dvě pípnutí.\n\nPo naplnění Podu prosím stiskněte tlačítko <b>Další</b>.\n\n<b>Poznámka:</b> prozatím nesundávejte kryt jehly Podu.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Systém se snaží spárovat s novým Podem a naplnit ho.\n\nJakmile bude inicializační proces úspěšně dokončen, můžete stisknout tlačítko <b>Další</b>.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Zvuk oznámení při pozastaveném podávání povolen</string>
+    <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Nepodařilo se připojit k Podu</string>
+    <string name="omnipod_dash_found_too_many_pods">Nalezeno příliš mnoho Podů k aktivaci</string>
+    <string name="omnipod_dash_scan_failed">Nelze najít dostupný Pod k aktivaci</string>
+    <string name="omnipod_dash_generic_error">Obecná chyba: %1$s</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-da-rDK/strings.xml b/omnipod-dash/src/main/res/values-da-rDK/strings.xml
index c690568d07..0d89375603 100644
--- a/omnipod-dash/src/main/res/values-da-rDK/strings.xml
+++ b/omnipod-dash/src/main/res/values-da-rDK/strings.xml
@@ -3,4 +3,6 @@
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-de-rDE/strings.xml b/omnipod-dash/src/main/res/values-de-rDE/strings.xml
index c690568d07..7778e692ff 100644
--- a/omnipod-dash/src/main/res/values-de-rDE/strings.xml
+++ b/omnipod-dash/src/main/res/values-de-rDE/strings.xml
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Dash - Description -->
+    <string name="omnipod_dash_pump_description">Pumpen-Integration für Omnipod Dash (das neue, bluetooth-fähige Modell mit blauer Nadelkappe).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <string name="omnipod_dash_overview_bluetooth_status">Bluetooth-Status</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Bluetooth-Adresse</string>
+    <string name="omnipod_dash_overview_firmware_version_value">Firmware %1$s / Bluetooth %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">Verbindungsqualität</string>
+    <string name="omnipod_dash_overview_delivery_status">Übermittlungsstatus</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Befülle den neuen Pod mit ausreichend Insulin für 3 Tage.\n\nAchte auch zwei Pieptöne vom Pod während des Füllens. Diese zeigen an, dass der Pod mit der Mindestmenge von 80 IE befüllt wurde. Leere die Spritze komplett, auch wenn Du die beiden Pieptöne gehört hast.\n\nKlicke <b>Weiter</b> nachdem Du den Pod befüllt hast.\n\n<b>Hinweis:</b> Entferne den Nadelschutz des Pods noch nicht.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Versuche Verbindung mit dem neuen Pod herzustellen und ihn zu befüllen.\n\nNachdem der Initalisierungsprozess erfolgreich beendet wurde, kannst Du auf <b>Weiter</b> klicken.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Ton bei unterbrochener Abgabe aktiviert</string>
+    <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Verbindung mit Pod fehlgeschlagen</string>
+    <string name="omnipod_dash_found_too_many_pods">Zu viele Pods für die Aktivierung gefunden</string>
+    <string name="omnipod_dash_scan_failed">Konnte keinen verfügbaren Pod für die Aktivierung finden</string>
+    <string name="omnipod_dash_generic_error">Allgemeiner Fehler: %1$s</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-el-rGR/strings.xml b/omnipod-dash/src/main/res/values-el-rGR/strings.xml
index c690568d07..0d89375603 100644
--- a/omnipod-dash/src/main/res/values-el-rGR/strings.xml
+++ b/omnipod-dash/src/main/res/values-el-rGR/strings.xml
@@ -3,4 +3,6 @@
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-es-rES/strings.xml b/omnipod-dash/src/main/res/values-es-rES/strings.xml
index c690568d07..0d89375603 100644
--- a/omnipod-dash/src/main/res/values-es-rES/strings.xml
+++ b/omnipod-dash/src/main/res/values-es-rES/strings.xml
@@ -3,4 +3,6 @@
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-fr-rFR/strings.xml b/omnipod-dash/src/main/res/values-fr-rFR/strings.xml
index 5c3615e060..5cc149124d 100644
--- a/omnipod-dash/src/main/res/values-fr-rFR/strings.xml
+++ b/omnipod-dash/src/main/res/values-fr-rFR/strings.xml
@@ -4,6 +4,6 @@
     <string name="omnipod_dash_pump_description">Intégration de la pompe Omnipod Dash (le nouveau modèle Bluetooth, avec un bouchon d\'aiguille bleue).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
-    <string name="omnipod_dash_bluetooth_status">État Bluetooth</string>
-    <string name="omnipod_dash_bluetooth_address">Adresse Bluetooth</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-ga-rIE/strings.xml b/omnipod-dash/src/main/res/values-ga-rIE/strings.xml
index c690568d07..0d89375603 100644
--- a/omnipod-dash/src/main/res/values-ga-rIE/strings.xml
+++ b/omnipod-dash/src/main/res/values-ga-rIE/strings.xml
@@ -3,4 +3,6 @@
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-hr-rHR/strings.xml b/omnipod-dash/src/main/res/values-hr-rHR/strings.xml
index c690568d07..0d89375603 100644
--- a/omnipod-dash/src/main/res/values-hr-rHR/strings.xml
+++ b/omnipod-dash/src/main/res/values-hr-rHR/strings.xml
@@ -3,4 +3,6 @@
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-it-rIT/strings.xml b/omnipod-dash/src/main/res/values-it-rIT/strings.xml
index 85381120db..5f55d28285 100644
--- a/omnipod-dash/src/main/res/values-it-rIT/strings.xml
+++ b/omnipod-dash/src/main/res/values-it-rIT/strings.xml
@@ -4,6 +4,6 @@
     <string name="omnipod_dash_pump_description">Integrazione del microinfusore Omnipod Dash (il nuovo modello, abilitato al Bluetooth e con la protezione ago di colore blu).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
-    <string name="omnipod_dash_bluetooth_status">Stato bluetooth</string>
-    <string name="omnipod_dash_bluetooth_address">Indirizzo bluetooth</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-iw-rIL/strings.xml b/omnipod-dash/src/main/res/values-iw-rIL/strings.xml
index 156a8b3dd4..2fb153f0c6 100644
--- a/omnipod-dash/src/main/res/values-iw-rIL/strings.xml
+++ b/omnipod-dash/src/main/res/values-iw-rIL/strings.xml
@@ -4,6 +4,18 @@
     <string name="omnipod_dash_pump_description">חיבור משאבת Omnipod Dash (הדגם החדש, התומך בבלוטות\' ובעל מכסה מחט כחול).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
-    <string name="omnipod_dash_bluetooth_status">מצב בלוטות\'</string>
-    <string name="omnipod_dash_bluetooth_address">כתובת בלוטות\'</string>
+    <string name="omnipod_dash_overview_bluetooth_status">מצב בלוטות\'</string>
+    <string name="omnipod_dash_overview_bluetooth_address">כתובת בלוטות\'</string>
+    <string name="omnipod_dash_overview_firmware_version_value">קושחה%1$s \\ בלוטות\' %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">איכות החיבור</string>
+    <string name="omnipod_dash_overview_delivery_status">סטטוס הזרקה</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">מלאו פוד חדש עם מספיק אינסולין לשלושה ימים.\n\nהקשיבו לשני צפצופים מהפוד במהלך המילוי. הם מציינים שהכמות המינימלית של 80 יחידות הוכנסה. הקפידו לרוקן לחלוטין את מזרק המילוי, גם לאחר שמיעת שני הצפצופים.\n\nלאחר מילוי הפוד, יש ללחוץ <b>הבא</b>.\n\n<b>הערה:</b> נא לא להסיר עדיין את מכסה המחט.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">מנסה לצמד את הפוד החדש ולתחל אותו.\n\nכאשר תהליך התחול יסתיים בהצלחה, תוכלו ללחוץ על <b>הבא</b>.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">השמע כשהתראת הפסקת ההזרקה מאופשרת</string>
+    <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">הקישור לפוד נכשל</string>
+    <string name="omnipod_dash_found_too_many_pods">נמצאו יותר מדי פודים להפעלה</string>
+    <string name="omnipod_dash_scan_failed">לא נמצא פוד זמין להפעלה</string>
+    <string name="omnipod_dash_generic_error">שגיאה גנרית: %1$s</string>
 </resources>
diff --git a/omnipod-dash/src/main/res/values-ko-rKR/strings.xml b/omnipod-dash/src/main/res/values-ko-rKR/strings.xml
index c690568d07..f01c43835c 100644
--- a/omnipod-dash/src/main/res/values-ko-rKR/strings.xml
+++ b/omnipod-dash/src/main/res/values-ko-rKR/strings.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Dash - Description -->
+    <string name="omnipod_dash_pump_description">옴니파드 대쉬(파란색 바늘 캡이 달린 새로운 블루투스 연결 모델)를 위한 펌프 통합</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-lt-rLT/strings.xml b/omnipod-dash/src/main/res/values-lt-rLT/strings.xml
index 582abcf0f6..a73633ba7b 100644
--- a/omnipod-dash/src/main/res/values-lt-rLT/strings.xml
+++ b/omnipod-dash/src/main/res/values-lt-rLT/strings.xml
@@ -4,6 +4,6 @@
     <string name="omnipod_dash_pump_description">Pompos integracija Omnipod Dash (naujas, Bluetooth palaikantis modelis su mėlynu adatos dangteliu).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
-    <string name="omnipod_dash_bluetooth_status">Bluetooth statusas</string>
-    <string name="omnipod_dash_bluetooth_address">Bluetooth adresas</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-nl-rNL/strings.xml b/omnipod-dash/src/main/res/values-nl-rNL/strings.xml
index e78d29a52f..1cc58e3cd8 100644
--- a/omnipod-dash/src/main/res/values-nl-rNL/strings.xml
+++ b/omnipod-dash/src/main/res/values-nl-rNL/strings.xml
@@ -4,6 +4,6 @@
     <string name="omnipod_dash_pump_description">Pomp integratie voor Omnipod Dash (het nieuwe, Bluetooth-enabled model met een blauwe naalddop).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
-    <string name="omnipod_dash_bluetooth_status">Bluetooth Status</string>
-    <string name="omnipod_dash_bluetooth_address">Bluetooth adres</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-no-rNO/strings.xml b/omnipod-dash/src/main/res/values-no-rNO/strings.xml
index 7e3cb97ee9..a8731fa961 100644
--- a/omnipod-dash/src/main/res/values-no-rNO/strings.xml
+++ b/omnipod-dash/src/main/res/values-no-rNO/strings.xml
@@ -4,6 +4,6 @@
     <string name="omnipod_dash_pump_description">Pumpeintegrering for Omnipod Dash (den nye, Bluetooth-aktiverte modellen med en blå kanylehette).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
-    <string name="omnipod_dash_bluetooth_status">Bluetooth status</string>
-    <string name="omnipod_dash_bluetooth_address">Bluetooth adresse</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-pl-rPL/strings.xml b/omnipod-dash/src/main/res/values-pl-rPL/strings.xml
index c690568d07..0d89375603 100644
--- a/omnipod-dash/src/main/res/values-pl-rPL/strings.xml
+++ b/omnipod-dash/src/main/res/values-pl-rPL/strings.xml
@@ -3,4 +3,6 @@
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-pt-rBR/strings.xml b/omnipod-dash/src/main/res/values-pt-rBR/strings.xml
index c690568d07..0d89375603 100644
--- a/omnipod-dash/src/main/res/values-pt-rBR/strings.xml
+++ b/omnipod-dash/src/main/res/values-pt-rBR/strings.xml
@@ -3,4 +3,6 @@
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-pt-rPT/strings.xml b/omnipod-dash/src/main/res/values-pt-rPT/strings.xml
index 76989f77ef..d01a3acdfe 100644
--- a/omnipod-dash/src/main/res/values-pt-rPT/strings.xml
+++ b/omnipod-dash/src/main/res/values-pt-rPT/strings.xml
@@ -4,6 +4,6 @@
     <string name="omnipod_dash_pump_description">Integração para a Omnipod Dash (o novo modelo, habilitado para o Bluetooth com uma proteção de agulha azul).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
-    <string name="omnipod_dash_bluetooth_status">Estado do Bluetooth</string>
-    <string name="omnipod_dash_bluetooth_address">Endereço Bluetooth</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-ro-rRO/strings.xml b/omnipod-dash/src/main/res/values-ro-rRO/strings.xml
index 34e36456e7..003e693422 100644
--- a/omnipod-dash/src/main/res/values-ro-rRO/strings.xml
+++ b/omnipod-dash/src/main/res/values-ro-rRO/strings.xml
@@ -4,6 +4,6 @@
     <string name="omnipod_dash_pump_description">Integrarea pompei pentru Omnipod Dash (modelul nou, cu Bluetooth, cu un capac de ac albastru).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
-    <string name="omnipod_dash_bluetooth_status">Stare Bluetooth</string>
-    <string name="omnipod_dash_bluetooth_address">Adresă Bluetooth</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-ru-rRU/strings.xml b/omnipod-dash/src/main/res/values-ru-rRU/strings.xml
index a53ecbb853..14a4ba1b3b 100644
--- a/omnipod-dash/src/main/res/values-ru-rRU/strings.xml
+++ b/omnipod-dash/src/main/res/values-ru-rRU/strings.xml
@@ -4,6 +4,6 @@
     <string name="omnipod_dash_pump_description">Интеграция с помпой Omnipod Dash (новая модель с поддержкой Bluetooth, с синим колпачком на игле).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
-    <string name="omnipod_dash_bluetooth_status">Статус Bluetooth</string>
-    <string name="omnipod_dash_bluetooth_address">Адрес Bluetooth</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-sk-rSK/strings.xml b/omnipod-dash/src/main/res/values-sk-rSK/strings.xml
index d12d39dc7d..029f44a38e 100644
--- a/omnipod-dash/src/main/res/values-sk-rSK/strings.xml
+++ b/omnipod-dash/src/main/res/values-sk-rSK/strings.xml
@@ -4,6 +4,6 @@
     <string name="omnipod_dash_pump_description">Integrácia pumpy pre Omnipod Dash (nový model s funkciou Bluetooth a modrým krytom).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
-    <string name="omnipod_dash_bluetooth_status">Stav Bluetooth</string>
-    <string name="omnipod_dash_bluetooth_address">Adresa Bluetooth</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-sl-rSI/strings.xml b/omnipod-dash/src/main/res/values-sl-rSI/strings.xml
index c690568d07..0d89375603 100644
--- a/omnipod-dash/src/main/res/values-sl-rSI/strings.xml
+++ b/omnipod-dash/src/main/res/values-sl-rSI/strings.xml
@@ -3,4 +3,6 @@
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-sv-rSE/strings.xml b/omnipod-dash/src/main/res/values-sv-rSE/strings.xml
index 16a67fc776..3c7c463c40 100644
--- a/omnipod-dash/src/main/res/values-sv-rSE/strings.xml
+++ b/omnipod-dash/src/main/res/values-sv-rSE/strings.xml
@@ -4,6 +4,6 @@
     <string name="omnipod_dash_pump_description">Pumpintegration för Omnipod Dash (den nya, Bluetooth-aktiverade modellen med blå nålskydd).</string>
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
-    <string name="omnipod_dash_bluetooth_status">Bluetoothstatus</string>
-    <string name="omnipod_dash_bluetooth_address">Bluetooth-adress</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-ta-rIN/strings.xml b/omnipod-dash/src/main/res/values-ta-rIN/strings.xml
index c690568d07..0d89375603 100644
--- a/omnipod-dash/src/main/res/values-ta-rIN/strings.xml
+++ b/omnipod-dash/src/main/res/values-ta-rIN/strings.xml
@@ -3,4 +3,6 @@
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-tr-rTR/strings.xml b/omnipod-dash/src/main/res/values-tr-rTR/strings.xml
index c690568d07..0d89375603 100644
--- a/omnipod-dash/src/main/res/values-tr-rTR/strings.xml
+++ b/omnipod-dash/src/main/res/values-tr-rTR/strings.xml
@@ -3,4 +3,6 @@
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values-zh-rCN/strings.xml b/omnipod-dash/src/main/res/values-zh-rCN/strings.xml
index c690568d07..0d89375603 100644
--- a/omnipod-dash/src/main/res/values-zh-rCN/strings.xml
+++ b/omnipod-dash/src/main/res/values-zh-rCN/strings.xml
@@ -3,4 +3,6 @@
     <!-- Omnipod Dash - Description -->
     <!-- Omnipod Dash - Keys -->
     <!-- Omnipod Dash - Overview -->
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
 </resources>
diff --git a/omnipod-dash/src/main/res/values/strings.xml b/omnipod-dash/src/main/res/values/strings.xml
index a9ead9ff3a..78482e02e7 100644
--- a/omnipod-dash/src/main/res/values/strings.xml
+++ b/omnipod-dash/src/main/res/values/strings.xml
@@ -9,8 +9,25 @@
     <string name="key_omnipod_dash_pod_state" translatable="false">AAPS.OmnipodDash.pod_state</string>
 
     <!-- Omnipod Dash - Overview -->
-    <string name="omnipod_dash_bluetooth_status">Bluetooth Status</string>
-    <string name="omnipod_dash_bluetooth_address">Bluetooth Address</string>
+    <string name="omnipod_dash_overview_bluetooth_status">Bluetooth Status</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Bluetooth Address</string>
+    <string name="omnipod_dash_overview_firmware_version_value">Firmware %1$s / Bluetooth %2$s</string>
+    <string name="omnipod_dash_overview_bluetooth_connection_quality">Connection quality</string>
+    <string name="omnipod_dash_overview_delivery_status">Delivery Status</string>
+
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Fill a 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 80U 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_dash_pod_activation_wizard_initialize_pod_text">Trying to pair with the new Pod and prime it.\n\nWhen the initialization process has successfully been completed, you can press <b>Next</b>.</string>
+
     <string name="key_omnipod_common_preferences_category_confirmation_beeps" translatable="false">omnipod_common_preferences_category_confirmation</string>
     <string name="key_common_preferences_category_other_settings" translatable="false">common_preferences_category_other</string>
-</resources>
\ No newline at end of file
+    <string name="key_omnipod_common_notification_delivery_suspended_sound_enabled" translatable="false">AAPS.Omnipod.notification_delivery_suspended_sound_enabled</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Sound when delivery suspended notification enabled</string>
+
+    <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Failed to connect to pod</string>
+    <string name="omnipod_dash_found_too_many_pods">Found too many pods for activation</string>
+    <string name="omnipod_dash_scan_failed">Could not find an available pod for activation</string>
+    <string name="omnipod_dash_generic_error">Generic error: %1$s</string>
+</resources>
diff --git a/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml b/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml
index 26d400e602..a5aca72dab 100644
--- a/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml
+++ b/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml
@@ -65,11 +65,38 @@
             validate:maxNumber="50"
             validate:minNumber="5"
             validate:testType="numericRange" />
+        <!--
+                <SwitchPreference
+                    android:defaultValue="false"
+                    android:key="@string/key_omnipod_common_automatically_silence_alerts_enabled"
+                    android:title="@string/omnipod_common_preferences_automatically_silence_alerts" />
+        -->
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="@string/key_omnipod_common_preferences_category_notifications_settings"
+        android:title="@string/omnipod_common_preferences_category_notifications"
+        app:initialExpandedChildrenCount="0">
 
         <SwitchPreference
             android:defaultValue="false"
-            android:key="@string/key_omnipod_common_automatically_silence_alerts_enabled"
-            android:title="@string/omnipod_common_preferences_automatically_silence_alerts" />
+            android:key="@string/key_omnipod_common_notification_uncertain_tbr_sound_enabled"
+            android:title="@string/omnipod_common_preferences_notification_uncertain_tbr_sound_enabled" />
+
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_omnipod_common_notification_uncertain_smb_sound_enabled"
+            android:title="@string/omnipod_common_preferences_notification_uncertain_smb_sound_enabled" />
+
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_omnipod_common_notification_uncertain_bolus_sound_enabled"
+            android:title="@string/omnipod_common_preferences_notification_uncertain_bolus_sound_enabled" />
+
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_omnipod_common_notification_delivery_suspended_sound_enabled"
+            android:title="@string/omnipod_common_preferences_notification_delivery_suspended_sound_enabled" />
 
     </PreferenceCategory>
 
@@ -82,12 +109,12 @@
             android:defaultValue="false"
             android:key="@string/key_omnipod_common_suspend_delivery_button_enabled"
             android:title="@string/omnipod_common_preferences_suspend_delivery_button_enabled" />
-
+<!--
         <SwitchPreference
             android:defaultValue="true"
             android:key="@string/key_omnipod_common_time_change_event_enabled"
             android:title="@string/omnipod_common_preferences_time_change_enabled" />
-
+-->
     </PreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/omnipod-dash/src/release/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/annotations/OpenForTesting.kt b/omnipod-dash/src/release/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/annotations/OpenForTesting.kt
new file mode 100644
index 0000000000..6cf2180e50
--- /dev/null
+++ b/omnipod-dash/src/release/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/annotations/OpenForTesting.kt
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.annotations
+
+/**
+ * Annotate a class with [OpenForTesting] if it should be extendable for testing.
+ * In production the class remains final.
+ */
+@Target(AnnotationTarget.CLASS)
+annotation class OpenForTesting
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt
new file mode 100644
index 0000000000..e6ad2844dc
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt
@@ -0,0 +1,61 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecrypt
+
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLoggerTest
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessagePacket
+import org.junit.Assert
+import org.junit.Test
+import org.spongycastle.util.encoders.Hex
+
+class EnDecryptTest {
+
+    @Test
+    fun decrypt() {
+        val received =
+            "54,57,11,a1,0c,16,03,00,08,20,2e,a9,08,20,2e,a8,34,7c,b9,7b,38,5d,45,a3,c4,0e,40,4c,55,71,5e,f3,c3,86,50,17,36,7e,62,3c,7d,0b,46,9e,81,cd,fd,9a".replace(
+                ",",
+                ""
+            )
+        val decryptedPayload =
+            "30,2e,30,3d,00,12,08,20,2e,a9,1c,0a,1d,05,00,16,b0,00,00,00,0b,ff,01,fe".replace(",", "")
+        val aapsLogger = AAPSLoggerTest()
+        val enDecrypt = EnDecrypt(
+            aapsLogger,
+            Nonce(
+                Hex.decode("6c,ff,5d,18,b7,61,6c,ae".replace(",", "")),
+                22
+            ),
+            Hex.decode("55,79,9f,d2,66,64,cb,f6,e4,76,52,5e,2d,ee,52,c6".replace(",", ""))
+        )
+        val encryptedMessage = Hex.decode(received)
+        val decrypted = Hex.decode(decryptedPayload)
+        val msg = MessagePacket.parse(encryptedMessage)
+        val decryptedMsg = enDecrypt.decrypt(msg)
+
+        Assert.assertEquals(decrypted.toHex(), decryptedMsg.payload.toHex())
+    }
+
+    @Test
+    fun encrypt() {
+        val aapsLogger = AAPSLoggerTest()
+        val enDecrypt = EnDecrypt(
+            aapsLogger,
+            Nonce(
+                Hex.decode("dda23c090a0a0a0a"),
+                0
+            ),
+            Hex.decode("ba1283744b6de9fab6d9b77d95a71d6e")
+        )
+        val encryptedMessage = Hex.decode(
+            "54571101070003400242000002420001" +
+                "e09158bcb0285a81bf30635f3a17ee73f0afbb3286bc524a8a66" +
+                "fb1bc5b001e56543"
+        )
+        val command = Hex.decode("53302e303d000effffffff00060704ffffffff82b22c47302e30")
+        val msg = MessagePacket.parse(encryptedMessage).copy(payload = command) // copy for the headers
+
+        val encrypted = enDecrypt.encrypt(msg)
+
+        Assert.assertEquals(encryptedMessage.toHex(), encrypted.asByteArray().toHex())
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt
new file mode 100644
index 0000000000..6ca71c6b94
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
+
+import com.google.crypto.tink.subtle.Hex
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLoggerTest
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Id
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class MessagePacketTest {
+
+    val payload =
+        "54,57,11,01,07,00,03,40,08,20,2e,a8,08,20,2e,a9,ab,35,d8,31,60,9b,b8,fe,3a,3b,de,5b,18,37,24,9a,16,db,f8,e4,d3,05,e9,75,dc,81,7c,37,07,cc,41,5f,af,8a".replace(
+            ",",
+            ""
+        )
+
+    @Test fun testParseMessagePacket() {
+        val aapsLogger = AAPSLoggerTest()
+        val msg = MessagePacket.parse(Hex.decode(payload))
+        assertEquals(msg.type, MessageType.ENCRYPTED)
+        assertEquals(msg.source, Id.fromLong(136326824))
+        assertEquals(msg.destination, Id.fromLong(136326825))
+        assertEquals(msg.sequenceNumber, 7.toByte())
+        assertEquals(msg.ackNumber, 0.toByte())
+        assertEquals(msg.eqos, 1.toShort())
+        assertEquals(msg.priority, false)
+        assertEquals(msg.lastMessage, false)
+        assertEquals(msg.gateway, false)
+        assertEquals(msg.sas, true)
+        assertEquals(msg.tfs, false)
+        assertEquals(msg.version, 0.toShort())
+        assertEquals(msg.payload.toHex(), payload.substring(32, payload.length))
+    }
+
+    @Test fun testSerializeMessagePacket() {
+        val msg = MessagePacket(
+            type = MessageType.ENCRYPTED,
+            source = Id.fromLong(136326824),
+            destination = Id.fromLong(136326825),
+            sequenceNumber = 7.toByte(),
+            ackNumber = 0.toByte(),
+            eqos = 1.toShort(),
+            priority = false,
+            lastMessage = false,
+            gateway = false,
+            sas = true,
+            tfs = false,
+            payload = Hex.decode(payload.substring(32, payload.length))
+        )
+        assertEquals(msg.asByteArray().toHex(), payload)
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt
new file mode 100644
index 0000000000..0ff9673c1d
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
+
+import com.google.crypto.tink.subtle.Hex
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadJoiner
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class PayloadJoinerTest {
+
+    @Test fun testJoiner() {
+        val f1 = Hex.decode("00,01,54,57,10,23,03,00,00,c0,ff,ff,ff,fe,08,20,2e,a8,50,30".replace(",", ""))
+        val f2 = Hex.decode("01,04,bc,20,1f,f6,3d,00,01,a5,ff,ff,ff,fe,08,20,2e,a8,50,30".replace(",", ""))
+        val payload = "54,57,10,23,03,00,00,c0,ff,ff,ff,fe,08,20,2e,a8,50,30,3d,00,01,a5".replace(",", "")
+        val joiner = PayloadJoiner(f1)
+        joiner.accumulate(f2)
+        val actual = joiner.finalize()
+        assertEquals(payload, actual.toHex())
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt
new file mode 100644
index 0000000000..ffc3510d57
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
+
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadJoiner
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadSplitter
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import java.util.*
+
+class PayloadSplitJoinTest {
+
+    private val random = Random(42)
+
+    @Test fun testSplitAndJoinBack() {
+        for (s in 0..250) {
+            val payload = ByteArray(s)
+            random.nextBytes(payload)
+            val splitter = PayloadSplitter(payload)
+            val packets = splitter.splitInPackets()
+            val joiner = PayloadJoiner(packets.get(0).toByteArray())
+            for (p in packets.subList(1, packets.size)) {
+                joiner.accumulate(p.toByteArray())
+            }
+            val got = joiner.finalize()
+            assertEquals(got.toHex(), payload.toHex())
+        }
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt
new file mode 100644
index 0000000000..a8f148acb4
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
+
+import com.google.crypto.tink.subtle.Hex
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadSplitter
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class PayloadSplitterTest {
+
+    @Test fun testSplitter() {
+        val f1 = "00,01,54,57,10,23,03,00,00,c0,ff,ff,ff,fe,08,20,2e,a8,50,30".replace(",", "")
+        val f2 = "01,04,bc,20,1f,f6,3d,00,01,a5,ff,ff,ff,fe,08,20,2e,a8,50,30".replace(",", "")
+        val payload = Hex.decode("54,57,10,23,03,00,00,c0,ff,ff,ff,fe,08,20,2e,a8,50,30,3d,00,01,a5".replace(",", ""))
+
+        val splitter = PayloadSplitter(payload)
+        val packets = splitter.splitInPackets()
+
+        assertEquals(packets.size, 2)
+        assertEquals(f1, packets.get(0).toByteArray().toHex())
+        val p2 = packets.get(1).toByteArray()
+        assertTrue(p2.size >= 10)
+        assertEquals(f2.subSequence(0, 20), p2.copyOfRange(0, 10).toHex())
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncodingTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncodingTest.kt
new file mode 100644
index 0000000000..ee1f18bad2
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/StringLengthPrefixEncodingTest.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
+
+import com.google.crypto.tink.subtle.Hex
+import info.nightscout.androidaps.extensions.toHex
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class StringLengthPrefixEncodingTest {
+
+    private val p0Payload = Hex.decode("50,30,3d,00,01,a5".replace(",", "")) // from logs
+    private val p0Content = Hex.decode("a5")
+
+    @Test fun testFormatKeysP0() {
+        val payload = StringLengthPrefixEncoding.formatKeys(arrayOf("P0="), arrayOf(p0Content))
+        assertEquals(p0Payload.toHex(), payload.toHex())
+    }
+
+    @Test fun testParseKeysP0() {
+        val parsed = StringLengthPrefixEncoding.parseKeys(arrayOf("P0="), p0Payload)
+        assertEquals(parsed.size, 1)
+        assertEquals(parsed[0].toHex(), p0Content.toHex())
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt
new file mode 100644
index 0000000000..237d1041ad
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt
@@ -0,0 +1,45 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair
+
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLoggerTest
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.RandomByteGenerator
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.X25519KeyGenerator
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.Mockito
+import org.mockito.Mockito.mock
+import org.mockito.Mockito.spy
+import org.spongycastle.util.encoders.Hex
+
+class KeyExchangeTest {
+
+    val keyGenerator = X25519KeyGenerator()
+    val keyGeneratorSpy = spy(keyGenerator)
+
+    var randomByteGenerator: RandomByteGenerator = mock(RandomByteGenerator::class.java)
+
+    @Test fun testLTK() {
+        val aapsLogger = AAPSLoggerTest()
+
+        Mockito.doReturn(Hex.decode("27ec94b71a201c5e92698d668806ae5ba00594c307cf5566e60c1fc53a6f6bb6"))
+            .`when`(keyGeneratorSpy).generatePrivateKey()
+
+        val pdmNonce = Hex.decode("edfdacb242c7f4e1d2bc4d93ca3c5706")
+
+        Mockito.`when`(randomByteGenerator.nextBytes(anyInt())).thenReturn(pdmNonce)
+
+        val ke = KeyExchange(
+            aapsLogger,
+            keyGeneratorSpy,
+            randomByteGenerator
+        )
+        val podPublicKey = Hex.decode("2fe57da347cd62431528daac5fbb290730fff684afc4cfc2ed90995f58cb3b74")
+        val podNonce = Hex.decode("00000000000000000000000000000000")
+        ke.updatePodPublicData(podPublicKey + podNonce)
+        assertEquals(ke.pdmPublic.toHex(), "f2b6940243aba536a66e19fb9a39e37f1e76a1cd50ab59b3e05313b4fc93975e")
+        assertEquals(ke.pdmConf.toHex(), "5fc3b4da865e838ceaf1e9e8bb85d1ac")
+        ke.validatePodConf(Hex.decode("af4f10db5f96e5d9cd6cfc1f54f4a92f"))
+        assertEquals(ke.ltk.toHex(), "341e16d13f1cbf73b19d1c2964fee02b")
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt
new file mode 100644
index 0000000000..1289b9c93a
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
+
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLoggerTest
+import org.junit.Assert
+import org.junit.Test
+import org.spongycastle.util.encoders.Hex
+
+class EapMessageTest {
+
+    @Test fun testParseAndBack() {
+        val aapsLogger = AAPSLoggerTest()
+        val payload =
+            Hex.decode("01bd0038170100000205000000c55c78e8d3b9b9e935860a7259f6c001050000c2cd1248451103bd77a6c7ef88c441ba7e0200006cff5d18")
+        val eapMsg = EapMessage.parse(aapsLogger, payload)
+        val back = eapMsg.toByteArray()
+        Assert.assertEquals(back.toHex(), payload.toHex())
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt
new file mode 100644
index 0000000000..107bfd7a03
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
+
+import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLoggerTest
+import org.junit.Assert
+import org.junit.Test
+import org.spongycastle.util.encoders.Hex
+
+class MilenageTest {
+
+    @Test fun testMilenage() {
+        val aapsLogger = AAPSLoggerTest()
+        val m = Milenage(
+            aapsLogger = aapsLogger,
+            k = Hex.decode("c0772899720972a314f557de66d571dd"),
+            sqn = byteArrayOf(0, 0, 0, 0, 0, 2),
+            randParam = Hex.decode("c2cd1248451103bd77a6c7ef88c441ba")
+        )
+        Assert.assertEquals(m.res.toHex(), "a40bc6d13861447e")
+        Assert.assertEquals(m.ck.toHex(), "55799fd26664cbf6e476525e2dee52c6")
+        Assert.assertEquals(m.autn.toHex(), "00c55c78e8d3b9b9e935860a7259f6c0")
+    }
+
+    @Test fun testMilenage2() {
+        val aapsLogger = AAPSLoggerTest()
+        val m = Milenage(
+            aapsLogger = aapsLogger,
+            k = Hex.decode("78411ccad0fd0fb6f381a47fb3335ecb"),
+            sqn = byteArrayOf(0, 0, 0, 0, 0, 2), // 1 + 1
+            randParam = Hex.decode("4fc01ac1a94376ae3e052339c07d9e1f")
+        )
+        Assert.assertEquals(m.res.toHex(), "ec549e00fa668a19")
+        Assert.assertEquals(m.ck.toHex(), "ee3dac761fe358a9f476cc5ee81aa3e9")
+        Assert.assertEquals(m.autn.toHex(), "a3e7a71430c8b9b95245b33b3bd679c4")
+    }
+
+    @Test fun testMilenageIncrementedSQN() {
+        val aapsLogger = AAPSLoggerTest()
+        val m = Milenage(
+            aapsLogger = aapsLogger,
+            k = Hex.decode("c0772899720972a314f557de66d571dd"),
+            //  byteArrayOf(0,0,0,0,0x01,0x5d), this is in logs. SQN has to be incremented.
+            sqn = byteArrayOf(0, 0, 0, 0, 0x01, 0x5e),
+            randParam = Hex.decode("d71cc44820e5419f42c62ae97c035988")
+        )
+        Assert.assertEquals(m.res.toHex(), "5f807a379a5c5d30")
+        Assert.assertEquals(m.ck.toHex(), "8dd4b3ceb849a01766e37f9d86045c39")
+        Assert.assertEquals(m.autn.toHex(), "0e0264d056fcb9b9752227365a090955")
+    }
+
+    @Test fun testMileageSynchronization() {
+        val aapsLogger = AAPSLoggerTest()
+        val m = Milenage(
+            aapsLogger = aapsLogger,
+            k = Hex.decode("689b860fde3331dd7e1671ad39985e3b"),
+            sqn = byteArrayOf(0, 0, 0, 0, 0, 8), // 1 + 1
+            auts = Hex.decode("84ff173947a67567985de71e4890"),
+            randParam = Hex.decode("396707041ca3a5931fc0e52d2d7b9ecf"),
+            amf = byteArrayOf(0, 0),
+        )
+        Assert.assertEquals(m.receivedMacS.toHex(), m.macS.toHex())
+        Assert.assertEquals(m.sqn.toHex(), m.synchronizationSqn.toHex())
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.java
deleted file mode 100644
index 4ffb19a702..0000000000
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import static org.junit.Assert.assertArrayEquals;
-
-public class DeactivateCommandTest {
-    @Test
-    public void testEncoding() throws DecoderException {
-        byte[] encoded = new DeactivateCommand.Builder() //
-                .setUniqueId(37879809) //
-                .setSequenceNumber((short) 5) //
-                .setNonce(1229869870) //
-                .build() //
-                .getEncoded();
-
-        assertArrayEquals(Hex.decodeHex("0242000114061C04494E532E001C"), encoded);
-    }
-}
\ No newline at end of file
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.kt
new file mode 100644
index 0000000000..6df505b0db
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/DeactivateCommandTest.kt
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+
+class DeactivateCommandTest {
+
+    @Test @Throws(DecoderException::class) fun testEncoding() {
+        val encoded = DeactivateCommand.Builder()
+            .setUniqueId(37879809)
+            .setSequenceNumber(5.toShort())
+            .setNonce(1229869870)
+            .build()
+            .encoded
+
+        Assert.assertArrayEquals(Hex.decodeHex("0242000114061C04494E532E001C"), encoded)
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommandTest.kt
new file mode 100644
index 0000000000..38b0d98641
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetStatusCommandTest.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.ResponseType
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+
+class GetStatusCommandTest {
+
+    @Test @Throws(DecoderException::class) fun testGetDefaultStatusResponse() {
+        val encoded = GetStatusCommand.Builder()
+            .setUniqueId(37879810)
+            .setSequenceNumber(15.toShort())
+            .setStatusResponseType(ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE)
+            .build()
+            .encoded
+
+        Assert.assertArrayEquals(Hex.decodeHex("024200023C030E0100024C"), encoded)
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.java
deleted file mode 100644
index 04191a4f67..0000000000
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import static org.junit.Assert.assertArrayEquals;
-
-public class GetVersionCommandTest {
-    @Test
-    public void testEncoding() throws DecoderException {
-        byte[] encoded = new GetVersionCommand.Builder() //
-                .setSequenceNumber((short) 0) //
-                .setUniqueId(GetVersionCommand.DEFAULT_UNIQUE_ID) //
-                .build() //
-                .getEncoded();
-
-        assertArrayEquals(Hex.decodeHex("FFFFFFFF00060704FFFFFFFF82B2"), encoded);
-    }
-}
\ No newline at end of file
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.kt
new file mode 100644
index 0000000000..20492004cb
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/GetVersionCommandTest.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+
+class GetVersionCommandTest {
+
+    @Test @Throws(DecoderException::class) fun testEncoding() {
+        val encoded = GetVersionCommand.Builder()
+            .setSequenceNumber(0.toShort())
+            .setUniqueId(GetVersionCommand.DEFAULT_UNIQUE_ID)
+            .build()
+            .encoded
+
+        Assert.assertArrayEquals(Hex.decodeHex("FFFFFFFF00060704FFFFFFFF82B2"), encoded)
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java
deleted file mode 100644
index d137fed93b..0000000000
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertConfiguration;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertSlot;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertTriggerType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepRepetitionType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType;
-
-import static org.junit.Assert.assertArrayEquals;
-
-public class ProgramAlertsCommandTest {
-    @Test
-    public void testExpirationAlerts() throws DecoderException {
-        List<AlertConfiguration> configurations = new ArrayList<>();
-        configurations.add(new AlertConfiguration(AlertSlot.EXPIRATION, true, (short) 420, false, AlertTriggerType.TIME_TRIGGER, (short) 4305, BeepType.FOUR_TIMES_BIP_BEEP, BeepRepetitionType.XXX3));
-        configurations.add(new AlertConfiguration(AlertSlot.EXPIRATION_IMMINENT, true, (short) 0, false, AlertTriggerType.TIME_TRIGGER, (short) 4725, BeepType.FOUR_TIMES_BIP_BEEP, BeepRepetitionType.XXX4));
-
-        byte[] encoded = new ProgramAlertsCommand.Builder() //
-                .setUniqueId(37879811) //
-                .setSequenceNumber((short) 3) //
-                .setMultiCommandFlag(true) //
-                .setNonce(1229869870) //
-                .setAlertConfigurations(configurations) //
-                .build() //
-                .getEncoded();
-
-        assertArrayEquals(Hex.decodeHex("024200038C121910494E532E79A410D1050228001275060280F5"), encoded);
-    }
-
-    @Test
-    public void testLowReservoirAlert() throws DecoderException {
-        List<AlertConfiguration> configurations = new ArrayList<>();
-        configurations.add(new AlertConfiguration(AlertSlot.LOW_RESERVOIR, true, (short) 0, false, AlertTriggerType.RESERVOIR_VOLUME_TRIGGER, (short) 200, BeepType.FOUR_TIMES_BIP_BEEP, BeepRepetitionType.XXX));
-
-        byte[] encoded = new ProgramAlertsCommand.Builder() //
-                .setUniqueId(37879811) //
-                .setSequenceNumber((short) 8) //
-                .setNonce(1229869870) //
-                .setAlertConfigurations(configurations) //
-                .build() //
-                .getEncoded();
-
-        assertArrayEquals(Hex.decodeHex("02420003200C190A494E532E4C0000C801020149"), encoded);
-    }
-
-    @Test
-    public void testUserExpirationAlert() throws DecoderException {
-        List<AlertConfiguration> configurations = new ArrayList<>();
-        configurations.add(new AlertConfiguration(AlertSlot.USER_SET_EXPIRATION, true, (short) 0, false, AlertTriggerType.TIME_TRIGGER, (short) 4079, BeepType.FOUR_TIMES_BIP_BEEP, BeepRepetitionType.XXX2));
-
-        byte[] encoded = new ProgramAlertsCommand.Builder() //
-                .setUniqueId(37879811) //
-                .setSequenceNumber((short) 15) //
-                .setNonce(1229869870) //
-                .setAlertConfigurations(configurations) //
-                .build() //
-                .getEncoded();
-
-        assertArrayEquals(Hex.decodeHex("024200033C0C190A494E532E38000FEF030203E2"), encoded);
-    }
-
-
-    @Test
-    public void testLumpOfCoalAlert() throws DecoderException {
-        List<AlertConfiguration> configurations = new ArrayList<>();
-        configurations.add(new AlertConfiguration(AlertSlot.EXPIRATION, true, (short) 55, false, AlertTriggerType.TIME_TRIGGER, (short) 5, BeepType.FOUR_TIMES_BIP_BEEP, BeepRepetitionType.XXX5));
-
-        byte[] encoded = new ProgramAlertsCommand.Builder() //
-                .setUniqueId(37879811) //
-                .setSequenceNumber((short) 10) //
-                .setMultiCommandFlag(false) //
-                .setNonce(1229869870) //
-                .setAlertConfigurations(configurations) //
-                .build() //
-                .getEncoded();
-
-        assertArrayEquals(Hex.decodeHex("02420003280C190A494E532E7837000508020356"), encoded);
-    }
-}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.kt
new file mode 100644
index 0000000000..ebd52957b2
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramAlertsCommandTest.kt
@@ -0,0 +1,128 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertConfiguration
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertTrigger
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepRepetitionType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+import java.util.*
+
+class ProgramAlertsCommandTest {
+
+    @Test @Throws(DecoderException::class) fun testExpirationAlerts() {
+        val configurations: MutableList<AlertConfiguration> = ArrayList()
+        configurations.add(
+            AlertConfiguration(
+                AlertType.EXPIRATION,
+                true,
+                420.toShort(),
+                false,
+                AlertTrigger.TimerTrigger(4305.toShort()),
+                BeepType.FOUR_TIMES_BIP_BEEP,
+                BeepRepetitionType.XXX3
+            )
+        )
+        configurations.add(
+            AlertConfiguration(
+                AlertType.EXPIRATION_IMMINENT,
+                true,
+                0.toShort(),
+                false,
+                AlertTrigger.TimerTrigger(4725.toShort()),
+                BeepType.FOUR_TIMES_BIP_BEEP,
+                BeepRepetitionType.XXX4
+            )
+        )
+
+        val encoded = ProgramAlertsCommand.Builder()
+            .setUniqueId(37879811)
+            .setSequenceNumber(3.toShort())
+            .setMultiCommandFlag(true)
+            .setNonce(1229869870)
+            .setAlertConfigurations(configurations)
+            .build()
+            .encoded
+
+        Assert.assertArrayEquals(Hex.decodeHex("024200038C121910494E532E79A410D1050228001275060280F5"), encoded)
+    }
+
+    @Test @Throws(DecoderException::class) fun testLowReservoirAlert() {
+        val configurations: MutableList<AlertConfiguration> = ArrayList()
+        configurations.add(
+            AlertConfiguration(
+                AlertType.LOW_RESERVOIR,
+                true,
+                0.toShort(),
+                false,
+                AlertTrigger.ReservoirVolumeTrigger(200.toShort()),
+                BeepType.FOUR_TIMES_BIP_BEEP,
+                BeepRepetitionType.XXX
+            )
+        )
+
+        val encoded = ProgramAlertsCommand.Builder()
+            .setUniqueId(37879811)
+            .setSequenceNumber(8.toShort())
+            .setNonce(1229869870)
+            .setAlertConfigurations(configurations)
+            .build()
+            .encoded
+
+        Assert.assertArrayEquals(Hex.decodeHex("02420003200C190A494E532E4C0000C801020149"), encoded)
+    }
+
+    @Test @Throws(DecoderException::class) fun testUserExpirationAlert() {
+        val configurations: MutableList<AlertConfiguration> = ArrayList()
+        configurations.add(
+            AlertConfiguration(
+                AlertType.USER_SET_EXPIRATION,
+                true,
+                0.toShort(),
+                false,
+                AlertTrigger.TimerTrigger(4079.toShort()),
+                BeepType.FOUR_TIMES_BIP_BEEP,
+                BeepRepetitionType.XXX2
+            )
+        )
+
+        val encoded = ProgramAlertsCommand.Builder()
+            .setUniqueId(37879811)
+            .setSequenceNumber(15.toShort())
+            .setNonce(1229869870)
+            .setAlertConfigurations(configurations)
+            .build()
+            .encoded
+
+        Assert.assertArrayEquals(Hex.decodeHex("024200033C0C190A494E532E38000FEF030203E2"), encoded)
+    }
+
+    @Test @Throws(DecoderException::class) fun testLumpOfCoalAlert() {
+        val configurations: MutableList<AlertConfiguration> = ArrayList()
+        configurations.add(
+            AlertConfiguration(
+                AlertType.EXPIRATION,
+                true,
+                55.toShort(),
+                false,
+                AlertTrigger.TimerTrigger(5.toShort()),
+                BeepType.FOUR_TIMES_BIP_BEEP,
+                BeepRepetitionType.XXX5
+            )
+        )
+
+        val encoded = ProgramAlertsCommand.Builder()
+            .setUniqueId(37879811)
+            .setSequenceNumber(10.toShort())
+            .setMultiCommandFlag(false)
+            .setNonce(1229869870)
+            .setAlertConfigurations(configurations)
+            .build()
+            .encoded
+
+        Assert.assertArrayEquals(Hex.decodeHex("02420003280C190A494E532E7837000508020356"), encoded)
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommandTest.java
deleted file mode 100644
index 53d814fc0a..0000000000
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommandTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import static org.junit.Assert.assertArrayEquals;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.List;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ProgramReminder;
-
-public class ProgramBasalCommandTest {
-    @Test
-    public void testProgramBasalCommand() throws DecoderException {
-        List<BasalProgram.Segment> segments = Collections.singletonList(
-                new BasalProgram.Segment((short) 0, (short) 48, 300)
-        );
-        BasalProgram basalProgram = new BasalProgram(segments);
-        Calendar cal = Calendar.getInstance();
-        cal.set(Calendar.YEAR, 2021);
-        cal.set(Calendar.MONTH, Calendar.FEBRUARY);
-        cal.set(Calendar.DAY_OF_MONTH, 17);
-        cal.set(Calendar.HOUR_OF_DAY, 14);
-        cal.set(Calendar.MINUTE, 47);
-        cal.set(Calendar.SECOND, 43);
-
-        byte[] encoded = new ProgramBasalCommand.Builder() //
-                .setUniqueId(37879809) //
-                .setNonce(1229869870) //
-                .setSequenceNumber((short) 10) //
-                .setBasalProgram(basalProgram) //
-                .setCurrentTime(cal.getTime()) //
-                .setProgramReminder(new ProgramReminder(false, true, (byte) 0)) //
-                .build() //
-                .getEncoded();
-
-        assertArrayEquals(Hex.decodeHex("0242000128241A12494E532E0005E81D1708000CF01EF01EF01E130E40001593004C4B403840005B8D80827C"), encoded);
-    }
-
-}
\ No newline at end of file
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommandTest.kt
new file mode 100644
index 0000000000..74ed773246
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommandTest.kt
@@ -0,0 +1,183 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ProgramReminder
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+import java.util.*
+
+class ProgramBasalCommandTest {
+
+    @Test @Throws(DecoderException::class) fun testProgramBasalCommand() {
+        val segments = listOf(
+            BasalProgram.Segment(0.toShort(), 48.toShort(), 300)
+        )
+        val basalProgram = BasalProgram(segments)
+        val date = Date(121, 1, 17, 14, 47, 43)
+
+        val encoded = ProgramBasalCommand.Builder()
+            .setUniqueId(37879809)
+            .setNonce(1229869870)
+            .setSequenceNumber(10.toShort())
+            .setBasalProgram(basalProgram)
+            .setCurrentTime(date)
+            .setProgramReminder(ProgramReminder(false, true, 0.toByte()))
+            .build()
+            .encoded
+
+        Assert.assertArrayEquals(
+            Hex.decodeHex("0242000128241A12494E532E0005E81D1708000CF01EF01EF01E130E40001593004C4B403840005B8D80827C"),
+            encoded
+        )
+    }
+
+    @Test @Throws(DecoderException::class) fun testProgramBasalCommandWithExtraAlternateSegmentPulse() {
+        val segments = listOf(
+            BasalProgram.Segment(0.toShort(), 48.toShort(), 5)
+        )
+        val basalProgram = BasalProgram(segments)
+        val date = Date(121, 0, 30, 23, 21, 46)
+
+        val encoded = ProgramBasalCommand.Builder()
+            .setUniqueId(4241)
+            .setNonce(1229869870)
+            .setSequenceNumber(12.toShort())
+            .setBasalProgram(basalProgram)
+            .setCurrentTime(date)
+            .setProgramReminder(ProgramReminder(atStart = false, atEnd = false, atInterval = 0.toByte()))
+            .build()
+            .encoded
+
+        Assert.assertArrayEquals(
+            Hex.decodeHex("0000109130241a12494e532e0000c52e0f700000f800f800f800130e0000000707fcad8000f015752a00033b"),
+            encoded
+        )
+    }
+
+    @Test @Throws(DecoderException::class) fun testProgramBasalCommandAllSegments() {
+        val segments = mutableListOf<BasalProgram.Segment>()
+        for (segment in 0..23) {
+            val rate = when (segment) {
+                21 ->
+                    110
+                22 ->
+                    120
+                23 ->
+                    135
+                else ->
+                    segment * 5
+            }
+            segments.add(
+                BasalProgram.Segment((segment * 2).toShort(), ((segment + 1) * 2).toShort(), rate)
+            )
+        }
+
+        val basalProgram = BasalProgram(segments)
+        val date = Date(2021, 8, 7, 11, 9, 6)
+
+        val cmd = ProgramBasalCommand.Builder()
+            .setUniqueId(5)
+            .setNonce(1229869870)
+            .setSequenceNumber(2.toShort())
+            .setBasalProgram(basalProgram)
+            .setCurrentTime(date)
+            .setMultiCommandFlag(false)
+            .setProgramReminder(ProgramReminder(atStart = false, atEnd = true, atInterval = 0.toByte()))
+            .build()
+
+        val encoded = cmd.encoded
+        val expected =
+            "0000000508C41A28494E532E00018B16273000032000300130023003300430053006300730083009200A100B100C180D1398400B005E009E22E80002EB49D200000A15752A0000140ABA9500001E07270E000028055D4A800032044AA200003C0393870000460310BCDB005002AEA540005A02625A00006402255100006E01F360E8007801C9C380008201A68D13008C01885E6D0096016E360000A0015752A000AA0143209600B401312D0000BE01211D2800C80112A88000DC00F9B07400F000E4E1C0010E00CB73558158".lowercase()
+
+        Assert.assertArrayEquals(
+            Hex.decodeHex(
+                expected
+            ),
+            encoded
+        )
+    }
+
+    @Test @Throws(DecoderException::class) fun testProgramBasalCommandHighRates() {
+        val segments = listOf(
+            BasalProgram.Segment(0.toShort(), 2.toShort(), 300),
+            BasalProgram.Segment(2.toShort(), 4.toShort(), 290),
+            BasalProgram.Segment(4.toShort(), 6.toShort(), 280),
+            BasalProgram.Segment(6.toShort(), 8.toShort(), 270),
+            BasalProgram.Segment(8.toShort(), 10.toShort(), 260),
+            BasalProgram.Segment(10.toShort(), 14.toShort(), 250),
+            BasalProgram.Segment(14.toShort(), 18.toShort(), 235),
+            BasalProgram.Segment(18.toShort(), 22.toShort(), 225),
+            BasalProgram.Segment(22.toShort(), 24.toShort(), 200),
+            BasalProgram.Segment(24.toShort(), 30.toShort(), 185),
+            BasalProgram.Segment(30.toShort(), 34.toShort(), 165),
+            BasalProgram.Segment(34.toShort(), 38.toShort(), 145),
+            BasalProgram.Segment(38.toShort(), 42.toShort(), 130),
+            BasalProgram.Segment(42.toShort(), 44.toShort(), 115),
+            BasalProgram.Segment(44.toShort(), 46.toShort(), 100),
+            BasalProgram.Segment(46.toShort(), 48.toShort(), 65),
+        )
+
+        val basalProgram = BasalProgram(segments)
+        val date = Date(2021, 8, 7, 11, 12, 9)
+
+        val cmd = ProgramBasalCommand.Builder()
+            .setUniqueId(5)
+            .setNonce(1229869870)
+            .setSequenceNumber(7.toShort())
+            .setBasalProgram(basalProgram)
+            .setCurrentTime(date)
+            .setMultiCommandFlag(false)
+            .setProgramReminder(ProgramReminder(atStart = false, atEnd = true, atInterval = 0.toByte()))
+            .build()
+
+        val encoded = cmd.encoded
+        val expected =
+            "000000051C981A2C494E532E00046D162178000B101E101D101C101B101A301938173816101458123810380E300D180B100A180613684008013F008954400258005B8D800244005EB5B002300062179B021C0065B9AA02080069A34403E8006DDD0003AC0074E0360384007A12000190008954400456009476C1029400A675A2024400BD6B61020800D3468900E600EED54D00C80112A880008201A68D13809b"
+
+        Assert.assertArrayEquals(
+            Hex.decodeHex(
+                expected
+            ),
+            encoded
+        )
+    }
+
+    @Test @Throws(DecoderException::class) fun testProgramBasalCommandDifferentInterval() {
+        val segments = listOf(
+            BasalProgram.Segment(0.toShort(), 2.toShort(), 50),
+            BasalProgram.Segment(2.toShort(), 6.toShort(), 75),
+            BasalProgram.Segment(6.toShort(), 12.toShort(), 0),
+            BasalProgram.Segment(12.toShort(), 20.toShort(), 135),
+            BasalProgram.Segment(20.toShort(), 32.toShort(), 270),
+            BasalProgram.Segment(32.toShort(), 40.toShort(), 290),
+            BasalProgram.Segment(40.toShort(), 46.toShort(), 95),
+            BasalProgram.Segment(46.toShort(), 48.toShort(), 15),
+        )
+
+        val basalProgram = BasalProgram(segments)
+        val date = Date(2021, 8, 7, 11, 13, 50)
+
+        val cmd = ProgramBasalCommand.Builder()
+            .setUniqueId(5)
+            .setNonce(1229869870)
+            .setSequenceNumber(10.toShort())
+            .setBasalProgram(basalProgram)
+            .setCurrentTime(date)
+            .setMultiCommandFlag(false)
+            .setProgramReminder(ProgramReminder(atStart = false, atEnd = true, atInterval = 0.toByte()))
+            .build()
+
+        val encoded = cmd.encoded
+        val expected =
+            "0000000528581A1C494E532E00038E161E50000E100538075000780DB01B701D58091801133840040A100032DC82006402255100012C016E36000006EB49D200043800CB73550CA80065B9AA0910005EB5B0023A01211D28001E07270E000065"
+
+        Assert.assertArrayEquals(
+            Hex.decodeHex(
+                expected
+            ),
+            encoded
+        )
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommandTest.kt
new file mode 100644
index 0000000000..970e052e5c
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBeepsCommandTest.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ProgramReminder
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+
+class ProgramBeepsCommandTest {
+
+    @Test @Throws(DecoderException::class) fun testPlayTestBeep() {
+        val encoded = ProgramBeepsCommand.Builder()
+            .setUniqueId(37879810)
+            .setSequenceNumber(11.toShort())
+            .setImmediateBeepType(BeepType.FOUR_TIMES_BIP_BEEP)
+            .setBasalReminder(ProgramReminder(false, false, 0.toByte()))
+            .setTempBasalReminder(ProgramReminder(false, false, 0.toByte()))
+            .setBolusReminder(ProgramReminder(false, false, 0.toByte()))
+            .build()
+            .encoded
+
+        Assert.assertArrayEquals(Hex.decodeHex("024200022C061E0402000000800F"), encoded)
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommandTest.java
deleted file mode 100644
index 2eea08c718..0000000000
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommandTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ProgramReminder;
-
-import static org.junit.Assert.assertArrayEquals;
-
-public class ProgramBolusCommandTest {
-    @Test
-    public void testProgramBolusCommand() throws DecoderException {
-        byte[] encoded = new ProgramBolusCommand.Builder() //
-                .setNumberOfUnits(5) //
-                .setProgramReminder(new ProgramReminder(false, true, (byte) 0)) //
-                .setDelayBetweenPulsesInEighthSeconds((byte) 16) //
-                .setUniqueId(37879809) //
-                .setSequenceNumber((short) 14) //
-                .setNonce(1229869870) //
-                .build() //
-                .getEncoded();
-
-        assertArrayEquals(Hex.decodeHex("02420001381F1A0E494E532E02010F01064000640064170D4003E800030D4000000000000080F6"), encoded);
-    }
-
-}
\ No newline at end of file
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommandTest.kt
new file mode 100644
index 0000000000..1069f86123
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBolusCommandTest.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ProgramReminder
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+
+class ProgramBolusCommandTest {
+
+    @Test @Throws(DecoderException::class) fun testProgramBolusCommand() {
+        val encoded = ProgramBolusCommand.Builder()
+            .setNumberOfUnits(5.0)
+            .setProgramReminder(ProgramReminder(false, true, 0.toByte()))
+            .setDelayBetweenPulsesInEighthSeconds(16.toByte())
+            .setUniqueId(37879809)
+            .setSequenceNumber(14.toShort())
+            .setNonce(1229869870)
+            .build()
+            .encoded
+
+        Assert.assertArrayEquals(
+            Hex.decodeHex("02420001381F1A0E494E532E02010F01064000640064170D4003E800030D4000000000000080F6"),
+            encoded
+        )
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommandTest.java
deleted file mode 100644
index b622174379..0000000000
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommandTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ProgramReminder;
-
-import static org.junit.Assert.assertArrayEquals;
-
-public class ProgramTempBasalCommandTest {
-    @Test
-    public void testExtraAlternateSegmentPulseTempBasal() throws DecoderException {
-        ProgramTempBasalCommand command = new ProgramTempBasalCommand.Builder() //
-                .setUniqueId(37879809) //
-                .setNonce(1229869870) //
-                .setSequenceNumber((short) 15) //
-                .setRateInUnitsPerHour(5.05d) //
-                .setDurationInMinutes((short) 60) //
-                .setProgramReminder(new ProgramReminder(false, true, (byte) 0)) //
-                .build();
-
-        assertArrayEquals(Hex.decodeHex("024200013C201A0E494E532E01011102384000321832160E400003F20036634403F20036634482A6"), command.getEncoded());
-    }
-
-    @Test
-    public void testZeroTempBasal() throws DecoderException {
-        ProgramTempBasalCommand command = new ProgramTempBasalCommand.Builder() //
-                .setUniqueId(37879809) //
-                .setNonce(1229869870) //
-                .setSequenceNumber((short) 7) //
-                .setRateInUnitsPerHour(0.0) //
-                .setDurationInMinutes((short) 300) //
-                .setProgramReminder(new ProgramReminder(true, true, (byte) 0)) //
-                .build();
-
-        assertArrayEquals(Hex.decodeHex("024200011C201A0E494E532E0100820A384000009000160EC000000A6B49D200000AEB49D20001DE"), command.getEncoded());
-    }
-}
\ No newline at end of file
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommandTest.kt
new file mode 100644
index 0000000000..84bd7b3454
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramTempBasalCommandTest.kt
@@ -0,0 +1,42 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ProgramReminder
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+
+class ProgramTempBasalCommandTest {
+
+    @Test @Throws(DecoderException::class) fun testExtraAlternateSegmentPulseTempBasal() {
+        val command = ProgramTempBasalCommand.Builder()
+            .setUniqueId(37879809)
+            .setNonce(1229869870)
+            .setSequenceNumber(15.toShort())
+            .setRateInUnitsPerHour(5.05)
+            .setDurationInMinutes(60.toShort())
+            .setProgramReminder(ProgramReminder(false, true, 0.toByte()))
+            .build()
+
+        Assert.assertArrayEquals(
+            Hex.decodeHex("024200013C201A0E494E532E01011102384000321832160E400003F20036634403F20036634482A6"),
+            command.encoded
+        )
+    }
+
+    @Test @Throws(DecoderException::class) fun testZeroTempBasal() {
+        val command = ProgramTempBasalCommand.Builder()
+            .setUniqueId(37879809)
+            .setNonce(1229869870)
+            .setSequenceNumber(7.toShort())
+            .setRateInUnitsPerHour(0.0)
+            .setDurationInMinutes(300.toShort())
+            .setProgramReminder(ProgramReminder(true, true, 0.toByte()))
+            .build()
+
+        Assert.assertArrayEquals(
+            Hex.decodeHex("024200011C201A0E494E532E0100820A384000009000160EC000000A6B49D200000AEB49D20001DE"),
+            command.encoded
+        )
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.java
deleted file mode 100644
index 7965ebe0a1..0000000000
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import java.util.Date;
-
-import static org.junit.Assert.assertArrayEquals;
-
-public class SetUniqueIdCommandTest {
-    @Test
-    public void testEncoding() throws DecoderException {
-        @SuppressWarnings("deprecation")
-        byte[] encoded = new SetUniqueIdCommand.Builder() //
-                .setUniqueId(37879811) //
-                .setSequenceNumber((short) 6) //
-                .setLotNumber(135556289) //
-                .setPodSequenceNumber(681767) //
-                .setInitializationTime(new Date(2021, 1, 10, 14, 41)) //
-                .build() //
-                .getEncoded();
-
-        assertArrayEquals(Hex.decodeHex("FFFFFFFF18150313024200031404020A150E2908146CC1000A67278344"), encoded);
-    }
-}
\ No newline at end of file
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.kt
new file mode 100644
index 0000000000..7fafa8de0d
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SetUniqueIdCommandTest.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+import java.util.*
+
+class SetUniqueIdCommandTest {
+
+    @Test @Throws(DecoderException::class) fun testEncoding() {
+        val encoded = SetUniqueIdCommand.Builder()
+            .setUniqueId(37879811)
+            .setSequenceNumber(6.toShort())
+            .setLotNumber(135556289)
+            .setPodSequenceNumber(681767)
+            .setInitializationTime(Date(2021, 1, 10, 14, 41))
+            .build()
+            .encoded
+
+        Assert.assertArrayEquals(Hex.decodeHex("FFFFFFFF18150313024200031404020A150E2908146CC1000A67278344"), encoded)
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.java
deleted file mode 100644
index a8447ed558..0000000000
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import static org.junit.Assert.assertArrayEquals;
-
-public class SilenceAlertsCommandTest {
-    @Test
-    public void testSilenceLowReservoirAlert() throws DecoderException {
-        byte[] encoded = new SilenceAlertsCommand.Builder() //
-                .setUniqueId(37879811) //
-                .setSequenceNumber((short) 1) //
-                .setNonce(1229869870) //
-                .setSilenceLowReservoirAlert(true) //
-                .build() //
-                .getEncoded();
-
-        assertArrayEquals(Hex.decodeHex("0242000304071105494E532E1081CE"), encoded);
-    }
-
-    // TODO capture more silence alerts commands
-}
\ No newline at end of file
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.kt
new file mode 100644
index 0000000000..910c518715
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/SilenceAlertsCommandTest.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+import java.util.*
+
+class SilenceAlertsCommandTest {
+
+    @Test @Throws(DecoderException::class) fun testSilenceLowReservoirAlert() {
+        val encoded = SilenceAlertsCommand.Builder()
+            .setUniqueId(37879811)
+            .setSequenceNumber(1.toShort())
+            .setNonce(1229869870)
+            .setAlertTypes(EnumSet.of(AlertType.LOW_RESERVOIR))
+            .build()
+            .encoded
+
+        Assert.assertArrayEquals(Hex.decodeHex("0242000304071105494E532E1081CE"), encoded)
+    }
+
+    // TODO capture more silence alerts commands
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.java
deleted file mode 100644
index 08576996bb..0000000000
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType;
-
-import static org.junit.Assert.assertArrayEquals;
-
-public class StopDeliveryCommandTest {
-    @Test
-    public void testStopTempBasal() throws DecoderException {
-        byte[] encoded = new StopDeliveryCommand.Builder() //
-                .setUniqueId(37879811) //
-                .setSequenceNumber((short) 0) //
-                .setNonce(1229869870) //
-                .setDeliveryType(StopDeliveryCommand.DeliveryType.TEMP_BASAL) //
-                .setBeepType(BeepType.LONG_SINGLE_BEEP) //
-                .build() //
-                .getEncoded();
-
-        assertArrayEquals(Hex.decodeHex("0242000300071F05494E532E6201B1"), encoded);
-    }
-
-    @Test
-    public void testSuspendDelivery() throws DecoderException {
-        byte[] encoded = new StopDeliveryCommand.Builder() //
-                .setUniqueId(37879811) //
-                .setSequenceNumber((short) 2) //
-                .setNonce(1229869870) //
-                .setDeliveryType(StopDeliveryCommand.DeliveryType.ALL) //
-                .setBeepType(BeepType.SILENT) //
-                .build() //
-                .getEncoded();
-
-        assertArrayEquals(Hex.decodeHex("0242000308071F05494E532E078287"), encoded);
-    }
-
-    // TODO test cancel bolus
-}
\ No newline at end of file
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.kt
new file mode 100644
index 0000000000..e64fa539c3
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/StopDeliveryCommandTest.kt
@@ -0,0 +1,38 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.command
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+
+class StopDeliveryCommandTest {
+
+    @Test @Throws(DecoderException::class) fun testStopTempBasal() {
+        val encoded = StopDeliveryCommand.Builder()
+            .setUniqueId(37879811)
+            .setSequenceNumber(0.toShort())
+            .setNonce(1229869870)
+            .setDeliveryType(StopDeliveryCommand.DeliveryType.TEMP_BASAL)
+            .setBeepType(BeepType.LONG_SINGLE_BEEP)
+            .build()
+            .encoded
+
+        Assert.assertArrayEquals(Hex.decodeHex("0242000300071F05494E532E6201B1"), encoded)
+    }
+
+    @Test @Throws(DecoderException::class) fun testSuspendDelivery() {
+        val encoded = StopDeliveryCommand.Builder()
+            .setUniqueId(37879811)
+            .setSequenceNumber(2.toShort())
+            .setNonce(1229869870)
+            .setDeliveryType(StopDeliveryCommand.DeliveryType.ALL)
+            .setBeepType(BeepType.SILENT)
+            .build()
+            .encoded
+
+        Assert.assertArrayEquals(Hex.decodeHex("0242000308071F05494E532E078287"), encoded)
+    }
+
+    // TODO test cancel bolus
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.java
deleted file mode 100644
index 892f22cdb2..0000000000
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlarmType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.DeliveryStatus;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-
-public class AlarmStatusResponseTest {
-    @Test
-    public void testValidResponse() throws DecoderException {
-        byte[] encoded = Hex.decodeHex("021602080100000501BD00000003FF01950000000000670A");
-        AlarmStatusResponse response = new AlarmStatusResponse(encoded);
-
-        assertArrayEquals(encoded, response.getEncoded());
-        assertNotSame(encoded, response.getEncoded());
-        assertEquals(ResponseType.ADDITIONAL_STATUS_RESPONSE, response.getResponseType());
-        assertEquals(ResponseType.ADDITIONAL_STATUS_RESPONSE.getValue(), response.getMessageType());
-        assertEquals(ResponseType.AdditionalStatusResponseType.ALARM_STATUS, response.getStatusResponseType());
-        assertEquals(ResponseType.AdditionalStatusResponseType.ALARM_STATUS.getValue(), response.getAdditionalStatusResponseType());
-        assertEquals(PodStatus.RUNNING_ABOVE_MIN_VOLUME, response.getPodStatus());
-        assertEquals(DeliveryStatus.BASAL_ACTIVE, response.getDeliveryStatus());
-        assertEquals((short) 0, response.getBolusPulsesRemaining());
-        assertEquals((short) 5, response.getSequenceNumberOfLastProgrammingCommand());
-        assertEquals((short) 445, response.getTotalPulsesDelivered());
-        assertEquals(AlarmType.NONE, response.getAlarmType());
-        assertEquals((short) 0, response.getAlarmTime());
-        assertEquals((short) 1023, response.getReservoirPulsesRemaining());
-        assertEquals((short) 405, response.getMinutesSinceActivation());
-        assertFalse(response.isAlert0Active());
-        assertFalse(response.isAlert1Active());
-        assertFalse(response.isAlert2Active());
-        assertFalse(response.isAlert3Active());
-        assertFalse(response.isAlert4Active());
-        assertFalse(response.isAlert5Active());
-        assertFalse(response.isAlert6Active());
-        assertFalse(response.isAlert7Active());
-        assertFalse(response.isOcclusionAlarm());
-        assertFalse(response.isPulseInfoInvalid());
-        assertEquals(PodStatus.UNINITIALIZED, response.getPodStatusWhenAlarmOccurred());
-        assertFalse(response.isImmediateBolusWhenAlarmOccurred());
-        assertEquals((byte) 0x00, response.getOcclusionType());
-        assertFalse(response.isOccurredWhenFetchingImmediateBolusActiveInformation());
-        assertEquals(0, response.getRssi());
-        assertEquals(0, response.getReceiverLowerGain());
-        assertEquals(PodStatus.UNINITIALIZED, response.getPodStatusWhenAlarmOccurred2());
-        assertEquals((short) 26378, response.getReturnAddressOfPodAlarmHandlerCaller());
-    }
-}
\ No newline at end of file
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.kt
new file mode 100644
index 0000000000..c57fb20a82
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/AlarmStatusResponseTest.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlarmType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.DeliveryStatus
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+
+class AlarmStatusResponseTest {
+
+    @Test @Throws(DecoderException::class) fun testValidResponse() {
+        val encoded = Hex.decodeHex("021602080100000501BD00000003FF01950000000000670A")
+        val response = AlarmStatusResponse(encoded)
+
+        Assert.assertArrayEquals(encoded, response.encoded)
+        Assert.assertNotSame(encoded, response.encoded)
+        Assert.assertEquals(ResponseType.ADDITIONAL_STATUS_RESPONSE, response.responseType)
+        Assert.assertEquals(ResponseType.ADDITIONAL_STATUS_RESPONSE.value, response.messageType)
+        Assert.assertEquals(ResponseType.StatusResponseType.ALARM_STATUS, response.statusResponseType)
+        Assert.assertEquals(ResponseType.StatusResponseType.ALARM_STATUS.value, response.additionalStatusResponseType)
+        Assert.assertEquals(PodStatus.RUNNING_ABOVE_MIN_VOLUME, response.podStatus)
+        Assert.assertEquals(DeliveryStatus.BASAL_ACTIVE, response.deliveryStatus)
+        Assert.assertEquals(0.toShort(), response.bolusPulsesRemaining)
+        Assert.assertEquals(5.toShort(), response.sequenceNumberOfLastProgrammingCommand)
+        Assert.assertEquals(445.toShort(), response.totalPulsesDelivered)
+        Assert.assertEquals(AlarmType.NONE, response.alarmType)
+        Assert.assertEquals(0.toShort(), response.alarmTime)
+        Assert.assertEquals(1023.toShort(), response.reservoirPulsesRemaining)
+        Assert.assertEquals(405.toShort(), response.minutesSinceActivation)
+        Assert.assertEquals(0, response.activeAlerts.size)
+        Assert.assertFalse(response.occlusionAlarm)
+        Assert.assertFalse(response.pulseInfoInvalid)
+        Assert.assertEquals(PodStatus.UNINITIALIZED, response.podStatusWhenAlarmOccurred)
+        Assert.assertFalse(response.immediateBolusWhenAlarmOccurred)
+        Assert.assertEquals(0x00.toByte(), response.occlusionType)
+        Assert.assertFalse(response.occurredWhenFetchingImmediateBolusActiveInformation)
+        Assert.assertEquals(0.toShort(), response.rssi)
+        Assert.assertEquals(0.toShort(), response.receiverLowerGain)
+        Assert.assertEquals(PodStatus.UNINITIALIZED, response.podStatusWhenAlarmOccurred2)
+        Assert.assertEquals(26378.toShort(), response.returnAddressOfPodAlarmHandlerCaller)
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.java
deleted file mode 100644
index 2e3ddbd7c1..0000000000
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.DeliveryStatus;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-
-public class DefaultStatusResponseTest {
-    @Test
-    public void testValidResponse() throws DecoderException {
-        byte[] encoded = Hex.decodeHex("1D1800A02800000463FF");
-        DefaultStatusResponse response = new DefaultStatusResponse(encoded);
-
-        assertArrayEquals(encoded, response.getEncoded());
-        assertNotSame(encoded, response.getEncoded());
-        assertEquals(ResponseType.DEFAULT_STATUS_RESPONSE, response.getResponseType());
-        assertEquals(ResponseType.DEFAULT_STATUS_RESPONSE.getValue(), response.getMessageType());
-        assertEquals(DeliveryStatus.BASAL_ACTIVE, response.getDeliveryStatus());
-        assertEquals(PodStatus.RUNNING_ABOVE_MIN_VOLUME, response.getPodStatus());
-        assertEquals((short) 320, response.getTotalPulsesDelivered());
-        assertEquals((short) 5, response.getSequenceNumberOfLastProgrammingCommand());
-        assertEquals((short) 0, response.getBolusPulsesRemaining());
-        assertFalse(response.isOcclusionAlertActive());
-        assertFalse(response.isAlert1Active());
-        assertFalse(response.isAlert2Active());
-        assertFalse(response.isAlert3Active());
-        assertFalse(response.isAlert4Active());
-        assertFalse(response.isAlert5Active());
-        assertFalse(response.isAlert6Active());
-        assertFalse(response.isAlert7Active());
-        assertEquals((short) 280, response.getMinutesSinceActivation());
-        assertEquals((short) 1023, response.getReservoirPulsesRemaining());
-    }
-}
\ No newline at end of file
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.kt
new file mode 100644
index 0000000000..bcce591db4
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.kt
@@ -0,0 +1,106 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.DeliveryStatus
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+
+class DefaultStatusResponseTest {
+
+    @Test @Throws(DecoderException::class) fun testValidResponse() {
+        val encoded = Hex.decodeHex("1D1800A02800000463FF")
+        val response = DefaultStatusResponse(encoded)
+        Assert.assertArrayEquals(encoded, response.encoded)
+        Assert.assertNotSame(encoded, response.encoded)
+        Assert.assertEquals(ResponseType.DEFAULT_STATUS_RESPONSE, response.responseType)
+        Assert.assertEquals(ResponseType.DEFAULT_STATUS_RESPONSE.value, response.messageType)
+        Assert.assertEquals(DeliveryStatus.BASAL_ACTIVE, response.deliveryStatus)
+        Assert.assertEquals(PodStatus.RUNNING_ABOVE_MIN_VOLUME, response.podStatus)
+        Assert.assertEquals(320.toShort(), response.totalPulsesDelivered)
+        Assert.assertEquals(5.toShort(), response.sequenceNumberOfLastProgrammingCommand)
+        Assert.assertEquals(0.toShort(), response.bolusPulsesRemaining)
+        Assert.assertEquals(0, response.activeAlerts.size)
+        Assert.assertEquals(280.toShort(), response.minutesSinceActivation)
+        Assert.assertEquals(1023.toShort(), response.reservoirPulsesRemaining)
+    }
+
+    /**
+     * response (hex) 08202EAA0C0A1D1905281000004387D3039A
+     Status response: 29
+     Pod status: RUNNING_BELOW_MIN_VOLUME
+     Basal active: true
+     Temp Basal active: false
+     Immediate bolus active: false
+     Extended bolus active: false
+     Bolus pulses remaining: 0
+     sequence number of last programing command: 2
+     Total full pulses delivered: 2640
+     Full reservoir pulses remaining: 979
+     Time since activation: 4321
+     Alert 1 is InActive
+     Alert 2 is InActive
+     Alert 3 is InActive
+     Alert 4 is InActive
+     Alert 5 is InActive
+     Alert 6 is InActive
+     Alert 7 is InActive
+     Occlusion alert active false
+     */
+    @Test @Throws(DecoderException::class) fun testValidResponseBelowMin() {
+        val encoded = Hex.decodeHex("1D1905281000004387D3039A")
+        val response = DefaultStatusResponse(encoded)
+        Assert.assertArrayEquals(encoded, response.encoded)
+        Assert.assertNotSame(encoded, response.encoded)
+        Assert.assertEquals(ResponseType.DEFAULT_STATUS_RESPONSE, response.responseType)
+        Assert.assertEquals(ResponseType.DEFAULT_STATUS_RESPONSE.value, response.messageType)
+        Assert.assertEquals(DeliveryStatus.BASAL_ACTIVE, response.deliveryStatus)
+        Assert.assertEquals(PodStatus.RUNNING_BELOW_MIN_VOLUME, response.podStatus)
+        Assert.assertEquals(2.toShort(), response.sequenceNumberOfLastProgrammingCommand)
+        Assert.assertEquals(0.toShort(), response.bolusPulsesRemaining)
+        Assert.assertEquals(0, response.activeAlerts.size)
+        Assert.assertEquals(4321.toShort(), response.minutesSinceActivation)
+        Assert.assertEquals(979.toShort(), response.reservoirPulsesRemaining)
+        Assert.assertEquals(2640.toShort(), response.totalPulsesDelivered)
+    }
+
+    /**
+     * response (hex) 08202EAA080A1D180519C00E0039A7FF8085
+     Status response: 29
+     Pod status: RUNNING_ABOVE_MIN_VOLUME
+     Basal active: true
+     Temp Basal active: false
+     Immediate bolus active: false
+     Extended bolus active: false
+     Bolus pulses remaining: 14
+     sequence number of last programing command: 8
+     Total full pulses delivered: 2611
+     Full reservoir pulses remaining: 1023
+     Time since activation: 3689
+     Alert 1 is InActive
+     Alert 2 is InActive
+     Alert 3 is InActive
+     Alert 4 is InActive
+     Alert 5 is InActive
+     Alert 6 is InActive
+     Alert 7 is InActive
+     Occlusion alert active false
+     */
+    @Test @Throws(DecoderException::class) fun testValidResponseBolusPulsesRemaining() {
+        val encoded = Hex.decodeHex("1D180519C00E0039A7FF8085")
+        val response = DefaultStatusResponse(encoded)
+        Assert.assertArrayEquals(encoded, response.encoded)
+        Assert.assertNotSame(encoded, response.encoded)
+        Assert.assertEquals(ResponseType.DEFAULT_STATUS_RESPONSE, response.responseType)
+        Assert.assertEquals(ResponseType.DEFAULT_STATUS_RESPONSE.value, response.messageType)
+        Assert.assertEquals(DeliveryStatus.BASAL_ACTIVE, response.deliveryStatus)
+        Assert.assertEquals(PodStatus.RUNNING_ABOVE_MIN_VOLUME, response.podStatus)
+        Assert.assertEquals(8.toShort(), response.sequenceNumberOfLastProgrammingCommand)
+        Assert.assertEquals(14.toShort(), response.bolusPulsesRemaining)
+        Assert.assertEquals(0, response.activeAlerts.size)
+        Assert.assertEquals(3689.toShort(), response.minutesSinceActivation)
+        Assert.assertEquals(1023.toShort(), response.reservoirPulsesRemaining)
+        Assert.assertEquals(2611.toShort(), response.totalPulsesDelivered)
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.java
deleted file mode 100644
index 06937a0e92..0000000000
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlarmType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.NakErrorType;
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-
-public class NakResponseTest {
-    @Test
-    public void testValidResponse() throws DecoderException {
-        byte[] encoded = Hex.decodeHex("0603070009");
-        NakResponse response = new NakResponse(encoded);
-
-        assertArrayEquals(encoded, response.getEncoded());
-        assertNotSame(encoded, response.getEncoded());
-        assertEquals(ResponseType.NAK_RESPONSE, response.getResponseType());
-        assertEquals(ResponseType.NAK_RESPONSE.getValue(), response.getMessageType());
-        assertEquals(NakErrorType.ILLEGAL_PARAM, response.getNakErrorType());
-        assertEquals(AlarmType.NONE, response.getAlarmType());
-        assertEquals(PodStatus.RUNNING_BELOW_MIN_VOLUME, response.getPodStatus());
-        assertEquals((byte) 0x00, response.getSecurityNakSyncCount());
-    }
-}
\ No newline at end of file
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.kt
new file mode 100644
index 0000000000..b5254eca1d
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/NakResponseTest.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlarmType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.NakErrorType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+
+class NakResponseTest {
+
+    @Test @Throws(DecoderException::class) fun testValidResponse() {
+        val encoded = Hex.decodeHex("0603070009")
+        val response = NakResponse(encoded)
+
+        Assert.assertArrayEquals(encoded, response.encoded)
+        Assert.assertNotSame(encoded, response.encoded)
+        Assert.assertEquals(ResponseType.NAK_RESPONSE, response.responseType)
+        Assert.assertEquals(ResponseType.NAK_RESPONSE.value, response.messageType)
+        Assert.assertEquals(NakErrorType.ILLEGAL_PARAM, response.nakErrorType)
+        Assert.assertEquals(AlarmType.NONE, response.alarmType)
+        Assert.assertEquals(PodStatus.RUNNING_BELOW_MIN_VOLUME, response.podStatus)
+        Assert.assertEquals(0x00.toShort(), response.securityNakSyncCount)
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.java
deleted file mode 100644
index 1de262db9d..0000000000
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-
-public class SetUniqueIdResponseTest {
-    @Test
-    public void testValidResponse() throws DecoderException {
-        byte[] encoded = Hex.decodeHex("011B13881008340A50040A00010300040308146CC1000954D402420001");
-        SetUniqueIdResponse response = new SetUniqueIdResponse(encoded);
-
-        assertArrayEquals(encoded, response.getEncoded());
-        assertNotSame(encoded, response.getEncoded());
-        assertEquals(ResponseType.ACTIVATION_RESPONSE, response.getResponseType());
-        assertEquals(ResponseType.ActivationResponseType.SET_UNIQUE_ID_RESPONSE, response.getActivationResponseType());
-
-        assertEquals(ResponseType.ACTIVATION_RESPONSE.getValue(), response.getMessageType());
-        assertEquals(27, response.getMessageLength());
-        assertEquals(5000, response.getPulseVolumeInTenThousandthMicroLiter());
-        assertEquals(16, response.getDeliveryRate());
-        assertEquals(8, response.getPrimeRate());
-        assertEquals(52, response.getNumberOfEngagingClutchDrivePulses());
-        assertEquals(10, response.getNumberOfPrimePulses());
-        assertEquals(80, response.getPodExpirationTimeInHours());
-        assertEquals(4, response.getFirmwareVersionMajor());
-        assertEquals(10, response.getFirmwareVersionMinor());
-        assertEquals(0, response.getFirmwareVersionInterim());
-        assertEquals(1, response.getBleVersionMajor());
-        assertEquals(3, response.getBleVersionMinor());
-        assertEquals(0, response.getBleVersionInterim());
-        assertEquals(4, response.getProductId());
-        assertEquals(PodStatus.UID_SET, response.getPodStatus());
-        assertEquals(135556289L, response.getLotNumber());
-        assertEquals(611540L, response.getPodSequenceNumber());
-        assertEquals(37879809L, response.getUniqueIdReceivedInCommand());
-    }
-}
\ No newline at end of file
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.kt
new file mode 100644
index 0000000000..311be2c08b
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/SetUniqueIdResponseTest.kt
@@ -0,0 +1,39 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+
+class SetUniqueIdResponseTest {
+
+    @Test @Throws(DecoderException::class) fun testValidResponse() {
+        val encoded = Hex.decodeHex("011B13881008340A50040A00010300040308146CC1000954D402420001")
+        val response = SetUniqueIdResponse(encoded)
+
+        Assert.assertArrayEquals(encoded, response.encoded)
+        Assert.assertNotSame(encoded, response.encoded)
+        Assert.assertEquals(ResponseType.ACTIVATION_RESPONSE, response.responseType)
+        Assert.assertEquals(ResponseType.ActivationResponseType.SET_UNIQUE_ID_RESPONSE, response.activationResponseType)
+        Assert.assertEquals(ResponseType.ACTIVATION_RESPONSE.value, response.messageType)
+        Assert.assertEquals(27.toShort(), response.messageLength)
+        Assert.assertEquals(5000.toShort(), response.pulseVolumeInTenThousandthMicroLiter)
+        Assert.assertEquals(16.toShort(), response.pumpRate)
+        Assert.assertEquals(8.toShort(), response.primePumpRate)
+        Assert.assertEquals(52.toShort(), response.numberOfEngagingClutchDrivePulses)
+        Assert.assertEquals(10.toShort(), response.numberOfPrimePulses)
+        Assert.assertEquals(80.toShort(), response.podExpirationTimeInHours)
+        Assert.assertEquals(4.toShort(), response.firmwareVersionMajor)
+        Assert.assertEquals(10.toShort(), response.firmwareVersionMinor)
+        Assert.assertEquals(0.toShort(), response.firmwareVersionInterim)
+        Assert.assertEquals(1.toShort(), response.bleVersionMajor)
+        Assert.assertEquals(3.toShort(), response.bleVersionMinor)
+        Assert.assertEquals(0.toShort(), response.bleVersionInterim)
+        Assert.assertEquals(4.toShort(), response.productId)
+        Assert.assertEquals(PodStatus.UID_SET, response.podStatus)
+        Assert.assertEquals(135556289L, response.lotNumber)
+        Assert.assertEquals(611540L, response.podSequenceNumber)
+        Assert.assertEquals(37879809L, response.uniqueIdReceivedInCommand)
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.java b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.java
deleted file mode 100644
index c88142a715..0000000000
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.junit.Test;
-
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-
-public class VersionResponseTest {
-
-    @Test
-    public void testValidResponse() throws DecoderException {
-        byte[] encoded = Hex.decodeHex("0115040A00010300040208146CC1000954D400FFFFFFFF");
-        VersionResponse response = new VersionResponse(encoded);
-
-        assertArrayEquals(encoded, response.getEncoded());
-        assertNotSame(encoded, response.getEncoded());
-        assertEquals(ResponseType.ACTIVATION_RESPONSE, response.getResponseType());
-        assertEquals(ResponseType.ActivationResponseType.GET_VERSION_RESPONSE, response.getActivationResponseType());
-
-        assertEquals(ResponseType.ACTIVATION_RESPONSE.getValue(), response.getMessageType());
-        assertEquals(21, response.getMessageLength());
-        assertEquals(4, response.getFirmwareVersionMajor());
-        assertEquals(10, response.getFirmwareVersionMinor());
-        assertEquals(0, response.getFirmwareVersionInterim());
-        assertEquals(1, response.getBleVersionMajor());
-        assertEquals(3, response.getBleVersionMinor());
-        assertEquals(0, response.getBleVersionInterim());
-        assertEquals(4, response.getProductId());
-        assertEquals(PodStatus.FILLED, response.getPodStatus());
-        assertEquals(135556289, response.getLotNumber());
-        assertEquals(611540, response.getPodSequenceNumber());
-        assertEquals(0L, response.getRssi());
-        assertEquals(0L, response.getReceiverLowerGain());
-        assertEquals(4294967295L, response.getUniqueIdReceivedInCommand());
-    }
-}
\ No newline at end of file
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.kt
new file mode 100644
index 0000000000..58e3585cae
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/VersionResponseTest.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response
+
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodStatus
+import org.apache.commons.codec.DecoderException
+import org.apache.commons.codec.binary.Hex
+import org.junit.Assert
+import org.junit.Test
+
+class VersionResponseTest {
+
+    @Test @Throws(DecoderException::class) fun testValidResponse() {
+        val encoded = Hex.decodeHex("0115040A00010300040208146CC1000954D400FFFFFFFF")
+        val response = VersionResponse(encoded)
+
+        Assert.assertArrayEquals(encoded, response.encoded)
+        Assert.assertNotSame(encoded, response.encoded)
+        Assert.assertEquals(ResponseType.ACTIVATION_RESPONSE, response.responseType)
+        Assert.assertEquals(ResponseType.ActivationResponseType.GET_VERSION_RESPONSE, response.activationResponseType)
+        Assert.assertEquals(ResponseType.ACTIVATION_RESPONSE.value, response.messageType)
+        Assert.assertEquals(21.toShort(), response.messageLength)
+        Assert.assertEquals(4.toShort(), response.firmwareVersionMajor)
+        Assert.assertEquals(10.toShort(), response.firmwareVersionMinor)
+        Assert.assertEquals(0.toShort(), response.firmwareVersionInterim)
+        Assert.assertEquals(1.toShort(), response.bleVersionMajor)
+        Assert.assertEquals(3.toShort(), response.bleVersionMinor)
+        Assert.assertEquals(0.toShort(), response.bleVersionInterim)
+        Assert.assertEquals(4.toShort(), response.productId)
+        Assert.assertEquals(PodStatus.FILLED, response.podStatus)
+        Assert.assertEquals(135556289L, response.lotNumber)
+        Assert.assertEquals(611540L, response.podSequenceNumber)
+        Assert.assertEquals(0.toByte(), response.rssi)
+        Assert.assertEquals(0.toByte(), response.receiverLowerGain)
+        Assert.assertEquals(4294967295L, response.uniqueIdReceivedInCommand)
+    }
+}
diff --git a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt
new file mode 100644
index 0000000000..03dfebdbe0
--- /dev/null
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/util/FunctionsTest.kt
@@ -0,0 +1,113 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.util
+
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.interfaces.Profile.ProfileValue
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram
+import org.junit.Assert
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+
+class FunctionsTest {
+
+    @Test fun validProfile() {
+        val profile = Mockito.mock(Profile::class.java)
+
+        `when`(profile.getBasalValues()).thenReturn(
+            arrayOf(
+                ProfileValue(0, 0.5),
+                ProfileValue(18000, 1.0),
+                ProfileValue(50400, 3.05)
+            )
+        )
+
+        val basalProgram: BasalProgram = mapProfileToBasalProgram(profile)
+        val entries: List<BasalProgram.Segment> = basalProgram.segments
+        assertEquals(3, entries.size)
+        val entry1: BasalProgram.Segment = entries[0]
+        assertEquals(0.toShort(), entry1.startSlotIndex)
+        assertEquals(50, entry1.basalRateInHundredthUnitsPerHour)
+        assertEquals(10.toShort(), entry1.endSlotIndex)
+        val entry2: BasalProgram.Segment = entries[1]
+        assertEquals(10.toShort(), entry2.startSlotIndex)
+        assertEquals(100, entry2.basalRateInHundredthUnitsPerHour)
+        assertEquals(28.toShort(), entry2.endSlotIndex)
+        val entry3: BasalProgram.Segment = entries[2]
+        assertEquals(28.toShort(), entry3.startSlotIndex)
+        assertEquals(305, entry3.basalRateInHundredthUnitsPerHour)
+        assertEquals(48.toShort(), entry3.endSlotIndex)
+    }
+
+    @Test fun invalidProfileZeroEntries() {
+        val profile = Mockito.mock(Profile::class.java)
+
+        `when`(profile.getBasalValues()).thenReturn(emptyArray())
+
+        Assert.assertThrows(
+            "Basal values should contain values",
+            java.lang.IllegalArgumentException::class.java
+        ) {
+            mapProfileToBasalProgram(profile)
+        }
+    }
+
+    @Test fun invalidProfileNonZeroOffset() {
+        val profile = Mockito.mock(Profile::class.java)
+
+        `when`(profile.getBasalValues()).thenReturn(
+            arrayOf(ProfileValue(1800, 0.5))
+        )
+
+        Assert.assertThrows(
+            "First basal segment start time should be 0",
+            java.lang.IllegalArgumentException::class.java
+        ) {
+            mapProfileToBasalProgram(profile)
+        }
+    }
+
+    @Test fun invalidProfileMoreThan24Hours() {
+        val profile = Mockito.mock(Profile::class.java)
+
+        `when`(profile.getBasalValues()).thenReturn(
+            arrayOf(
+                ProfileValue(0, 0.5),
+                ProfileValue(86400, 0.5)
+            )
+        )
+
+        Assert.assertThrows(
+            "Basal segment start time can not be greater than 86400",
+            java.lang.IllegalArgumentException::class.java
+        ) {
+            mapProfileToBasalProgram(profile)
+        }
+    }
+
+    @Test fun invalidProfileNegativeOffset() {
+        val profile = Mockito.mock(Profile::class.java)
+
+        `when`(profile.getBasalValues()).thenReturn(
+            arrayOf(ProfileValue(-1, 0.5))
+        )
+
+        Assert.assertThrows("Basal segment start time can not be less than 0", IllegalArgumentException::class.java) {
+            mapProfileToBasalProgram(profile)
+        }
+    }
+
+    @Test fun roundsToSupportedPrecision() {
+        val profile = Mockito.mock(Profile::class.java)
+
+        `when`(profile.getBasalValues()).thenReturn(
+            arrayOf(
+                ProfileValue(0, 0.04)
+            )
+        )
+
+        val basalProgram: BasalProgram = mapProfileToBasalProgram(profile)
+        val basalProgramElement: BasalProgram.Segment = basalProgram.segments[0]
+        assertEquals(5, basalProgramElement.basalRateInHundredthUnitsPerHour)
+    }
+}
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java
index 6bcd7e9ba0..35ef3f0835 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java
@@ -62,7 +62,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLin
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType;
-import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandAcknowledgeAlerts;
+import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandSilenceAlerts;
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandDeactivatePod;
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandHandleTimeChange;
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandPlayTestBeep;
@@ -78,7 +78,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.Al
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSet;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepConfigType;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util.TimeUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosActiveAlertsChanged;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosFaultEventChanged;
@@ -122,7 +122,7 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley
     public static final int STARTUP_STATUS_REQUEST_TRIES = 2;
     public static final double RESERVOIR_OVER_50_UNITS_DEFAULT = 75.0;
 
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
     private final RileyLinkServiceData rileyLinkServiceData;
     private final AapsOmnipodErosManager aapsOmnipodErosManager;
     private final AapsOmnipodUtil aapsOmnipodUtil;
@@ -168,7 +168,7 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley
             ResourceHelper resourceHelper,
             ActivePlugin activePlugin,
             SP sp,
-            PodStateManager podStateManager,
+            ErosPodStateManager podStateManager,
             AapsOmnipodErosManager aapsOmnipodErosManager,
             CommandQueueProvider commandQueue,
             FabricPrivacy fabricPrivacy,
@@ -254,7 +254,7 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley
                     }
 
                     if (aapsOmnipodErosManager.isAutomaticallyAcknowledgeAlertsEnabled() && podStateManager.isPodActivationCompleted() && !podStateManager.isPodDead() &&
-                            podStateManager.getActiveAlerts().size() > 0 && !getCommandQueue().isCustomCommandInQueue(CommandAcknowledgeAlerts.class)) {
+                            podStateManager.getActiveAlerts().size() > 0 && !getCommandQueue().isCustomCommandInQueue(CommandSilenceAlerts.class)) {
                         queueAcknowledgeAlertsCommand();
                     }
                 } else {
@@ -413,7 +413,7 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley
                 rxBus.send(new EventNewNotification(notification));
                 pumpSync.insertAnnouncement(notificationText, null, PumpType.OMNIPOD_EROS, serialNumber());
 
-                if (aapsOmnipodErosManager.isAutomaticallyAcknowledgeAlertsEnabled() && !getCommandQueue().isCustomCommandInQueue(CommandAcknowledgeAlerts.class)) {
+                if (aapsOmnipodErosManager.isAutomaticallyAcknowledgeAlertsEnabled() && !getCommandQueue().isCustomCommandInQueue(CommandSilenceAlerts.class)) {
                     queueAcknowledgeAlertsCommand();
                 }
             }
@@ -440,7 +440,7 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley
     }
 
     private void queueAcknowledgeAlertsCommand() {
-        getCommandQueue().customCommand(new CommandAcknowledgeAlerts(), new Callback() {
+        getCommandQueue().customCommand(new CommandSilenceAlerts(), new Callback() {
             @Override public void run() {
                 if (result != null) {
                     aapsLogger.debug(LTag.PUMP, "Acknowledge alerts result: {} ({})", result.getSuccess(), result.getComment());
@@ -829,7 +829,7 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley
 
     @Override
     public PumpEnactResult executeCustomCommand(@NonNull CustomCommand command) {
-        if (command instanceof CommandAcknowledgeAlerts) {
+        if (command instanceof CommandSilenceAlerts) {
             return executeCommand(OmnipodCommandType.ACKNOWLEDGE_ALERTS, aapsOmnipodErosManager::acknowledgeAlerts);
         }
         if (command instanceof CommandGetPodStatus) {
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt
index 453f1f7f86..341779fbec 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/dagger/OmnipodErosModule.kt
@@ -6,7 +6,7 @@ import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.ActivityScope
 import info.nightscout.androidaps.plugins.pump.omnipod.common.dagger.OmnipodWizardModule
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.data.RLHistoryItemOmnipod
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsErosPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.service.RileyLinkOmnipodService
@@ -23,36 +23,36 @@ abstract class OmnipodErosModule {
     // ACTIVITIES
 
     @ContributesAndroidInjector
-    abstract fun contributesPodManagementActivity(): ErosPodManagementActivity
-    @ContributesAndroidInjector abstract fun contributesPodHistoryActivity(): ErosPodHistoryActivity
+    abstract fun contributesErosPodManagementActivity(): ErosPodManagementActivity
+    @ContributesAndroidInjector abstract fun contributesErosPodHistoryActivity(): ErosPodHistoryActivity
 
     @ActivityScope
     @ContributesAndroidInjector(modules = [OmnipodWizardModule::class, OmnipodErosWizardViewModelsModule::class])
-    abstract fun contributesActivationWizardActivity(): ErosPodActivationWizardActivity
+    abstract fun contributesErosActivationWizardActivity(): ErosPodActivationWizardActivity
 
     @ActivityScope
     @ContributesAndroidInjector(modules = [OmnipodWizardModule::class, OmnipodErosWizardViewModelsModule::class])
-    abstract fun contributesDeactivationWizardActivity(): ErosPodDeactivationWizardActivity
+    abstract fun contributesErosDeactivationWizardActivity(): ErosPodDeactivationWizardActivity
 
     // FRAGMENTS
 
     @ContributesAndroidInjector
-    abstract fun contributesOmnipodFragment(): OmnipodErosOverviewFragment
+    abstract fun contributesOmnipodErosOverviewFragment(): OmnipodErosOverviewFragment
 
     // SERVICES
 
     @ContributesAndroidInjector
-    abstract fun omnipodCommunicationManagerProvider(): OmnipodRileyLinkCommunicationManager
+    abstract fun contributesOmnipodRileyLinkCommunicationManagerProvider(): OmnipodRileyLinkCommunicationManager
     @ContributesAndroidInjector
     abstract fun contributesRileyLinkOmnipodService(): RileyLinkOmnipodService
 
     // DATA
 
-    @ContributesAndroidInjector abstract fun rlHistoryItemOmnipod(): RLHistoryItemOmnipod
+    @ContributesAndroidInjector abstract fun contributesRlHistoryItemOmnipod(): RLHistoryItemOmnipod
 
     companion object {
 
         @Provides
-        fun podStateManagerProvider(aapsErosPodStateManager: AapsErosPodStateManager): PodStateManager = aapsErosPodStateManager
+        fun erosPodStateManagerProvider(aapsErosPodStateManager: AapsErosPodStateManager): ErosPodStateManager = aapsErosPodStateManager
     }
 }
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AcknowledgeAlertsAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AcknowledgeAlertsAction.java
index 6252d6db56..24dc417c72 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AcknowledgeAlertsAction.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AcknowledgeAlertsAction.java
@@ -6,14 +6,14 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSet;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSlot;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
 public class AcknowledgeAlertsAction implements OmnipodAction<StatusResponse> {
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
     private final AlertSet alerts;
 
-    public AcknowledgeAlertsAction(PodStateManager podStateManager, AlertSet alerts) {
+    public AcknowledgeAlertsAction(ErosPodStateManager podStateManager, AlertSet alerts) {
         if (podStateManager == null) {
             throw new IllegalArgumentException("Pod state manager cannot be null");
         }
@@ -26,7 +26,7 @@ public class AcknowledgeAlertsAction implements OmnipodAction<StatusResponse> {
         this.alerts = alerts;
     }
 
-    public AcknowledgeAlertsAction(PodStateManager podStateManager, AlertSlot alertSlot) {
+    public AcknowledgeAlertsAction(ErosPodStateManager podStateManager, AlertSlot alertSlot) {
         this(podStateManager, new AlertSet(Collections.singletonList(alertSlot)));
     }
 
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.java
index 2d615177de..5f1314c59d 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/AssignAddressAction.java
@@ -14,14 +14,14 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.Pa
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalMessageAddressException;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalPacketTypeException;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalVersionResponseTypeException;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
 public class AssignAddressAction implements OmnipodAction<Void> {
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
     private final AAPSLogger aapsLogger;
 
-    public AssignAddressAction(PodStateManager podStateManager, AAPSLogger aapsLogger) {
+    public AssignAddressAction(ErosPodStateManager podStateManager, AAPSLogger aapsLogger) {
         if (podStateManager == null) {
             throw new IllegalArgumentException("podStateManager can not be null");
         }
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/BolusAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/BolusAction.java
index 465a68a9ca..7ed57a6db6 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/BolusAction.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/BolusAction.java
@@ -9,17 +9,17 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.SetInsulinScheduleCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BolusDeliverySchedule;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
 public class BolusAction implements OmnipodAction<StatusResponse> {
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
     private final double units;
     private final Duration timeBetweenPulses;
     private final boolean acknowledgementBeep;
     private final boolean completionBeep;
 
-    public BolusAction(PodStateManager podStateManager, double units, Duration timeBetweenPulses,
+    public BolusAction(ErosPodStateManager podStateManager, double units, Duration timeBetweenPulses,
                        boolean acknowledgementBeep, boolean completionBeep) {
         if (podStateManager == null) {
             throw new IllegalArgumentException("Pod state manager cannot be null");
@@ -34,7 +34,7 @@ public class BolusAction implements OmnipodAction<StatusResponse> {
         this.completionBeep = completionBeep;
     }
 
-    public BolusAction(PodStateManager podStateManager, double units, boolean acknowledgementBeep, boolean completionBeep) {
+    public BolusAction(ErosPodStateManager podStateManager, double units, boolean acknowledgementBeep, boolean completionBeep) {
         this(podStateManager, units, Duration.standardSeconds(2), acknowledgementBeep, completionBeep);
     }
 
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/CancelDeliveryAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/CancelDeliveryAction.java
index 5140edf673..5fc280207f 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/CancelDeliveryAction.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/CancelDeliveryAction.java
@@ -14,15 +14,15 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepConfigType;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepType;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryType;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
 public class CancelDeliveryAction implements OmnipodAction<StatusResponse> {
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
     private final EnumSet<DeliveryType> deliveryTypes;
     private final boolean acknowledgementBeep;
 
-    public CancelDeliveryAction(PodStateManager podStateManager, EnumSet<DeliveryType> deliveryTypes,
+    public CancelDeliveryAction(ErosPodStateManager podStateManager, EnumSet<DeliveryType> deliveryTypes,
                                 boolean acknowledgementBeep) {
         if (podStateManager == null) {
             throw new IllegalArgumentException("Pod state manager cannot be null");
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureAlertsAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureAlertsAction.java
index 39265c03a7..ad10e1284d 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureAlertsAction.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureAlertsAction.java
@@ -5,14 +5,14 @@ import java.util.List;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.ConfigureAlertsCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertConfiguration;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
 public class ConfigureAlertsAction implements OmnipodAction<StatusResponse> {
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
     private final List<AlertConfiguration> alertConfigurations;
 
-    public ConfigureAlertsAction(PodStateManager podStateManager, List<AlertConfiguration> alertConfigurations) {
+    public ConfigureAlertsAction(ErosPodStateManager podStateManager, List<AlertConfiguration> alertConfigurations) {
         if (podStateManager == null) {
             throw new IllegalArgumentException("Pod state manager cannot be null");
         }
@@ -31,7 +31,7 @@ public class ConfigureAlertsAction implements OmnipodAction<StatusResponse> {
         return statusResponse;
     }
 
-    public static void updateConfiguredAlerts(PodStateManager podStateManager, List<AlertConfiguration> alertConfigurations) {
+    public static void updateConfiguredAlerts(ErosPodStateManager podStateManager, List<AlertConfiguration> alertConfigurations) {
         for (AlertConfiguration alertConfiguration : alertConfigurations) {
             if (alertConfiguration.isActive()) {
                 podStateManager.putConfiguredAlert(alertConfiguration.getAlertSlot(), alertConfiguration.getAlertType());
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureBeepAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureBeepAction.java
index b8b8914256..c1dd3e2a55 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureBeepAction.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/ConfigureBeepAction.java
@@ -5,11 +5,11 @@ import org.joda.time.Duration;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.BeepConfigCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.BeepConfigType;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
 public class ConfigureBeepAction implements OmnipodAction<StatusResponse> {
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
     private final BeepConfigType beepType;
     private final boolean basalCompletionBeep;
     private final Duration basalIntervalBeep;
@@ -18,7 +18,7 @@ public class ConfigureBeepAction implements OmnipodAction<StatusResponse> {
     private final boolean bolusCompletionBeep;
     private final Duration bolusIntervalBeep;
 
-    public ConfigureBeepAction(PodStateManager podState, BeepConfigType beepType, boolean basalCompletionBeep, Duration basalIntervalBeep, boolean tempBasalCompletionBeep, Duration tempBasalIntervalBeep, boolean bolusCompletionBeep, Duration bolusIntervalBeep) {
+    public ConfigureBeepAction(ErosPodStateManager podState, BeepConfigType beepType, boolean basalCompletionBeep, Duration basalIntervalBeep, boolean tempBasalCompletionBeep, Duration tempBasalIntervalBeep, boolean bolusCompletionBeep, Duration bolusIntervalBeep) {
         if (podState == null || beepType == null) {
             throw new IllegalArgumentException("Required parameter(s) missing");
         }
@@ -33,7 +33,7 @@ public class ConfigureBeepAction implements OmnipodAction<StatusResponse> {
         this.podStateManager = podState;
     }
 
-    public ConfigureBeepAction(PodStateManager podState, BeepConfigType beepType) {
+    public ConfigureBeepAction(ErosPodStateManager podState, BeepConfigType beepType) {
         this(podState, beepType, false, Duration.ZERO, false, Duration.ZERO, false, Duration.ZERO);
     }
 
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/DeactivatePodAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/DeactivatePodAction.java
index 2170a43e20..ec70547c6d 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/DeactivatePodAction.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/DeactivatePodAction.java
@@ -6,14 +6,14 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.DeliveryType;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.PodFaultException;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
 public class DeactivatePodAction implements OmnipodAction<StatusResponse> {
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
     private final boolean acknowledgementBeep;
 
-    public DeactivatePodAction(PodStateManager podStateManager, boolean acknowledgementBeep) {
+    public DeactivatePodAction(ErosPodStateManager podStateManager, boolean acknowledgementBeep) {
         if (podStateManager == null) {
             throw new IllegalArgumentException("Pod state manager cannot be null");
         }
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetPodInfoAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetPodInfoAction.java
index 399309b4f7..efbfc3157d 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetPodInfoAction.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetPodInfoAction.java
@@ -3,14 +3,14 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communicatio
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.GetStatusCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.podinfo.PodInfoResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
 public class GetPodInfoAction implements OmnipodAction<PodInfoResponse> {
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
     private final PodInfoType podInfoType;
 
-    public GetPodInfoAction(PodStateManager podStateManager, PodInfoType podInfoType) {
+    public GetPodInfoAction(ErosPodStateManager podStateManager, PodInfoType podInfoType) {
         if (podStateManager == null) {
             throw new IllegalArgumentException("Pod state manager cannot be null");
         }
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetStatusAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetStatusAction.java
index 9cb087e328..b68928e2b2 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetStatusAction.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/GetStatusAction.java
@@ -3,13 +3,13 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communicatio
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.GetStatusCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodInfoType;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
 public class GetStatusAction implements OmnipodAction<StatusResponse> {
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
 
-    public GetStatusAction(PodStateManager podState) {
+    public GetStatusAction(ErosPodStateManager podState) {
         if (podState == null) {
             throw new IllegalArgumentException("Pod state manager cannot be null");
         }
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/InsertCannulaAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/InsertCannulaAction.java
index 994d3a8d07..15c76ae683 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/InsertCannulaAction.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/InsertCannulaAction.java
@@ -11,17 +11,17 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.Al
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalSchedule;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalActivationProgressException;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
 public class InsertCannulaAction implements OmnipodAction<Void> {
 
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
     private final BasalSchedule initialBasalSchedule;
     private final Duration expirationReminderTimeBeforeShutdown;
     private final Integer lowReservoirAlertUnits;
 
-    public InsertCannulaAction(PodStateManager podStateManager, BasalSchedule initialBasalSchedule,
+    public InsertCannulaAction(ErosPodStateManager podStateManager, BasalSchedule initialBasalSchedule,
                                Duration expirationReminderTimeBeforeShutdown, Integer lowReservoirAlertUnits) {
         if (podStateManager == null) {
             throw new IllegalArgumentException("Pod state manager cannot be null");
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/PrimeAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/PrimeAction.java
index 582df47447..df02efe473 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/PrimeAction.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/PrimeAction.java
@@ -3,15 +3,15 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communicatio
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.action.service.PrimeService;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalActivationProgressException;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
 public class PrimeAction implements OmnipodAction<Void> {
 
     private final PrimeService service;
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
 
-    public PrimeAction(PrimeService primeService, PodStateManager podStateManager) {
+    public PrimeAction(PrimeService primeService, ErosPodStateManager podStateManager) {
         if (primeService == null) {
             throw new IllegalArgumentException("Prime service cannot be null");
         }
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetBasalScheduleAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetBasalScheduleAction.java
index a96d2c0853..ff1f98407f 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetBasalScheduleAction.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetBasalScheduleAction.java
@@ -9,17 +9,17 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.SetInsulinScheduleCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalSchedule;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
 public class SetBasalScheduleAction implements OmnipodAction<StatusResponse> {
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
     private final BasalSchedule basalSchedule;
     private final boolean confidenceReminder;
     private final Duration scheduleOffset;
     private final boolean acknowledgementBeep;
 
-    public SetBasalScheduleAction(PodStateManager podStateManager, BasalSchedule basalSchedule,
+    public SetBasalScheduleAction(ErosPodStateManager podStateManager, BasalSchedule basalSchedule,
                                   boolean confidenceReminder, Duration scheduleOffset, boolean acknowledgementBeep) {
         if (podStateManager == null) {
             throw new IllegalArgumentException("Pod state manager cannot be null");
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetTempBasalAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetTempBasalAction.java
index e26a2d803b..b643c174e3 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetTempBasalAction.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetTempBasalAction.java
@@ -10,17 +10,17 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.SetInsulinScheduleCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.command.TempBasalExtraCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
 public class SetTempBasalAction implements OmnipodAction<StatusResponse> {
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
     private final double rate;
     private final Duration duration;
     private final boolean acknowledgementBeep;
     private final boolean completionBeep;
 
-    public SetTempBasalAction(PodStateManager podStateManager, double rate, Duration duration,
+    public SetTempBasalAction(ErosPodStateManager podStateManager, double rate, Duration duration,
                               boolean acknowledgementBeep, boolean completionBeep) {
         if (podStateManager == null) {
             throw new IllegalArgumentException("Pod state manager cannot be null");
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java
index 5188210bca..cd4614c6ac 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/SetupPodAction.java
@@ -16,14 +16,14 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.Ill
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalPacketTypeException;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalPodProgressException;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.IllegalVersionResponseTypeException;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
 public class SetupPodAction implements OmnipodAction<Void> {
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
     private final AAPSLogger aapsLogger;
 
-    public SetupPodAction(PodStateManager podStateManager, AAPSLogger aapsLogger) {
+    public SetupPodAction(ErosPodStateManager podStateManager, AAPSLogger aapsLogger) {
         if (podStateManager == null) {
             throw new IllegalArgumentException("Pod state manager can not be null");
         }
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/ExpirationReminderBuilder.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/ExpirationReminderBuilder.java
index 3e208d87ba..a2cd03d4de 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/ExpirationReminderBuilder.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/ExpirationReminderBuilder.java
@@ -11,14 +11,14 @@ import java.util.Map;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertConfiguration;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSlot;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util.AlertConfigurationUtil;
 
 public final class ExpirationReminderBuilder {
     private final Map<AlertSlot, AlertConfiguration> alerts = new HashMap<>();
     private final DateTime endOfServiceTime;
 
-    public ExpirationReminderBuilder(PodStateManager podStateManager) {
+    public ExpirationReminderBuilder(ErosPodStateManager podStateManager) {
         this.endOfServiceTime = podStateManager.getActivatedAt().plus(OmnipodConstants.SERVICE_DURATION);
     }
 
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/PrimeService.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/PrimeService.java
index e5973ca1e9..640869dc00 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/PrimeService.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/action/service/PrimeService.java
@@ -11,26 +11,26 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertConfiguration;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util.AlertConfigurationUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 
 public class PrimeService {
 
-    public StatusResponse executeDisableTab5Sub16And17FaultConfigCommand(OmnipodRileyLinkCommunicationManager communicationService, PodStateManager podStateManager) {
+    public StatusResponse executeDisableTab5Sub16And17FaultConfigCommand(OmnipodRileyLinkCommunicationManager communicationService, ErosPodStateManager podStateManager) {
         FaultConfigCommand faultConfigCommand = new FaultConfigCommand(podStateManager.getCurrentNonce(), (byte) 0x00, (byte) 0x00);
         OmnipodMessage faultConfigMessage = new OmnipodMessage(podStateManager.getAddress(),
                 Collections.singletonList(faultConfigCommand), podStateManager.getMessageNumber());
         return communicationService.exchangeMessages(StatusResponse.class, podStateManager, faultConfigMessage);
     }
 
-    public StatusResponse executeFinishSetupReminderAlertCommand(OmnipodRileyLinkCommunicationManager communicationService, PodStateManager podStateManager) {
+    public StatusResponse executeFinishSetupReminderAlertCommand(OmnipodRileyLinkCommunicationManager communicationService, ErosPodStateManager podStateManager) {
         AlertConfiguration finishSetupReminderAlertConfiguration = AlertConfigurationUtil.createFinishSetupReminderAlertConfiguration();
         return communicationService.executeAction(new ConfigureAlertsAction(podStateManager,
                 Collections.singletonList(finishSetupReminderAlertConfiguration)));
     }
 
-    public StatusResponse executePrimeBolusCommand(OmnipodRileyLinkCommunicationManager communicationService, PodStateManager podStateManager) {
+    public StatusResponse executePrimeBolusCommand(OmnipodRileyLinkCommunicationManager communicationService, ErosPodStateManager podStateManager) {
         return communicationService.executeAction(new BolusAction(podStateManager, OmnipodConstants.POD_PRIME_BOLUS_UNITS,
                 Duration.standardSeconds(1), false, true));
     }
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/PodStateManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java
similarity index 99%
rename from omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/PodStateManager.java
rename to omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java
index adc56510bb..e066f5e1a9 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/PodStateManager.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/ErosPodStateManager.java
@@ -38,13 +38,13 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.sc
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util.TimeUtil;
 
 // TODO add nullchecks on some setters
-public abstract class PodStateManager {
+public abstract class ErosPodStateManager {
 
     private final AAPSLogger aapsLogger;
     private final Gson gsonInstance;
     private PodState podState;
 
-    protected PodStateManager(AAPSLogger aapsLogger) {
+    protected ErosPodStateManager(AAPSLogger aapsLogger) {
         this.aapsLogger = aapsLogger;
         this.gsonInstance = createGson();
     }
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java
index d76b183cf6..6649eced0d 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/manager/OmnipodManager.java
@@ -63,7 +63,7 @@ public class OmnipodManager {
     private static final int ACTION_VERIFICATION_TRIES = 1;
 
     private final OmnipodRileyLinkCommunicationManager communicationService;
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
 
     private ActiveBolusData activeBolusData;
     private SingleSubject<Boolean> bolusCommandExecutionSubject;
@@ -76,7 +76,7 @@ public class OmnipodManager {
     public OmnipodManager(AAPSLogger aapsLogger,
                           AapsSchedulers aapsSchedulers,
                           OmnipodRileyLinkCommunicationManager communicationService,
-                          PodStateManager podStateManager) {
+                          ErosPodStateManager podStateManager) {
         if (communicationService == null) {
             throw new IllegalArgumentException("Communication service cannot be null");
         }
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java
index 99e58b3550..4a170d5c35 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManager.java
@@ -8,7 +8,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.OmnipodErosStorageKeys;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosActiveAlertsChanged;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosFaultEventChanged;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosTbrChanged;
@@ -16,7 +16,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodEr
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 @Singleton
-public class AapsErosPodStateManager extends PodStateManager {
+public class AapsErosPodStateManager extends ErosPodStateManager {
     private final SP sp;
     private final RxBusWrapper rxBus;
 
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java
index d286ebfc74..2e73d08141 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java
@@ -73,7 +73,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.Ril
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.RileyLinkUnexpectedException;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.RileyLinkUnreachableException;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.OmnipodManager;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosPumpValuesChanged;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil;
@@ -87,7 +87,7 @@ import io.reactivex.subjects.SingleSubject;
 @Singleton
 public class AapsOmnipodErosManager {
 
-    private final PodStateManager podStateManager;
+    private final ErosPodStateManager podStateManager;
     private final AapsOmnipodUtil aapsOmnipodUtil;
     private final AAPSLogger aapsLogger;
     private final RxBusWrapper rxBus;
@@ -116,7 +116,7 @@ public class AapsOmnipodErosManager {
 
     @Inject
     public AapsOmnipodErosManager(OmnipodRileyLinkCommunicationManager communicationService,
-                                  PodStateManager podStateManager,
+                                  ErosPodStateManager podStateManager,
                                   AapsOmnipodUtil aapsOmnipodUtil,
                                   AAPSLogger aapsLogger,
                                   AapsSchedulers aapsSchedulers,
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java
index 2e405af2ee..bd8ae128ee 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/manager/OmnipodRileyLinkCommunicationManager.java
@@ -43,7 +43,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.Pod
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.RileyLinkTimeoutException;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.RileyLinkUnexpectedException;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.exception.RileyLinkUnreachableException;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 
 /**
  * Created by andy on 6/29/18.
@@ -86,11 +86,11 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication
         return super.sendAndListen(msg, timeout_ms, repeatCount, retryCount, extendPreamble_ms);
     }
 
-    public <T extends MessageBlock> T sendCommand(Class<T> responseClass, PodStateManager podStateManager, MessageBlock command) {
+    public <T extends MessageBlock> T sendCommand(Class<T> responseClass, ErosPodStateManager podStateManager, MessageBlock command) {
         return sendCommand(responseClass, podStateManager, command, true);
     }
 
-    public <T extends MessageBlock> T sendCommand(Class<T> responseClass, PodStateManager podStateManager, MessageBlock command, boolean automaticallyResyncNone) {
+    public <T extends MessageBlock> T sendCommand(Class<T> responseClass, ErosPodStateManager podStateManager, MessageBlock command, boolean automaticallyResyncNone) {
         OmnipodMessage message = new OmnipodMessage(podStateManager.getAddress(), Collections.singletonList(command), podStateManager.getMessageNumber());
         return exchangeMessages(responseClass, podStateManager, message, automaticallyResyncNone);
     }
@@ -100,19 +100,19 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication
         return action.execute(this);
     }
 
-    public <T extends MessageBlock> T exchangeMessages(Class<T> responseClass, PodStateManager podStateManager, OmnipodMessage message) {
+    public <T extends MessageBlock> T exchangeMessages(Class<T> responseClass, ErosPodStateManager podStateManager, OmnipodMessage message) {
         return exchangeMessages(responseClass, podStateManager, message, true);
     }
 
-    public <T extends MessageBlock> T exchangeMessages(Class<T> responseClass, PodStateManager podStateManager, OmnipodMessage message, boolean automaticallyResyncNonce) {
+    public <T extends MessageBlock> T exchangeMessages(Class<T> responseClass, ErosPodStateManager podStateManager, OmnipodMessage message, boolean automaticallyResyncNonce) {
         return exchangeMessages(responseClass, podStateManager, message, null, null, automaticallyResyncNonce);
     }
 
-    public synchronized <T extends MessageBlock> T exchangeMessages(Class<T> responseClass, PodStateManager podStateManager, OmnipodMessage message, Integer addressOverride, Integer ackAddressOverride) {
+    public synchronized <T extends MessageBlock> T exchangeMessages(Class<T> responseClass, ErosPodStateManager podStateManager, OmnipodMessage message, Integer addressOverride, Integer ackAddressOverride) {
         return exchangeMessages(responseClass, podStateManager, message, addressOverride, ackAddressOverride, true);
     }
 
-    public synchronized <T extends MessageBlock> T exchangeMessages(Class<T> responseClass, PodStateManager podStateManager, OmnipodMessage message, Integer addressOverride, Integer ackAddressOverride, boolean automaticallyResyncNonce) {
+    public synchronized <T extends MessageBlock> T exchangeMessages(Class<T> responseClass, ErosPodStateManager podStateManager, OmnipodMessage message, Integer addressOverride, Integer ackAddressOverride, boolean automaticallyResyncNonce) {
         aapsLogger.debug(LTag.PUMPBTCOMM, "Exchanging OmnipodMessage: responseClass={}, podStateManager={}, message={}, addressOverride={}, ackAddressOverride={}, automaticallyResyncNonce={}", //
                 responseClass.getSimpleName(), podStateManager, message, addressOverride, ackAddressOverride, automaticallyResyncNonce);
 
@@ -192,7 +192,7 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication
 
     }
 
-    private MessageBlock transportMessages(PodStateManager podStateManager, OmnipodMessage message, Integer addressOverride, Integer ackAddressOverride) {
+    private MessageBlock transportMessages(ErosPodStateManager podStateManager, OmnipodMessage message, Integer addressOverride, Integer ackAddressOverride) {
         int packetAddress = podStateManager.getAddress();
         if (addressOverride != null) {
             packetAddress = addressOverride;
@@ -298,7 +298,7 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication
         return messageBlock;
     }
 
-    private OmnipodPacket createAckPacket(PodStateManager podStateManager, Integer packetAddress, Integer messageAddress) {
+    private OmnipodPacket createAckPacket(ErosPodStateManager podStateManager, Integer packetAddress, Integer messageAddress) {
         if (packetAddress == null) {
             packetAddress = podStateManager.getAddress();
         }
@@ -308,7 +308,7 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication
         return new OmnipodPacket(packetAddress, PacketType.ACK, podStateManager.getPacketNumber(), ByteUtil.getBytesFromInt(messageAddress));
     }
 
-    private void ackUntilQuiet(PodStateManager podStateManager, Integer packetAddress, Integer messageAddress) {
+    private void ackUntilQuiet(ErosPodStateManager podStateManager, Integer packetAddress, Integer messageAddress) {
         OmnipodPacket ack = createAckPacket(podStateManager, packetAddress, messageAddress);
         boolean quiet = false;
         while (!quiet) try {
@@ -326,15 +326,15 @@ public class OmnipodRileyLinkCommunicationManager extends RileyLinkCommunication
         podStateManager.increasePacketNumber();
     }
 
-    private OmnipodPacket exchangePackets(PodStateManager podStateManager, OmnipodPacket packet) {
+    private OmnipodPacket exchangePackets(ErosPodStateManager podStateManager, OmnipodPacket packet) {
         return exchangePackets(podStateManager, packet, 0, 333, 9000, 127);
     }
 
-    private OmnipodPacket exchangePackets(PodStateManager podStateManager, OmnipodPacket packet, int repeatCount, int preambleExtensionMilliseconds) {
+    private OmnipodPacket exchangePackets(ErosPodStateManager podStateManager, OmnipodPacket packet, int repeatCount, int preambleExtensionMilliseconds) {
         return exchangePackets(podStateManager, packet, repeatCount, 333, 9000, preambleExtensionMilliseconds);
     }
 
-    private OmnipodPacket exchangePackets(PodStateManager podStateManager, OmnipodPacket packet, int repeatCount, int responseTimeoutMilliseconds, int exchangeTimeoutMilliseconds, int preambleExtensionMilliseconds) {
+    private OmnipodPacket exchangePackets(ErosPodStateManager podStateManager, OmnipodPacket packet, int repeatCount, int responseTimeoutMilliseconds, int exchangeTimeoutMilliseconds, int preambleExtensionMilliseconds) {
         long timeoutTime = System.currentTimeMillis() + exchangeTimeoutMilliseconds;
 
         podStateManager.increasePacketNumber();
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java
index 1ad2887005..090e754eb2 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/rileylink/service/RileyLinkOmnipodService.java
@@ -19,7 +19,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLin
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.R;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.rileylink.manager.OmnipodRileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil;
@@ -35,8 +35,6 @@ public class RileyLinkOmnipodService extends RileyLinkService {
 
     @Inject OmnipodErosPumpPlugin omnipodErosPumpPlugin;
     @Inject AapsOmnipodUtil aapsOmnipodUtil;
-    @Inject PodStateManager podStateManager;
-    @Inject AapsOmnipodErosManager aapsOmnipodErosManager;
     @Inject OmnipodRileyLinkCommunicationManager omnipodRileyLinkCommunicationManager;
 
     private final IBinder mBinder = new LocalBinder();
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
index 3d16b252e6..5020b99c2a 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
@@ -19,7 +19,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugi
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.R
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.databinding.OmnipodErosPodManagementBinding
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosPumpValuesChanged
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandReadPulseLog
@@ -44,7 +44,7 @@ class ErosPodManagementActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var commandQueue: CommandQueueProvider
-    @Inject lateinit var podStateManager: PodStateManager
+    @Inject lateinit var podStateManager: ErosPodStateManager
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var rileyLinkServiceData: RileyLinkServiceData
     @Inject lateinit var aapsOmnipodManager: AapsOmnipodErosManager
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt
index fe2bd876a2..a46f7eaa92 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt
@@ -24,7 +24,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLin
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData
 import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.OmnipodCommonOverviewButtonsBinding
 import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.OmnipodCommonOverviewPodInfoBinding
-import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandAcknowledgeAlerts
+import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandSilenceAlerts
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandHandleTimeChange
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandResumeDelivery
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandSuspendDelivery
@@ -35,7 +35,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.databinding.OmnipodE
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.util.TimeUtil
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.event.EventOmnipodErosPumpValuesChanged
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager
@@ -74,7 +74,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var omnipodErosPumpPlugin: OmnipodErosPumpPlugin
-    @Inject lateinit var podStateManager: PodStateManager
+    @Inject lateinit var podStateManager: ErosPodStateManager
     @Inject lateinit var sp: SP
     @Inject lateinit var omnipodUtil: AapsOmnipodUtil
     @Inject lateinit var omnipodAlertUtil: OmnipodAlertUtil
@@ -148,7 +148,8 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
 
         buttonBinding.buttonSilenceAlerts.setOnClickListener {
             disablePodActionButtons()
-            commandQueue.customCommand(CommandAcknowledgeAlerts(),
+            commandQueue.customCommand(
+                CommandSilenceAlerts(),
                 DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_common_error_failed_to_silence_alerts), false)
                     .messageOnSuccess(resourceHelper.gs(R.string.omnipod_common_confirmation_silenced_alerts))
                     .actionOnSuccess { rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_ALERTS)) })
@@ -254,13 +255,13 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
         }
 
         if (!podStateManager.hasPodState() || !podStateManager.isPodInitialized) {
-            podInfoBinding.podAddress.text = if (podStateManager.hasPodState()) {
+            podInfoBinding.uniqueId.text = if (podStateManager.hasPodState()) {
                 podStateManager.address.toString()
             } else {
                 PLACEHOLDER
             }
             podInfoBinding.podLot.text = PLACEHOLDER
-            podInfoBinding.podTid.text = PLACEHOLDER
+            podInfoBinding.podSequenceNumber.text = PLACEHOLDER
             podInfoBinding.firmwareVersion.text = PLACEHOLDER
             podInfoBinding.timeOnPod.text = PLACEHOLDER
             podInfoBinding.podExpiryDate.text = PLACEHOLDER
@@ -271,9 +272,9 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
             podInfoBinding.reservoir.setTextColor(Color.WHITE)
             podInfoBinding.podActiveAlerts.text = PLACEHOLDER
         } else {
-            podInfoBinding.podAddress.text = podStateManager.address.toString()
+            podInfoBinding.uniqueId.text = podStateManager.address.toString()
             podInfoBinding.podLot.text = podStateManager.lot.toString()
-            podInfoBinding.podTid.text = podStateManager.tid.toString()
+            podInfoBinding.podSequenceNumber.text = podStateManager.tid.toString()
             podInfoBinding.firmwareVersion.text = resourceHelper.gs(R.string.omnipod_eros_overview_firmware_version_value, podStateManager.pmVersion.toString(), podStateManager.piVersion.toString())
 
             podInfoBinding.timeOnPod.text = readableZonedTime(podStateManager.time)
@@ -513,7 +514,8 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
     }
 
     private fun updateSilenceAlertsButton() {
-        if (!omnipodManager.isAutomaticallyAcknowledgeAlertsEnabled && podStateManager.isPodRunning && (podStateManager.hasActiveAlerts() || commandQueue.isCustomCommandInQueue(CommandAcknowledgeAlerts::class.java))) {
+        if (!omnipodManager.isAutomaticallyAcknowledgeAlertsEnabled && podStateManager.isPodRunning && (podStateManager.hasActiveAlerts() || commandQueue.isCustomCommandInQueue(
+                CommandSilenceAlerts::class.java))) {
             buttonBinding.buttonSilenceAlerts.visibility = View.VISIBLE
             buttonBinding.buttonSilenceAlerts.isEnabled = rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
         } else {
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt
index e721cdbd6b..e7cfd81ed5 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInitializePodViewModel.kt
@@ -1,15 +1,23 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.viewmodel.action
 
 import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InitializePodViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.R
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsErosPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager
+import io.reactivex.Single
 import javax.inject.Inject
 
-class ErosInitializePodViewModel @Inject constructor(private val aapsOmnipodManager: AapsOmnipodErosManager, private val podStateManager: AapsErosPodStateManager) : InitializePodViewModel() {
+class ErosInitializePodViewModel @Inject constructor(
+    private val aapsOmnipodManager: AapsOmnipodErosManager,
+    private val podStateManager: AapsErosPodStateManager,
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : InitializePodViewModel(injector, logger) {
 
     override fun isPodInAlarm(): Boolean = podStateManager.isPodFaulted
 
@@ -17,7 +25,7 @@ class ErosInitializePodViewModel @Inject constructor(private val aapsOmnipodMana
 
     override fun isPodDeactivatable(): Boolean = podStateManager.activationProgress.isAtLeast(ActivationProgress.PAIRING_COMPLETED)
 
-    override fun doExecuteAction(): PumpEnactResult = aapsOmnipodManager.initializePod()
+    override fun doExecuteAction(): Single<PumpEnactResult> = Single.just(aapsOmnipodManager.initializePod())
 
     @StringRes
     override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_initialize_pod_title
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt
index bc503baedd..f28b6d1e9b 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/activation/viewmodel/action/ErosInsertCannulaViewModel.kt
@@ -1,16 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.viewmodel.action
 
 import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.R
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.ActivationProgress
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsErosPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager
+import io.reactivex.Single
 import javax.inject.Inject
 
-class ErosInsertCannulaViewModel @Inject constructor(private val aapsOmnipodManager: AapsOmnipodErosManager, private val podStateManager: AapsErosPodStateManager, private val profileFunction: ProfileFunction) : InsertCannulaViewModel() {
+class ErosInsertCannulaViewModel @Inject constructor(
+    private val aapsOmnipodManager: AapsOmnipodErosManager,
+    private val podStateManager: AapsErosPodStateManager,
+    private val profileFunction: ProfileFunction,
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : InsertCannulaViewModel(injector, logger) {
 
     override fun isPodInAlarm(): Boolean = podStateManager.isPodFaulted
 
@@ -18,7 +27,7 @@ class ErosInsertCannulaViewModel @Inject constructor(private val aapsOmnipodMana
 
     override fun isPodDeactivatable(): Boolean = podStateManager.activationProgress.isAtLeast(ActivationProgress.PAIRING_COMPLETED)
 
-    override fun doExecuteAction(): PumpEnactResult = aapsOmnipodManager.insertCannula(profileFunction.getProfile())
+    override fun doExecuteAction(): Single<PumpEnactResult> = Single.just(aapsOmnipodManager.insertCannula(profileFunction.getProfile()))
 
     @StringRes
     override fun getTitleId(): Int = R.string.omnipod_common_pod_activation_wizard_insert_cannula_title
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt
index fad491a5f5..2546e6426c 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/wizard/deactivation/viewmodel/action/ErosDeactivatePodViewModel.kt
@@ -1,27 +1,33 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.viewmodel.action
 
 import androidx.annotation.StringRes
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.pump.omnipod.common.R
 import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandDeactivatePod
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.deactivation.viewmodel.action.DeactivatePodViewModel
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager
 import info.nightscout.androidaps.queue.Callback
-import io.reactivex.subjects.SingleSubject
+import io.reactivex.Single
 import javax.inject.Inject
 
-class ErosDeactivatePodViewModel @Inject constructor(private val aapsOmnipodManager: AapsOmnipodErosManager, private val commandQueueProvider: CommandQueueProvider) : DeactivatePodViewModel() {
+class ErosDeactivatePodViewModel @Inject constructor(
+    private val aapsOmnipodManager: AapsOmnipodErosManager,
+    private val commandQueueProvider: CommandQueueProvider,
+    injector: HasAndroidInjector,
+    logger: AAPSLogger
+) : DeactivatePodViewModel(injector, logger) {
 
-    override fun doExecuteAction(): PumpEnactResult {
-        val singleSubject = SingleSubject.create<PumpEnactResult>()
-        commandQueueProvider.customCommand(CommandDeactivatePod(), object : Callback() {
-            override fun run() {
-                singleSubject.onSuccess(result)
-            }
-        })
-        return singleSubject.blockingGet()
-    }
+    override fun doExecuteAction(): Single<PumpEnactResult> =
+        Single.create { source ->
+            commandQueueProvider.customCommand(CommandDeactivatePod(), object : Callback() {
+                override fun run() {
+                    source.onSuccess(result)
+                }
+            })
+        }
 
     override fun discardPod() {
         aapsOmnipodManager.discardPodState()
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java
index ad99d1746b..2ac8d0cdf2 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/util/AapsOmnipodUtil.java
@@ -20,7 +20,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.R;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSet;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertSlot;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.AlertType;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.PodStateManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.manager.ErosPodStateManager;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 /**
@@ -56,7 +56,7 @@ public class AapsOmnipodUtil {
         return this.gsonInstance;
     }
 
-    public List<String> getTranslatedActiveAlerts(PodStateManager podStateManager) {
+    public List<String> getTranslatedActiveAlerts(ErosPodStateManager podStateManager) {
         List<String> translatedAlerts = new ArrayList<>();
         AlertSet activeAlerts = podStateManager.getActiveAlerts();
 
diff --git a/omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml b/omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml
index a6262966e3..4aa7408086 100644
--- a/omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml
+++ b/omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml
@@ -14,7 +14,6 @@
         android:orientation="vertical">
 
         <TextView
-            android:id="@+id/omnipod_eros_pod_management_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
@@ -125,7 +124,7 @@
                 android:orientation="horizontal"
                 app:layout_constraintGuide_percent="0" />
 
-            <info.nightscout.androidaps.utils.ui.SingleClickButton
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/button_play_test_beep"
                 style="?android:attr/buttonStyle"
                 android:layout_width="0dp"
@@ -256,7 +255,7 @@
                 android:orientation="vertical"
                 app:layout_constraintGuide_percent="0.5" />
 
-            <info.nightscout.androidaps.utils.ui.SingleClickButton
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/button_pulse_log"
                 style="?android:attr/buttonStyle"
                 android:layout_width="0dp"
diff --git a/omnipod-eros/src/main/res/values-de-rDE/strings.xml b/omnipod-eros/src/main/res/values-de-rDE/strings.xml
index ddabbae38f..b3bd8f44af 100644
--- a/omnipod-eros/src/main/res/values-de-rDE/strings.xml
+++ b/omnipod-eros/src/main/res/values-de-rDE/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Eros - Description -->
+    <string name="omnipod_eros_pump_description">Pumpen-Integration für Omnipod Eros (älteres Modell mit transparenter Nadelkappe). Benötigt ein RileyLink-Gerät mit mindestens Firmware-Version 2.0.</string>
     <!-- Omnipod Eros - Keys -->
     <!-- Omnipod Eros - Overview -->
     <!-- Omnipod Eros - Preferences -->
@@ -26,8 +27,47 @@
     <string name="omnipod_eros_short_status_riley_link_battery">RLBatt: %1$d</string>
     <!-- Omnipod Eros - Error -->
     <string name="omnipod_eros_error_riley_link_address_invalid">RileyLink Adresse ungültig.</string>
+    <string name="omnipod_eros_error_crc_mismatch">Kommunikation fehlgeschlagen: Die Überprüfung der Nachrichtenintegrität ist fehlgeschlagen</string>
+    <string name="omnipod_eros_error_invalid_packet_type">Kommunikation fehlgeschlagen: Es wurde ein ungültiges Paket vom Pod empfangen.</string>
+    <string name="omnipod_eros_error_invalid_progress_state">Kommunikation fehlgeschlagen: Der Pod befindet sich in einem falschen Zustand.</string>
+    <string name="omnipod_eros_error_invalid_response">Kommunikation fehlgeschlagen: Es wurde eine ungültige Antwort vom Pod empfangen.</string>
+    <string name="omnipod_eros_error_invalid_message_sequence_number">Kommunikation fehlgeschlagen: Ungültige Zeichenfolge vom Pod empfangen.</string>
+    <string name="omnipod_eros_error_invalid_message_address">Kommunikation fehlgeschlagen: Ungültige Adresse vom Pod empfangen.</string>
+    <string name="omnipod_eros_error_message_decoding_failed">Kommunikation fehlgeschlagen: Nachricht vom Pod konnte nicht decodiert werden.</string>
+    <string name="omnipod_eros_error_nonce_resync_failed">Kommunikation fehlgeschlagen: Nonce resync fehlgeschlagen.</string>
+    <string name="omnipod_eros_error_nonce_out_of_sync">Kommunikation fehlgeschlagen: Nonce nicht synchronisiert.</string>
+    <string name="omnipod_eros_error_not_enough_data">Kommunikation fehlgeschlagen: Nicht genügend Daten vom Pod empfangen.</string>
+    <string name="omnipod_eros_error_pod_fault">Ein Pod-Fehler (%1$03d %2$s) wurde festgestellt. Bitte deaktiviere den Pod und aktiviere einen neuen.</string>
+    <string name="omnipod_eros_error_pod_returned_error_response">Kommunikation fehlgeschlagen: Fehlerhafte Antwort vom Pod.</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_riley_link">Keine Antwort vom RileyLink</string>
+    <string name="omnipod_eros_error_communication_failed_riley_link_interrupted">RileyLink unterbrochen</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_pod">Keine Rückmeldung vom Pod</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_might_be_suspended">Basalprofil konnte nicht eingestellt werden. Insulinabgabe wird evtl. unterbrochen. Aktualisiere den Pod Status bitte manuell im Omnipod Tab und starte die Abgabe falls notwendig neu. </string>
+    <string name="omnipod_eros_error_set_basal_might_have_failed_delivery_might_be_suspended">Basalprofil konnte evtl. nicht eingestellt werden. Insulinabgabe wird evtl. unterbrochen. Aktualisiere den Pod Status bitte manuell im Omnipod Tab und starte die Abgabe falls notwendig neu. </string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_suspended">Basalprofil konnte nicht eingestellt werden. Insulinabgabe wurde unterbrochen. Bitte starte die Abgabe manuell im Omnipod Tab neu. </string>
+    <string name="omnipod_eros_error_cancel_temp_basal_failed_uncertain">Abbruch der temporären Basalrate evtl. fehlgeschlagen. Aktualisiere den Pod Status manuell im Omnipod Tab.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_might_be_cancelled">TBR konnte nicht gesetzt werden. Falls zuvor eine andere TBR aktiv war, wurde diese evtl. abgebrochen. Aktualisiere bitte manuell den Pod Status im Omnipod Tab.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">TBR konnte evtl. nicht gesetzt werden. Falls zuvor eine andere TBR aktiv war, wurde diese abgebrochen. Aktualisiere bitte manuell den Pod Status im Omnipod Tab.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_validation">TBR Dauer muss größer null und ein Vielfaches von %1$s Minuten sein.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_might_be_suspended">Zeit konnte evtl. nicht eingestellt werden. Insulinabgabe wird evtl. unterbrochen. Aktualisiere den Pod Status bitte manuell im Omnipod Tab und starte die Abgabe falls notwendig neu. </string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_suspended">Zeit konnte nicht eingestellt werden. Insulinabgabe wurde unterbrochen. Bitte starte die Abgabe manuell im Omnipod Tab neu. </string>
+    <string name="omnipod_eros_error_failed_to_read_pulse_log">Fehler beim Lesen des Pulse-Log</string>
+    <string name="omnipod_eros_error_automatic_time_or_timezone_change_failed">Zeit auf den Pod konnte nicht geändert werden. Synchronisiere die Zeit manuell im Omnipod tab.</string>
+    <string name="omnipod_eros_error_operation_not_possible_no_configuration">Aktion ist nicht möglich.\n\n Du musst zuerst den Omnipod konfigurieren, bevor Du diese Operation verwenden kannst.</string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain">Bolusabgabe kann nicht verifiziert werden. Prüfe manuell, ob der Pod Insulin abgibt, indem Du auf Klickgeräusche achtest. <b>Wenn Du sicher bist, dass der Bolus nicht abgegeben wurde, musst Du ihn manuell aus den Behandlungen löschen. Dies gilt auch, wenn Du jetzt \'Bolus abbrechen\' klickst!</b></string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain_smb">SMB-Abgabe (%1$.2f IE) kann nicht verifiziert werden. <b>Wenn Du sicher bist, dass der SMB nicht abgegeben wurde, musst Du ihn manuell aus den Behandlungen löschen.</b></string>
+    <string name="omnipod_eros_error_tbr_running_but_aaps_not_aware">Auf dem Pod läuft eine temp. Basalrate, aber AAPS kennt diese nicht. Brich die TBR bitte manuell ab.</string>
     <!-- Omnipod Eros - Pod Management -->
+    <string name="omnipod_eros_pod_management_button_riley_link_stats">RileyLink Status</string>
+    <string name="omnipod_eros_pod_management_waiting_for_riley_link_connection">Warte auf Verbindung mit RileyLink…</string>
+    <string name="omnipod_eros_pod_management_button_reset_riley_link_config">RileyLink-Konfiguration zurücksetzen</string>
+    <string name="omnipod_eros_pod_management_button_read_pulse_log">Pulse-Log lesen</string>
+    <string name="omnipod_eros_pod_management_button_reading_pulse_log">Lese Puls-Log...</string>
+    <string name="omnipod_eros_pod_management_pulse_log">Pulse Log</string>
+    <string name="omnipod_eros_pod_management_pulse_log_value">Pulse Log (in Zwischenablage kopiert)</string>
     <!-- Omnipod Eros - Pod Activation Wizard -->
     <string name="omnipod_eros_pod_activation_wizard_start_pod_activation_text">Befülle den neuen Pod mit ausreichend Insulin für 3 Tage.\n\nAchte auch zwei Pieptöne vom Pod während des Füllens. Diese zeigen an, dass der Pod mit der Mindestmenge von 80 IE befüllt wurde. Leere die Spritze komplett, auch wenn Du die beiden Pieptöne gehört hast.\n\nKlicke <b>Weiter</b> nachdem Du den Pod befüllt hast.\n\n<b>Hinweis:</b> Entferne den Nadelschutz des Pods noch nicht.\n<b>Hinweis:</b> Bringe den RileyLink in eine aufrechte Position und platziere den Pod einige Zentimeter entfernt davon.</string>
+    <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">Versuche, Dich mit dem neuen Pod zu verbinden und ihn zu befüllen.\n\nWenn der Initialisierungsprozess erfolgreich abgeschlossen ist, kannst Du <b>Weiter</b> drücken.\n\n<b>Hinweis:</b> Bringe den RileyLink bitte in eine aufrechte Position und platziere den Pod einige Zentimeter entfernt davon.</string>
     <!-- Omnipod Eros - Other -->
+    <string name="omnipod_eros_uncertain">unsicher</string>
 </resources>
diff --git a/omnipod-eros/src/main/res/values-ko-rKR/strings.xml b/omnipod-eros/src/main/res/values-ko-rKR/strings.xml
index bc89093c83..b1b3b56249 100644
--- a/omnipod-eros/src/main/res/values-ko-rKR/strings.xml
+++ b/omnipod-eros/src/main/res/values-ko-rKR/strings.xml
@@ -1,13 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Eros - Description -->
+    <string name="omnipod_eros_pump_description">Omnipod Eros 를 위한 펌프 통합 (투명 니들 캡이있는 구형 모델). 펌웨어 버전이 2.0 이상인 RileyLink 장치가 필요합니다.</string>
     <!-- Omnipod Eros - Keys -->
     <!-- Omnipod Eros - Overview -->
     <!-- Omnipod Eros - Preferences -->
+    <string name="omnipod_eros_preferences_riley_link_configuration">RileyLink 의 구성</string>
+    <string name="omnipod_eros_preferences_category_notifications">알림</string>
+    <string name="omnipod_eros_preferences_pulse_log_button_enabled">Pod 관리 메뉴에 Pulse 로그 버튼 표시</string>
+    <string name="omnipod_eros_preferences_riley_link_stats_button_enabled">Pod 관리 메뉴에 RileyLink 통계 버튼 표시</string>
+    <string name="omnipod_eros_preferences_battery_change_logging_enabled">Actions 탭에서 배터리 교환 활성화</string>
+    <string name="omnipod_eros_preferences_category_riley_link">RileyLink</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_tbr_sound_enabled">불확실한 TBR 알림 소리 활성화</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_smb_sound_enabled">불확실한 SMB 알림 소리 활성화</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_bolus_sound_enabled">불확실한 볼루스 알림 소리 활성화</string>
     <!-- Omnipod Eros - History -->
+    <string name="omnipod_eros_history_title">Pod 이력</string>
+    <string name="omnipod_eros_history_item_description">상세설명</string>
+    <string name="omnipod_eros_history_item_source">소스</string>
+    <string name="omnipod_eros_history_item_date">날짜</string>
+    <string name="omnipod_eros_history_type">종류:</string>
+    <string name="omnipod_eros_history_bolus_value">%1$.2f U</string>
+    <string name="omnipod_eros_history_bolus_value_with_carbs">%1$.2f U, CH=%2$.1f g</string>
+    <string name="omnipod_eros_history_tbr_value">Rate: %1$.2f U, 기간: %2$d 분</string>
     <!-- Omnipod Eros - Short Status -->
+    <string name="omnipod_eros_short_status_riley_link_battery">RLBatt: %1$d</string>
     <!-- Omnipod Eros - Error -->
+    <string name="omnipod_eros_error_riley_link_address_invalid">RileyLink 주소가 유효하지 않습니다</string>
+    <string name="omnipod_eros_error_crc_mismatch">통신 실패: 메시지 연동 확인 실패</string>
+    <string name="omnipod_eros_error_invalid_packet_type">통신 실패: Pod 에서 유효하지 않은 패킷을 받음</string>
+    <string name="omnipod_eros_error_invalid_progress_state">통신 실패: Pod 가 잘못된 상태에 있음</string>
+    <string name="omnipod_eros_error_invalid_response">통신 실패: Pod 에서 유효하지 않은 응답을 받음</string>
+    <string name="omnipod_eros_error_invalid_message_sequence_number">연결 실패: Pod에서 유효하지 않은 일련번호 포함한 메시지 전송됨</string>
+    <string name="omnipod_eros_error_invalid_message_address">연결 실패: Pod에서 유효하지 않은 주소 포함한 메시지 전송됨</string>
+    <string name="omnipod_eros_error_message_decoding_failed">연결 실패: Pod에서 암호 해독 실패함</string>
+    <string name="omnipod_eros_error_nonce_resync_failed">연결 실패: 임시 재동기화 실패함</string>
+    <string name="omnipod_eros_error_nonce_out_of_sync">연결 실패: 임시 동기화 시간 지남</string>
+    <string name="omnipod_eros_error_not_enough_data">연결 실패: Pod로부터 수신한 데이터 부족</string>
+    <string name="omnipod_eros_error_pod_fault">Pod 이상 (%1$03d %2$s)이 감지되었습니다. 현재 pod를 비활성화하고, 새로운 pod를 활성화하십시오.</string>
+    <string name="omnipod_eros_error_pod_returned_error_response">연결 실패: Pod가 오류 응답을 보냄</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_riley_link">RileyLink에서 반응 없음</string>
+    <string name="omnipod_eros_error_communication_failed_riley_link_interrupted">RileyLink 차단됨</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_pod">Pod에서 반응 없음</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_might_be_suspended">Basal 프로파일 설정이 실패함. 주입이 중지되었을 것입니다! 필요하다면, Omnipod 탭에서 Pod 상태를 수동으로 업데이트하고 재시작하십시오.</string>
+    <string name="omnipod_eros_error_set_basal_might_have_failed_delivery_might_be_suspended">Basal 프로파일 설정이 실패했을 것입니다. 주입이 중지되었을 것입니다! 필요하다면, Omnipod 탭에서 Pod 상태를 수동으로 업데이트하고, 주입을 재시작하십시오.</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_suspended">Basal 프로파일 설정이 실패함. 주입이 중지됨! Omnipod 탭에서 주입을 수동으로 재시작하십시오.</string>
+    <string name="omnipod_eros_error_cancel_temp_basal_failed_uncertain">임시 basal 취소가 실패한 것 같습니다. Omnipod 탭에서 Pod 상태를 수동으로 업데이트하십시오.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_might_be_cancelled">임시 basal 설정이 실패함. 임시 basal이 작동하고 있었다면, 이는 취소되었을 것입니다. Omnipod 탭에서 Pod 상태를 수동으로 업데이트 하십시오.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">임시 basal 설정이 실패한 것 같습니다. 임시 basal이 작동하고 있었다면, 이는 취소되었을 것입니다. Omnipod 탭에서 Pod 상태를 수동으로 업데이트 하십시오.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_validation">TBR 기간은 반드시 0보다 크고, %1$s분의 배수이어야 합니다.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_might_be_suspended">시간 설정이 실패했을 것입니다. 주입이 중지되었을 것입니다! 필요하다면, Omnipod 탭에서 Pod 상태를 수동으로 업데이트하고, 주입을 재시작하십시오.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_suspended">시간 설정이 실패함. 주입이 중지됨! Omnipod 탭에서 주입을 수동으로 재시작하십시오.</string>
+    <string name="omnipod_eros_error_failed_to_read_pulse_log">Pulse 로그 읽어오기 실패함</string>
+    <string name="omnipod_eros_error_automatic_time_or_timezone_change_failed">Pod에서 자동 시간 전환 실패함. Omnipod 탭에서 수동으로 시간을 동기화 하여야 합니다.</string>
+    <string name="omnipod_eros_error_operation_not_possible_no_configuration">작업이 불가능합니다.\n\n이 작업을 사용하기 전에 우선 Omnipod를 설정해야합니다.</string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain">Bolus가 성공적으로 주입되었는지 확인이 어렵습니다. 딸깍 소리에 귀기울여 Pod가 bolus를 주입 중인지 수동으로 확인하십시오. <b>Bolus가 성공적으로 주입되지 않음이 확실하면, 지금 \'Bolus 취소\'를 눌렀을지라도 \'처치\' 탭에서 bolus 기록을 수동으로 삭제하십시오!</b></string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain_smb">SMB bolus(%1$.2f U)가 성공적으로 주입되었는지 확인이 어렵습니다. <b>SMB Bolus가 성공적으로 주입되지 않음이 확실하면, \'처치\' 탭에서 SMB 기록을 수동으로 삭제해야 합니다.</b></string>
+    <string name="omnipod_eros_error_tbr_running_but_aaps_not_aware">Pod에서 임시 basal이 작동하고 있으나, AAPS는 이 임시 basal을 인식하지 못하고 있습니다. 임시 basal을 수동으로 취소하십시오.</string>
     <!-- Omnipod Eros - Pod Management -->
+    <string name="omnipod_eros_pod_management_button_riley_link_stats">RileyLink 통계</string>
+    <string name="omnipod_eros_pod_management_waiting_for_riley_link_connection">RileyLink 연결 대기...</string>
+    <string name="omnipod_eros_pod_management_button_reset_riley_link_config">RileyLink 구성 재설정</string>
+    <string name="omnipod_eros_pod_management_button_read_pulse_log">Pulse Log 확인</string>
+    <string name="omnipod_eros_pod_management_button_reading_pulse_log">Pulse Log 확인 중...</string>
+    <string name="omnipod_eros_pod_management_pulse_log">Pulse 로그</string>
+    <string name="omnipod_eros_pod_management_pulse_log_value">Pulse 로그 (클립보드에 복사됨)</string>
     <!-- Omnipod Eros - Pod Activation Wizard -->
+    <string name="omnipod_eros_pod_activation_wizard_start_pod_activation_text">3일 동안 사용할 수 있는 충분한 인슐린으로 새로운 Pod를 채우십시오. \n\n인슐린을 채우는 동안 Pod에서 나는 두 번의 신호음을 듣습니다. 이는 최소 용량인 80U이 채워졌음을 의미합니다. 두 번의 신호음을 들은 후에도 인슐린 충전용 시린지가 완전히 비워졌는지 확인하십시오. \n\nPod를 채운 후, <b>다음</b>을 누르십시오. \n\n<b>참고:</b>이 때 Pod의 바늘 캡을 제거하지 마십시오. \n<b>참고:</b>RileyLink를 반듯하게 세워놓고 Pod를 가까이 두십시오.</string>
+    <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">새로운 Pod를 연결하고 prime을 시도하십시오. \n\n 시작 과정이 성공적으로 완료되면, <b>다음</b>을 누를 수 있습니다. \n\n<b>참고:</b>RileyLink를 반듯하게 세워놓고 Pod를 가까이 두십시오.</string>
     <!-- Omnipod Eros - Other -->
+    <string name="omnipod_eros_uncertain">불확실함</string>
 </resources>
diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt
index ed2c180ba2..469f4aa346 100644
--- a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt
@@ -267,7 +267,7 @@ class OpenHumansUploader @Inject internal constructor(
                 put("currentTemp", JSONObject(it.currentTempJson))
                 put("iobData", JSONObject(it.iobDataJson))
                 put("profile", JSONObject(it.profileJson))
-                put("autosensData", JSONObject(it.autosensDataJson))
+                put("autosensData", JSONObject(it.autosensDataJson ?: ""))
                 put("mealData", JSONObject(it.mealDataJson))
                 put("isMicroBolusAllowed", it.isMicroBolusAllowed)
                 put("result", JSONObject(it.resultJson))
diff --git a/openhumans/src/main/res/values-ko-rKR/strings.xml b/openhumans/src/main/res/values-ko-rKR/strings.xml
index 14bbbe149e..969971395d 100644
--- a/openhumans/src/main/res/values-ko-rKR/strings.xml
+++ b/openhumans/src/main/res/values-ko-rKR/strings.xml
@@ -2,9 +2,18 @@
 <resources>
     <string name="open_humans">Open Humans (데이터를 공개함)</string>
     <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Open Humans는 당신의 당뇨 관련 데이터를 업로드하고 이를 과학적 연구 프로젝트에 기증하도록 허용합니다.</string>
     <string name="logout">로그아웃</string>
+    <string name="setup">설정</string>
+    <string name="setup_completed_info">Open Humans가 설정되었습니다. 데이터 업로드의 중단을 원할 경우, \'로그아웃\'을 누르십시오.</string>
+    <string name="not_setup_info">Open Humans가 현재 비활성화되어 있습니다. 데이터 업로드의 시작을 원할 경우, \'설정\'을 누르십시오.</string>
+    <string name="project_member_id">프로젝트 회원 ID: %1$s</string>
     <string name="only_upload_if_connected_to_wifi">WiFi에 연결되었을 경우에만 업로드함</string>
     <string name="only_upload_if_charging">충전 중에만 업로드함</string>
+    <string name="open_humans_uploading">Open Humans에 업로드 중...</string>
+    <string name="open_humans_notifications">Open Humans 알림</string>
+    <string name="uploading_to_open_humans">AndroidAPS가 Open Humans에 업로드 중입니다. 시간이 조금 걸립니다.</string>
     <string name="you_have_been_signed_out_of_open_humans">Open Humans에 접속 종료되었습니다.</string>
     <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">의도한 것이 아닌 경우 \"여기\"를 클릭하여 다시 접속하십시오.</string>
+    <string name="upload_now">지금 업로드하기</string>
 </resources>
diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt
index 6314f5e668..39c4f9ecd6 100644
--- a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt
@@ -69,7 +69,6 @@ abstract class PumpPluginAbstract protected constructor(
     protected var displayConnectionMessages = false
 
     var pumpType: PumpType = PumpType.GENERIC_AAPS
-        get() = field
         set(value) {
             field = value
             pumpDescription.fillFor(value)
diff --git a/rileylink/src/main/res/values-ko-rKR/strings.xml b/rileylink/src/main/res/values-ko-rKR/strings.xml
index 776fdba0e6..e6ed20e16c 100644
--- a/rileylink/src/main/res/values-ko-rKR/strings.xml
+++ b/rileylink/src/main/res/values-ko-rKR/strings.xml
@@ -2,6 +2,19 @@
 <resources>
     <!-- RL keys -->
     <!-- RL BLE Config -->
+    <string name="riley_link_ble_config_button_scan_start">스캔하기</string>
+    <string name="riley_link_ble_config_scan_stop">정지</string>
+    <string name="riley_link_ble_config_scan_selected">선택됨</string>
+    <string name="riley_link_ble_config_scan_title">RileyLink 스캔</string>
+    <string name="riley_link_ble_config_scan_scanning">스캔중</string>
+    <string name="riley_link_ble_config_scan_finished">스캔 완료</string>
+    <string name="riley_link_ble_config_scan_error">스캔 에러: %1$d</string>
+    <string name="riley_link_ble_config_connected_never">절대</string>
+    <string name="riley_link_ble_config_scan_currently_selected_riley_link">현재 선택된 RileyLink</string>
+    <string name="riley_link_ble_config_remove_riley_link">삭제</string>
+    <string name="riley_link_ble_config_remove_riley_link_confirmation">RileyLink를 제거하는 것이 확실합니까?</string>
+    <string name="riley_link_ble_config_remove_riley_link_confirmation_title">RileyLink 제거하기</string>
+    <string name="riley_link_ble_config_no_riley_link_selected">선택된 RileyLink 없음</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">설정</string>
     <string name="rileylink_settings_tab2">이력</string>
@@ -9,7 +22,23 @@
     <string name="medtronic_pump_status">펌프 상태</string>
     <string name="title_activity_rileylink_settings">RileyLink 설정</string>
     <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_address">주소:</string>
+    <string name="rileylink_name">이름:</string>
+    <string name="rileylink_battery_level">배터리 잔량:</string>
+    <string name="rileylink_battery_level_value">%1$d%%</string>
+    <string name="rileylink_connection_status">연결상태:</string>
+    <string name="rileylink_connection_error">연결에러:</string>
     <string name="rileylink_device">장치</string>
+    <string name="rileylink_device_type">장치타입:</string>
+    <string name="rileylink_configured_device_model">설정된 장치 모델:</string>
+    <string name="rileylink_connected_device_model">연결된 장치 모델:</string>
+    <string name="rileylink_last_used_frequency">최근 사용된 주파수:</string>
+    <string name="rileylink_last_device_contact">최근 장치 연결:</string>
+    <string name="rileylink_firmware_version">펌웨어 버전:</string>
+    <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_pump_serial_number">펌프 일련번호:</string>
+    <string name="rileylink_pump_frequency">펌프 주파수:</string>
+    <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
     <!-- RL State -->
     <string name="rileylink_state_bt_init">블루투스 초기화중...</string>
     <string name="rileylink_state_bt_error">블루투스 에러</string>
@@ -19,14 +48,28 @@
     <string name="rileylink_state_rl_error">RileyLink 에러</string>
     <string name="rileylink_state_pc_tune_up">RileyLink 와 펌프 튜닝</string>
     <string name="rileylink_state_pc_error">펌프 연결 문제</string>
+    <string name="rileylink_state_connected">연결됨</string>
+    <string name="rileylink_state_rl_ready">RileyLink 준비</string>
     <!-- RL Errors -->
     <string name="rileylink_error_not_rl">장치가 RileyLink가 아닙니다.</string>
     <string name="rileylink_error_unreachable">RileyLink에 연결할 수 없음</string>
     <string name="rileylink_error_bt_disabled">블루투스 비활성</string>
     <string name="rileylink_error_no_bt_adapter">블루투스 어댑터 없음</string>
     <string name="rileylink_error_tuneup_failed">튜닝 실패</string>
+    <string name="rileylink_error_pump_unreachable">펌프에 연결할 수 없습니다.</string>
     <string name="rileylink_error_pod_unreachable">포드에 연결할 수 없습니다.</string>
     <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">메드트로닉 펌프</string>
+    <string name="rileylink_target_device_omnipod">Omnipod (Eros)</string>
+    <string name="riley_link_common_yes">네</string>
+    <string name="riley_link_common_no">아니오</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">OrangeLink/EmaLink/DiaLink에서 보고한 배터리 잔량 나타내기</string>
+    <string name="riley_link_show_battery_level_summary">오리지널 RileyLink와 작동하지 않음. 다른 RileyLink 대체 기기와도 작동하지 않을 수 있음.</string>
+    <plurals name="duration_days">
+        <item quantity="other">%1$d 일</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="other">%1$d 시간</item>
+    </plurals>
 </resources>
diff --git a/wear/src/main/res/values-ko-rKR/strings.xml b/wear/src/main/res/values-ko-rKR/strings.xml
index 668663e075..90fbedc84f 100644
--- a/wear/src/main/res/values-ko-rKR/strings.xml
+++ b/wear/src/main/res/values-ko-rKR/strings.xml
@@ -10,6 +10,7 @@
     <string name="label_xdrip_v2">AAPSv2</string>
     <string name="label_xdrip_cockpit">AAPS(조종석)</string>
     <string name="label_xdrip_steampunk">AAPS(스팀펑크)</string>
+    <string name="label_digitalstyle">AAPS(디지털방식)</string>
     <string name="label_warning_sync">데이터없음!</string>
     <string name="label_warning_old">오래된 데이터!</string>
     <string name="label_warning_since">%1$s 이후</string>
@@ -60,12 +61,15 @@
     <string name="pref_complication_tap_action">컴플리케이션 탭 동작</string>
     <string name="pref_unicode_in_complications">컴플리케이션에서 유니코드 사용</string>
     <string name="pref_version">버전:</string>
+    <string name="pref_moreWatchfaceSettings">더 다양한 워치페이스 설정</string>
+    <string name="pref_lookInYourWatchfaceConfiguration">워치페이스 설정을 확인하십시오.</string>
     <string name="menu_tempt">임시목표</string>
     <string name="menu_wizard">마법사</string>
     <string name="menu_bolus">Bolus</string>
     <string name="menu_ecarb">확장탄수화물</string>
     <string name="menu_settings">설정</string>
     <string name="menu_status">상태</string>
+    <string name="menu_resync">재동기화</string>
     <string name="menu_prime_fill">교체/채움</string>
     <string name="menu_none">없음</string>
     <string name="menu_default">기본</string>
@@ -86,6 +90,9 @@
     <string name="action_confirm">확인</string>
     <string name="action_timeshift">시간이동</string>
     <string name="action_bolus">Bolus</string>
+    <string name="bolus_progress">Bolus 주입 중</string>
+    <string name="press_to_cancel">눌러서 취소하기</string>
+    <string name="cancel_bolus">BOLUS 취소</string>
     <string name="status_pump">펌프</string>
     <string name="status_loop">Loop</string>
     <string name="status_cpp">CPP</string>
@@ -93,4 +100,40 @@
     <string name="activity_carb">Carb</string>
     <string name="activity_IOB">IOB</string>
     <string name="activity_no_status">상태 없음</string>
+    <string name="color_name_red">빨강</string>
+    <string name="color_name_pink">핑크</string>
+    <string name="color_name_purple">보라</string>
+    <string name="color_name_deeppurple">진보라</string>
+    <string name="color_name_indigo">진파랑</string>
+    <string name="color_name_blue">파랑</string>
+    <string name="color_name_lightblue">밝은 파랑</string>
+    <string name="color_name_cyan">하늘색</string>
+    <string name="color_name_teal">청록</string>
+    <string name="color_name_green">초록</string>
+    <string name="color_name_lightgreen">밝은 초록</string>
+    <string name="color_name_lime">라임</string>
+    <string name="color_name_yellow">노랑</string>
+    <string name="color_name_amber">황색</string>
+    <string name="color_name_orange">주황</string>
+    <string name="color_name_deeporange">짙은 주황</string>
+    <string name="color_name_brown">갈색</string>
+    <string name="color_name_gray">회색</string>
+    <string name="color_name_bluegray">청회색</string>
+    <string name="color_name_white">흰색</string>
+    <string name="color_name_black">검정</string>
+    <string name="color_name_multicolor">다양한 색상</string>
+    <string name="pref_vibrate_hourly">시간마다 진동</string>
+    <string name="pref_show_weeknumber">몇 번째 주인지 표시</string>
+    <string name="digitalstyle_pref_your_style">사용자 형식:</string>
+    <string name="digitalstyle_style_none">형식 없음</string>
+    <string name="digitalstyle_style_minimal">단순한 형태</string>
+    <string name="digitalstyle_style_shape">모양</string>
+    <string name="digitalstyle_style_full">완전한 형식</string>
+    <string name="digitalstyle_pref_your_color">사용자 색상:</string>
+    <string name="digitalstyle_pref_your_color_saturation">사용자 색상 선명도:</string>
+    <string name="digitalstyle_pref_your_color_opacity">사용자 색상 불투명도:</string>
+    <string name="bolus_progress_channel_name">AAPS Bolus 주입 중</string>
+    <string name="bolus_progress_silent_channel_name">AAPS Bolus 주입 무음화</string>
+    <string name="bolus_progress_channel_description">Bolus 진행과 취소</string>
+    <string name="bolus_progress_silent_channel_description">Bolus 주입과 취소 시 진동 적게 함</string>
 </resources>
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/mockers/WearUtilMocker.java b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/WearUtilMocker.java
index e3f24e878e..5e6ac597db 100644
--- a/wear/src/test/java/info/nightscout/androidaps/testing/mockers/WearUtilMocker.java
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/WearUtilMocker.java
@@ -58,7 +58,7 @@ public class WearUtilMocker {
         return REF_NOW - (Constants.DAY_IN_MS * d + Constants.HOUR_IN_MS * h + Constants.MINUTE_IN_MS * m + Constants.SECOND_IN_MS * s);
     }
 
-    private static Answer bundleToDataMapMock = invocation -> {
+    private static final Answer bundleToDataMapMock = invocation -> {
         DataMap map = new DataMap();
         Bundle bundle = invocation.getArgument(0);
         for(String key: bundle.keySet()) {